wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 5fd9826b8cdcb9130b0bf6943a2a5cd7c7499370.

Browse Source
This commit is contained in:
Elizabeth Figura
2025-08-28 16:19:59 -05:00
parent e250393ba4
commit e2610f8a45
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From fbd5deecb137fa6ef4b0161266d3fb4b157ad069 Mon Sep 17 00:00:00 2001
From 3d9b1442bd52b7ca013f8af5f156446caeecde1c 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 1923499cf9c..3c4b09d61fb 100644
index 2cc5398d178..5363c8b5e3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1231,6 +1231,7 @@ then
@@ -1258,6 +1258,7 @@ then
dnl *** All of the following tests require X11/Xlib.h
AC_CHECK_HEADERS([X11/extensions/shape.h \
@@ -29,10 +29,10 @@ index 1923499cf9c..3c4b09d61fb 100644
X11/extensions/XShm.h \
X11/extensions/Xfixes.h \
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 8a5ef62f57d..24188e25d98 100644
index 25836fe835d..d860f201c1e 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -1825,11 +1825,7 @@ BOOL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags)
@@ -1835,11 +1835,7 @@ BOOL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags)
return TRUE;
}
@@ -45,7 +45,7 @@ index 8a5ef62f57d..24188e25d98 100644
{
HWND hwnd;
@@ -1843,6 +1839,24 @@ BOOL X11DRV_MappingNotify( HWND dummy, XEvent *event )
@@ -1853,6 +1849,24 @@ BOOL X11DRV_MappingNotify( HWND dummy, XEvent *event )
return TRUE;
}
@@ -71,7 +71,7 @@ index 8a5ef62f57d..24188e25d98 100644
/***********************************************************************
* VkKeyScanEx (X11DRV.@)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index cbf5835b75c..59a9835e9b4 100644
index 63d76256202..3cb2553cb59 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -31,6 +31,9 @@
@@ -215,10 +215,10 @@ index cbf5835b75c..59a9835e9b4 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 75dd3c1711a..f48c3782e53 100644
index c69c83e5dd9..17f0b3fc7bd 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -719,6 +719,7 @@ extern void reapply_cursor_clipping(void);
@@ -732,6 +732,7 @@ extern void reapply_cursor_clipping(void);
extern void ungrab_clipping_window(void);
extern void move_resize_window( HWND hwnd, int dir, POINT pos );
extern void X11DRV_InitKeyboard( Display *display );
@@ -227,17 +227,17 @@ index 75dd3c1711a..f48c3782e53 100644
typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void *arg );
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index e27202eb2bf..629c8fc172c 100644
index 715a2444667..5df92db9f5a 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -669,6 +669,7 @@ static NTSTATUS x11drv_init( void *arg )
@@ -673,6 +673,7 @@ static NTSTATUS x11drv_init( void *arg )
XkbUseExtension( gdi_display, NULL, NULL );
X11DRV_InitKeyboard( gdi_display );
+ X11DRV_InitMouse( gdi_display );
if (use_xim) use_xim = xim_init( input_style );
init_user_driver();
init_icm_profile();
--
2.47.2
2.50.1

20
patches/winex11-Fixed-scancodes/0003-winex11-Write-supported-keyboard-layout-list-in-regi.patch
View File

@@ -1,4 +1,4 @@
From 3d27835e97b472ed46ffbfd48bc1e16a30d1ff61 Mon Sep 17 00:00:00 2001
From 3f06b0580aaffb924233ca92bfd0c663ef9e4561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 6 Jan 2023 08:09:11 +0100
Subject: [PATCH] winex11: Write supported keyboard layout list in registry.
@@ -12,10 +12,10 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
3 files changed, 42 insertions(+)
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 5c7f6c37276..1846bd923a5 100644
index 25836fe835d..5b0f27536dd 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -1084,6 +1084,27 @@ static const WORD xfree86_vendor_key_vkey[256] =
@@ -1093,6 +1093,27 @@ static const WORD xfree86_vendor_key_vkey[256] =
0, 0, 0, 0, 0, 0, 0, 0 /* 1008FFF8 */
};
@@ -44,12 +44,12 @@ index 5c7f6c37276..1846bd923a5 100644
/* kbd_section must be held */
static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e)
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 2917579927c..da501ad4618 100644
index c69c83e5dd9..1b6df2b48a5 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -701,6 +701,10 @@ extern BOOL xinerama_get_fullscreen_monitors( const RECT *rect, long *indices );
extern void xinerama_init( unsigned int width, unsigned int height );
@@ -747,6 +747,10 @@ extern void xinerama_init( unsigned int width, unsigned int height );
extern void init_recursive_mutex( pthread_mutex_t *mutex );
extern void init_icm_profile(void);
+/* keyboard.c */
+
@@ -59,10 +59,10 @@ index 2917579927c..da501ad4618 100644
extern const unsigned int *depths;
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 70212a067b0..73b2237778b 100644
index 67ba9eaf614..70f169adcb3 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -446,6 +446,19 @@ static HKEY create_hkcu_key( const char *name )
@@ -421,6 +421,19 @@ static HKEY create_hkcu_key( const char *name )
return reg_open_hkcu_key( name, TRUE );
}
@@ -82,7 +82,7 @@ index 70212a067b0..73b2237778b 100644
ULONG query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size )
{
@@ -561,6 +574,10 @@ static void setup_options(void)
@@ -533,6 +546,10 @@ static void setup_options(void)
if (!get_config_key( hkey, appkey, "GrabFullscreen", buffer, sizeof(buffer) ))
grab_fullscreen = IS_OPTION_TRUE( buffer[0] );
@@ -94,5 +94,5 @@ index 70212a067b0..73b2237778b 100644
default_visual.depth = wcstol( buffer, NULL, 0 );
--
2.42.0
2.50.1

2
staging/upstream-commit
View File

@@ -1 +1 @@
4a7d6576f0a8507097e3894a579061b568db6ac6
5fd9826b8cdcb9130b0bf6943a2a5cd7c7499370