Rebase against 9070f0d572e36645f5e5764ef40472f158513d48.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "a958b5aebfeed4538a4091f49996ae30ee9803fc"
+	echo "9070f0d572e36645f5e5764ef40472f158513d48"
 }
 
 # Show version information

patches/user32-recursive-activation/0002-user32-tests-Test-a-recursive-activation-loop-on-WM_.patch

@@ -1,4 +1,4 @@
-From ae16397afc8e15401c7274308e31c69aa6e8b619 Mon Sep 17 00:00:00 2001
+From 0d9d17704211c5cb2d3399ad551c89dd5d429149 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= <gabrielopcode@gmail.com>
 Date: Mon, 22 Jul 2019 15:29:26 +0300
 Subject: [PATCH] user32/tests: Test a recursive activation loop on WM_ACTIVATE
@@ -15,10 +15,10 @@ Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
  1 file changed, 81 insertions(+)
 
 diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
-index 36199f055ac..877cdfbcc9c 100644
+index cca211cc22a..2a819797491 100644
 --- a/dlls/user32/tests/msg.c
 +++ b/dlls/user32/tests/msg.c
-@@ -5114,6 +5114,39 @@ static void test_showwindow(void)
+@@ -5195,6 +5195,39 @@ static void test_showwindow(void)
      flush_sequence();
  }
  
@@ -58,7 +58,7 @@ index 36199f055ac..877cdfbcc9c 100644
  static void test_sys_menu(void)
  {
      HWND hwnd;
-@@ -10131,6 +10164,48 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP
+@@ -10760,6 +10793,48 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP
      return ret;
  }
  
@@ -107,9 +107,9 @@ index 36199f055ac..877cdfbcc9c 100644
  static LRESULT WINAPI PaintLoopProcA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
  {
      switch (msg)
-@@ -10228,6 +10303,10 @@ static BOOL RegisterWindowClasses(void)
+@@ -10857,6 +10932,10 @@ static void register_classes(void)
      cls.lpszClassName = "ShowWindowClass";
-     if(!RegisterClassA(&cls)) return FALSE;
+     register_class(&cls);
  
 +    cls.lpfnWndProc = recursive_activation_wndprocA;
 +    cls.lpszClassName = "RecursiveActivationClass";
@@ -117,8 +117,8 @@ index 36199f055ac..877cdfbcc9c 100644
 +
      cls.lpfnWndProc = PopupMsgCheckProcA;
      cls.lpszClassName = "TestPopupClass";
-     if(!RegisterClassA(&cls)) return FALSE;
-@@ -10283,6 +10362,7 @@ static BOOL is_our_logged_class(HWND hwnd)
+     register_class(&cls);
+@@ -10930,6 +11009,7 @@ static BOOL is_our_logged_class(HWND hwnd)
      {
  	if (!lstrcmpiA(buf, "TestWindowClass") ||
  	    !lstrcmpiA(buf, "ShowWindowClass") ||
@@ -126,7 +126,7 @@ index 36199f055ac..877cdfbcc9c 100644
  	    !lstrcmpiA(buf, "TestParentClass") ||
  	    !lstrcmpiA(buf, "TestPopupClass") ||
  	    !lstrcmpiA(buf, "SimpleWindowClass") ||
-@@ -18521,6 +18601,7 @@ START_TEST(msg)
+@@ -19697,6 +19777,7 @@ START_TEST(msg)
      test_messages();
      test_setwindowpos();
      test_showwindow();
@@ -135,5 +135,5 @@ index 36199f055ac..877cdfbcc9c 100644
      test_mdi_messages();
      test_button_messages();
 -- 
-2.33.0
+2.39.0
 

patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch

@@ -1,4 +1,4 @@
-From c3fe536e57885944c18d4146edff7611086cfcb6 Mon Sep 17 00:00:00 2001
+From 7f3f9c61bf10459c607d29e4b359a6ed0894ccb6 Mon Sep 17 00:00:00 2001
 From: Esdras Tarsis <esdrastarsis@gmail.com>
 Date: Wed, 2 Sep 2020 23:41:19 -0300
 Subject: [PATCH] windows.networking.connectivity: Add stub dll.
@@ -16,17 +16,17 @@ Signed-off-by: Esdras Tarsis <esdrastarsis@gmail.com>
  create mode 100644 dlls/windows.networking.connectivity/windows.networking.connectivity_main.c
 
 diff --git a/configure.ac b/configure.ac
-index 9ff7c5e8914..51317b85745 100644
+index 6410f8a0e42..b34adab1ad3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3125,6 +3125,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests)
+@@ -3128,6 +3128,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests)
  WINE_CONFIG_MAKEFILE(dlls/windows.media)
  WINE_CONFIG_MAKEFILE(dlls/windows.media/tests)
  WINE_CONFIG_MAKEFILE(dlls/windows.networking)
 +WINE_CONFIG_MAKEFILE(dlls/windows.networking.connectivity)
  WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers)
  WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers/tests)
- WINE_CONFIG_MAKEFILE(dlls/windowscodecs)
+ WINE_CONFIG_MAKEFILE(dlls/windows.ui)
 diff --git a/dlls/windows.networking.connectivity/Makefile.in b/dlls/windows.networking.connectivity/Makefile.in
 new file mode 100644
 index 00000000000..6fc24a72feb

staging/upstream-commit

@@ -1 +1 @@
-a958b5aebfeed4538a4091f49996ae30ee9803fc
+9070f0d572e36645f5e5764ef40472f158513d48