Rebase against df5f6f66de80085249d392be5efa085e6ee056a0.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "25743d46f4103c7345c955b87b4134a065fb5f1d"
+	echo "b'df5f6f66de80085249d392be5efa085e6ee056a0'"
 }
 
 # Show version information

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

@@ -1,4 +1,4 @@
-From ce8d669795e7c7fc81189c534e16fd58c501e577 Mon Sep 17 00:00:00 2001
+From b2f68f427f6fc486238b768c664ed6df6009a5ef 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,10 +20,10 @@ __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 2ac23ba999c..2db536fc48e 100644
+index afd352e1fbd..2442aa49053 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
-@@ -131,6 +131,7 @@ UINT WINAPI NtUserSendInput( UINT count, INPUT *inputs, int size )
+@@ -613,6 +613,7 @@ UINT WINAPI NtUserSendInput( UINT count, INPUT *inputs, int size )
  {
      UINT i;
      NTSTATUS status = STATUS_SUCCESS;
@@ -31,7 +31,7 @@ index 2ac23ba999c..2db536fc48e 100644
  
      if (size != sizeof(INPUT))
      {
-@@ -160,7 +161,7 @@ UINT WINAPI NtUserSendInput( UINT count, INPUT *inputs, int size )
+@@ -642,7 +643,7 @@ UINT WINAPI NtUserSendInput( UINT count, INPUT *inputs, int size )
              update_mouse_coords( &input );
              /* fallthrough */
          case INPUT_KEYBOARD:
@@ -41,10 +41,10 @@ index 2ac23ba999c..2db536fc48e 100644
          case INPUT_HARDWARE:
              RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED );
 diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
-index 62bd20c42aa..3e35d278fab 100644
+index 56a23a95e71..7b0004dfb96 100644
 --- a/dlls/win32u/message.c
 +++ b/dlls/win32u/message.c
-@@ -2611,7 +2611,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r
+@@ -2623,7 +2623,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 62bd20c42aa..3e35d278fab 100644
              break;
          case INPUT_KEYBOARD:
              req->input.kbd.vkey  = input->ki.wVk;
-@@ -2619,7 +2619,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r
+@@ -2631,7 +2631,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,18 +114,18 @@ index a339c20ceda..222751abc29 100644
  
          default:
 diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
-index 19a974b3c24..d5c5689d396 100644
+index 5780c942283..41835ea3e2d 100644
 --- a/dlls/winemac.drv/ime.c
 +++ b/dlls/winemac.drv/ime.c
 @@ -38,6 +38,7 @@
  #include "imm.h"
- #include "ddk/imm.h"
+ #include "immdev.h"
  #include "wine/debug.h"
 +#include "wine/server.h"
  
  WINE_DEFAULT_DEBUG_CHANNEL(imm);
  
-@@ -1409,6 +1410,7 @@ NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size)
+@@ -1403,6 +1404,7 @@ NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size)
                                       params->cursor_pos, !params->complete);
          else
          {
@@ -133,7 +133,7 @@ index 19a974b3c24..d5c5689d396 100644
              INPUT input;
              unsigned int i;
  
-@@ -1421,10 +1423,10 @@ NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size)
+@@ -1415,10 +1417,10 @@ NTSTATUS WINAPI macdrv_ime_set_text(void *arg, ULONG size)
              {
                  input.ki.wScan      = params->text[i];
                  input.ki.dwFlags    = KEYEVENTF_UNICODE;
@@ -274,5 +274,5 @@ index 82a82032957..17e88f87982 100644
  }
  
 -- 
-2.39.0
+2.39.1
 

staging/upstream-commit

@@ -1 +1 @@
-25743d46f4103c7345c955b87b4134a065fb5f1d
+df5f6f66de80085249d392be5efa085e6ee056a0