[PATCH v3 1/3] user32/tests: Test restore window messages.

[Zhiyi Zhang]

Mostly to show that there is a WM_ACTIVATE message
before WM_SYSCOMMAND SC_RESTORE and after WM_WINDOWPOSCHANGED

This test won't work on non-Windows because the emulated key inputs
doesn't reach the host, unless we required user interaction, e.g.,
clicking on the taskbar icon or Alt+Tab manually.

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
v2: SetActiveWindow only when restoring from iconic state and window is visible.
v3: Add a test to verify message sequence. Previous comments say the fix
    is for Mirror's Edge, but in fact it is for Project CARS. I remember incorrectly.
    Supersede 165435~165436

 dlls/user32/tests/msg.c | 91 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 6d0f0637ee..71b7f9f156 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -17522,6 +17522,96 @@ static void test_DoubleSetCapture(void)
     DestroyWindow(hwnd);
 }
 
+static const struct message WmRestoreMinimizedSeq[] = {
+    {HCBT_ACTIVATE, hook},
+    {WM_WINDOWPOSCHANGING, sent | wparam, SWP_NOSIZE | SWP_NOMOVE},
+    {WM_WINDOWPOSCHANGED, sent | wparam, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE},
+    {WM_ACTIVATEAPP, sent | wparam, 1},
+    {WM_NCACTIVATE, sent | wparam, 0x200001},
+    {WM_GETTEXT, sent | defwinproc | optional},
+    {WM_ACTIVATE, sent | wparam, 0x200001}, /* Note that activate messages are after WM_WINDOWPOSCHANGED and before WM_SYSCOMMAND */
+    {HCBT_KEYSKIPPED, hook | optional},
+    {WM_SYSKEYUP, sent | optional},
+    {WM_SYSCOMMAND, sent | wparam, SC_RESTORE},
+    {HCBT_SYSCOMMAND, hook | wparam, SC_RESTORE},
+    {HCBT_SYSCOMMAND, hook | wparam | optional, SC_RESTORE},
+    {HCBT_MINMAX, hook},
+    {HCBT_MINMAX, hook | optional},
+    {WM_QUERYOPEN, sent | defwinproc},
+    {WM_QUERYOPEN, sent | optional},
+    {WM_GETTEXT, sent | defwinproc | optional},
+    {WM_WINDOWPOSCHANGING, sent | wparam | defwinproc, SWP_FRAMECHANGED | SWP_NOCOPYBITS | SWP_STATECHANGED},
+    {WM_GETMINMAXINFO, sent | defwinproc},
+    {WM_NCCALCSIZE, sent | wparam | defwinproc, 1},
+    {WM_NCPAINT, sent | wparam | defwinproc | optional, 1},
+    {WM_GETTEXT, sent | defwinproc | optional},
+    {WM_ERASEBKGND, sent | defwinproc},
+    {WM_WINDOWPOSCHANGED, sent | wparam | defwinproc, SWP_FRAMECHANGED | SWP_NOCOPYBITS | SWP_STATECHANGED},
+    {WM_MOVE, sent | defwinproc},
+    {WM_SIZE, sent | defwinproc},
+    {WM_NCCALCSIZE, sent | wparam | defwinproc | optional, 1},
+    {WM_NCPAINT, sent | wparam | defwinproc | optional, 1},
+    {WM_ERASEBKGND, sent | defwinproc | optional},
+    {HCBT_SETFOCUS, hook},
+    {WM_SETFOCUS, sent | defwinproc},
+    {WM_ACTIVATE, sent | wparam | defwinproc, 1},
+    {WM_PAINT, sent| optional},
+    {WM_SETFOCUS, sent | defwinproc | optional},
+    {HCBT_KEYSKIPPED, hook | optional},
+    {WM_KEYUP, sent | optional},
+    {HCBT_KEYSKIPPED, hook | optional},
+    {WM_SYSKEYUP, sent | optional},
+    {HCBT_KEYSKIPPED, hook | optional},
+    {WM_KEYUP, sent | optional},
+    {WM_PAINT, sent| optional},
+    {0}
+};
+
+static void test_restore_messages(void)
+{
+    INPUT ip = {0};
+    HWND hwnd;
+    INT i;
+
+    hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100,
+                           100, 200, 200, 0, 0, 0, NULL);
+    ok (hwnd != 0, "Failed to create overlapped window\n");
+    SetForegroundWindow(hwnd);
+    ShowWindow(hwnd, SW_MINIMIZE);
+    flush_events();
+    flush_sequence();
+
+    for (i = 0; i < 5; i++)
+    {
+        /* Send Alt+Tab to restore test window from minimized state */
+        ip.type = INPUT_KEYBOARD;
+        ip.ki.wVk = VK_MENU;
+        SendInput(1, &ip, sizeof(INPUT));
+        ip.ki.wVk = VK_TAB;
+        SendInput(1, &ip, sizeof(INPUT));
+        ip.ki.wVk = VK_MENU;
+        ip.ki.dwFlags = KEYEVENTF_KEYUP;
+        SendInput(1, &ip, sizeof(INPUT));
+        ip.ki.wVk = VK_TAB;
+        ip.ki.dwFlags = KEYEVENTF_KEYUP;
+        SendInput(1, &ip, sizeof(INPUT));
+        flush_events();
+        if (!IsIconic(hwnd))
+            break;
+        Sleep(500);
+    }
+
+    if (IsIconic(hwnd))
+    {
+        skip("Alt+Tab failed to bring up test window.\n");
+        goto done;
+    }
+    ok_sequence(WmRestoreMinimizedSeq, "Restore minimized window", TRUE);
+
+done:
+    DestroyWindow(hwnd);
+}
+
 static void init_funcs(void)
 {
     HMODULE hKernel32 = GetModuleHandleA("kernel32.dll");
@@ -17646,6 +17736,7 @@ START_TEST(msg)
     test_quit_message();
     test_notify_message();
     test_SetActiveWindow();
+    test_restore_messages();
 
     if (!pTrackMouseEvent)
         win_skip("TrackMouseEvent is not available\n");
-- 
2.20.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=53214

Your paranoid android.


=== w7u (32 bit report) ===

user32:
msg.c:13781: Test failed: CreateDialogParam_3: 12: the msg 0x001c was expected, but got msg 0x0047 instead