From 2fc93c905c0e9fc16f0118f04cac71ce60218e40 Mon Sep 17 00:00:00 2001 From: yuiiio Date: Thu, 26 Nov 2020 01:35:50 +0900 Subject: [PATCH] Revert "winex11.drv: Update _NET_WM_STATE before resizing windows." This reverts commit c69bb0342ca5e2b30f542ad4e61ae6bc404f22a1. --- dlls/user32/tests/win.c | 3 +++ dlls/winex11.drv/window.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5cc7a2cca91..d5749cfe998 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8539,7 +8539,10 @@ static void test_fullscreen(void) if (rc.right - rc.left == 100 && rc.bottom - rc.top == 100) break; } + /* FVWM used by TestBots are not EWMH compliant. So this bug doesn't appear. */ + 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 52dac77c731..fa9f2bf3dee 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1363,7 +1363,6 @@ 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.29.2