[PATCH 4/5] strmbase: Get rid of the "pfnOnReceiveMessage" callback.

Zebediah Figura z.figura12 at gmail.com
Tue Oct 15 16:00:19 CDT 2019


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 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 0e49f27f151..87491d8851c 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 413f334d99d..d3fdfb13a39 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 fed10021286..3135de066a0 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 166a60171bc..34a558ab8e8 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;
 
-- 
2.23.0




More information about the wine-devel mailing list