xinput: Check that we actually received a value before assignment.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46999Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

xinput: Check that we actually received a value before assignment.
72e62952 · Alistair Leslie-Hughes · Alexandre Julliard · 34d5f90d · 72e62952
Commit 72e62952 authored Apr 24, 2019 by Alistair Leslie-Hughes Committed by Alexandre Julliard Apr 24, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 12 deletions

hid.c dlls/xinput1_3/hid.c +18 -12

No files found.
--- a/dlls/xinput1_3/hid.c
+++ b/dlls/xinput1_3/hid.c
@@ -388,23 +388,29 @@ void HID_update_state(xinput_controller* device)
        }
    }
-    HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length);
+    if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value,
-    device->state.Gamepad.sThumbLX = scale_short(value, &private->lx);
+                                    private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS)
+        device->state.Gamepad.sThumbLX = scale_short(value, &private->lx);
-    HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length);
+    if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value,
-    device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1;
+                                    private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS)
+        device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1;
-    HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length);
+    if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value,
-    device->state.Gamepad.sThumbRX = scale_short(value, &private->rx);
+                                    private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS)
+        device->state.Gamepad.sThumbRX = scale_short(value, &private->rx);
-    HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length);
+    if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value,
-    device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1;
+                                    private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS)
+        device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1;
-    HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length);
+    if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value,
-    device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger);
+                                    private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS)
+        device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger);
-    HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length);
+    if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value,
-    device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger);
+                                    private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS)
+        device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger);
    LeaveCriticalSection(&private->crit);
 }