CreateWindow should not activate invisible minimized or maximized

windows. Add several tests to show the correct behavior.

CreateWindow should not activate invisible minimized or maximized
aae76324 · Vitaliy Margolen · Alexandre Julliard · 19b55e89 · aae76324 · aae76324
Commit aae76324 authored Nov 30, 2005 by Vitaliy Margolen Committed by Alexandre Julliard Nov 30, 2005
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 219 additions and 3 deletions

msg.c dlls/user/tests/msg.c +215 -0

window.c dlls/x11drv/window.c +4 -3

No files found.
--- a/dlls/user/tests/msg.c
+++ b/dlls/user/tests/msg.c
--- a/dlls/x11drv/window.c
+++ b/dlls/x11drv/window.c
@@ -1020,9 +1020,10 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
        UINT swFlag = (style & WS_MINIMIZE) ? SW_MINIMIZE : SW_MAXIMIZE;
        WIN_SetStyle( hwnd, 0, WS_MAXIMIZE | WS_MINIMIZE );
        WINPOS_MinMaximize( hwnd, swFlag, &newPos );
-        swFlag = ((style & WS_CHILD) || GetActiveWindow())
-            ? SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED
-            : SWP_NOZORDER | SWP_FRAMECHANGED;
+
+        swFlag = SWP_FRAMECHANGED | SWP_NOZORDER; /* Frame always gets changed */
+        if (!(style & WS_VISIBLE) || (style & WS_CHILD) || GetActiveWindow()) swFlag |= SWP_NOACTIVATE;
+
        SetWindowPos( hwnd, 0, newPos.left, newPos.top,
                      newPos.right, newPos.bottom, swFlag );
    }