quartz: Improve video window sizing on first sample.

Preserve sizes set by the application and defer erasing as it is not needed and can cause deadlock between threads with child video windows.

quartz: Improve video window sizing on first sample.
e2b3a7f4 · Aric Stewart · Alexandre Julliard · f138a572 · e2b3a7f4
Commit e2b3a7f4 authored Sep 27, 2010 by Aric Stewart Committed by Alexandre Julliard Sep 28, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 30 additions and 17 deletions

videorenderer.c dlls/quartz/videorenderer.c +30 -17

No files found.
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -298,23 +298,36 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, 
    if (!This->init)
    {
-        DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE);
+        if (!This->WindowPos.right || !This->WindowPos.top)
-        DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE);
+        {
+            DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE);
-        if (!This->WindowPos.right || !This->WindowPos.bottom)
+            DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE);
-            This->WindowPos = This->SourceRect;
+            if (!This->WindowPos.right)
-        AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex);
+            {
+                This->WindowPos.left = This->SourceRect.left;
-        TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom);
+                This->WindowPos.right = This->SourceRect.right;
-        SetWindowPos(This->hWnd, NULL,
+            }
-            This->WindowPos.left,
+            if (!This->WindowPos.bottom)
-            This->WindowPos.top,
+            {
-            This->WindowPos.right - This->WindowPos.left,
+                This->WindowPos.top = This->SourceRect.top;
-            This->WindowPos.bottom - This->WindowPos.top,
+                This->WindowPos.bottom = This->SourceRect.bottom;
-            SWP_NOZORDER|SWP_NOMOVE);
+            }
-        GetClientRect(This->hWnd, &This->DestRect);
+            AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex);
+            TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom);
+            SetWindowPos(This->hWnd, NULL,
+                This->WindowPos.left,
+                This->WindowPos.top,
+                This->WindowPos.right - This->WindowPos.left,
+                This->WindowPos.bottom - This->WindowPos.top,
+                SWP_NOZORDER|SWP_NOMOVE|SWP_DEFERERASE);
+            GetClientRect(This->hWnd, &This->DestRect);
+        }
+        else
+            This->DestRect = This->WindowPos;
        This->init = TRUE;
    }