Zhiyi Zhang : ddraw/tests: Do not create a fullscreen test window in test_window_position_cb().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 36afabb9c1aa73ea6aeab4af627327ce1a712b2a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/36afabb9c1aa73ea6aeab4af627327c...

Author: Zhiyi Zhang 
Date:   Wed Jan 11 10:08:22 2023 +0800

ddraw/tests: Do not create a fullscreen test window in test_window_position_cb().

Some window managers have trouble moving fullscreen windows to another monitor. For example, KWin
doesn't allow moving windows with _NET_WM_STATE_FULLSCREEN set. FVWM used by TestBots keeps
the size for fullscreen windows after they are moved to another monitor and when the window is also
fullscreen on the new monitor, which could be a bug in FVWM. But let's work around this in the tests
as well. The changed tests don't need created windows being fullscreen at the start.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54172

---

dlls/ddraw/tests/ddraw1.c | 3 +--
 dlls/ddraw/tests/ddraw2.c | 3 +--
 dlls/ddraw/tests/ddraw4.c | 3 +--
 dlls/ddraw/tests/ddraw7.c | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index cd31c8504d6..3d81c590a3a 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -14457,8 +14457,7 @@ static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *mo
     ddraw = create_ddraw();
     ok(!!ddraw, "Failed to create a ddraw object.\n");
     window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left,
-            monitor_rect->top, monitor_rect->right - monitor_rect->left,
-            monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL);
+            monitor_rect->top, 100, 100, NULL, NULL, NULL, NULL);
     ok(!!window, "Failed to create a window.\n");
     flush_events();

diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 2880982ed33..f4079b1e5e5 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -15371,8 +15371,7 @@ static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *mo
     ddraw = create_ddraw();
     ok(!!ddraw, "Failed to create a ddraw object.\n");
     window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left,
-            monitor_rect->top, monitor_rect->right - monitor_rect->left,
-            monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL);
+            monitor_rect->top, 100, 100, NULL, NULL, NULL, NULL);
     ok(!!window, "Failed to create a window.\n");
     flush_events();

diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 11c03dc596c..ff38483faf9 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -18421,8 +18421,7 @@ static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *mo
     ddraw = create_ddraw();
     ok(!!ddraw, "Failed to create a ddraw object.\n");
     window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left,
-            monitor_rect->top, monitor_rect->right - monitor_rect->left,
-            monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL);
+            monitor_rect->top, 100, 100, NULL, NULL, NULL, NULL);
     ok(!!window, "Failed to create a window.\n");
     flush_events();

diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 92ba54c68bd..8631f824edd 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -18688,8 +18688,7 @@ static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *mo
     ddraw = create_ddraw();
     ok(!!ddraw, "Failed to create a ddraw object.\n");
     window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left,
-            monitor_rect->top, monitor_rect->right - monitor_rect->left,
-            monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL);
+            monitor_rect->top, 100, 100, NULL, NULL, NULL, NULL);
     ok(!!window, "Failed to create a window.\n");
     flush_events();