ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1312 from ManiacDC/master 

Fix for slow DirectInput enumerations.
This commit is contained in:
zilmar 2017-05-16 05:00:58 +10:00 committed by GitHub
parent 52ff3ff407 e9c9976951
commit 9b9cf3ad52
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/nragev20/DirectInput.cpp
View File

@ -678,8 +678,23 @@ BOOL CALLBACK EnumGetEffectTypes( LPCDIEFFECTINFO pdei, LPVOID pvRef )
// EnumMakeDeviceList has been rewritten. --rabid
BOOL CALLBACK EnumMakeDeviceList( LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef )
{
if( IsXInputDevice( &lpddi->guidProduct ) ) // Check if is XInput device --tecnicors
return DIENUM_CONTINUE;
switch (GET_DIDEVICE_TYPE(lpddi->dwDevType)) {
// we don't need to do anything with these generic devices
case DI8DEVTYPE_DEVICE:
return DIENUM_CONTINUE;
break;
// these are potential xinput controllers, check them
case DI8DEVTYPE_GAMEPAD:
case DI8DEVTYPE_DRIVING:
case DI8DEVTYPE_JOYSTICK:
case DI8DEVTYPE_FLIGHT:
if (IsXInputDevice(&lpddi->guidProduct)) // Check if is XInput device --tecnicors
return DIENUM_CONTINUE;
break;
// for all other devices, continue on
default:
break;
}
if (IsEqualGUID(g_sysMouse.guidInstance, lpddi->guidInstance))
return DIENUM_CONTINUE;