[PATCH 0/1] MR1932: 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 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1932
From: Zhiyi Zhang <zzhang(a)codeweavers.com> 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(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1932
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=128292 Your paranoid android. === w10pro64 (32 bit report) === ddraw: ddraw1.c:13629: Test failed: WM_KILLFOCUS was not received. ddraw1.c:13665: Test failed: Got unexpected hr 0x887600e1. ddraw1.c:13668: Test failed: Got unexpected hr 0x887600ff. 01d0:ddraw1: unhandled exception c0000005 at 00418050 === w10pro64 (32 bit report) === ddraw: ddraw2.c:15430: Test failed: Failed to set foreground window. ddraw2.c:15436: Test failed: SetForegroundWindow failed, error 0. ddraw2.c:15440: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1023,767). ddraw2.c:15447: Test failed: Expect window rect (0,0)-(1024,768), got (0,0)-(1023,767). === w10pro64 (64 bit report) === ddraw: ddraw2.c:9006: Test failed: Failed to set foreground window. ddraw2.c:9008: Test failed: Got unexpected hr 0. ddraw2.c:9010: Test failed: Got unexpected hr 0. ddraw2.c:9012: Test failed: Got unexpected hr 0. ddraw2.c:9014: Test failed: Got unexpected hr 0. ddraw2.c:9024: Test failed: Got unexpected hr 0. ddraw2.c:9026: Test failed: Got unexpected hr 0. ddraw2.c:9028: Test failed: Got unexpected hr 0. ddraw2.c:9032: Test failed: Failed to set foreground window. ddraw2.c:9034: Test failed: Got unexpected hr 0. ddraw2.c:9036: Test failed: Got unexpected hr 0. ddraw2.c:9042: Test failed: Got unexpected hr 0. ddraw2.c:9062: Test failed: Got unexpected hr 0. ddraw2.c:9064: Test failed: Got unexpected hr 0x887600e1. ddraw2.c:9070: Test failed: Got unexpected hr 0. ddraw2.c:9089: Test failed: Failed to set foreground window. ddraw2.c:9101: Test failed: Failed to set foreground window. ddraw2.c:14634: Test failed: WM_KILLFOCUS was not received. ddraw2.c:14670: Test failed: Got unexpected hr 0x887600e1. ddraw2.c:14673: Test failed: Got unexpected hr 0x887600ff. 1398:ddraw2: unhandled exception c0000005 at 000000000045538E === w10pro64 (32 bit report) === ddraw: ddraw4.c:17240: Test failed: WM_KILLFOCUS was not received. ddraw4.c:17417: Test failed: Got unexpected hr 0x887600e1. ddraw4.c:17420: Test failed: Got unexpected hr 0x887600ff. 1e5c:ddraw4: unhandled exception c0000005 at 004AF05F === w10pro64 (64 bit report) === ddraw: ddraw7.c:17115: Test failed: WM_KILLFOCUS was not received. ddraw7.c:17277: Test failed: Got unexpected hr 0x887600e1. ddraw7.c:17280: Test failed: Got unexpected hr 0x887600ff. 1c80:ddraw7: unhandled exception c0000005 at 00000000004E3760
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1932
participants (4)
-
Marvin -
Zebediah Figura (＠zfigura) -
Zhiyi Zhang
-
Zhiyi Zhang (＠zhiyi)