Browse Source

Make sure we're actually running on Windows before using D3D renderers

(cherry picked from commit e22c89536a4cc834f0c45de5fcfd9e641b08a037)
Sam Lantinga 9 months ago
parent
commit
d3765b27c2
2 changed files with 11 additions and 2 deletions
  1. 5 1
      src/render/direct3d/SDL_render_d3d.c
  2. 6 1
      src/render/direct3d11/SDL_render_d3d11.c

+ 5 - 1
src/render/direct3d/SDL_render_d3d.c

@@ -1610,7 +1610,11 @@ SDL_Renderer *D3D_CreateRenderer(SDL_Window *window, Uint32 flags)
     renderer->driverdata = data;
 
     SDL_VERSION(&windowinfo.version);
-    SDL_GetWindowWMInfo(window, &windowinfo);
+    if (!SDL_GetWindowWMInfo(window, &windowinfo) ||
+        windowinfo.subsystem != SDL_SYSWM_WINDOWS) {
+        SDL_free(data);
+        return SDL_SetError("Couldn't get window handle");
+    }
 
     window_flags = SDL_GetWindowFlags(window);
     SDL_GetWindowSizeInPixels(window, &w, &h);

+ 6 - 1
src/render/direct3d11/SDL_render_d3d11.c

@@ -813,7 +813,12 @@ static HRESULT D3D11_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
 #if defined(__WIN32__) || defined(__WINGDK__)
         SDL_SysWMinfo windowinfo;
         SDL_VERSION(&windowinfo.version);
-        SDL_GetWindowWMInfo(renderer->window, &windowinfo);
+        if (!SDL_GetWindowWMInfo(renderer->window, &windowinfo) ||
+            windowinfo.subsystem != SDL_SYSWM_WINDOWS) {
+            SDL_SetError("Couldn't get window handle");
+            result = E_FAIL;
+            goto done;
+        }
 
         result = IDXGIFactory2_CreateSwapChainForHwnd(data->dxgiFactory,
                                                       (IUnknown *)data->d3dDevice,