Rebase against c0af8b73725d2670c9b018a255c503dee6912cf5.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "5a1d836def24043b4e7afcdc8cf1342223957edf"
+	echo "c0af8b73725d2670c9b018a255c503dee6912cf5"
 }
 
 # Show version information
@@ -4479,10 +4479,9 @@ fi
 # |   *	[#50546] xactengine3_7: Send Notification after the Wavebank is created.
 # |
 # | Modified files:
-# |   *	dlls/xactengine3_7/xact_dll.c, include/xact3.h, include/xact3wb.h
+# |   *	dlls/xactengine3_7/xact_dll.c
 # |
 if test "$enable_xactengine3_7_Notification" -eq 1; then
-	patch_apply xactengine3_7-Notification/0000-xactengine-Use-nameless-unions.patch
 	patch_apply xactengine3_7-Notification/0001-xactengine3.7-Delay-Notication-for-WAVEBANKPREPARED.patch
 	patch_apply xactengine3_7-Notification/0002-xactengine3_7-Record-context-for-each-notications.patch
 fi

patches/user32-rawinput-hid/0017-hidclass.sys-Assign-rawinput-handles-through-device-.patch

@@ -1,4 +1,4 @@
-From 0f24bf7b15e0e22fda2106e8573b5422b80eaa04 Mon Sep 17 00:00:00 2001
+From c3d4b71d3981ce40c3d94e5e539e285a27f24450 Mon Sep 17 00:00:00 2001
 From: Arkadiusz Hiler <ahiler@codeweavers.com>
 Date: Wed, 10 Feb 2021 13:23:33 +0100
 Subject: [PATCH] hidclass.sys: Assign rawinput handles through device
@@ -9,11 +9,11 @@ Subject: [PATCH] hidclass.sys: Assign rawinput handles through device
  1 file changed, 13 insertions(+)
 
 diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c
-index 1d82215bbfe..7eaa28a411d 100644
+index 5e50ee90c60..61619b5a28f 100644
 --- a/dlls/hidclass.sys/pnp.c
 +++ b/dlls/hidclass.sys/pnp.c
-@@ -25,6 +25,8 @@
- #include "ntddmou.h"
+@@ -26,6 +26,8 @@
+ #include "ntddkbd.h"
  #include "ddk/hidtypes.h"
  #include "ddk/wdm.h"
 +#include "initguid.h"
@@ -21,7 +21,7 @@ index 1d82215bbfe..7eaa28a411d 100644
  #include "regstr.h"
  #include "winuser.h"
  #include "wine/debug.h"
-@@ -87,6 +89,8 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH
+@@ -88,6 +90,8 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH
      return irp_status.u.Status;
  }
  
@@ -30,7 +30,7 @@ index 1d82215bbfe..7eaa28a411d 100644
  /* user32 reserves 1 & 2 for winemouse and winekeyboard,
   * keep this in sync with user_private.h */
  #define WINE_MOUSE_HANDLE 1
-@@ -241,6 +245,15 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b
+@@ -248,6 +252,15 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo)
      else
          pdo_ext->u.pdo.rawinput_handle = alloc_rawinput_handle();
  

patches/user32-rawinput-hid/0018-user32-Enumerate-mouse-rawinput-device-before-HID-de.patch

@@ -1,17 +1,17 @@
-From c28c0feaa804d97e3d105d402f12430e6cee054e Mon Sep 17 00:00:00 2001
+From 18328523b2e186f1f6f6d1ecb199ddc8db61b33e Mon Sep 17 00:00:00 2001
 From: Arkadiusz Hiler <ahiler@codeweavers.com>
 Date: Mon, 22 Feb 2021 15:41:46 +0200
 Subject: [PATCH] user32: Enumerate mouse rawinput device before HID devices.
 
 ---
- dlls/user32/rawinput.c | 31 ++++++++++++++++---------------
- 1 file changed, 16 insertions(+), 15 deletions(-)
+ dlls/user32/rawinput.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
 
 diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c
-index c69393d9ed2..ea8d15ac97b 100644
+index 9ca00504e5c..566a5844ad5 100644
 --- a/dlls/user32/rawinput.c
 +++ b/dlls/user32/rawinput.c
-@@ -175,6 +175,22 @@ static void find_devices(void)
+@@ -169,6 +169,22 @@ static void find_devices(void)
      }
      rawinput_devices_count = 0;
  
@@ -34,28 +34,6 @@ index c69393d9ed2..ea8d15ac97b 100644
      set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT);
  
      for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx)
-@@ -203,21 +219,6 @@ static void find_devices(void)
- 
-     SetupDiDestroyDeviceInfoList(set);
- 
--    set = SetupDiGetClassDevsW(&GUID_DEVINTERFACE_MOUSE, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT);
--
--    for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_MOUSE, idx, &iface); ++idx)
--    {
--        static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE};
--
--        if (!(device = add_device(set, &iface)))
--            continue;
--
--        device->info.dwType = RIM_TYPEMOUSE;
--        device->info.u.mouse = mouse_info;
--    }
--
--    SetupDiDestroyDeviceInfoList(set);
--
-     LeaveCriticalSection(&rawinput_devices_cs);
- }
- 
 -- 
 2.30.2
 

patches/user32-rawinput-hid/0019-user32-Use-device-handles-assigned-by-hidclass.sys.patch

