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

[Rémi Bernon]

Similar to f5ee314270d7bc0b476b3c64840b52bcc1853a13 for ddraw1 tests.

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

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

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Similar to f5ee314270d7bc0b476b3c64840b52bcc1853a13 for ddraw1 tests.
---
 dlls/ddraw/tests/ddraw1.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 96047744635..cfc14600c5c 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -3247,6 +3247,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);
-- 
GitLab

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

[PATCH 0/1] MR6055: ddraw/tests: Make sure the window is restored after some minimize tests. - approved

[Elizabeth Figura (＠zfigura)]

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

[PATCH 0/1] MR6055: ddraw/tests: Make sure the window is restored after some minimize tests. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6055