[PATCH resend 2/2] winex11.drv: Update _NET_WM_STATE before resizing windows.

[Zhiyi Zhang]

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(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 9845f9830d5..700e60db17e 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -8452,10 +8452,7 @@ 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 52e345ceb61..c773c278b72 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -1262,6 +1262,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.25.1

[Marvin]

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=71344

Your paranoid android.


=== w1064v1507 (32 bit report) ===

user32:
win.c:9478: Test failed: Timed out waiting for the child process

=== w1064v1809 (32 bit report) ===

user32:
win.c:3164: Test failed: GetActiveWindow() = 00030060
win.c:3167: Test failed: GetFocus() = 00000000
win.c:3179: Test failed: GetFocus() = 00000000
win.c:3182: Test failed: GetFocus() = 00000000
win.c:3185: Test failed: GetFocus() = 00000000
win.c:3188: Test failed: GetActiveWindow() = 00030060
win.c:3192: Test failed: GetFocus() = 00000000
win.c:3195: Test failed: GetFocus() = 00000000
win.c:3889: Test failed: hwnd 00020174/000C02CE message 0737
win.c:3894: Test failed: hwnd 000C02CE/000C02CE message 0202
win.c:3899: Test failed: hwnd 000C02CE/000C02CE message 0203
win.c:3903: Test failed: message 0202 available

=== w1064v1809_2scr (32 bit report) ===

user32:
win.c:3164: Test failed: GetActiveWindow() = 000402A8
win.c:3167: Test failed: GetFocus() = 00000000
win.c:3179: Test failed: GetFocus() = 00000000
win.c:3182: Test failed: GetFocus() = 00000000
win.c:3185: Test failed: GetFocus() = 00000000
win.c:3188: Test failed: GetActiveWindow() = 000402A8
win.c:3192: Test failed: GetFocus() = 00000000
win.c:3195: Test failed: GetFocus() = 00000000
win.c:3889: Test failed: hwnd 00030110/0028032E message 0737
win.c:3894: Test failed: hwnd 0028032E/0028032E message 0202
win.c:3899: Test failed: hwnd 0028032E/0028032E message 0203
win.c:3903: Test failed: message 0202 available

=== w1064v1809_he (32 bit report) ===

user32:
win.c:9478: Test failed: Timed out waiting for the child process

=== w1064v1809_ja (32 bit report) ===

user32:
win.c:9478: Test failed: Timed out waiting for the child process
win.c:3724: Test failed: message 0738 available
win.c:3849: Test failed: hwnd 00B402D4 message 7fff
win.c:3928: Test failed: hwnd 00B402D4/0004006E message 7fff
win.c:3931: Test failed: hwnd 00B402D4/0004006E message 7fff

=== w1064v1809_zh_CN (32 bit report) ===

user32:
win.c:3849: Test failed: hwnd 00010386 message 0282
win.c:3928: Test failed: hwnd 00010386/000A03D6 message 0282
win.c:3931: Test failed: hwnd 00010386/000A03D6 message 0282

=== w1064v1809 (64 bit report) ===

user32:
win.c:3164: Test failed: GetActiveWindow() = 000000000003004C
win.c:3167: Test failed: GetFocus() = 0000000000000000
win.c:3179: Test failed: GetFocus() = 0000000000000000
win.c:3182: Test failed: GetFocus() = 0000000000000000
win.c:3185: Test failed: GetFocus() = 0000000000000000
win.c:3188: Test failed: GetActiveWindow() = 000000000003004C
win.c:3192: Test failed: GetFocus() = 0000000000000000
win.c:3195: Test failed: GetFocus() = 0000000000000000
win.c:3889: Test failed: hwnd 0000000000040066/00000000002D02D8 message 0737
win.c:3894: Test failed: hwnd 00000000002D02D8/00000000002D02D8 message 0202
win.c:3899: Test failed: hwnd 00000000002D02D8/00000000002D02D8 message 0203
win.c:3903: Test failed: message 0202 available