pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DirectInput: ignore everything but joysticks and gamepads (thanks, Justin!).

Browse source 
Fixes Bugzilla #2460.

--HG--
extra : rebase_source : db50b42eeefe76084e477dc521fcd8f86fe9d1b0
This commit is contained in:
Ryan C. Gordon 2015-04-08 02:14:59 -04:00
parent e7b13cff94
commit 67034e77b6
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/joystick/windows/SDL_dinputjoystick.c
View file

@ -345,6 +345,11 @@ EnumJoysticksCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext)
return DIENUM_CONTINUE; /* ignore XInput devices here, keep going. */ return DIENUM_CONTINUE; /* ignore XInput devices here, keep going. */
} }
const DWORD devtype = (pdidInstance->dwDevType & 0xFF);
if ((devtype != DI8DEVTYPE_JOYSTICK) && (devtype != DI8DEVTYPE_GAMEPAD)) {
return DIENUM_CONTINUE; /* Ignore touchpads, etc. */
}
pNewJoystick = *(JoyStick_DeviceData **)pContext; pNewJoystick = *(JoyStick_DeviceData **)pContext;
while (pNewJoystick) { while (pNewJoystick) {
if (!SDL_memcmp(&pNewJoystick->dxdevice.guidInstance, &pdidInstance->guidInstance, sizeof(pNewJoystick->dxdevice.guidInstance))) { if (!SDL_memcmp(&pNewJoystick->dxdevice.guidInstance, &pdidInstance->guidInstance, sizeof(pNewJoystick->dxdevice.guidInstance))) {