Rebase against d54e7cd51db7d3def7dab549a547b1b6bf7573e2.

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

@@ -1,4 +1,4 @@
-From c5886826531d48127be7e9f957708c737bb9f9ea Mon Sep 17 00:00:00 2001
+From aed9514fd73f808a0fe1ed00829fe2dc68735423 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
@@ -12,12 +12,11 @@ __wine_send_input with INPUT_HARDWARE input type and a rawinput.
  dlls/win32u/message.c           |  4 ++--
  dlls/wineandroid.drv/keyboard.c |  3 ++-
  dlls/wineandroid.drv/window.c   |  5 +++--
- dlls/winemac.drv/ime.c          |  1 +
  dlls/winemac.drv/keyboard.c     |  3 ++-
  dlls/winemac.drv/mouse.c        |  3 ++-
  dlls/winex11.drv/keyboard.c     |  3 ++-
  dlls/winex11.drv/mouse.c        | 11 +++++++----
- 9 files changed, 23 insertions(+), 13 deletions(-)
+ 8 files changed, 22 insertions(+), 13 deletions(-)
 
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
 index 83d2a4e3efb..511d4040d38 100644
@@ -113,18 +112,6 @@ index f01df37a400..eb96300da89 100644
              break;
  
          default:
-diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
-index 9249b722909..b8aec78e12c 100644
---- a/dlls/winemac.drv/ime.c
-+++ b/dlls/winemac.drv/ime.c
-@@ -38,6 +38,7 @@
- #include "imm.h"
- #include "immdev.h"
- #include "wine/debug.h"
-+#include "wine/server.h"
- 
- WINE_DEFAULT_DEBUG_CHANNEL(imm);
- 
 diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c
 index c1963daa56e..14f0010e37e 100644
 --- a/dlls/winemac.drv/keyboard.c

staging/upstream-commit

@@ -1 +1 @@
-5662d85e0e95a2715ab3b81c25c89121fc8db34d
+d54e7cd51db7d3def7dab549a547b1b6bf7573e2