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>

xinput: Fix vibration capabilities.
9855fbe2 · Alexey Prokhin · Alexandre Julliard · 433c14b0 · 9855fbe2 · 9855fbe2
Commit 9855fbe2 authored Aug 07, 2019 by Alexey Prokhin Committed by Alexandre Julliard Aug 07, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

hid.c dlls/xinput1_3/hid.c +7 -3

xinput_private.h dlls/xinput1_3/xinput_private.h +1 -0

No files found.
--- a/dlls/xinput1_3/hid.c
+++ b/dlls/xinput1_3/hid.c
@@ -173,7 +173,11 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_

    value_caps_count = caps->NumberOutputValueCaps;
    if (value_caps_count > 0)
+    {
        xinput_caps->Flags |= XINPUT_CAPS_FFB_SUPPORTED;
+        xinput_caps->Vibration.wLeftMotorSpeed = 255;
+        xinput_caps->Vibration.wRightMotorSpeed = 255;
+    }

    return TRUE;
 }
@@ -456,8 +460,8 @@ DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state)

    if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED)
    {
-        device->caps.Vibration.wLeftMotorSpeed = state->wLeftMotorSpeed;
-        device->caps.Vibration.wRightMotorSpeed = state->wRightMotorSpeed;
+        device->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed;
+        device->vibration.wRightMotorSpeed = state->wRightMotorSpeed;

        if (private->enabled)
        {
@@ -498,7 +502,7 @@ void HID_enable(xinput_controller* device, BOOL enable)
        }
        else if (!private->enabled && enable)
        {
-            HID_set_state(device, &device->caps.Vibration);
+            HID_set_state(device, &device->vibration);
        }
        LeaveCriticalSection(&private->crit);
    }

--- a/dlls/xinput1_3/xinput_private.h
+++ b/dlls/xinput1_3/xinput_private.h
@@ -23,6 +23,7 @@ typedef struct _xinput_controller
    XINPUT_CAPABILITIES caps;
    void *platform_private;
    XINPUT_STATE state;
+    XINPUT_VIBRATION vibration;
 } xinput_controller;