[PATCH 3/5] strmbase: Get rid of BaseWindowImpl_OnReceiveMessage().
Zebediah Figura
z.figura12 at gmail.com
Tue Oct 15 16:00:18 CDT 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
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 3d91b05eadd..fed10021286 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 2213f79b975..166a60171bc 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
--
2.23.0
More information about the wine-devel
mailing list