Don't return video interface if real interface is missing. Closes #3735

baldurk · baldurk · commit f5e990386042 · 2025-11-27T15:20:44.000Z
diff --git a/renderdoc/driver/d3d11/d3d11_video.cpp b/renderdoc/driver/d3d11/d3d11_video.cpp
@@ -51,9 +51,17 @@ HRESULT STDMETHODCALLTYPE WrappedID3D11VideoDevice2::QueryInterface(REFIID riid,
   }
   else if(riid == __uuidof(ID3D11VideoDevice))
   {
-    *ppvObject = (ID3D11VideoDevice *)this;
-    AddRef();
-    return S_OK;
+    if(m_pReal)
+    {
+      *ppvObject = (ID3D11VideoDevice *)this;
+      AddRef();
+      return S_OK;
+    }
+    else
+    {
+      *ppvObject = NULL;
+      return E_NOINTERFACE;
+    }
   }
   else if(riid == __uuidof(ID3D11VideoDevice1))
   {

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,17 @@ HRESULT STDMETHODCALLTYPE WrappedID3D11VideoDevice2::QueryInterface(REFIID riid,`
`51`	`51`	`}`
`52`	`52`	`else if(riid == __uuidof(ID3D11VideoDevice))`
`53`	`53`	`{`
`54`		`- ppvObject = (ID3D11VideoDevice )this;`
`55`		`- AddRef();`
`56`		`- return S_OK;`
	`54`	`+ if(m_pReal)`
	`55`	`+ {`
	`56`	`+ ppvObject = (ID3D11VideoDevice )this;`
	`57`	`+ AddRef();`
	`58`	`+ return S_OK;`
	`59`	`+ }`
	`60`	`+ else`
	`61`	`+ {`
	`62`	`+ *ppvObject = NULL;`
	`63`	`+ return E_NOINTERFACE;`
	`64`	`+ }`
`57`	`65`	`}`
`58`	`66`	`else if(riid == __uuidof(ID3D11VideoDevice1))`
`59`	`67`	`{`