Module: wine Branch: master Commit: a0aa542a26da07ee2fd4099faeca0f6e29f97c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0aa542a26da07ee2fd4099fa...
Author: Zebediah Figura z.figura12@gmail.com Date: Tue Oct 15 16:00:19 2019 -0500
strmbase: Get rid of the "pfnOnReceiveMessage" callback.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/quartz/videorenderer.c | 1 - dlls/quartz/vmr9.c | 1 - dlls/strmbase/window.c | 3 --- include/wine/strmbase.h | 2 -- 4 files changed, 7 deletions(-)
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 0e49f27f15..87491d8851 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -443,7 +443,6 @@ static const BaseRendererFuncTable BaseFuncTable = static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { VideoRenderer_GetClassWindowStyles, VideoRenderer_GetDefaultRect, - NULL, VideoRenderer_OnSize };
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 413f334d99..d3fdfb13a3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -606,7 +606,6 @@ static BOOL WINAPI VMR9_OnSize(BaseWindow *This, LONG Width, LONG Height) static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { VMR9_GetClassWindowStyles, VMR9_GetDefaultRect, - NULL, VMR9_OnSize, };
diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index fed1002128..3135de066a 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -40,9 +40,6 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM if (!This) return DefWindowProcW(hwnd, message, wparam, lparam);
- if (This->pFuncsTable->pfnOnReceiveMessage) - return This->pFuncsTable->pfnOnReceiveMessage(This, hwnd, message, wparam, lparam); - switch (message) { case WM_KEYDOWN: diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 166a60171b..34a558ab8e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -371,7 +371,6 @@ typedef struct tagBaseWindow
typedef LPWSTR (WINAPI *BaseWindow_GetClassWindowStyles)(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx); typedef RECT (WINAPI *BaseWindow_GetDefaultRect)(BaseWindow *This); -typedef LRESULT (WINAPI *BaseWindow_OnReceiveMessage)(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); typedef BOOL (WINAPI *BaseWindow_OnSize)(BaseWindow *This, LONG Height, LONG Width);
typedef struct BaseWindowFuncTable @@ -380,7 +379,6 @@ typedef struct BaseWindowFuncTable BaseWindow_GetClassWindowStyles pfnGetClassWindowStyles; BaseWindow_GetDefaultRect pfnGetDefaultRect; /* Optional, WinProc Related */ - BaseWindow_OnReceiveMessage pfnOnReceiveMessage; BaseWindow_OnSize pfnOnSize; } BaseWindowFuncTable;