Rebase against 9172ca5baa27b0c929b14a49f60333613cc30c65.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "ce72f9b4263a898503c154a37df6bc9d43153f4b"
+	echo "9172ca5baa27b0c929b14a49f60333613cc30c65"
 }
 
 # Show version information

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

@@ -1,4 +1,4 @@
-From 08fddee8b126a47b698e58d38aef37f62390c0e3 Mon Sep 17 00:00:00 2001
+From ef8db03ac854f6f58ee8787f80b22c35efc69850 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 2ce2b3c6e54..50e6ab0f883 100644
+index d6be31a7d8b..aaff4f94e2f 100644
 --- a/dlls/user32/tests/msg.c
 +++ b/dlls/user32/tests/msg.c
-@@ -16449,6 +16449,7 @@ static const struct message WmSetParentSeq_2[] = {
+@@ -16708,6 +16708,7 @@ static const struct message WmSetParentSeq_2[] = {
      { HCBT_ACTIVATE, hook|optional },
      { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 },
      { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE },
@@ -33,7 +33,7 @@ index 2ce2b3c6e54..50e6ab0f883 100644
      { WM_NCACTIVATE, sent|wparam|optional, 1 },
      { WM_ACTIVATE, sent|wparam|optional, 1 },
      { HCBT_SETFOCUS, hook|optional },
-@@ -16519,7 +16520,7 @@ static void test_SetParent(void)
+@@ -16778,7 +16779,7 @@ static void test_SetParent(void)
  
      SetParent(popup, child);
      flush_events();
@@ -43,12 +43,12 @@ index 2ce2b3c6e54..50e6ab0f883 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/user32/winpos.c b/dlls/user32/winpos.c
-index 9e5a0c238af..31143e70abf 100644
+index de5d50d4c3a..fc8f2cd478c 100644
 --- a/dlls/user32/winpos.c
 +++ b/dlls/user32/winpos.c
-@@ -1119,8 +1119,8 @@ static BOOL show_window( HWND hwnd, INT cmd )
- 
-     swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp );
+@@ -1130,8 +1130,8 @@ static BOOL show_window( HWND hwnd, INT cmd )
+     }
+     swp = new_swp;
  
 -    parent = GetAncestor( hwnd, GA_PARENT );
 -    if (parent && !IsWindowVisible( parent ) && !(swp & SWP_STATECHANGED))
@@ -57,7 +57,7 @@ index 9e5a0c238af..31143e70abf 100644
      {
          /* if parent is not visible simply toggle WS_VISIBLE and return */
          if (showFlag) WIN_SetStyle( hwnd, WS_VISIBLE, 0 );
-@@ -1955,8 +1955,11 @@ static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect, int par
+@@ -1980,8 +1980,11 @@ static BOOL fixup_flags( WINDOWPOS *winpos, const RECT *old_window_rect, int par
      if (winpos->cy < 0) winpos->cy = 0;
      else if (winpos->cy > 32767) winpos->cy = 32767;
  
@@ -72,5 +72,5 @@ index 9e5a0c238af..31143e70abf 100644
      if (wndPtr->dwStyle & WS_VISIBLE) winpos->flags &= ~SWP_SHOWWINDOW;
      else
 -- 
-2.29.2
+2.30.2
 

staging/upstream-commit

@@ -1 +1 @@
-0a50674c6aabb0368811ece4078a2bb69d7ea1bb
+9172ca5baa27b0c929b14a49f60333613cc30c65