Add "D3DFMT_UNKNOWN" checks on object creation (#184)

crosire · Oct 17, 2024 · 7a2f98e · 7a2f98e
1 parent f7012c9
commit 7a2f98e
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/source/d3d8to9_device.cpp b/source/d3d8to9_device.cpp
@@ -279,6 +279,9 @@ HRESULT STDMETHODCALLTYPE Direct3DDevice8::CreateTexture(UINT Width, UINT Height
 	if (ppTexture == nullptr)
 		return D3DERR_INVALIDCALL;
 
+	if (Format == D3DFMT_UNKNOWN)
+		return D3DERR_INVALIDCALL;
+
 	*ppTexture = nullptr;
 
 	if (Pool == D3DPOOL_DEFAULT)
@@ -312,6 +315,9 @@ HRESULT STDMETHODCALLTYPE Direct3DDevice8::CreateVolumeTexture(UINT Width, UINT
 	if (ppVolumeTexture == nullptr)
 		return D3DERR_INVALIDCALL;
 
+	if (Format == D3DFMT_UNKNOWN)
+		return D3DERR_INVALIDCALL;
+
 	*ppVolumeTexture = nullptr;
 
 	IDirect3DVolumeTexture9 *TextureInterface = nullptr;
@@ -329,6 +335,9 @@ HRESULT STDMETHODCALLTYPE Direct3DDevice8::CreateCubeTexture(UINT EdgeLength, UI
 	if (ppCubeTexture == nullptr)
 		return D3DERR_INVALIDCALL;
 
+	if (Format == D3DFMT_UNKNOWN)
+		return D3DERR_INVALIDCALL;
+
 	*ppCubeTexture = nullptr;
 
 	IDirect3DCubeTexture9 *TextureInterface = nullptr;
@@ -380,6 +389,9 @@ HRESULT STDMETHODCALLTYPE Direct3DDevice8::CreateRenderTarget(UINT Width, UINT H
 	if (ppSurface == nullptr)
 		return D3DERR_INVALIDCALL;
 
+	if (Format == D3DFMT_UNKNOWN)
+		return D3DERR_INVALIDCALL;
+
 	*ppSurface = nullptr;
 
 	DWORD QualityLevels = 0;
@@ -409,6 +421,9 @@ HRESULT STDMETHODCALLTYPE Direct3DDevice8::CreateDepthStencilSurface(UINT Width,
 	if (ppSurface == nullptr)
 		return D3DERR_INVALIDCALL;
 
+	if (Format == D3DFMT_UNKNOWN)
+		return D3DERR_INVALIDCALL;
+
 	*ppSurface = nullptr;
 
 	DWORD QualityLevels = 0;
@@ -442,8 +457,13 @@ HRESULT STDMETHODCALLTYPE Direct3DDevice8::CreateImageSurface(UINT Width, UINT H
 	if (ppSurface == nullptr)
 		return D3DERR_INVALIDCALL;
 
+	// Only CreateImageSurface clears the content of ppSurface
+	// before checking if Format is equal to D3DFMT_UNKNOWN.
 	*ppSurface = nullptr;
 
+	if (Format == D3DFMT_UNKNOWN)
+		return D3DERR_INVALIDCALL;
+
 	IDirect3DSurface9 *SurfaceInterface = nullptr;
 
 	const HRESULT hr = ProxyInterface->CreateOffscreenPlainSurface(Width, Height, Format, D3DPOOL_SYSTEMMEM, &SurfaceInterface, nullptr);