|
@@ -453,6 +453,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);
|
|
@@ -462,6 +463,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;
|