Rebase against b07e06e297dd8bca67fc1ee523fc235cecebbf1e.

patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch

@@ -1,4 +1,4 @@
-From 12a9a9cb506aede4748611c8fa3339afcee7c070 Mon Sep 17 00:00:00 2001
+From eddc40dbf4048ceea1fda7f842adad340865723b Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 5 Jul 2019 13:20:23 +0800
 Subject: [PATCH] cryptext: Implement CryptExtOpenCER.
@@ -17,29 +17,29 @@ Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
  create mode 100644 dlls/cryptext/tests/cryptext.c
 
 diff --git a/configure b/configure
-index 20bcb96a2a6..b8fd60dbb53 100755
+index 6425e4da5f8..c97671cdfc6 100755
 --- a/configure
 +++ b/configure
-@@ -20910,6 +20910,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
+@@ -21346,6 +21346,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
  wine_fn_config_makefile dlls/cryptdlg enable_cryptdlg
  wine_fn_config_makefile dlls/cryptdll enable_cryptdll
  wine_fn_config_makefile dlls/cryptext enable_cryptext
 +wine_fn_config_makefile dlls/cryptext/tests enable_tests
  wine_fn_config_makefile dlls/cryptnet enable_cryptnet
  wine_fn_config_makefile dlls/cryptnet/tests enable_tests
- wine_fn_config_makefile dlls/cryptsp enable_cryptsp
+ wine_fn_config_makefile dlls/cryptowinrt enable_cryptowinrt
 diff --git a/configure.ac b/configure.ac
-index 6cbd947bf31..c68c5975e63 100644
+index b5a3b0069fb..73b1b1c8c2b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2361,6 +2361,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
+@@ -2450,6 +2450,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptdlg)
  WINE_CONFIG_MAKEFILE(dlls/cryptdll)
  WINE_CONFIG_MAKEFILE(dlls/cryptext)
 +WINE_CONFIG_MAKEFILE(dlls/cryptext/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptnet)
  WINE_CONFIG_MAKEFILE(dlls/cryptnet/tests)
- WINE_CONFIG_MAKEFILE(dlls/cryptsp)
+ WINE_CONFIG_MAKEFILE(dlls/cryptowinrt)
 diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in
 index 0ec2b8a2045..76accca43eb 100644
 --- a/dlls/cryptext/Makefile.in
@@ -67,7 +67,7 @@ index ee3e155f457..24b4794c198 100644
  @ stub CryptExtOpenCRLW
  @ stub CryptExtOpenCTL
 diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c
-index 537ba66cd3b..f9e34d1f8c5 100644
+index 537ba66cd3b..a4314518eac 100644
 --- a/dlls/cryptext/cryptext_main.c
 +++ b/dlls/cryptext/cryptext_main.c
 @@ -22,10 +22,29 @@
@@ -161,7 +161,7 @@ index 00000000000..522fc60a4af
 +	cryptext.c
 diff --git a/dlls/cryptext/tests/cryptext.c b/dlls/cryptext/tests/cryptext.c
 new file mode 100644
-index 00000000000..cc62a772b59
+index 00000000000..ab1007dbd82
 --- /dev/null
 +++ b/dlls/cryptext/tests/cryptext.c
 @@ -0,0 +1,61 @@
@@ -227,5 +227,5 @@ index 00000000000..cc62a772b59
 +    test_CryptExtOpenCER();
 +}
 -- 
-2.34.1
+2.35.1
 

patches/patchinstall.sh

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

patches/user32-rawinput-mouse/0006-user32-Set-SEND_HWMSG_RAWINPUT-flags-only-when-RAWIN.patch

@@ -1,4 +1,4 @@
-From bfd714f789759de6fda3c8d302f70154213b7c5f Mon Sep 17 00:00:00 2001
+From bd9db8c44139ffb946feed5c39bb3ec0180862f1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Wed, 24 Mar 2021 23:29:28 +0100
 Subject: [PATCH] user32: Set SEND_HWMSG_RAWINPUT flags only when RAWINPUT is
