[PATCH 0/2] MR1861: d3d8/tests: Fix some test failures on Gitlab CI.

[Alexandre Julliard (＠julliard)]

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

[PATCH 1/2] d3d8/tests: Don't require WM_MOVE on window reactivation.

[Alexandre Julliard]

From: Alexandre Julliard <julliard(a)winehq.org>

It can be activated without moving.
---
 dlls/d3d8/tests/device.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 12d8aeb89f6..9dcdcab066f 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -2922,7 +2922,6 @@ static void test_wndproc(void)
     {
         {WM_WINDOWPOSCHANGING,  DEVICE_WINDOW,  FALSE,  0},
         {WM_WINDOWPOSCHANGED,   DEVICE_WINDOW,  FALSE,  0},
-        {WM_MOVE,               DEVICE_WINDOW,  FALSE,  0},
         {WM_ACTIVATEAPP,        FOCUS_WINDOW,   TRUE,   TRUE},
         {0,                     0,              FALSE,  0},
     };
-- 
GitLab


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

[PATCH 2/2] d3d8/tests: Make sure that the window has focus before testing loss of focus.

[Alexandre Julliard]

From: Alexandre Julliard <julliard(a)winehq.org>

---
 dlls/d3d8/tests/device.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 9dcdcab066f..59532d0a208 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -3305,6 +3305,7 @@ static void test_wndproc(void)
         skip("Failed to create a D3D device, skipping tests.\n");
         goto done;
     }
+    SetForegroundWindow(focus_window);  /* make sure that the window has focus */
 
     filter_messages = NULL;
 
-- 
GitLab

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

[Zebediah Figura (＠zfigura)]

For the record, the first commit corresponds to 099bc21df7f for d3d9. We don't get WM_MOVE because we are minimizing a window that was maximized and then restoring it, which doesn't change its position at all. Not sure what circumstances the window can actually be moved?

Second commit: we should in theory already *have* focus from the previous ShowWindow(focus_window, SW_SHOWNORMAL), I think? But d3d9 does the same thing anyway (introduced with the tests in 36553d862, specifically the line marked "For KDE".) Since this is probably a winex11 bug and orthogonal to the tests anyway I think it makes sense.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1861#note_19945

[PATCH 0/2] MR1861: d3d8/tests: Fix some test failures on Gitlab CI. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1861