wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against fd99bd4e247a879e8cb186212d1dc66268aa0888.

Browse Source
This commit is contained in:
Zebediah Figura 2023-03-20 17:32:04 -05:00
parent 3a47cfd8a5
commit 68cc39d3ba
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch
View File

@ -1,4 +1,4 @@
From 98a9b8337d40c1f6df21227dff3d993f270aef46 Mon Sep 17 00:00:00 2001
From f1c2e802d382007f8b4de0ddb9f8d23b24073747 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 24 May 2019 16:16:13 +1000
Subject: [PATCH] dinput: Allow mapping of controls based of Genre type.
@ -8,10 +8,10 @@ Subject: [PATCH] dinput: Allow mapping of controls based of Genre type.
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index e826cc89c1e..a4815f24958 100644
index b010dc8dbf0..ed7bd5ae64a 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -1741,8 +1741,15 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
@@ -2020,8 +2020,15 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
/* Count the actions */
for (i = 0; i < format->dwNumActions; i++)
@ -26,9 +26,9 @@ index e826cc89c1e..a4815f24958 100644
+ }
+ }
/* Should return DI_NOEFFECT if we dont have any actions and actionformat has not changed */
if (num_actions == 0 && format->dwCRC == new_crc && !(flags & DIDSAM_FORCESAVE)) return DI_NOEFFECT;
@@ -1779,7 +1786,39 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
if (num_actions == 0) return DI_NOEFFECT;
@@ -2054,8 +2061,40 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
action++;
}
@ -57,17 +57,18 @@ index e826cc89c1e..a4815f24958 100644
+ action++;
+ }
+ }
+ }
+
}
+ if (action == 0)
+ {
+ free( obj_df );
+ return DI_NOEFFECT;
}
+ }
+ data_format.dwNumObjs = action;
+
IDirectInputDevice8_SetDataFormat( iface, &data_format );
impl->action_map = action_map;
--
2.33.0
2.39.0

2
patches/dinput-joy-mappings/definition
View File

@ -1,3 +1,5 @@
Fixes: [34108] dinput: Improve support for user Joystick configuration.
Fixes: [47326] dinput: Allow mapping of controls based of genre type.
Fixes: [35815] dinput: Allow remapping of joystick buttons.
# Seeing active work...
Disabled: true

2
staging/upstream-commit
View File

@ -1 +1 @@
15aec461174ae2f2568d63fa83f32576ede05a9c
fd99bd4e247a879e8cb186212d1dc66268aa0888