Rebase against 0ac1033f04074339de5cae9ffd9f4f45baaef92e.

patches/user32-message-order/0001-user32-Fix-messages-sent-on-a-window-without-WS_CHIL.patch

@@ -1,4 +1,4 @@
-From 8480b74b27a589db418493a787af4c98e05e29b7 Mon Sep 17 00:00:00 2001
+From 935578a612809e97c3204f7f3d122c285085ba0e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= <gabrielopcode@gmail.com>
 Date: Wed, 16 Sep 2020 17:35:09 +0300
 Subject: [PATCH] user32: Fix messages sent on a window without WS_CHILD, but
@@ -22,10 +22,10 @@ Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
  2 files changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
-index 4e2d39dff10..f28b1151c4d 100644
+index e50ddc45038..82403058eea 100644
 --- a/dlls/user32/tests/msg.c
 +++ b/dlls/user32/tests/msg.c
-@@ -17118,6 +17118,7 @@ static const struct message WmSetParentSeq_2[] = {
+@@ -19114,6 +19114,7 @@ static const struct message WmSetParentSeq_2[] = {
      { HCBT_ACTIVATE, hook|optional },
      { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 },
      { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE },
@@ -33,7 +33,7 @@ index 4e2d39dff10..f28b1151c4d 100644
      { WM_NCACTIVATE, sent|wparam|optional, 1 },
      { WM_ACTIVATE, sent|wparam|optional, 1 },
      { HCBT_SETFOCUS, hook|optional },
-@@ -17188,7 +17189,7 @@ static void test_SetParent(void)
+@@ -19184,7 +19185,7 @@ static void test_SetParent(void)
  
      SetParent(popup, child);
      flush_events();
@@ -43,10 +43,10 @@ index 4e2d39dff10..f28b1151c4d 100644
      ok(GetWindowLongA(popup, GWL_STYLE) & WS_VISIBLE, "WS_VISIBLE should be set\n");
      ok(!IsWindowVisible(popup), "IsWindowVisible() should return FALSE\n");
 diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
-index 96a1606c5a1..10f43b9b32f 100644
+index b1445be99be..39029e45342 100644
 --- a/dlls/win32u/window.c
 +++ b/dlls/win32u/window.c
-@@ -2699,8 +2699,11 @@ static BOOL fixup_swp_flags( WINDOWPOS *winpos, const RECT *old_window_rect, int
+@@ -3548,8 +3548,11 @@ static BOOL fixup_swp_flags( WINDOWPOS *winpos, const RECT *old_window_rect, int
      if (winpos->cy < 0) winpos->cy = 0;
      else if (winpos->cy > 32767) winpos->cy = 32767;
  
@@ -60,7 +60,7 @@ index 96a1606c5a1..10f43b9b32f 100644
  
      if (win->dwStyle & WS_VISIBLE) winpos->flags &= ~SWP_SHOWWINDOW;
      else
-@@ -3735,8 +3738,8 @@ static BOOL show_window( HWND hwnd, INT cmd )
+@@ -4665,8 +4668,8 @@ static BOOL show_window( HWND hwnd, INT cmd )
      }
      swp = new_swp;
  
@@ -70,7 +70,7 @@ index 96a1606c5a1..10f43b9b32f 100644
 +        !is_window_visible( parent ) && !(swp & SWP_STATECHANGED))
      {
          /* if parent is not visible simply toggle WS_VISIBLE and return */
-         if (show_flag) set_window_style( hwnd, WS_VISIBLE, 0 );
+         if (show_flag) set_window_style_bits( hwnd, WS_VISIBLE, 0 );
 -- 
-2.35.1
+2.47.2
 

staging/upstream-commit

@@ -1 +1 @@
-09539a3af5f806bf319917cafff2b07e6480d656
+0ac1033f04074339de5cae9ffd9f4f45baaef92e