system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 16:44:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dinput: Report optional force feedback state only if supported.

Browse source 
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2022-02-18 10:31:16 +01:00 committed by Alexandre Julliard
parent d5ff6917b7
commit 482768a9e6
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/dinput/joystick_hid.c
View file

@ -163,6 +163,9 @@ struct pid_effect_state
{
BYTE id;
UINT collection;
struct hid_value_caps *safety_switch_caps;
struct hid_value_caps *actuator_power_caps;
struct hid_value_caps *actuator_override_switch_caps;
};
struct hid_joystick
@ -1298,9 +1301,12 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface )
}
}
if (!(device_state & DIGFFS_ACTUATORSON)) device_state |= DIGFFS_ACTUATORSOFF;
if (!(device_state & DIGFFS_SAFETYSWITCHON)) device_state |= DIGFFS_SAFETYSWITCHOFF;
if (!(device_state & DIGFFS_USERFFSWITCHON)) device_state |= DIGFFS_USERFFSWITCHOFF;
if (!(device_state & DIGFFS_POWERON)) device_state |= DIGFFS_POWEROFF;
if (!(device_state & DIGFFS_SAFETYSWITCHON) && impl->pid_effect_state.safety_switch_caps)
device_state |= DIGFFS_SAFETYSWITCHOFF;
if (!(device_state & DIGFFS_USERFFSWITCHON) && impl->pid_effect_state.actuator_override_switch_caps)
device_state |= DIGFFS_USERFFSWITCHOFF;
if (!(device_state & DIGFFS_POWERON) && impl->pid_effect_state.actuator_power_caps)
device_state |= DIGFFS_POWEROFF;
TRACE( "effect %lu state %#x, device state %#x\n", index, effect_state, device_state );
@ -1772,7 +1778,15 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap
return DIENUM_CONTINUE;
if (instance->wCollectionNumber == effect_state->collection)
{
SET_REPORT_ID( effect_state );
if (instance->wUsage == PID_USAGE_SAFETY_SWITCH)
effect_state->safety_switch_caps = caps;
if (instance->wUsage == PID_USAGE_ACTUATOR_POWER)
effect_state->actuator_power_caps = caps;
if (instance->wUsage == PID_USAGE_ACTUATOR_OVERRIDE_SWITCH)
effect_state->actuator_override_switch_caps = caps;
}
if (!(instance->dwType & DIDFT_OUTPUT)) return DIENUM_CONTINUE;