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

PAD: windows: fix DInput

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2020-12-12 23:45:16 +01:00 committed by lightningterror
parent 913cb296b4
commit b8cedae527
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/PAD/Windows/Diagnostics.cpp
View File

@ -158,6 +158,6 @@ void Diagnose(int id, HWND hWnd)
else
dm->EnableDevice(i);
}
DialogBox(hInst, MAKEINTRESOURCE(IDD_DIAG), hWnd, DiagDialog);
DialogBox(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_DIAG), hWnd, DiagDialog);
ClearKeyQueue();
}

2
pcsx2/PAD/Windows/DirectInput.cpp
View File

@ -76,7 +76,7 @@ IDirectInput8* GetDirectInput()
{
if (!di8d.lpDI8)
{
if (FAILED(DirectInput8Create(hInst, 0x800, IID_IDirectInput8, (void**)&di8d.lpDI8, 0)))
if (FAILED(DirectInput8Create(GetModuleHandle(nullptr), 0x800, IID_IDirectInput8, (void**)&di8d.lpDI8, 0)))
return 0;
}
di8d.refCount++;

3
pcsx2/PAD/Windows/Global.h
View File

@ -130,8 +130,5 @@ extern Window GSwin;
#include "PS2Edefs.h"
#ifdef _MSC_VER
extern HINSTANCE hInst;
#endif
// Needed for config screen
void GetNameAndVersionString(wchar_t* out);

12
pcsx2/PAD/Windows/PADConfig.cpp
View File

@ -350,13 +350,13 @@ void PADsetSettingsDir(const char* dir)
_wfopen_s(&temp, iniFileUSB, L"r");
if (!temp)
{ // File not found, possibly.
HRSRC res = FindResource(hInst, MAKEINTRESOURCE(IDR_INI1), RT_RCDATA);
HRSRC res = FindResource(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDR_INI1), RT_RCDATA);
if (!res)
return;
HGLOBAL data = LoadResource(hInst, res);
HGLOBAL data = LoadResource(GetModuleHandle(nullptr), res);
if (!data)
return;
size_t size = SizeofResource(hInst, res);
size_t size = SizeofResource(GetModuleHandle(nullptr), res);
u8* fdata = (u8*)LockResource(data);
_wfopen_s(&temp, iniFileUSB, L"w");
if (!temp)
@ -1375,7 +1375,7 @@ void AddTooltip(UINT id, HWND hWnd)
HWND hWndTip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL,
TTS_ALWAYSTIP | TTS_NOPREFIX,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
hWnd, NULL, hInst, NULL);
hWnd, NULL, GetModuleHandle(nullptr), NULL);
if (hWndTip == NULL)
return;
@ -2502,7 +2502,7 @@ void UpdatePadPages()
ZeroMemory(&psp, sizeof(psp));
psp.dwSize = sizeof(psp);
psp.dwFlags = PSP_USETITLE | PSP_PREMATURE;
psp.hInstance = hInst;
psp.hInstance = GetModuleHandle(nullptr);
psp.pfnDlgProc = DialogProc;
psp.lParam = port | (slot << 1);
psp.pszTitle = title;
@ -3089,7 +3089,7 @@ void Configure()
ZeroMemory(&psp, sizeof(psp));
psp.dwSize = sizeof(psp);
psp.dwFlags = PSP_USETITLE | PSP_PREMATURE;
psp.hInstance = hInst;
psp.hInstance = GetModuleHandle(nullptr);
psp.pfnDlgProc = GeneralDialogProc;
psp.pszTitle = L"General";
psp.pszTemplate = MAKEINTRESOURCE(IDD_GENERAL);