@@ -20,7 +20,7 @@ __wine_send_input with INPUT_HARDWARE input type and a rawinput.
  9 files changed, 26 insertions(+), 15 deletions(-)
 
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index c57a987cd14..6f503ddd6d0 100644
+index 067c37af8df..a2d1af57f78 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
 @@ -131,6 +131,7 @@ UINT WINAPI NtUserSendInput( UINT count, INPUT *inputs, int size )
@@ -41,10 +41,10 @@ index c57a987cd14..6f503ddd6d0 100644
          case INPUT_HARDWARE:
              RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED );
 diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
-index 5312be370a9..baa9112bc8e 100644
+index cef7aa73db7..e8e59376510 100644
 --- a/dlls/win32u/message.c
 +++ b/dlls/win32u/message.c
-@@ -2441,7 +2441,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r
+@@ -2600,7 +2600,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r
              req->input.mouse.flags = input->mi.dwFlags;
              req->input.mouse.time  = input->mi.time;
              req->input.mouse.info  = input->mi.dwExtraInfo;
@@ -53,7 +53,7 @@ index 5312be370a9..baa9112bc8e 100644
              break;
          case INPUT_KEYBOARD:
              req->input.kbd.vkey  = input->ki.wVk;
-@@ -2449,7 +2449,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r
+@@ -2608,7 +2608,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r
              req->input.kbd.flags = input->ki.dwFlags;
              req->input.kbd.time  = input->ki.time;
              req->input.kbd.info  = input->ki.dwExtraInfo;
@@ -114,7 +114,7 @@ index 9406236a405..1b9b8e8f22f 100644
  
          default:
 diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
-index fd94591a2b8..fe96b077a55 100644
+index 1b994f0c5e8..4bb9e151eb7 100644
 --- a/dlls/winemac.drv/ime.c
 +++ b/dlls/winemac.drv/ime.c
 @@ -38,6 +38,7 @@
@@ -125,7 +125,7 @@ index fd94591a2b8..fe96b077a55 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(imm);
  
-@@ -1408,6 +1409,7 @@ NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size)
+@@ -1409,6 +1410,7 @@ NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size)
                                       params->cursor_pos, !params->complete);
          else
          {
@@ -133,16 +133,16 @@ index fd94591a2b8..fe96b077a55 100644
              INPUT input;
              unsigned int i;
  
-@@ -1420,10 +1422,10 @@ NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size)
+@@ -1421,10 +1423,10 @@ NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size)
              {
                  input.ki.wScan      = params->text[i];
                  input.ki.dwFlags    = KEYEVENTF_UNICODE;
--                __wine_send_input(params->hwnd, &input, NULL);
-+                __wine_send_input(params->hwnd, &input, &rawinput);
+-                __wine_send_input(hwnd, &input, NULL);
++                __wine_send_input(hwnd, &input, &rawinput);
  
                  input.ki.dwFlags    = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP;
--                __wine_send_input(params->hwnd, &input, NULL);
-+                __wine_send_input(params->hwnd, &input, &rawinput);
+-                __wine_send_input(hwnd, &input, NULL);
++                __wine_send_input(hwnd, &input, &rawinput);
              }
          }
      }
@@ -210,7 +210,7 @@ index 51644e3b5ba..2e4f3f7edcb 100644
  
  
 diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
-index 6b5f67a2c00..86cbd72387c 100644
+index eea19bef02b..5f6111ae92e 100644
 --- a/dlls/winex11.drv/mouse.c
 +++ b/dlls/winex11.drv/mouse.c
 @@ -749,6 +749,7 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x
@@ -239,7 +239,7 @@ index 6b5f67a2c00..86cbd72387c 100644
  }
  
  #ifdef SONAME_LIBXCURSOR
