[PATCH v4 1/3] d3d9/tests: Work around test_reset_fullscreen failing on gitlab CI.

[Stefan Dösinger]

From: Stefan Dösinger

---

See the added comment for details what is going on.
---
 dlls/d3d9/tests/device.c | 68 ++++++++++++++++++++++++++++------------
 1 file changed, 48 insertions(+), 20 deletions(-)

diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 8ab52c7d5e4..0d38f68bf3f 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -4752,11 +4752,14 @@ done:
 static void test_reset_fullscreen(void)
 {
     struct device_desc device_desc;
-    D3DDISPLAYMODE d3ddm, d3ddm2;
     unsigned int mode_count, i;
     IDirect3DDevice9 *device;
+    D3DDISPLAYMODE d3ddm;
     WNDCLASSEXA wc = {0};
     IDirect3D9 *d3d;
+    BOOL fvwm2_bad;
+    D3DFORMAT fmt;
+    RECT r1, r2;
     HRESULT hr;
     ATOM atom;
     static const struct message messages[] =
@@ -4795,49 +4798,74 @@ static void test_reset_fullscreen(void)
         goto cleanup;
     }

+    IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &d3ddm);
+    fmt = d3ddm.Format;
+    mode_count = IDirect3D9_GetAdapterModeCount(d3d, D3DADAPTER_DEFAULT, fmt);
+    for (i = 0; i < mode_count; ++i)
+    {
+        hr = IDirect3D9_EnumAdapterModes(d3d, D3DADAPTER_DEFAULT, fmt, i, &d3ddm);
+        ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#lx.\n", hr);
+
+        if (d3ddm.Width != registry_mode.dmPelsWidth || d3ddm.Height != registry_mode.dmPelsHeight)
+            break;
+    }
+    if (i == mode_count)
+    {
+        skip("Could not find a suitable display mode.\n");
+        goto cleanup;
+    }
+
     /*
      * Switch to fullscreen mode.
      * This will force the window to be shown and will cause the WM_ACTIVATEAPP
      * message to be sent.
      */
-    device_desc.width = registry_mode.dmPelsWidth;
-    device_desc.height = registry_mode.dmPelsHeight;
+    device_desc.width = d3ddm.Width;
+    device_desc.height = d3ddm.Height;
     device_desc.device_window = device_window;
     device_desc.flags = CREATE_DEVICE_FULLSCREEN;
     ok(SUCCEEDED(reset_device(device, &device_desc)), "Failed to reset device.\n");

+    /* FVWM2 doesn't update its knowledge about the screen size on mode changes. It
+     * will therefore try to resize our fullscreen window to the original size. We
+     * don't learn about this until we process messages, but then we receive a
+     * WM_SIZE message after d3d9 stopped filtering. To dodge the issue, switch to
+     * the original mode when testing for WM_SIZE, but double check that the window
+     * size was changed. */
+    GetWindowRect(device_window, &r1);
+
     flush_events();
     ok(expect_messages->message == 0, "Expected to receive message %#x.\n", expect_messages->message);
     expect_messages = NULL;

-    IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &d3ddm);
-    mode_count = IDirect3D9_GetAdapterModeCount(d3d, D3DADAPTER_DEFAULT, d3ddm.Format);
-    for (i = 0; i < mode_count; ++i)
-    {
-        hr = IDirect3D9_EnumAdapterModes(d3d, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2);
-        ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#lx.\n", hr);
-
-        if (d3ddm2.Width != d3ddm.Width || d3ddm2.Height != d3ddm.Height)
-            break;
-    }
-    if (i == mode_count)
-    {
-        skip("Could not find a suitable display mode.\n");
-        goto cleanup;
-    }
+    /* This is what FVWM2 does to us: Resize the window behind our back. */
+    GetWindowRect(device_window, &r2);
+    fvwm2_bad = !EqualRect(&r1, &r2);
+    todo_wine_if(fvwm2_bad)
+    ok(EqualRect(&r1, &r2), "Window rect changed during event flush: %s -> %s.\n",
+            wine_dbgstr_rect(&r1), wine_dbgstr_rect(&r2));

wm_size_received = 0;

/* Fullscreen mode change. */
-    device_desc.width = d3ddm2.Width;
-    device_desc.height = d3ddm2.Height;
+    device_desc.width = registry_mode.dmPelsWidth;
+    device_desc.height = registry_mode.dmPelsHeight;
     device_desc.device_window = device_window;
     device_desc.flags = CREATE_DEVICE_FULLSCREEN;
     ok(SUCCEEDED(reset_device(device, &device_desc)), "Failed to reset device.\n");

flush_events();
+
+    /* And some FVWM2 versions still insist on resizing in the flush_events() above -
+     * my fvwm 2.7.0 resizes the window back to the size before the mode change and
+     * then back to the new mode. This doesn't affect the gitlab machines afaics. */
+    todo_wine_if (fvwm2_bad && wm_size_received)
     ok(!wm_size_received, "Received unexpected WM_SIZE message.\n");

+    GetWindowRect(device_window, &r2);
+    ok(!EqualRect(&r1, &r2), "Window rectangles before and after mode change are equal: %s\n",
+            wine_dbgstr_rect(&r1));
+
 cleanup:
     if (device) IDirect3DDevice9_Release(device);
     IDirect3D9_Release(d3d);