[PATCH 2/5] strmbase: Get rid of BaseWindowImpl_OnSize().

Zebediah Figura z.figura12 at gmail.com
Wed Oct 16 19:36:48 CDT 2019


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/quartz/videorenderer.c |  3 ++-
 dlls/quartz/vmr9.c          |  3 ++-
 dlls/strmbase/window.c      | 12 +++---------
 include/wine/strmbase.h     |  1 -
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index a16a422e2d5..11a11833552 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -415,7 +415,8 @@ static BOOL WINAPI VideoRenderer_OnSize(BaseWindow *iface, LONG Width, LONG Heig
         This->DestRect.top,
         This->DestRect.right - This->DestRect.left,
         This->DestRect.bottom - This->DestRect.top);
-    return BaseWindowImpl_OnSize(iface, Width, Height);
+
+    return TRUE;
 }
 
 static const BaseRendererFuncTable BaseFuncTable =
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 536703fbff1..59a5152cf5b 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -589,7 +589,8 @@ static BOOL WINAPI VMR9_OnSize(BaseWindow *This, LONG Width, LONG Height)
         pVMR9->target_rect.top,
         pVMR9->target_rect.right - pVMR9->target_rect.left,
         pVMR9->target_rect.bottom - pVMR9->target_rect.top);
-    return BaseWindowImpl_OnSize(This, Width, Height);
+
+    return TRUE;
 }
 
 static const BaseWindowFuncTable renderer_BaseWindowFuncTable = {
diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c
index 142336bc193..82bb814827a 100644
--- a/dlls/strmbase/window.c
+++ b/dlls/strmbase/window.c
@@ -74,20 +74,14 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM
     case WM_SIZE:
         if (This->pFuncsTable->pfnOnSize)
             return This->pFuncsTable->pfnOnSize(This, LOWORD(lparam), HIWORD(lparam));
-        else
-            return BaseWindowImpl_OnSize(This, LOWORD(lparam), HIWORD(lparam));
+
+        This->Width = LOWORD(lparam);
+        This->Height = HIWORD(lparam);
     }
 
     return DefWindowProcW(hwnd, message, wparam, lparam);
 }
 
-BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Width, LONG Height)
-{
-    This->Width = Width;
-    This->Height = Height;
-    return TRUE;
-}
-
 HRESULT WINAPI BaseWindow_Init(BaseWindow *pBaseWindow, const BaseWindowFuncTable* pFuncsTable)
 {
     if (!pFuncsTable)
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index 11397170edc..13544f414b6 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -381,7 +381,6 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *pBaseWindow);
 
 HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This);
 HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This);
-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