From 6be691c005b0d268f3dd38a3dbe76bc95f4e155f Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Sat, 25 Jun 2022 21:09:49 +1000
Subject: [PATCH] Rebase against af8ed02b572081206be6c505261f5f2e98a8053c.

---
 patches/patchinstall.sh                       |  4 +--
 ...pport-for-absolute-rawinput-messages.patch | 26 ++++++++++++++-----
 staging/upstream-commit                       |  2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index dff79f75..9d4de746 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "1a3217393e2e6226da0f4024d4d384def207a189"
+	echo "af8ed02b572081206be6c505261f5f2e98a8053c"
 }
 
 # Show version information
@@ -3267,7 +3267,7 @@ fi
 # |   *	[#45882] - Raw Input should use untransformed mouse values (affects Overwatch, several Source games).
 # |
 # | Modified files:
-# |   *	dlls/user32/rawinput.c, dlls/winex11.drv/mouse.c, server/queue.c
+# |   *	dlls/user32/rawinput.c, dlls/win32u/rawinput.c, dlls/winex11.drv/mouse.c, server/queue.c
 # |
 if test "$enable_user32_rawinput_mouse_experimental" -eq 1; then
 	patch_apply user32-rawinput-mouse-experimental/0001-server-Clear-the-MOUSEEVENTF_-ABSOLUTE-VIRTUALDESK-f.patch
diff --git a/patches/user32-rawinput-mouse-experimental/0002-user32-Add-support-for-absolute-rawinput-messages.patch b/patches/user32-rawinput-mouse-experimental/0002-user32-Add-support-for-absolute-rawinput-messages.patch
index a0d914ec..403931c4 100644
--- a/patches/user32-rawinput-mouse-experimental/0002-user32-Add-support-for-absolute-rawinput-messages.patch
+++ b/patches/user32-rawinput-mouse-experimental/0002-user32-Add-support-for-absolute-rawinput-messages.patch
@@ -1,27 +1,39 @@
-From 3fde11e2e3cf70b4815d88283ec0947c019c5424 Mon Sep 17 00:00:00 2001
+From 6ca9dd8fcd77c1e95cdf11d4cfcda9ee131fdc8c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Mon, 25 Oct 2021 11:26:43 +0200
 Subject: [PATCH] user32: Add support for absolute rawinput messages.
 
 ---
- dlls/user32/rawinput.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ dlls/user32/rawinput.c | 1 -
+ dlls/win32u/rawinput.c | 3 ++-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c
-index 3a316024656..d2c1f1cf2b5 100644
+index d6290f08d12..9848bcade98 100644
 --- a/dlls/user32/rawinput.c
 +++ b/dlls/user32/rawinput.c
-@@ -316,7 +316,9 @@ BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_ms
+@@ -350,7 +350,6 @@ BOOL rawinput_device_get_usages(HANDLE handle, USAGE *usage_page, USAGE *usage)
+     return TRUE;
+ }
+ 
+-
+ /***********************************************************************
+  *              GetRawInputDeviceList   (USER32.@)
+  */
+diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c
+index d6d4e0c13f7..9299d6928fc 100644
+--- a/dlls/win32u/rawinput.c
++++ b/dlls/win32u/rawinput.c
+@@ -90,7 +90,8 @@ static bool rawinput_from_hardware_message( RAWINPUT *rawinput, const struct har
          rawinput->header.hDevice = WINE_MOUSE_HANDLE;
          rawinput->header.wParam  = 0;
  
 -        rawinput->data.mouse.usFlags           = MOUSE_MOVE_RELATIVE;
 +        rawinput->data.mouse.usFlags = msg_data->flags & MOUSEEVENTF_ABSOLUTE ? MOUSE_MOVE_ABSOLUTE : MOUSE_MOVE_RELATIVE;
 +        if (msg_data->flags & MOUSEEVENTF_VIRTUALDESK) rawinput->data.mouse.usFlags |= MOUSE_VIRTUAL_DESKTOP;
-+
          rawinput->data.mouse.usButtonFlags = 0;
          rawinput->data.mouse.usButtonData  = 0;
          for (i = 1; i < ARRAY_SIZE(button_flags); ++i)
 -- 
-2.33.0
+2.35.1
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 3ae996e7..8a45e02f 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-712c547e0869b0caf797694137e36bacea614aa6
+af8ed02b572081206be6c505261f5f2e98a8053c