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

Merge pull request #1923 from ergo720/xinput_dll 

Load the most appropriate xinput dll based on the Windows version
This commit is contained in:
PatrickvL 2020-06-19 09:15:02 +02:00 committed by GitHub
parent 66bccac3cf 91241dbd08
commit cf87eaef06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/common/input/XInputPad.cpp
View File

@ -38,11 +38,6 @@
#include "core\kernel\support\Emu.h" #include "core\kernel\support\Emu.h"
#include "InputManager.h" #include "InputManager.h"
// For MinGW
#ifndef XINPUT_DLL
#define XINPUT_DLL "xinput1_3.dll"
#endif
#ifndef XINPUT_GAMEPAD_GUIDE #ifndef XINPUT_GAMEPAD_GUIDE
#define XINPUT_GAMEPAD_GUIDE 0x0400 #define XINPUT_GAMEPAD_GUIDE 0x0400
#endif #endif
@ -106,22 +101,31 @@ namespace XInput
{ {
std::unique_lock<std::mutex> lck(Mtx); std::unique_lock<std::mutex> lck(Mtx);
// Because we use _WIN32_WINNT=0x0601, this will load the XInput 9.1.0 library // Load the most appropriate version of the xinput library depending on which Windows OS version we are running on.
// The 9.1.0 (Win7) doesn't provide support for the guide button, but the legacy 1.3 does. Unfortunately, it requires // We will try the 9.1.0 version as a last resort since that's the only one that doesn't provide support for the guide button.
// that the user has installed the June 2010 release of the DirectX SDK to be available. If they didn't, we will default // For more info, see MS documentation at https://docs.microsoft.com/en-us/windows/win32/xinput/xinput-versions.
// to the 9.1.0 instead of failing the initialization
if (std::string(XINPUT_DLL).compare(TEXT("xinput9_1_0.dll")) == 0) { // will only work on Win8/10; provides guide button info
hXInput = ::LoadLibrary(TEXT("xinput1_3.dll")); std::string xinput_dll_name = "xinput1_4.dll";
} hXInput = ::LoadLibrary(TEXT(xinput_dll_name.c_str()));
if (!hXInput) { if (!hXInput) {
hXInput = ::LoadLibrary(XINPUT_DLL); // will only work if the user has installed the June 2010 release of the DirectX SDK; provides guide button info
xinput_dll_name = "xinput1_3.dll";
hXInput = ::LoadLibrary(TEXT(xinput_dll_name.c_str()));
if (!hXInput) { if (!hXInput) {
EmuLog(LOG_LEVEL::ERROR2, "Failed to initialize XInput subsystem!"); // will work on Win7; does NOT provide guide button info
XInputInitStatus = XINPUT_INIT_ERROR; xinput_dll_name = "xinput9_1_0.dll";
return; hXInput = ::LoadLibrary(TEXT(xinput_dll_name.c_str()));
if (!hXInput) {
EmuLog(LOG_LEVEL::ERROR2, "Failed to initialize XInput subsystem!");
XInputInitStatus = XINPUT_INIT_ERROR;
return;
}
} }
} }
EmuLog(LOG_LEVEL::INFO, "Loaded %s library", xinput_dll_name.c_str());
PXInputGetCapabilities = PXInputGetCapabilities =
(XInputGetCapabilities_t)::GetProcAddress(hXInput, "XInputGetCapabilities"); (XInputGetCapabilities_t)::GetProcAddress(hXInput, "XInputGetCapabilities");
PXInputSetState = (XInputSetState_t)::GetProcAddress(hXInput, "XInputSetState"); PXInputSetState = (XInputSetState_t)::GetProcAddress(hXInput, "XInputSetState");
@ -130,9 +134,11 @@ namespace XInput
// button info. Try loading it and fall back if needed. // button info. Try loading it and fall back if needed.
PXInputGetState = (XInputGetState_t)::GetProcAddress(hXInput, (LPCSTR)100); PXInputGetState = (XInputGetState_t)::GetProcAddress(hXInput, (LPCSTR)100);
if (PXInputGetState) { if (PXInputGetState) {
EmuLog(LOG_LEVEL::INFO, "Guide button information available");
haveGuideButton = true; haveGuideButton = true;
} }
else { else {
EmuLog(LOG_LEVEL::INFO, "Guide button information not available");
PXInputGetState = (XInputGetState_t)::GetProcAddress(hXInput, "XInputGetState"); PXInputGetState = (XInputGetState_t)::GetProcAddress(hXInput, "XInputGetState");
} }