From ad0af488837e44cbea0f0eab3b2f73b50a74bff4 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 2 Nov 2023 08:33:15 -0700
Subject: [PATCH] Check to make sure the Windows joystick device has buttons
and axes
This reverts commit e5a15f94e2f1a8fbbffb25ea9932cda9679a68fd.
It turns out removing this check allows mice like the ROG PUGIO II to show up as game controllers. We need to find a different way to differentiate between gaming mice and pedals.
Since these mice show up as controllers, and potentially causing games to use them instead of real controllers, we'll go ahead revert this change for now.
Reopens https://github.com/libsdl-org/SDL/issues/8227
---
src/joystick/windows/SDL_dinputjoystick.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/joystick/windows/SDL_dinputjoystick.c b/src/joystick/windows/SDL_dinputjoystick.c
index fbb0e8240c61..b6868891a9fa 100644
--- a/src/joystick/windows/SDL_dinputjoystick.c
+++ b/src/joystick/windows/SDL_dinputjoystick.c
@@ -451,6 +451,7 @@ static BOOL CALLBACK EnumJoystickDetectCallback(LPCDIDEVICEINSTANCE pDeviceInsta
char *hidPath = NULL;
char *name = NULL;
LPDIRECTINPUTDEVICE8 device = NULL;
+ DIDEVCAPS caps;
/* We are only supporting HID devices. */
CHECK(pDeviceInstance->dwDevType & DIDEVTYPE_HID);
@@ -460,6 +461,13 @@ static BOOL CALLBACK EnumJoystickDetectCallback(LPCDIDEVICEINSTANCE pDeviceInsta
CHECK(QueryDevicePath(device, &hidPath));
CHECK(QueryDeviceInfo(device, &vendor, &product));
+ /* Check to make sure the device has buttons and axes.
+ * This fixes incorrectly detecting the ROG CHAKRAM X mouse as a game controller on Windows 10
+ */
+ caps.dwSize = sizeof(caps);
+ CHECK(SUCCEEDED(IDirectInputDevice8_GetCapabilities(device, &caps)));
+ CHECK(caps.dwAxes > 0 && caps.dwButtons > 0);
+
CHECK(!SDL_IsXInputDevice(vendor, product, hidPath));
pNewJoystick = *(JoyStick_DeviceData **)pContext;