dinput: OS/X joystick: Check usage page to avoid odd non-button elements found…

dinput: OS/X joystick: Check usage page to avoid odd non-button elements found on the 360 controller.

dinput: OS/X joystick: Check usage page to avoid odd non-button elements found…
6bbec8e6 · Aric Stewart · Alexandre Julliard · c95011dc · 6bbec8e6
Commit 6bbec8e6 authored Mar 11, 2009 by Aric Stewart Committed by Alexandre Julliard Mar 12, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

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

No files found.
--- a/dlls/dinput/joystick_osx.c
+++ b/dlls/dinput/joystick_osx.c
@@ -320,6 +320,13 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8])
            {
                case kIOHIDElementTypeInput_Button:
                {
+                    int usagePage = IOHIDElementGetUsagePage( tIOHIDElementRef );
+                    if (usagePage != kHIDPage_Button)
+                    {
+                        /* avoid strange elements found on the 360 controler */
+                        continue;
+                    }
+
                    if (buttons < 128)
                    {
                        CFArrayInsertValueAtIndex(device->elementCFArrayRef, (axes+povs+buttons), tIOHIDElementRef);