[PATCH 0/2] MR5987: ddraw/tests: Workaround some X11 ConfigureNotify event race condition.

[Rémi Bernon (＠rbernon)]

Somehow more likely to be triggered with https://gitlab.winehq.org/wine/wine/-/merge_requests/5970.

[PATCH 1/2] ddraw/tests: Make sure the window is restored after some minimize tests.

[Rémi Bernon]

From: Rémi Bernon

We may receive ConfigureNotify for the minimization late, overriding the
restore request, and ending with a minimized window for the rest of the
test.
---
 dlls/ddraw/tests/ddraw2.c | 7 +++++++
 dlls/ddraw/tests/ddraw4.c | 7 +++++++
 dlls/ddraw/tests/ddraw7.c | 7 +++++++
 3 files changed, 21 insertions(+)

diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 66fceafbc8d..4841a4f0b8a 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -3344,6 +3344,13 @@ static void test_coop_level_mode_set(void)
     /* For Wine. */
     change_ret = ChangeDisplaySettingsW(NULL, CDS_FULLSCREEN);
     ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret);
+    flush_events();
+
+    if (IsIconic(window)) /* make sure the window is restored, working around some Wine/X11 race condition */
+    {
+        ShowWindow(window, SW_RESTORE);
+        flush_events();
+    }

memset(&ddsd, 0, sizeof(ddsd));
     ddsd.dwSize = sizeof(ddsd);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index a952eb683a5..00b5d27f55c 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -3587,6 +3587,13 @@ static void test_coop_level_mode_set(void)
     /* For Wine. */
     change_ret = ChangeDisplaySettingsW(NULL, CDS_FULLSCREEN);
     ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret);
+    flush_events();
+
+    if (IsIconic(window)) /* make sure the window is restored, working around some Wine/X11 race condition */
+    {
+        ShowWindow(window, SW_RESTORE);
+        flush_events();
+    }

memset(&ddsd, 0, sizeof(ddsd));
     ddsd.dwSize = sizeof(ddsd);
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 04fe5a2049b..39be7a1b1e8 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -3359,6 +3359,13 @@ static void test_coop_level_mode_set(void)
     /* For Wine. */
     change_ret = ChangeDisplaySettingsW(NULL, CDS_FULLSCREEN);
     ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret);
+    flush_events();
+
+    if (IsIconic(window)) /* make sure the window is restored, working around some Wine/X11 race condition */
+    {
+        ShowWindow(window, SW_RESTORE);
+        flush_events();
+    }

memset(&ddsd, 0, sizeof(ddsd));
     ddsd.dwSize = sizeof(ddsd);

[PATCH 2/2] ddraw/tests: Flush messages and X11 events between some tests.

[Rémi Bernon]

From: Rémi Bernon

This test appear to be sensitive to pending ConfigureNotify events which
will otherwise overwrite window resizes triggered by cooperative level
and display mode changes.
---
 dlls/ddraw/tests/ddraw2.c | 2 ++
 dlls/ddraw/tests/ddraw4.c | 2 ++
 dlls/ddraw/tests/ddraw7.c | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 4841a4f0b8a..48a49815c58 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -3784,6 +3784,8 @@ static void test_coop_level_mode_set(void)
     hr = IDirectDraw2_RestoreDisplayMode(ddraw);
     ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);

+    flush_events(); /* flush any pending window resize X11 event */
+
     /* If the window is changed at the same time, messages are sent to the new window. */
     hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
     ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#lx.\n", hr);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 00b5d27f55c..8abd9cd44fd 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -4020,6 +4020,8 @@ static void test_coop_level_mode_set(void)
     hr = IDirectDraw4_RestoreDisplayMode(ddraw);
     ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);

+    flush_events(); /* flush any pending window resize X11 event */
+
     /* If the window is changed at the same time, messages are sent to the new window. */
     hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
     ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#lx.\n", hr);
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 39be7a1b1e8..3e03d3e4dd6 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -3792,6 +3792,8 @@ static void test_coop_level_mode_set(void)
     hr = IDirectDraw7_RestoreDisplayMode(ddraw);
     ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr);

+    flush_events(); /* flush any pending window resize X11 event */
+
     /* If the window is changed at the same time, messages are sent to the new window. */
     hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
     ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#lx.\n", hr);

[PATCH 0/2] MR5987: ddraw/tests: Workaround some X11 ConfigureNotify event race condition. - approved

[Elizabeth Figura (＠zfigura)]

This merge request was approved by Elizabeth Figura.

[PATCH 0/2] MR5987: ddraw/tests: Workaround some X11 ConfigureNotify event race condition. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.