[PATCH 2/2] winex11.drv: Update _NET_WM_STATE before resizing windows.
According to the Extended Window Manager Hints (EWMH) spec 1.3 regarding _NET_WM_STATE_FULLSCREEN, "the Window Manager is responsible for restoring the original geometry after a switch from fullscreen back to normal window.", which means that removing _NET_WM_STATE_FULLSCREEN from a window may cause the window to receive a ConfigureNotify event to restore the window size, thus causing a application resize action to be overwritten by the window managers. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 3 --- dlls/winex11.drv/window.c | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 948b133701..8ef5014224 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8445,10 +8445,7 @@ static void test_fullscreen(void) flush_events(TRUE); GetWindowRect(hwnd, &rc); - /* FVWM used by the TestBots are not EWMH compliant. So this bug doesn't appear on TestBots. */ - todo_wine_if(rc.right - rc.left != 100) ok(rc.right - rc.left == 100, "Expect width %d, got %d.\n", 100, rc.right - rc.left); - todo_wine_if(rc.bottom - rc.top != 100) ok(rc.bottom - rc.top == 100, "Expect height %d, got %d.\n", 100, rc.bottom - rc.top); DestroyWindow(hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd..350a559c53 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1260,6 +1260,7 @@ static void sync_window_position( struct x11drv_win_data *data, set_size_hints( data, style ); set_mwm_hints( data, style, ex_style ); + update_net_wm_states( data ); data->configure_serial = NextRequest( data->display ); XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); #ifdef HAVE_LIBXSHAPE -- 2.20.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=67796 Your paranoid android. === w1064v1809 (32 bit report) === user32: win.c:3167: Test failed: GetActiveWindow() = 00040292 win.c:3191: Test failed: GetActiveWindow() = 00040292 win.c:3892: Test failed: hwnd 000200E4/00130060 message 0737 win.c:3897: Test failed: hwnd 00130060/00130060 message 0202 win.c:3902: Test failed: hwnd 00130060/00130060 message 0203 === w1064v1809_2scr (32 bit report) === user32: win.c:3167: Test failed: GetActiveWindow() = 000300E0 win.c:3170: Test failed: GetFocus() = 00000000 win.c:3182: Test failed: GetFocus() = 00000000 win.c:3185: Test failed: GetFocus() = 00000000 win.c:3188: Test failed: GetFocus() = 00000000 win.c:3191: Test failed: GetActiveWindow() = 000300E0 win.c:3195: Test failed: GetFocus() = 00000000 win.c:3198: Test failed: GetFocus() = 00000000 win.c:3892: Test failed: hwnd 000200E2/000C029A message 0737 win.c:3897: Test failed: hwnd 000C029A/000C029A message 0202 win.c:3902: Test failed: hwnd 000C029A/000C029A message 0203 win.c:3906: Test failed: message 0202 available === w1064v1809_he (32 bit report) === user32: win.c:9471: Test failed: Timed out waiting for the child process win.c:9967: Test failed: pos = 00e700d0 win.c:9971: Test failed: pos = 00e700d0 win.c:9975: Test failed: pos = 00e700d0 === w1064v1809_ja (32 bit report) === user32: win.c:3727: Test failed: message 0738 available win.c:3852: Test failed: hwnd 000202FE message 7fff win.c:3931: Test failed: hwnd 000202FE/00260300 message 7fff win.c:3934: Test failed: hwnd 000202FE/00260300 message 7fff === w1064v1809_zh_CN (32 bit report) === user32: win.c:3852: Test failed: hwnd 00010374 message 0282 win.c:3931: Test failed: hwnd 00010374/000D03D6 message 0282 win.c:3934: Test failed: hwnd 00010374/000D03D6 message 0282 === w1064v1809 (64 bit report) === user32: win.c:3167: Test failed: GetActiveWindow() = 0000000000030294 win.c:3170: Test failed: GetFocus() = 0000000000000000 win.c:3182: Test failed: GetFocus() = 0000000000000000 win.c:3185: Test failed: GetFocus() = 0000000000000000 win.c:3188: Test failed: GetFocus() = 0000000000000000 win.c:3191: Test failed: GetActiveWindow() = 0000000000030294 win.c:3195: Test failed: GetFocus() = 0000000000000000 win.c:3198: Test failed: GetFocus() = 0000000000000000 win.c:3892: Test failed: hwnd 00000000000200E4/00000000001702C4 message 0737 win.c:3897: Test failed: hwnd 00000000001702C4/00000000001702C4 message 0202 win.c:3902: Test failed: hwnd 00000000001702C4/00000000001702C4 message 0203 win.c:3906: Test failed: message 0202 available === debiant (32 bit report) === user32: win.c:8448: Test failed: Expect width 100, got 1030. win.c:8449: Test failed: Expect height 100, got 774. === debiant (32 bit WoW report) === user32: win.c:8448: Test failed: Expect width 100, got 1030. win.c:8449: Test failed: Expect height 100, got 774.
On 3/23/20 6:34 PM, Marvin wrote:
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=67796
Your paranoid android.
=== w1064v1809 (32 bit report) ===
user32: win.c:3167: Test failed: GetActiveWindow() = 00040292 win.c:3191: Test failed: GetActiveWindow() = 00040292 win.c:3892: Test failed: hwnd 000200E4/00130060 message 0737 win.c:3897: Test failed: hwnd 00130060/00130060 message 0202 win.c:3902: Test failed: hwnd 00130060/00130060 message 0203
=== w1064v1809_2scr (32 bit report) ===
user32: win.c:3167: Test failed: GetActiveWindow() = 000300E0 win.c:3170: Test failed: GetFocus() = 00000000 win.c:3182: Test failed: GetFocus() = 00000000 win.c:3185: Test failed: GetFocus() = 00000000 win.c:3188: Test failed: GetFocus() = 00000000 win.c:3191: Test failed: GetActiveWindow() = 000300E0 win.c:3195: Test failed: GetFocus() = 00000000 win.c:3198: Test failed: GetFocus() = 00000000 win.c:3892: Test failed: hwnd 000200E2/000C029A message 0737 win.c:3897: Test failed: hwnd 000C029A/000C029A message 0202 win.c:3902: Test failed: hwnd 000C029A/000C029A message 0203 win.c:3906: Test failed: message 0202 available
=== w1064v1809_he (32 bit report) ===
user32: win.c:9471: Test failed: Timed out waiting for the child process win.c:9967: Test failed: pos = 00e700d0 win.c:9971: Test failed: pos = 00e700d0 win.c:9975: Test failed: pos = 00e700d0
=== w1064v1809_ja (32 bit report) ===
user32: win.c:3727: Test failed: message 0738 available win.c:3852: Test failed: hwnd 000202FE message 7fff win.c:3931: Test failed: hwnd 000202FE/00260300 message 7fff win.c:3934: Test failed: hwnd 000202FE/00260300 message 7fff
=== w1064v1809_zh_CN (32 bit report) ===
user32: win.c:3852: Test failed: hwnd 00010374 message 0282 win.c:3931: Test failed: hwnd 00010374/000D03D6 message 0282 win.c:3934: Test failed: hwnd 00010374/000D03D6 message 0282
=== w1064v1809 (64 bit report) ===
user32: win.c:3167: Test failed: GetActiveWindow() = 0000000000030294 win.c:3170: Test failed: GetFocus() = 0000000000000000 win.c:3182: Test failed: GetFocus() = 0000000000000000 win.c:3185: Test failed: GetFocus() = 0000000000000000 win.c:3188: Test failed: GetFocus() = 0000000000000000 win.c:3191: Test failed: GetActiveWindow() = 0000000000030294 win.c:3195: Test failed: GetFocus() = 0000000000000000 win.c:3198: Test failed: GetFocus() = 0000000000000000 win.c:3892: Test failed: hwnd 00000000000200E4/00000000001702C4 message 0737 win.c:3897: Test failed: hwnd 00000000001702C4/00000000001702C4 message 0202 win.c:3902: Test failed: hwnd 00000000001702C4/00000000001702C4 message 0203 win.c:3906: Test failed: message 0202 available
=== debiant (32 bit report) ===
user32: win.c:8448: Test failed: Expect width 100, got 1030. win.c:8449: Test failed: Expect height 100, got 774.
=== debiant (32 bit WoW report) ===
user32: win.c:8448: Test failed: Expect width 100, got 1030. win.c:8449: Test failed: Expect height 100, got 774. It seems the tests are not very reliable. I got no error in https://testbot.winehq.org/JobDetails.pl?Key=67779&f101=win32.report#k101. I will look into this and send a new version. Please ignore this series.
participants (2)
-
Marvin -
Zhiyi Zhang