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

xpad: Support both XInput 1.3 and 1.4

This commit is contained in:
Jonathan Li 2016-02-29 00:46:48 +00:00
parent 02ea7d390c
commit 13bb7cf30a
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/xpad/xpad.cpp
View File

@ -21,8 +21,13 @@
#include "stdafx.h"
#include "xpad.h"
#include <VersionHelpers.h>
static HMODULE s_hModule;
static HMODULE s_xInputDll;
static decltype(&XInputEnable) pXInputEnable;
static decltype(&XInputGetState) pXInputGetState;
static decltype(&XInputSetState) pXInputSetState;
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
{
@ -133,7 +138,7 @@ public:
{
memset(&m_state, 0, sizeof(m_state));
m_connected = XInputGetState(m_pad, &m_state) == S_OK; // ERROR_DEVICE_NOT_CONNECTED is not an error, SUCCEEDED(...) won't work here
m_connected = pXInputGetState(m_pad, &m_state) == S_OK; // ERROR_DEVICE_NOT_CONNECTED is not an error, SUCCEEDED(...) won't work here
m_lastpoll = now;
}
@ -147,7 +152,7 @@ public:
{
if(m_vibration.wLeftMotorSpeed != vibration.wLeftMotorSpeed || m_vibration.wRightMotorSpeed != vibration.wRightMotorSpeed)
{
XInputSetState(m_pad, &vibration);
pXInputSetState(m_pad, &vibration);
m_vibration = vibration;
}
@ -634,16 +639,41 @@ LRESULT WINAPI PADwndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
EXPORT_C_(UINT32) PADinit(UINT32 flags)
{
DWORD loadFlags = LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32;
s_xInputDll = LoadLibraryEx(L"xinput1_3.dll", nullptr, loadFlags);
if (s_xInputDll == nullptr && IsWindows8OrGreater())
{
s_xInputDll = LoadLibraryEx(L"XInput1_4.dll", nullptr, loadFlags);
}
if (s_xInputDll == nullptr)
{
return 1;
}
if (!(pXInputEnable = reinterpret_cast<decltype(&XInputEnable)>(GetProcAddress(s_xInputDll, "XInputEnable")))
|| !(pXInputSetState = reinterpret_cast<decltype(&XInputSetState)>(GetProcAddress(s_xInputDll, "XInputSetState")))
|| !(pXInputGetState = reinterpret_cast<decltype(&XInputGetState)>(GetProcAddress(s_xInputDll, "XInputGetState"))))
{
FreeLibrary(s_xInputDll);
s_xInputDll = nullptr;
return 1;
}
return 0;
}
EXPORT_C PADshutdown()
{
if (s_xInputDll)
{
FreeLibrary(s_xInputDll);
s_xInputDll = nullptr;
}
}
EXPORT_C_(UINT32) PADopen(void* pDsp)
{
XInputEnable(TRUE);
pXInputEnable(TRUE);
if(s_nRefs == 0)
{
@ -671,7 +701,7 @@ EXPORT_C PADclose()
}
}
XInputEnable(FALSE);
pXInputEnable(FALSE);
}
EXPORT_C_(UINT32) CALLBACK PADquery()