dinput: Ignore vendor-specific usage pages for joystick elements on Mac.

Signed-off-by: Bob Ziuchkovski <bob.ziuchkovski@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dinput: Ignore vendor-specific usage pages for joystick elements on Mac.
221708d6 · Bob Ziuchkovski · Alexandre Julliard · 2de3dc3d · 221708d6
Commit 221708d6 authored Jan 07, 2018 by Bob Ziuchkovski Committed by Alexandre Julliard Jan 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

joystick_osx.c dlls/dinput/joystick_osx.c +7 -1

No files found.
--- a/dlls/dinput/joystick_osx.c
+++ b/dlls/dinput/joystick_osx.c
@@ -640,14 +640,20 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8])
        {
            IOHIDElementRef element = ( IOHIDElementRef ) CFArrayGetValueAtIndex( elements, idx );
            int type = IOHIDElementGetType( element );
+            int usage_page = IOHIDElementGetUsagePage( element );

            TRACE("element %s\n", debugstr_element(element));

+            if (usage_page >= kHIDPage_VendorDefinedStart)
+            {
+                /* vendor pages can repurpose type ids, resulting in incorrect case matches below (e.g. ds4 controllers) */
+                continue;
+            }
+
            switch(type)
            {
                case kIOHIDElementTypeInput_Button:
                {
-                    int usage_page = IOHIDElementGetUsagePage( element );
                    TRACE("kIOHIDElementTypeInput_Button usage_page %d\n", usage_page);
                    if (usage_page != kHIDPage_Button)
                    {