Преглед на файлове

Only call WIN_RoUninitialize() if WIN_RoInitialize() succeeded

Fixes https://github.com/libsdl-org/SDL/issues/14178
Sam Lantinga преди 4 дни
родител
ревизия
7914bdb7ea
променени са 1 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 5 1
      src/joystick/windows/SDL_windows_gaming_input.c

+ 5 - 1
src/joystick/windows/SDL_windows_gaming_input.c

@@ -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);
     }
     }
 
 
-    WIN_RoUninitialize();
+    if (wgi.ro_initialized) {
+        WIN_RoUninitialize();
+    }
 
 
     SDL_zero(wgi);
     SDL_zero(wgi);
 }
 }