[PATCH v3 0/2] MR419: win32u/window: Ignore SetWindowPos() for message-only windows.

[Giovanni Mascellani (＠giomasce)]

--
  v3: win32u/window: Ignore changing WS_EX_TOPMOST for message-only windows.
      user32/tests: Check that message-only windows ignore WS_EX_TOPMOST.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/419

[PATCH v3 1/2] user32/tests: Check that message-only windows ignore WS_EX_TOPMOST.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

libOVR brings a message window topmost claiming that this way it receives
WM_DEVICECHANGE faster. Currently, in Wine, this causes a WM_KILLFOCUS to
be sent to the actual topmost window, which in turn causes "Shantae: Risky's
Revenge" to minimize. The effect is that the game automatically minimizes
as soon as it is launched, which is incorrect.

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com>
---
 dlls/user32/tests/win.c | 78 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 4c2af09d0c6..8183bfd3eeb 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -8898,6 +8898,83 @@ static void test_hwnd_message(void)
     DestroyWindow(hwnd);
 }
 
+static BOOL message_window_topmost_event_delivered = FALSE;
+
+static LRESULT WINAPI message_window_topmost_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+    message_window_topmost_event_delivered = TRUE;
+
+    return DefWindowProcW(hwnd, msg, wparam, lparam);
+}
+
+static void test_message_window_topmost(void)
+{
+    WNDCLASSW cls = { 0 };
+    HWND hwnd, hwnd_msg;
+    HDWP hdwp;
+    ATOM atom;
+    BOOL ret;
+    MSG msg;
+
+    cls.lpfnWndProc = message_window_topmost_proc;
+    cls.hInstance = GetModuleHandleW(NULL);
+    cls.lpszClassName = L"test_message_window_topmost";
+    atom = RegisterClassW(&cls);
+    ok(!!atom, "Cannot register window class\n");
+
+    hwnd = CreateWindowW(L"test_message_window_topmost", L"main window", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+            CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandleW(NULL), NULL);
+    ok(!!hwnd, "Cannot create main window\n");
+
+    hwnd_msg = CreateWindowW(L"test_message_window_topmost", L"message window", 0,
+            CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, HWND_MESSAGE, NULL, GetModuleHandleW(NULL), NULL);
+    ok(!!hwnd_msg, "Cannot create message window\n");
+
+    while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
+    {
+        TranslateMessage(&msg);
+        DispatchMessageW(&msg);
+    }
+
+    message_window_topmost_event_delivered = FALSE;
+
+    SetLastError(0xdeadbeef);
+
+    ret = SetWindowPos(hwnd_msg, HWND_TOPMOST, 100, 100, 100, 100, 0);
+    ok(ret, "Unexpected failure when calling SetWindowPos()\n");
+
+    ret = SetWindowPos(hwnd_msg, HWND_NOTOPMOST, 100, 100, 100, 100, 0);
+    ok(ret, "Unexpected failure when calling SetWindowPos()\n");
+
+    hdwp = BeginDeferWindowPos(2);
+    ok(!!hdwp, "Unexpected failure when calling BeginDeferWindowPos()\n");
+
+    hdwp = DeferWindowPos(hdwp, hwnd_msg, HWND_TOPMOST, 100, 100, 100, 100, 0);
+    ok(!!hdwp, "Unexpected failure when calling DeferWindowPos()\n");
+
+    hdwp = DeferWindowPos(hdwp, hwnd_msg, HWND_NOTOPMOST, 100, 100, 100, 100, 0);
+    ok(!!hdwp, "Unexpected failure when calling DeferWindowPos()\n");
+
+    ret = EndDeferWindowPos(hdwp);
+    ok(ret, "Unexpected failure when calling EndDeferWindowPos()\n");
+
+    ok(GetLastError() == 0xdeadbeef, "Last error unexpectedly set to %#lx\n", GetLastError());
+
+    while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
+    {
+        TranslateMessage(&msg);
+        DispatchMessageW(&msg);
+    }
+
+    todo_wine ok(!message_window_topmost_event_delivered, "Unexpected event was delivered\n");
+
+    ok(DestroyWindow(hwnd_msg), "Cannot destroy main window\n");
+    ok(DestroyWindow(hwnd), "Cannot destroy message window\n");
+
+    ok(UnregisterClassW(L"test_message_window_topmost", GetModuleHandleW(NULL)), "Cannot unregister class\n");
+}
+
+
 static void test_layered_window(void)
 {
     HWND hwnd, child;
@@ -13088,6 +13165,7 @@ START_TEST(win)
     test_thick_child_size(hwndMain);
     test_fullscreen();
     test_hwnd_message();
+    test_message_window_topmost();
     test_nonclient_area(hwndMain);
     test_params();
     test_GetWindowModuleFileName();
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/419

[PATCH v3 2/2] win32u/window: Ignore changing WS_EX_TOPMOST for message-only windows.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com>
---
 dlls/user32/tests/win.c |  2 +-
 dlls/win32u/window.c    | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 8183bfd3eeb..0fd052c16ff 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -8966,7 +8966,7 @@ static void test_message_window_topmost(void)
         DispatchMessageW(&msg);
     }
 
-    todo_wine ok(!message_window_topmost_event_delivered, "Unexpected event was delivered\n");
+    ok(!message_window_topmost_event_delivered, "Unexpected event was delivered\n");
 
     ok(DestroyWindow(hwnd_msg), "Cannot destroy main window\n");
     ok(DestroyWindow(hwnd), "Cannot destroy message window\n");
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index fee1617ef10..559693f83a4 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -3366,6 +3366,16 @@ BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y )
     BOOL ret = FALSE;
     DPI_AWARENESS_CONTEXT context;
 
+    if (winpos->hwndInsertAfter == HWND_TOPMOST || winpos->hwndInsertAfter == HWND_NOTOPMOST)
+    {
+        HWND root;
+
+        root = NtUserGetAncestor(winpos->hwnd, GA_ROOT);
+        root = NtUserGetAncestor(root, GA_PARENT);
+        if (root == get_hwnd_message_parent())
+            return TRUE;
+    }
+
     orig_flags = winpos->flags;
 
     /* First, check z-order arguments.  */
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/419