Zebediah Figura : strmbase: Get rid of BaseWindowImpl_OnReceiveMessage().
Alexandre Julliard
julliard at winehq.org
Wed Oct 16 16:59:29 CDT 2019
Module: wine
Branch: master
Commit: a29b1d58b77b446e4098b11e1e21279f4eea666a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a29b1d58b77b446e4098b11e1e21279f4eea666a
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Oct 15 16:00:18 2019 -0500
strmbase: Get rid of BaseWindowImpl_OnReceiveMessage().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/strmbase/window.c | 14 ++++----------
include/wine/strmbase.h | 1 -
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c
index 3d91b05ead..fed1002128 100644
--- a/dlls/strmbase/window.c
+++ b/dlls/strmbase/window.c
@@ -32,22 +32,16 @@ static inline BaseControlWindow *impl_from_BaseWindow(BaseWindow *iface)
return CONTAINING_RECORD(iface, BaseControlWindow, baseWindow);
}
-static LRESULT CALLBACK WndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)
{
BaseWindow* This = (BaseWindow*)GetWindowLongPtrW(hwnd, 0);
+ BaseControlWindow *window = impl_from_BaseWindow(This);
if (!This)
- return DefWindowProcW(hwnd, uMsg, wParam, lParam);
+ return DefWindowProcW(hwnd, message, wparam, lparam);
if (This->pFuncsTable->pfnOnReceiveMessage)
- return This->pFuncsTable->pfnOnReceiveMessage(This, hwnd, uMsg, wParam, lParam);
- else
- return BaseWindowImpl_OnReceiveMessage(This, hwnd, uMsg, wParam, lParam);
-}
-
-LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT message, WPARAM wparam, LPARAM lparam)
-{
- BaseControlWindow *window = impl_from_BaseWindow(This);
+ return This->pFuncsTable->pfnOnReceiveMessage(This, hwnd, message, wparam, lparam);
switch (message)
{
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index 2213f79b97..166a60171b 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -389,7 +389,6 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *pBaseWindow);
HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This);
HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This);
-LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam);
BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width);
enum strmbase_type_id
More information about the wine-cvs
mailing list