Brendan Shanks : dinput: Enable Xbox One controller View and Xbox buttons on Mac.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4cec31aaad4ae6f584418b0ceeef5a1fab6783ba
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4cec31aaad4ae6f584418b0ce...

Author: Brendan Shanks 
Date:   Tue Feb  9 14:38:58 2021 -0800

dinput: Enable Xbox One controller View and Xbox buttons on Mac.

Signed-off-by: Brendan Shanks 
Signed-off-by: Alexandre Julliard

---

dlls/dinput/joystick_osx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c
index b91b9d14b12..58f6b86fc16 100644
--- a/dlls/dinput/joystick_osx.c
+++ b/dlls/dinput/joystick_osx.c
@@ -661,7 +661,7 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8])
                 case kIOHIDElementTypeInput_Button:
                 {
                     TRACE("kIOHIDElementTypeInput_Button usage_page %d\n", usage_page);
-                    if (usage_page != kHIDPage_Button)
+                    if ((usage_page != kHIDPage_Button) && (usage_page != kHIDPage_Consumer))
                     {
                         /* avoid strange elements found on the 360 controller */
                         continue;