-@@ -1787,6 +1788,7 @@ void move_resize_window( HWND hwnd, int dir )
+@@ -1788,6 +1789,7 @@ void move_resize_window( HWND hwnd, int dir )
      {
          MSG msg;
          INPUT input;
@@ -247,7 +247,7 @@ index 6b5f67a2c00..86cbd72387c 100644
          int x, y, rootX, rootY;
  
          if (!XQueryPointer( display, root_window, &root, &child, &rootX, &rootY, &x, &y, &xstate )) break;
-@@ -1802,7 +1804,7 @@ void move_resize_window( HWND hwnd, int dir )
+@@ -1803,7 +1805,7 @@ void move_resize_window( HWND hwnd, int dir )
              input.u.mi.dwFlags     = button_up_flags[button - 1] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE;
              input.u.mi.time        = NtGetTickCount();
              input.u.mi.dwExtraInfo = 0;
@@ -256,7 +256,7 @@ index 6b5f67a2c00..86cbd72387c 100644
          }
  
          while (NtUserPeekMessage( &msg, 0, 0, 0, PM_REMOVE ))
-@@ -2015,6 +2017,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
+@@ -2016,6 +2018,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
  static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
  {
      XIRawEvent *event = xev->data;
@@ -264,7 +264,7 @@ index 6b5f67a2c00..86cbd72387c 100644
      INPUT input;
  
      if (broken_rawevents && is_old_motion_event( xev->serial ))
-@@ -2032,7 +2035,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
+@@ -2033,7 +2036,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
      input.u.mi.dy          = 0;
      if (!map_raw_event_coords( event, &input )) return FALSE;
  

patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch

@@ -1,4 +1,4 @@
-From a5a328146b516516e027e52ffa1b0ecc88d85ac3 Mon Sep 17 00:00:00 2001
+From 880782b69eb8dd2cae56ec6198ab6c1a44a5f2df Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 28 May 2021 12:34:37 +1000
 Subject: [PATCH] include: Add windows.networking.connectivity.idl
@@ -10,17 +10,17 @@ Subject: [PATCH] include: Add windows.networking.connectivity.idl
  create mode 100644 include/windows.networking.connectivity.idl
 
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 3492df997d1..77879b77dfd 100644
+index 91c80b54e4e..98517af424d 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -796,6 +796,7 @@ SOURCES = \
+@@ -813,6 +813,7 @@ SOURCES = \
  	windows.media.idl \
  	windows.media.speechrecognition.idl \
  	windows.media.speechsynthesis.idl \
 +	windows.networking.connectivity.idl \
+ 	windows.security.cryptography.idl \
  	windows.storage.streams.idl \
  	windows.system.idl \
- 	windows.system.power.idl \
 diff --git a/include/windows.networking.connectivity.idl b/include/windows.networking.connectivity.idl
 new file mode 100644
 index 00000000000..3ccefca02fa

patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch

@@ -1,4 +1,4 @@
-From 55da467e320f91b823b8d1a8b4c9075c1df9f33f Mon Sep 17 00:00:00 2001
+From 712f6b80db26f6475fdf009148c62c2219f7ff88 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 1 Jun 2021 10:26:28 +1000
 Subject: [PATCH] include: Add windows.networking.idl
@@ -11,17 +11,17 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  create mode 100644 include/windows.networking.idl
 
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 37c014fe96c..8c0ac200546 100644
+index 98517af424d..dc1194c508d 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -806,6 +806,7 @@ SOURCES = \
+@@ -813,6 +813,7 @@ SOURCES = \
  	windows.media.idl \
  	windows.media.speechrecognition.idl \
  	windows.media.speechsynthesis.idl \
 +	windows.networking.idl \
  	windows.networking.connectivity.idl \
+ 	windows.security.cryptography.idl \
  	windows.storage.streams.idl \
- 	windows.system.idl \
 diff --git a/include/windows.networking.idl b/include/windows.networking.idl
 new file mode 100644
 index 00000000000..67d8e6a8d0b

staging/upstream-commit

@@ -1 +1 @@
-cb0e4f5f4f7dc10a0933349ad780a11405cd736e
+b07e06e297dd8bca67fc1ee523fc235cecebbf1e