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

Merge pull request #1237 from turtleli/xinput 

lilypad|xpad: Remove DirectX SDK dependency, support both XInput 1.3 and 1.4
This commit is contained in:
Jonathan Li 2016-03-28 09:46:58 +01:00
parent a99750ae87 a80a7175f3
commit 587c0ea339
5 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/LilyPad/LilyPad.vcxproj
View File

@ -99,9 +99,6 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<LibraryPath Condition="'$(Platform)'=='Win32'">$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
<LibraryPath Condition="'$(Platform)'=='x64'">$(DXSDK_DIR)Lib\x64;$(LibraryPath)</LibraryPath>
<IncludePath>$(DXSDK_DIR)include;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>

16
plugins/LilyPad/XInputEnum.cpp
View File

@ -16,6 +16,7 @@
*/
#include "Global.h"
#include <VersionHelpers.h>
#include <xinput.h>
#include "VKey.h"
#include "InputManager.h"
@ -248,18 +249,21 @@ public:
};
void EnumXInputDevices() {
int i;
wchar_t temp[30];
if (!pXInputSetState) {
// Also used as flag to indicute XInput not installed, so
// don't repeatedly try to load it.
if (pXInputEnable) return;
HMODULE hMod = 0;
for (i=3; i>= 0; i--) {
wsprintfW(temp, L"xinput1_%i.dll", i);
if (hMod = LoadLibraryW(temp)) break;
const DWORD flags = LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32;
// Prefer XInput 1.3 since SCP only has an XInput 1.3 wrapper right now.
// FIXME: Missing FreeLibrary call.
HMODULE hMod = LoadLibraryEx(L"xinput1_3.dll", nullptr, flags);
if (hMod == nullptr && IsWindows8OrGreater()) {
hMod = LoadLibraryEx(L"XInput1_4.dll", nullptr, flags);
}
if (hMod) {
if ((pXInputEnable = (_XInputEnable) GetProcAddress(hMod, "XInputEnable")) &&
((pXInputGetStateEx = (_XInputGetStateEx) GetProcAddress(hMod, (LPCSTR)100)) || // Try Ex version first
@ -274,7 +278,7 @@ void EnumXInputDevices() {
}
}
pXInputEnable(1);
for (i=0; i<4; i++) {
for (int i = 0; i < 4; i++) {
wsprintfW(temp, L"XInput Pad %i", i);
dm->AddDevice(new XInputDevice(i, temp));
}

1
plugins/xpad/stdafx.h
View File

@ -12,7 +12,6 @@
#include <commctrl.h>
#include <commdlg.h>
#include <shellapi.h>
#include <xinput.h>
#include <assert.h>
#include <time.h>

4
plugins/xpad/vsprops/common.props
View File

@ -12,16 +12,12 @@
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4995;4324;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>d3d10.lib;d3dx10.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;strmiids.lib;xinput.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\bin\plugins\$(ProjectName).dll</OutputFile>
<DelayLoadDLLs>d3d9.dll;d3dx9_43.dll;d3d10.dll;d3dx10_43.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
</Project>

42
plugins/xpad/xpad.cpp
View File

@ -21,8 +21,17 @@
#include "stdafx.h"
#include "xpad.h"
#include <VersionHelpers.h>
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0602 // Required for XInputEnable definition
#include <xinput.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 +142,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 +156,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 +643,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 +705,7 @@ EXPORT_C PADclose()
}
}
XInputEnable(FALSE);
pXInputEnable(FALSE);
}
EXPORT_C_(UINT32) CALLBACK PADquery()