mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-11-11 04:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only call WIN_RoUninitialize() if WIN_RoInitialize() succeeded

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/14178
This commit is contained in:
Sam Lantinga
2025-10-08 13:15:48 -07:00
parent 8830b466d0
commit 7914bdb7ea
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,6 +69,7 @@ typedef PCWSTR(WINAPI *WindowsGetStringRawBuffer_t)(HSTRING string, UINT32 *leng
static struct static struct
{ {
bool ro_initialized;
CoIncrementMTAUsage_t CoIncrementMTAUsage; CoIncrementMTAUsage_t CoIncrementMTAUsage;
RoGetActivationFactory_t RoGetActivationFactory; RoGetActivationFactory_t RoGetActivationFactory;
WindowsCreateStringReference_t WindowsCreateStringReference; WindowsCreateStringReference_t WindowsCreateStringReference;
@@ -592,6 +593,7 @@ static bool WGI_JoystickInit(void)
if (FAILED(WIN_RoInitialize())) { if (FAILED(WIN_RoInitialize())) {
return SDL_SetError("RoInitialize() failed"); return SDL_SetError("RoInitialize() failed");
} }
wgi.ro_initialized = true;
#define RESOLVE(x) wgi.x = (x##_t)WIN_LoadComBaseFunction(#x); if (!wgi.x) return WIN_SetError("GetProcAddress failed for " #x); #define RESOLVE(x) wgi.x = (x##_t)WIN_LoadComBaseFunction(#x); if (!wgi.x) return WIN_SetError("GetProcAddress failed for " #x);
RESOLVE(CoIncrementMTAUsage); RESOLVE(CoIncrementMTAUsage);
@@ -1002,7 +1004,9 @@ static void WGI_JoystickQuit(void)
__x_ABI_CWindows_CGaming_CInput_CIRawGameControllerStatics_Release(wgi.controller_statics); __x_ABI_CWindows_CGaming_CInput_CIRawGameControllerStatics_Release(wgi.controller_statics);
} }
if (wgi.ro_initialized) {
WIN_RoUninitialize(); WIN_RoUninitialize();
}
SDL_zero(wgi); SDL_zero(wgi);
} }