Rebase against 2bca8cb236b7d4d5f4e0e35d6fcad6a1d8a2c5e3.

patches/user32-rawinput-mouse/0005-winex11-Keep-track-of-mouse-device-and-pointer-butto.patch

@@ -1,4 +1,4 @@
-From a0452d319eecec33d0e130e19e9d1993b52caa2f Mon Sep 17 00:00:00 2001
+From 03ca1a439ace6f14b8551a5e9a83dec83872577f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Thu, 19 Dec 2019 22:34:44 +0100
 Subject: [PATCH] winex11: Keep track of mouse device and pointer button
@@ -17,10 +17,10 @@ Original patch by Andrew Eikum <aeikum@codeweavers.com>.
  5 files changed, 114 insertions(+), 6 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index d95ff178367..5d38e874089 100644
+index d7d8411c1a3..720e016d0af 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1194,6 +1194,7 @@ then
+@@ -1203,6 +1203,7 @@ then
  
      dnl *** All of the following tests require X11/Xlib.h
      AC_CHECK_HEADERS([X11/extensions/shape.h \
@@ -29,10 +29,10 @@ index d95ff178367..5d38e874089 100644
                        X11/extensions/XShm.h \
                        X11/extensions/Xfixes.h \
 diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
-index 23f07b851a7..130b7e516a2 100644
+index bb5bf6220e1..af0bdb54205 100644
 --- a/dlls/winex11.drv/keyboard.c
 +++ b/dlls/winex11.drv/keyboard.c
-@@ -1838,11 +1838,7 @@ BOOL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags)
+@@ -1820,11 +1820,7 @@ BOOL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags)
      return TRUE;
  }
  
@@ -45,7 +45,7 @@ index 23f07b851a7..130b7e516a2 100644
  {
      HWND hwnd;
  
-@@ -1856,6 +1852,24 @@ BOOL X11DRV_MappingNotify( HWND dummy, XEvent *event )
+@@ -1838,6 +1834,24 @@ BOOL X11DRV_MappingNotify( HWND dummy, XEvent *event )
      return TRUE;
  }
  
@@ -71,7 +71,7 @@ index 23f07b851a7..130b7e516a2 100644
  /***********************************************************************
   *		VkKeyScanEx (X11DRV.@)
 diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
-index d3c97468fdb..5a5ec51e370 100644
+index e513e302351..23ceb5eb00a 100644
 --- a/dlls/winex11.drv/mouse.c
 +++ b/dlls/winex11.drv/mouse.c
 @@ -31,6 +31,9 @@
@@ -175,7 +175,7 @@ index d3c97468fdb..5a5ec51e370 100644
  #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
  /***********************************************************************
   *              update_relative_valuators
-@@ -1674,6 +1754,8 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev )
+@@ -1671,6 +1751,8 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev )
  
      if (event->deviceid != data->xinput2_pointer) return FALSE;
      update_relative_valuators( event->classes, event->num_classes );
@@ -184,7 +184,7 @@ index d3c97468fdb..5a5ec51e370 100644
      return TRUE;
  }
  
-@@ -1822,7 +1904,7 @@ static BOOL X11DRV_TouchEvent( HWND hwnd, XGenericEventCookie *xev )
+@@ -1819,7 +1901,7 @@ static BOOL X11DRV_TouchEvent( HWND hwnd, XGenericEventCookie *xev )
   */
  void x11drv_xinput2_load(void)
  {
@@ -193,7 +193,7 @@ index d3c97468fdb..5a5ec51e370 100644
      int event, error;
      void *libxi_handle = dlopen( SONAME_LIBXI, RTLD_NOW );
  
-@@ -1838,11 +1920,20 @@ void x11drv_xinput2_load(void)
+@@ -1835,11 +1917,20 @@ void x11drv_xinput2_load(void)
          return; \
      }
  
@@ -215,22 +215,22 @@ index d3c97468fdb..5a5ec51e370 100644
  
      xinput2_available = XQueryExtension( gdi_display, "XInputExtension", &xinput2_opcode, &event, &error );
 diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
-index 70ef0a112ac..a56eb8b0046 100644
+index 1e669f9fe61..a6cfd5a483e 100644
 --- a/dlls/winex11.drv/x11drv.h
 +++ b/dlls/winex11.drv/x11drv.h
-@@ -682,6 +682,7 @@ extern void retry_grab_clipping_window(void);
+@@ -687,6 +687,7 @@ extern void reapply_cursor_clipping(void);
  extern void ungrab_clipping_window(void);
  extern void move_resize_window( HWND hwnd, int dir );
  extern void X11DRV_InitKeyboard( Display *display );
 +extern void X11DRV_InitMouse( Display *display );
- extern BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*, XPointer), ULONG_PTR arg );
  extern BOOL X11DRV_ProcessEvents( DWORD mask );
  extern HWND *build_hwnd_list(void);
+ 
 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
-index c9e0d43c9ce..930f3a1c088 100644
+index abc14032c61..d95c4761529 100644
 --- a/dlls/winex11.drv/x11drv_main.c
 +++ b/dlls/winex11.drv/x11drv_main.c
-@@ -680,6 +680,7 @@ static NTSTATUS x11drv_init( void *arg )
+@@ -672,6 +672,7 @@ static NTSTATUS x11drv_init( void *arg )
  
      XkbUseExtension( gdi_display, NULL, NULL );
      X11DRV_InitKeyboard( gdi_display );
@@ -239,5 +239,5 @@ index c9e0d43c9ce..930f3a1c088 100644
  
      init_user_driver();
 -- 
-2.43.0
+2.45.2
 

staging/upstream-commit

@@ -1 +1 @@
-3a6e9365336304b4d7eb4d66aef959f67361cc1f
+2bca8cb236b7d4d5f4e0e35d6fcad6a1d8a2c5e3