ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xinput: Fix vibration capabilities. 

wLeftMotorSpeed and wRightMotorSpeed returned by XInputGetCapabilities
are supposed to be resolutions rather than current motor speeds.

This fixes rumble in Far Cry 5.

Signed-off-by: Alexey Prokhin <alexey@prokhin.ru>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexey Prokhin 2019-08-07 19:51:35 +03:00 committed by Alexandre Julliard
parent 433c14b064
commit 9855fbe252
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/xinput1_3/hid.c
View File

@ -173,7 +173,11 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_
value_caps_count = caps->NumberOutputValueCaps; value_caps_count = caps->NumberOutputValueCaps;
if (value_caps_count > 0) if (value_caps_count > 0)
{
xinput_caps->Flags |= XINPUT_CAPS_FFB_SUPPORTED; xinput_caps->Flags |= XINPUT_CAPS_FFB_SUPPORTED;
xinput_caps->Vibration.wLeftMotorSpeed = 255;
xinput_caps->Vibration.wRightMotorSpeed = 255;
}
return TRUE; return TRUE;
} }
@ -456,8 +460,8 @@ DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state)
if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED)
{ {
device->caps.Vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; device->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed;
device->caps.Vibration.wRightMotorSpeed = state->wRightMotorSpeed; device->vibration.wRightMotorSpeed = state->wRightMotorSpeed;
if (private->enabled) if (private->enabled)
{ {
@ -498,7 +502,7 @@ void HID_enable(xinput_controller* device, BOOL enable)
} }
else if (!private->enabled && enable) else if (!private->enabled && enable)
{ {
HID_set_state(device, &device->caps.Vibration); HID_set_state(device, &device->vibration);
} }
LeaveCriticalSection(&private->crit); LeaveCriticalSection(&private->crit);
} }

1
dlls/xinput1_3/xinput_private.h
View File

@ -23,6 +23,7 @@ typedef struct _xinput_controller
XINPUT_CAPABILITIES caps; XINPUT_CAPABILITIES caps;
void *platform_private; void *platform_private;
XINPUT_STATE state; XINPUT_STATE state;
XINPUT_VIBRATION vibration;
} xinput_controller; } xinput_controller;