winebus.sys: Only attempt to open joysticks and gamepads in the IOHID backend.

An extension of 3985b7c5. Opening the device for the Touch Bar on older MacBooks also triggers a permission prompt, so for now it makes sense to restrict the devices we open.

winebus.sys: Only attempt to open joysticks and gamepads in the IOHID backend.
c5f9d918 · Tim Clem · Alexandre Julliard · 4a227c62 · c5f9d918
Commit c5f9d918 authored Mar 01, 2024 by Tim Clem Committed by Alexandre Julliard Mar 04, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

bus_iohid.c dlls/winebus.sys/bus_iohid.c +11 -6

No files found.
--- a/dlls/winebus.sys/bus_iohid.c
+++ b/dlls/winebus.sys/bus_iohid.c
@@ -281,17 +281,22 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void *
    usage_page = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsagePageKey)));
    usage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsageKey)));

-    if (usage_page == HID_USAGE_PAGE_GENERIC && (usage == HID_USAGE_GENERIC_MOUSE || usage == HID_USAGE_GENERIC_KEYBOARD))
-    {
-        TRACE("Ignoring mouse / keyboard device\n");
-        return;
-    }
-
    desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey)));
    desc.pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey)));
    desc.version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey)));
    desc.uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey)));

+    if (usage_page != HID_USAGE_PAGE_GENERIC ||
+        !(usage == HID_USAGE_GENERIC_JOYSTICK || usage == HID_USAGE_GENERIC_GAMEPAD))
+    {
+        /* winebus isn't currently meant to handle anything but these, and
+         * opening keyboards, mice, or the Touch Bar on older MacBooks triggers
+         * a permissions dialog for input monitoring.
+         */
+        ERR("Ignoring HID device %p (vid %04x, pid %04x): not a joystick or gamepad\n", IOHIDDevice, desc.vid, desc.pid);
+        return;
+    }
+
    if (IOHIDDeviceOpen(IOHIDDevice, 0) != kIOReturnSuccess)
    {
        ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, desc.vid, desc.pid);