user32: Send a WM_ACTIVATE message after restoring a minimized top level window.

The WmShowRestoreMinimizedOverlappedSeq message sequence in tests clearly show that there is a WM_ACTIVATE message at the end of ShowWindow() calls after restoring a minimized window, and it's not from SetFocus(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47507Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Send a WM_ACTIVATE message after restoring a minimized top level window.
3898ad40 · Zhiyi Zhang · Alexandre Julliard · d2c2987b · 3898ad40 · 3898ad40
Commit 3898ad40 authored Feb 10, 2021 by Zhiyi Zhang Committed by Alexandre Julliard Feb 18, 2021
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

msg.c dlls/user32/tests/msg.c +0 -0

winpos.c dlls/user32/winpos.c +7 -1

No files found.
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -1179,7 +1179,13 @@ static BOOL show_window( HWND hwnd, INT cmd )
    else WIN_ReleasePtr( wndPtr );

    /* if previous state was minimized Windows sets focus to the window */
-    if (style & WS_MINIMIZE) SetFocus( hwnd );
+    if (style & WS_MINIMIZE)
+    {
+        SetFocus( hwnd );
+        /* Send a WM_ACTIVATE message for a top level window, even if the window is already active */
+        if (GetAncestor( hwnd, GA_ROOT ) == hwnd && !(swp & SWP_NOACTIVATE))
+            SendMessageW( hwnd, WM_ACTIVATE, WA_ACTIVE, 0 );
+    }

 done:
    SetThreadDpiAwarenessContext( context );