From 68cc39d3baa4dea93e581294bcb7f1d63277a2fb Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 20 Mar 2023 17:32:04 -0500 Subject: [PATCH] Rebase against fd99bd4e247a879e8cb186212d1dc66268aa0888. --- ...ping-of-controls-based-of-Genre-type.patch | 23 ++++++++++--------- patches/dinput-joy-mappings/definition | 2 ++ staging/upstream-commit | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch b/patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch index 086aded0..3af812b6 100644 --- a/patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch +++ b/patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch @@ -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 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 diff --git a/patches/dinput-joy-mappings/definition b/patches/dinput-joy-mappings/definition index f045cc56..36290939 100644 --- a/patches/dinput-joy-mappings/definition +++ b/patches/dinput-joy-mappings/definition @@ -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 diff --git a/staging/upstream-commit b/staging/upstream-commit index 2f8454c6..986cd578 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -15aec461174ae2f2568d63fa83f32576ede05a9c +fd99bd4e247a879e8cb186212d1dc66268aa0888