@@ -1,4 +1,4 @@
-From c1c1e256848179a46ebf8f10183b68c9f1a087ee Mon Sep 17 00:00:00 2001
+From 29aca5031e4237e55b1c3cfe591cd7f4af31fa9c Mon Sep 17 00:00:00 2001
 From: Arkadiusz Hiler <ahiler@codeweavers.com>
 Date: Mon, 22 Feb 2021 15:41:46 +0200
 Subject: [PATCH] user32: Use device handles assigned by hidclass.sys.
@@ -10,15 +10,16 @@ family.
  1 file changed, 51 insertions(+), 10 deletions(-)
 
 diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c
-index 0af44536677..4444a3b3e57 100644
+index 566a5844ad5..d42c2017e78 100644
 --- a/dlls/user32/rawinput.c
 +++ b/dlls/user32/rawinput.c
-@@ -38,14 +38,18 @@
+@@ -38,15 +38,19 @@
  #include "user_private.h"
  
  #include "initguid.h"
 +#include "devpkey.h"
  #include "ntddmou.h"
+ #include "ntddkbd.h"
  
  WINE_DEFAULT_DEBUG_CHANNEL(rawinput);
  
@@ -32,7 +33,7 @@ index 0af44536677..4444a3b3e57 100644
      RID_DEVICE_INFO info;
      PHIDP_PREPARSED_DATA data;
  };
-@@ -91,10 +95,12 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int
+@@ -92,10 +96,12 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int
  
  static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
  {
@@ -46,7 +47,7 @@ index 0af44536677..4444a3b3e57 100644
  
      SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, NULL);
      if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-@@ -108,7 +114,27 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
+@@ -109,7 +115,27 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
          return FALSE;
      }
      detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W);
@@ -75,7 +76,7 @@ index 0af44536677..4444a3b3e57 100644
  
      TRACE("Found HID device %s.\n", debugstr_w(detail->DevicePath));
  
-@@ -134,6 +160,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
+@@ -135,6 +161,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
      device->detail = detail;
      device->file = file;
      device->info.cbSize = sizeof(RID_DEVICE_INFO);
@@ -83,7 +84,7 @@ index 0af44536677..4444a3b3e57 100644
      device->data = NULL;
  
      return device;
-@@ -141,8 +168,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
+@@ -142,8 +169,6 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface)
  
  static void find_devices(void)
  {
@@ -92,7 +93,7 @@ index 0af44536677..4444a3b3e57 100644
      SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) };
      struct device *device;
      HIDD_ATTRIBUTES attr;
-@@ -151,10 +176,6 @@ static void find_devices(void)
+@@ -152,10 +177,6 @@ static void find_devices(void)
      HDEVINFO set;
      DWORD idx;
  
@@ -103,7 +104,7 @@ index 0af44536677..4444a3b3e57 100644
      HidD_GetHidGuid(&hid_guid);
  
      EnterCriticalSection(&rawinput_devices_cs);
-@@ -216,6 +237,26 @@ static void find_devices(void)
+@@ -247,6 +268,26 @@ static void find_devices(void)
  }
  
  
@@ -130,7 +131,7 @@ index 0af44536677..4444a3b3e57 100644
  struct rawinput_thread_data *rawinput_thread_data(void)
  {
      struct user_thread_info *thread_info = get_user_thread_info();
-@@ -389,7 +430,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun
+@@ -420,7 +461,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun
  
      for (i = 0; i < rawinput_devices_count; ++i)
      {
@@ -139,7 +140,7 @@ index 0af44536677..4444a3b3e57 100644
          devices[2 + i].dwType = rawinput_devices[i].info.dwType;
      }
  
-@@ -661,7 +702,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT
+@@ -692,7 +733,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT
      static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE};
  
      RID_DEVICE_INFO info;

patches/xactengine3_7-Notification/0000-xactengine-Use-nameless-unions.patch

@@ -1,40 +0,0 @@
-From 520b5366cb7ce1cba59a755a734f23dbd25fa093 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Thu, 22 Apr 2021 13:23:44 +1000
-Subject: [PATCH] xactengine: Use nameless unions
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- include/xact3.h   | 2 +-
- include/xact3wb.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/xact3.h b/include/xact3.h
-index 63eec707363..9b8f480829e 100644
---- a/include/xact3.h
-+++ b/include/xact3.h
-@@ -434,7 +434,7 @@ typedef struct XACT_NOTIFICATION
-         XACT_NOTIFICATION_VARIABLE variable;
-         XACT_NOTIFICATION_GUI gui;
-         XACT_NOTIFICATION_WAVE wave;
--    } DUMMYUNIONNAME;
-+    };
- } XACT_NOTIFICATION, *LPXACT_NOTIFICATION;
- typedef const XACT_NOTIFICATION *LPCXACT_NOTIFICATION;
- 
-diff --git a/include/xact3wb.h b/include/xact3wb.h
-index 6d157a466f9..834b3e1ef54 100644
---- a/include/xact3wb.h
-+++ b/include/xact3wb.h
-@@ -121,7 +121,7 @@ typedef struct WAVEBANKENTRY
-             DWORD Duration : 28;
-         } DUMMYSTRUCTNAME;
-         DWORD dwFlagsAndDuration;
--    } DUMMYUNIONNAME;
-+    };
- 
-     WAVEBANKMINIWAVEFORMAT Format;
-     WAVEBANKREGION PlayRegion;
--- 
-2.30.2
-

staging/upstream-commit

@@ -1 +1 @@
-5a1d836def24043b4e7afcdc8cf1342223957edf
+c0af8b73725d2670c9b018a255c503dee6912cf5