[v3 5/6] user32: Send WM_NCPAINT and WM_ERASEBKGND when window is shown and add tests

Fabian Maurer dark.shadow4 at web.de
Thu Feb 2 14:16:09 CST 2017


Fixes Bug 2624 and 6682 and a few others

v2: Make patch independent from the WM_NCPAINT issue
v3: Add more tests and split patch up

Signed-off-by: Fabian Maurer <dark.shadow4 at web.de>
---
 dlls/user32/winpos.c | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index 2fa194fa1c..a6c2ce101c 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(win);
     (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER)
 #define SWP_AGG_STATUSFLAGS \
     (SWP_AGG_NOPOSCHANGE | SWP_FRAMECHANGED | SWP_HIDEWINDOW | SWP_SHOWWINDOW)
+#define SWP_AGG_NOCLIENTCHANGE \
+        (SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE)
 
 #define HAS_DLGFRAME(style,exStyle) \
     (((exStyle) & WS_EX_DLGMODALFRAME) || \
@@ -2229,16 +2231,7 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos )
                          &newWindowRect, &newClientRect, valid_rects ))
         return FALSE;
 
-    /* erase parent when hiding or resizing child */
-    if (!(orig_flags & SWP_DEFERERASE) &&
-        ((orig_flags & SWP_HIDEWINDOW) ||
-         (!(orig_flags & SWP_SHOWWINDOW) &&
-          (winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE)))
-    {
-        HWND parent = GetAncestor( winpos->hwnd, GA_PARENT );
-        if (!parent || parent == GetDesktopWindow()) parent = winpos->hwnd;
-        erase_now( parent, 0 );
-    }
+
 
     if( winpos->flags & SWP_HIDEWINDOW )
         HideCaret(winpos->hwnd);
@@ -2254,6 +2247,26 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos )
             SetForegroundWindow( winpos->hwnd );
     }
 
+    if(!(orig_flags & SWP_DEFERERASE))
+    {
+        /* erase parent when hiding or resizing child */
+        if ((orig_flags & SWP_HIDEWINDOW) ||
+         (!(orig_flags & SWP_SHOWWINDOW) &&
+          (winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE))
+        {
+            HWND parent = GetAncestor( winpos->hwnd, GA_PARENT );
+            if (!parent || parent == GetDesktopWindow()) parent = winpos->hwnd;
+            erase_now( parent, 0 );
+        }
+
+        /* Give newly shown windows a chance to redraw */
+        if(((winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE)
+                && !(orig_flags & SWP_AGG_NOCLIENTCHANGE) && (orig_flags & SWP_SHOWWINDOW))
+        {
+            erase_now(winpos->hwnd, 0);
+        }
+    }
+
       /* And last, send the WM_WINDOWPOSCHANGED message */
 
     TRACE("\tstatus flags = %04x\n", winpos->flags & SWP_AGG_STATUSFLAGS);
-- 
2.11.0




More information about the wine-patches mailing list