zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 07:12:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix querying for the wrong interface when the UNICODE define is set

Browse source
This commit is contained in:
Magnus Norddahl 2019-06-30 21:13:56 +02:00
parent 6e29d81502
commit 259909b6dd
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/win32/i_input.cpp
View file

@ -650,7 +650,7 @@ bool I_InitInput (void *hwnd)
blah di8c = (blah)GetProcAddress(DInputDLL, "DirectInput8Create"); blah di8c = (blah)GetProcAddress(DInputDLL, "DirectInput8Create");
if (di8c != NULL) if (di8c != NULL)
{ {
hr = di8c(g_hInst, DIRECTINPUT_VERSION, IID_IDirectInput8A, (void **)&g_pdi, NULL); hr = di8c(g_hInst, DIRECTINPUT_VERSION, IID_IDirectInput8, (void **)&g_pdi, NULL);
if (FAILED(hr)) if (FAILED(hr))
{ {
Printf(TEXTCOLOR_ORANGE "DirectInput8Create failed: %08lx\n", hr); Printf(TEXTCOLOR_ORANGE "DirectInput8Create failed: %08lx\n", hr);
@ -676,7 +676,11 @@ bool I_InitInput (void *hwnd)
} }
typedef HRESULT (WINAPI *blah)(HINSTANCE, DWORD, LPDIRECTINPUT*, LPUNKNOWN); typedef HRESULT (WINAPI *blah)(HINSTANCE, DWORD, LPDIRECTINPUT*, LPUNKNOWN);
blah dic = (blah)GetProcAddress (DInputDLL, "DirectInputCreateA"); #ifdef UNICODE
blah dic = (blah)GetProcAddress (DInputDLL, "DirectInputCreateW");
#else
blah dic = (blah)GetProcAddress(DInputDLL, "DirectInputCreateA");
#endif
if (dic == NULL) if (dic == NULL)
{ {