encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "fix compiler warnings in SDL_windows_gaming_input.c" 

This reverts commit ca36cdb185f2f26241598068927821896f36b904.

The older Windows SDK's headers are wrong, and this change would crash if
you hotplug a device.
This commit is contained in:
Ryan C. Gordon 2022-01-24 08:56:33 -05:00
parent a70bb259c7
commit 43f0271b4e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/joystick/windows/SDL_windows_gaming_input.c
View File

@ -222,7 +222,7 @@ static ULONG STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_Release(__FI
return 1; return 1;
} }
static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeAdded(__FIEventHandler_1_Windows__CGaming__CInput__CRawGameController * This, IInspectable *sender, __x_ABI_CWindows_CGaming_CInput_CIRawGameController **e) static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeAdded(__FIEventHandler_1_Windows__CGaming__CInput__CRawGameController * This, IInspectable *sender, __x_ABI_CWindows_CGaming_CInput_CIRawGameController *e)
{ {
HRESULT hr; HRESULT hr;
__x_ABI_CWindows_CGaming_CInput_CIRawGameController *controller = NULL; __x_ABI_CWindows_CGaming_CInput_CIRawGameController *controller = NULL;
@ -233,7 +233,7 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeAdde
return S_OK; return S_OK;
} }
hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameController_QueryInterface(*e, &IID_IRawGameController, (void **)&controller); hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameController_QueryInterface(e, &IID_IRawGameController, (void **)&controller);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
char *name = NULL; char *name = NULL;
SDL_JoystickGUID guid; SDL_JoystickGUID guid;
@ -383,12 +383,12 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeAdde
return S_OK; return S_OK;
} }
static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeRemoved(__FIEventHandler_1_Windows__CGaming__CInput__CRawGameController * This, IInspectable *sender, __x_ABI_CWindows_CGaming_CInput_CIRawGameController **e) static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeRemoved(__FIEventHandler_1_Windows__CGaming__CInput__CRawGameController * This, IInspectable *sender, __x_ABI_CWindows_CGaming_CInput_CIRawGameController *e)
{ {
HRESULT hr; HRESULT hr;
__x_ABI_CWindows_CGaming_CInput_CIRawGameController *controller = NULL; __x_ABI_CWindows_CGaming_CInput_CIRawGameController *controller = NULL;
hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameController_QueryInterface(*e, &IID_IRawGameController, (void **)&controller); hr = __x_ABI_CWindows_CGaming_CInput_CIRawGameController_QueryInterface(e, &IID_IRawGameController, (void **)&controller);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
int i; int i;
@ -549,7 +549,7 @@ WGI_JoystickInit(void)
hr = __FIVectorView_1_Windows__CGaming__CInput__CRawGameController_GetAt(controllers, i, &controller); hr = __FIVectorView_1_Windows__CGaming__CInput__CRawGameController_GetAt(controllers, i, &controller);
if (SUCCEEDED(hr) && controller) { if (SUCCEEDED(hr) && controller) {
IEventHandler_CRawGameControllerVtbl_InvokeAdded(&controller_added, NULL, &controller); IEventHandler_CRawGameControllerVtbl_InvokeAdded(&controller_added, NULL, controller);
} }
} }
} }
@ -831,7 +831,7 @@ WGI_JoystickQuit(void)
{ {
if (wgi.statics) { if (wgi.statics) {
while (wgi.controller_count > 0) { while (wgi.controller_count > 0) {
IEventHandler_CRawGameControllerVtbl_InvokeRemoved(&controller_removed, NULL, &wgi.controllers[wgi.controller_count - 1].controller); IEventHandler_CRawGameControllerVtbl_InvokeRemoved(&controller_removed, NULL, wgi.controllers[wgi.controller_count - 1].controller);
} }
if (wgi.controllers) { if (wgi.controllers) {
SDL_free(wgi.controllers); SDL_free(wgi.controllers);