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.

Fix a game called Mugsters becomes maximized after exiting full screen.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2020-05-07 16:17:28 +08:00 committed by Alexandre Julliard
parent 36b720357b
commit c69bb0342c
2 changed files with 1 additions and 3 deletions

View File

@ -8452,10 +8452,7 @@ static void test_fullscreen(void)
if (rc.right - rc.left == 100 && rc.bottom - rc.top == 100) if (rc.right - rc.left == 100 && rc.bottom - rc.top == 100)
break; 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); 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); ok(rc.bottom - rc.top == 100, "Expect height %d, got %d.\n", 100, rc.bottom - rc.top);
DestroyWindow(hwnd); DestroyWindow(hwnd);

View File

@ -1262,6 +1262,7 @@ static void sync_window_position( struct x11drv_win_data *data,
set_size_hints( data, style ); set_size_hints( data, style );
set_mwm_hints( data, style, ex_style ); set_mwm_hints( data, style, ex_style );
update_net_wm_states( data );
data->configure_serial = NextRequest( data->display ); data->configure_serial = NextRequest( data->display );
XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes );
#ifdef HAVE_LIBXSHAPE #ifdef HAVE_LIBXSHAPE