winebus.sys: Also pass axis and button count to is_hidraw_enabled()

This is useful to detect some devices which do not have a well-known PID set. Link: ValveSoftware/Proton#6839 (comment)
kakra · Oct 3, 2023 · 7fceaf7 · 7fceaf7
1 parent 95ebcfa
commit 7fceaf7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c
@@ -1622,6 +1622,7 @@ static void udev_add_device(struct udev_device *dev, int fd)
     const char *subsystem;
     const char *devnode;
     int bus = 0;
+    int axes = -1, buttons = -1;
 
     if (!(devnode = udev_device_get_devnode(dev)))
     {
@@ -1644,6 +1645,9 @@ static void udev_add_device(struct udev_device *dev, int fd)
         close(fd);
         return;
     }
+
+    axes = count_abs_axis(fd);
+    buttons = count_buttons(fd, NULL);
 #endif
 
     get_device_subsystem_info(dev, "hid", &desc, &bus);
@@ -1697,7 +1701,7 @@ static void udev_add_device(struct udev_device *dev, int fd)
         memcpy(desc.serialnumber, zeros, sizeof(zeros));
     }
 
-    if (!is_hidraw_enabled(desc.vid, desc.pid))
+    if (!is_hidraw_enabled(desc.vid, desc.pid, axes, buttons))
     {
         TRACE("hidraw %s: deferring %s to a different backend\n", debugstr_a(devnode), debugstr_device_desc(&desc));
         close(fd);
@@ -1712,12 +1716,7 @@ static void udev_add_device(struct udev_device *dev, int fd)
     }
 #ifdef HAS_PROPER_INPUT_HEADER
     else
-    {
-        int axes=0, buttons=0;
-        axes = count_abs_axis(fd);
-        buttons = count_buttons(fd, NULL);
         desc.is_gamepad = (axes == 6 && buttons >= 14);
-    }
 #endif
 
     TRACE("dev %p, node %s, desc %s.\n", dev, debugstr_a(devnode), debugstr_device_desc(&desc));

diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h
@@ -271,6 +271,6 @@ BOOL is_wine_blacklisted(WORD vid, WORD pid) DECLSPEC_HIDDEN;
 BOOL is_dualshock4_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN;
 BOOL is_dualsense_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN;
 BOOL is_logitech_g920(WORD vid, WORD pid) DECLSPEC_HIDDEN;
-BOOL is_hidraw_enabled(WORD vid, WORD pid) DECLSPEC_HIDDEN;
+BOOL is_hidraw_enabled(WORD vid, WORD pid, INT axes, INT buttons) DECLSPEC_HIDDEN;
 
 #endif /* __WINEBUS_UNIX_PRIVATE_H */
diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c
@@ -105,7 +105,7 @@ static BOOL is_fanatec_pedals(WORD vid, WORD pid)
     return FALSE;
 }
 
-BOOL is_hidraw_enabled(WORD vid, WORD pid)
+BOOL is_hidraw_enabled(WORD vid, WORD pid, INT axes, INT buttons)
 {
     const char *enabled = getenv("PROTON_ENABLE_HIDRAW");
     char needle[16];