From cdb5b8b7370d3ae4ff590d08e285d9a296da0bf6 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 26 Jun 2013 23:06:17 -0400 Subject: [PATCH] DInputJoystick: Always exclude XInput Yeah, yeah, it's possible that some guy would try to build DInput without XInput, but they're crazy, and I doubt it would have worked since the header file mess was so fragile anyway. Always exclude DInput devices when we don't have XInput. --- .../Src/ControllerInterface/DInput/DInputJoystick.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index 24502e7a8a..033ee7b8a1 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -37,7 +37,6 @@ static const struct #define DATA_BUFFER_SIZE 32 -#ifdef NO_DUPLICATE_DINPUT_XINPUT //----------------------------------------------------------------------------- // Modified some MSDN code to get all the XInput device GUID.Data1 values in a vector, // faster than checking all the devices for each DirectInput device, like MSDN says to do @@ -141,7 +140,6 @@ LCleanup: if( bCleanupCOM ) CoUninitialize(); } -#endif void InitJoystick(IDirectInput8* const idi8, std::vector& devices, HWND hwnd) { @@ -152,21 +150,18 @@ void InitJoystick(IDirectInput8* const idi8, std::vector& devices // multiple joysticks with the same name shall get unique ids starting at 0 std::map< std::basic_string, int> name_counts; -#ifdef NO_DUPLICATE_DINPUT_XINPUT std::vector xinput_guids; GetXInputGUIDS( xinput_guids ); -#endif std::list::iterator i = joysticks.begin(), e = joysticks.end(); for ( ; i!=e; ++i ) { -#ifdef NO_DUPLICATE_DINPUT_XINPUT // skip XInput Devices if ( std::find( xinput_guids.begin(), xinput_guids.end(), i->guidProduct.Data1 ) != xinput_guids.end() ) continue; -#endif + LPDIRECTINPUTDEVICE8 js_device; if (SUCCEEDED(idi8->CreateDevice(i->guidInstance, &js_device, NULL))) {