Rebase against 530c1839603bd3caa1b9d17fe458b5bd341ccfc9.

patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,4 +1,4 @@
-From f73bf747238e157fc73f8b62941d3d8aa4b6bb33 Mon Sep 17 00:00:00 2001
+From b094a7cf3f804ea40e5bd05ad738c48b5464e0bb Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
@@ -9,12 +9,13 @@ Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
-index b2a5e2037e9..7140cc9f181 100644
+index 22be2612eeb..f3f31eb3671 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
-@@ -1,6 +1,6 @@
- MODULE    = dbghelp.dll
+@@ -2,7 +2,7 @@ MODULE    = dbghelp.dll
  IMPORTLIB = dbghelp
+ IMPORTS   = $(ZLIB_PE_LIBS)
+ EXTRAINCL = $(ZLIB_PE_CFLAGS)
 -EXTRADEFS = -D_IMAGEHLP_SOURCE_
 +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\""
  DELAYIMPORTS = version

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "0925a730272ed0c97f64c3365ebe542401f60d7c"
+	echo "530c1839603bd3caa1b9d17fe458b5bd341ccfc9"
 }
 
 # Show version information

patches/user32-rawinput-mouse/0008-winex11.drv-Listen-to-RawMotion-and-RawButton-events.patch

@@ -1,4 +1,4 @@
-From a5f930d50c026021b7d7ccac2cb2a58d43abff12 Mon Sep 17 00:00:00 2001
+From 39ec871a215f656ba792b846d0f1bb8cf055b735 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Thu, 25 Mar 2021 16:12:58 +0100
 Subject: [PATCH] winex11.drv: Listen to RawMotion and RawButton* events in the
@@ -141,9 +141,7 @@ index 6b6512521f4..7ff360d5127 100644
 +    else
 +    {
 +        TRACE( "raw pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );
- 
--    input.type = INPUT_MOUSE;
--    __wine_send_input( 0, &input, &rawinput );
++
 +        rawinput.header.dwType = RIM_TYPEMOUSE;
 +        rawinput.header.dwSize = offsetof(RAWINPUT, data) + sizeof(RAWMOUSE);
 +        rawinput.header.hDevice = ULongToHandle(1); /* WINE_MOUSE_HANDLE */
@@ -165,7 +163,9 @@ index 6b6512521f4..7ff360d5127 100644
 +    }
 +    return TRUE;
 +}
-+
+ 
+-    input.type = INPUT_MOUSE;
+-    __wine_send_input( 0, &input, &rawinput );
 +/***********************************************************************
 + *           X11DRV_RawButtonEvent
 + */
@@ -233,10 +233,10 @@ index 6b6512521f4..7ff360d5127 100644
      default:
          TRACE( "Unhandled event %#x\n", event->evtype );
 diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
-index 7a89a010395..2fd8519971d 100644
+index d8758e8a412..ef1765d42c7 100644
 --- a/dlls/winex11.drv/x11drv.h
 +++ b/dlls/winex11.drv/x11drv.h
-@@ -352,6 +352,7 @@ struct x11drv_thread_data
+@@ -351,6 +351,7 @@ struct x11drv_thread_data
      struct x11drv_valuator_data x_rel_valuator;
      struct x11drv_valuator_data y_rel_valuator;
      int      xi2_core_pointer;     /* XInput2 core pointer id */
@@ -245,19 +245,19 @@ index 7a89a010395..2fd8519971d 100644
  
  extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN;
 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
-index d8576949aea..c16825751c8 100644
+index 2a35a6a8548..0efe62a6c21 100644
 --- a/dlls/winex11.drv/x11drv_main.c
 +++ b/dlls/winex11.drv/x11drv_main.c
-@@ -633,6 +633,8 @@ void CDECL X11DRV_ThreadDetach(void)
- 
+@@ -647,6 +647,8 @@ void CDECL X11DRV_ThreadDetach(void)
      if (data)
      {
+         vulkan_thread_detach();
 +        if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId())
 +            x11drv_xinput_disable( data->display, DefaultRootWindow( data->display ), PointerMotionMask );
          if (data->xim) XCloseIM( data->xim );
          if (data->font_set) XFreeFontSet( data->display, data->font_set );
          XCloseDisplay( data->display );
-@@ -704,6 +706,8 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
+@@ -718,6 +720,8 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
      if (use_xim) X11DRV_SetupXIM();
  
      x11drv_xinput_init();
@@ -267,5 +267,5 @@ index d8576949aea..c16825751c8 100644
      return data;
  }
 -- 
-2.30.2
+2.33.0
 

patches/winex11-Vulkan_support/0001-winex11-Specify-a-default-vulkan-driver-if-one-not-f.patch

@@ -1,4 +1,4 @@
-From 2776cc4fd2366f0a687e90d0cfaaf7c3bdc63387 Mon Sep 17 00:00:00 2001
+From 3561f512f400ca1d049ac5ce26b9cbb6aac1dc31 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 1 Jun 2018 14:03:26 +1000
 Subject: [PATCH] winex11: Specify a default vulkan driver if one not found at
@@ -7,11 +7,11 @@ Subject: [PATCH] winex11: Specify a default vulkan driver if one not found at
 We cannot specify it as a dependency since Debian Jessie has the
 vulkan library in backports and not everybody will have this mapped.
 ---
- dlls/winex11.drv/vulkan.c | 31 ++++++++++++++-----------------
- 1 file changed, 14 insertions(+), 17 deletions(-)
+ dlls/winex11.drv/vulkan.c | 35 ++++++++++++++---------------------
+ 1 file changed, 14 insertions(+), 21 deletions(-)
 
 diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
-index 4de82586906..f254cda3227 100644
+index 4f6624b3db8..6e343f47f34 100644
 --- a/dlls/winex11.drv/vulkan.c
 +++ b/dlls/winex11.drv/vulkan.c
 @@ -40,10 +40,12 @@
@@ -29,7 +29,7 @@ index 4de82586906..f254cda3227 100644
  static CRITICAL_SECTION context_section;
  static CRITICAL_SECTION_DEBUG critsect_debug =
  {
-@@ -106,9 +108,17 @@ static void *vulkan_handle;
+@@ -111,9 +113,17 @@ static void *vulkan_handle;
  
  static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context)
  {
@@ -49,7 +49,7 @@ index 4de82586906..f254cda3227 100644
          return TRUE;
      }
  
-@@ -652,16 +662,3 @@ const struct vulkan_funcs *get_vulkan_driver(UINT version)
+@@ -735,20 +745,3 @@ const struct vulkan_funcs *get_vulkan_driver(UINT version)
      return NULL;
  }
  
@@ -65,7 +65,11 @@ index 4de82586906..f254cda3227 100644
 -{
 -}
 -
+-void vulkan_thread_detach(void)
+-{
+-}
+-
 -#endif /* SONAME_LIBVULKAN */
 -- 
-2.25.1
+2.33.0
 

staging/upstream-commit

@@ -1 +1 @@
-0925a730272ed0c97f64c3365ebe542401f60d7c
+530c1839603bd3caa1b9d17fe458b5bd341ccfc9