Arkadiusz Hiler : dinput: Use GUID_Slider type for dials.

Alexandre Julliard julliard at winehq.org
Mon Jul 25 16:19:30 CDT 2022


Module: wine
Branch: master
Commit: 6719e6b2d3cfbe4b59d04105de18ee66aa8f8316
URL:    https://gitlab.winehq.org/wine/wine/-/commit/6719e6b2d3cfbe4b59d04105de18ee66aa8f8316

Author: Arkadiusz Hiler <ahiler at codeweavers.com>
Date:   Fri Jul 22 14:55:35 2022 +0300

dinput: Use GUID_Slider type for dials.

---

 dlls/dinput/joystick_hid.c    | 1 +
 dlls/dinput/tests/joystick8.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c
index 7370982d4c9..ebebbee6eb2 100644
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -276,6 +276,7 @@ static const GUID *object_usage_to_guid( USAGE usage_page, USAGE usage )
         case HID_USAGE_GENERIC_RY: return &GUID_RyAxis;
         case HID_USAGE_GENERIC_RZ: return &GUID_RzAxis;
         case HID_USAGE_GENERIC_SLIDER: return &GUID_Slider;
+        case HID_USAGE_GENERIC_DIAL: return &GUID_Slider;
         case HID_USAGE_GENERIC_HATSWITCH: return &GUID_POV;
         }
         break;
diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c
index 811db94cab5..5eebcf87d44 100644
--- a/dlls/dinput/tests/joystick8.c
+++ b/dlls/dinput/tests/joystick8.c
@@ -2960,7 +2960,7 @@ static void test_many_axes_joystick(void)
         {0},
         {0},
         {0},
-        {.guid = TRUE},
+        {0},
         {.flags = TRUE},
         {.flags = TRUE},
         {.flags = TRUE},




More information about the wine-cvs mailing list