Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-25 23:25:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XInput fix: search for all three possible XInput DLLs (xinput1_4.dll, xinput1_3.dll, and xinput9_1_0.dll). I have not tested 32-bit builds.

Browse source
This commit is contained in:
Bart Trzynadlowski 2016-06-02 00:13:42 +00:00
parent ff8e9d6aad
commit d1330d310c
2 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
Src/OSD/Windows/DirectInputSystem.cpp
View file

@ -27,8 +27,10 @@
*/ */
#include "DirectInputSystem.h" #include "DirectInputSystem.h"
#include "Util/Format.h"
#include "Supermodel.h" #include "Supermodel.h"
#include <array>
#include <algorithm> #include <algorithm>
#include <wbemidl.h> #include <wbemidl.h>
@ -38,27 +40,12 @@
#include <SDL_syswm.h> #include <SDL_syswm.h>
/* /*
* MinGW compatibility: the XInput.h distributed with MinGW is missing these * There seem to be three versions of XInput floating around, all of which
* definitions. I've copied them from the Microsoft DirectX SDK. If a proper * ought to provide the functionality we need. We try them all in sequence,
* header file appears, this hack should be removed. * in order of newest/most feature-laden first.
*/ */
#if !defined(XINPUT_DLL_A) static std::array<const char *, 3> s_xinput_dlls = { TEXT("xinput1_4.dll"), TEXT("xinput1_3.dll"), TEXT("xinput9_1_0.dll") };
static std::array<const char *, 3> s_xinput_dlls_a = { "xinput1_4.dll", "xinput1_3.dll", "xinput9_1_0.dll" };
#ifndef XINPUT_USE_9_1_0
#define XINPUT_DLL_A "xinput1_3.dll"
#define XINPUT_DLL_W L"xinput1_3.dll"
#else
#define XINPUT_DLL_A "xinput9_1_0.dll"
#define XINPUT_DLL_W L"xinput9_1_0.dll"
#endif
#ifdef UNICODE
#define XINPUT_DLL XINPUT_DLL_W
#else
#define XINPUT_DLL XINPUT_DLL_A
#endif
#endif // XINPUT_DLL_A
// TODO - need to double check these all correct and see if can fill in any missing codes (although most just don't exist) // TODO - need to double check these all correct and see if can fill in any missing codes (although most just don't exist)
DIKeyMapStruct CDirectInputSystem::s_keyMap[] = DIKeyMapStruct CDirectInputSystem::s_keyMap[] =
@ -1541,6 +1528,33 @@ HRESULT CDirectInputSystem::CreateJoystickEffect(LPDIRECTINPUTDEVICE8 joystick,
return S_OK; return S_OK;
} }
void CDirectInputSystem::LoadXInputDLL()
{
// Try each of the XInput DLLs
HMODULE xInput = NULL;
for (auto filename: s_xinput_dlls)
{
xInput = LoadLibrary(filename);
if (xInput != NULL)
break;
}
if (xInput != NULL)
{
m_xiGetCapabilitiesPtr = (XInputGetCapabilitiesPtr)GetProcAddress(xInput, "XInputGetCapabilities");
m_xiGetStatePtr = (XInputGetStatePtr)GetProcAddress(xInput, "XInputGetState");
m_xiSetStatePtr = (XInputSetStatePtr)GetProcAddress(xInput, "XInputSetState");
m_useXInput = m_xiGetCapabilitiesPtr != NULL && m_xiGetStatePtr != NULL && m_xiSetStatePtr != NULL;
}
else
m_useXInput = false;
if (!m_useXInput)
{
ErrorLog("XInput not found. Tried: %s.", Util::Format(", ").Join(s_xinput_dlls_a).str().c_str());
ErrorLog("Falling back on DirectInput.");
}
}
bool CDirectInputSystem::InitializeSystem() bool CDirectInputSystem::InitializeSystem()
{ {
if (m_useRawInput) if (m_useRawInput)
@ -1577,19 +1591,8 @@ bool CDirectInputSystem::InitializeSystem()
if (m_useXInput) if (m_useXInput)
{ {
// Dynamically load XInput API // Dynamically load XInput API
HMODULE xInput = LoadLibrary(TEXT(XINPUT_DLL_A)); LoadXInputDLL();//LoadLibrary(TEXT(XINPUT_DLL_A));
if (xInput != NULL)
{
m_xiGetCapabilitiesPtr = (XInputGetCapabilitiesPtr)GetProcAddress(xInput, "XInputGetCapabilities");
m_xiGetStatePtr = (XInputGetStatePtr)GetProcAddress(xInput, "XInputGetState");
m_xiSetStatePtr = (XInputSetStatePtr)GetProcAddress(xInput, "XInputSetState");
m_useXInput = m_xiGetCapabilitiesPtr != NULL && m_xiGetStatePtr != NULL && m_xiSetStatePtr != NULL;
}
else
m_useXInput = false;
if (!m_useXInput)
ErrorLog("Unable to initialize XInput API (" XINPUT_DLL_A " not found) - switching to DirectInput.\n");
} }
// Dynamically create DirectInput8 via COM, rather than statically linking to dinput8.dll // Dynamically create DirectInput8 via COM, rather than statically linking to dinput8.dll

2
Src/OSD/Windows/DirectInputSystem.h
View file

@ -187,6 +187,8 @@ private:
HRESULT CreateJoystickEffect(LPDIRECTINPUTDEVICE8 di8Joystick, int axisNum, ForceFeedbackCmd ffCmd, LPDIRECTINPUTEFFECT *di8Effect); HRESULT CreateJoystickEffect(LPDIRECTINPUTDEVICE8 di8Joystick, int axisNum, ForceFeedbackCmd ffCmd, LPDIRECTINPUTEFFECT *di8Effect);
void LoadXInputDLL();
protected: protected:
/* /*
* Initializes the DirectInput input system. * Initializes the DirectInput input system.