Additional error handling

elishacloud · Sep 22, 2024 · 6ef8c94 · 6ef8c94
1 parent b89c6b7
commit 6ef8c94
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 10 deletions.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7205 
+#define BUILD_NUMBER 7206 
diff --git a/IClassFactory/IClassFactory.cpp b/IClassFactory/IClassFactory.cpp
@@ -82,6 +82,7 @@ HRESULT m_IClassFactory::QueryInterface(REFIID riid, LPVOID FAR * ppvObj)
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_IClassFactory || riid == IID_IUnknown)
 	{

diff --git a/ddraw/IDirect3DDeviceX.cpp b/ddraw/IDirect3DDeviceX.cpp
@@ -25,6 +25,7 @@ HRESULT m_IDirect3DDeviceX::QueryInterface(REFIID riid, LPVOID FAR * ppvObj, DWO
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{
@@ -754,7 +755,6 @@ HRESULT m_IDirect3DDeviceX::GetTexture(DWORD dwStage, LPDIRECT3DTEXTURE2* lplpTe
 		{
 			return DDERR_INVALIDPARAMS;
 		}
-
 		*lplpTexture = nullptr;
 
 		// Get surface stage
@@ -814,11 +814,10 @@ HRESULT m_IDirect3DDeviceX::GetTexture(DWORD dwStage, LPDIRECTDRAWSURFACE7* lplp
 		{
 			return DDERR_INVALIDPARAMS;
 		}
+		*lplpTexture = nullptr;
 
 		HRESULT hr = DDERR_GENERIC;
 
-		*lplpTexture = nullptr;
-
 		if (AttachedTexture[dwStage])
 		{
 			AttachedTexture[dwStage]->AddRef();
@@ -1968,7 +1967,6 @@ HRESULT m_IDirect3DDeviceX::GetDirect3D(LPDIRECT3D7* lplpD3D, DWORD DirectXVersi
 		{
 			return DDERR_INVALIDPARAMS;
 		}
-
 		*lplpD3D = nullptr;
 
 		// Check for device interface

diff --git a/ddraw/IDirect3DExecuteBuffer.cpp b/ddraw/IDirect3DExecuteBuffer.cpp
@@ -24,6 +24,7 @@ HRESULT m_IDirect3DExecuteBuffer::QueryInterface(REFIID riid, LPVOID FAR * ppvOb
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{

diff --git a/ddraw/IDirect3DLight.cpp b/ddraw/IDirect3DLight.cpp
@@ -24,6 +24,7 @@ HRESULT m_IDirect3DLight::QueryInterface(REFIID riid, LPVOID FAR * ppvObj)
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{

diff --git a/ddraw/IDirect3DMaterialX.cpp b/ddraw/IDirect3DMaterialX.cpp
@@ -24,6 +24,7 @@ HRESULT m_IDirect3DMaterialX::QueryInterface(REFIID riid, LPVOID FAR * ppvObj, D
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{

diff --git a/ddraw/IDirect3DTextureX.cpp b/ddraw/IDirect3DTextureX.cpp
@@ -24,6 +24,7 @@ HRESULT m_IDirect3DTextureX::QueryInterface(REFIID riid, LPVOID FAR * ppvObj, DW
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{

diff --git a/ddraw/IDirect3DVertexBufferX.cpp b/ddraw/IDirect3DVertexBufferX.cpp
@@ -24,6 +24,7 @@ HRESULT m_IDirect3DVertexBufferX::QueryInterface(REFIID riid, LPVOID FAR * ppvOb
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{

diff --git a/ddraw/IDirect3DViewportX.cpp b/ddraw/IDirect3DViewportX.cpp
@@ -24,6 +24,7 @@ HRESULT m_IDirect3DViewportX::QueryInterface(REFIID riid, LPVOID FAR * ppvObj, D
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{

diff --git a/ddraw/IDirect3DX.cpp b/ddraw/IDirect3DX.cpp
@@ -31,6 +31,7 @@ HRESULT m_IDirect3DX::QueryInterface(REFIID riid, LPVOID FAR * ppvObj, DWORD Dir
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{
@@ -411,6 +412,7 @@ HRESULT m_IDirect3DX::CreateLight(LPDIRECT3DLIGHT * lplpDirect3DLight, LPUNKNOWN
 		{
 			return DDERR_INVALIDPARAMS;
 		}
+		*lplpDirect3DLight = nullptr;
 
 		// Check for device
 		if (!ddrawParent)
@@ -461,6 +463,7 @@ HRESULT m_IDirect3DX::CreateMaterial(LPDIRECT3DMATERIAL3 * lplpDirect3DMaterial,
 		{
 			return DDERR_INVALIDPARAMS;
 		}
+		*lplpDirect3DMaterial = nullptr;
 
 		// Check for device
 		if (!ddrawParent)
@@ -515,6 +518,7 @@ HRESULT m_IDirect3DX::CreateViewport(LPDIRECT3DVIEWPORT3 * lplpD3DViewport, LPUN
 		{
 			return DDERR_INVALIDPARAMS;
 		}
+		*lplpD3DViewport = nullptr;
 
 		// Check for device
 		if (!ddrawParent)
@@ -617,6 +621,7 @@ HRESULT m_IDirect3DX::CreateDevice(REFCLSID rclsid, LPDIRECTDRAWSURFACE7 lpDDS,
 		{
 			return DDERR_INVALIDPARAMS;
 		}
+		*lplpD3DDevice = nullptr;
 
 		// Check for device
 		if (!ddrawParent)
@@ -707,6 +712,7 @@ HRESULT m_IDirect3DX::CreateVertexBuffer(LPD3DVERTEXBUFFERDESC lpVBDesc, LPDIREC
 		{
 			return DDERR_INVALIDPARAMS;
 		}
+		*lplpD3DVertexBuffer = nullptr;
 
 		if (!lpVBDesc->dwNumVertices)
 		{

diff --git a/ddraw/IDirectDrawClipper.cpp b/ddraw/IDirectDrawClipper.cpp
@@ -26,6 +26,7 @@ HRESULT m_IDirectDrawClipper::QueryInterface(REFIID riid, LPVOID FAR * ppvObj)
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{

diff --git a/ddraw/IDirectDrawColorControl.cpp b/ddraw/IDirectDrawColorControl.cpp
@@ -24,6 +24,7 @@ HRESULT m_IDirectDrawColorControl::QueryInterface(REFIID riid, LPVOID FAR * ppvO
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{

diff --git a/ddraw/IDirectDrawGammaControl.cpp b/ddraw/IDirectDrawGammaControl.cpp
@@ -24,6 +24,7 @@ HRESULT m_IDirectDrawGammaControl::QueryInterface(REFIID riid, LPVOID FAR * ppvO
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{

diff --git a/ddraw/IDirectDrawPalette.cpp b/ddraw/IDirectDrawPalette.cpp
@@ -27,6 +27,7 @@ HRESULT m_IDirectDrawPalette::QueryInterface(REFIID riid, LPVOID FAR * ppvObj)
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{

diff --git a/ddraw/IDirectDrawSurfaceX.cpp b/ddraw/IDirectDrawSurfaceX.cpp
@@ -2309,11 +2309,11 @@ HRESULT m_IDirectDrawSurfaceX::GetPalette(LPDIRECTDRAWPALETTE FAR * lplpDDPalett
 		{
 			return DDERR_INVALIDPARAMS;
 		}
+		*lplpDDPalette = nullptr;
 
 		// No palette attached
 		if (!attachedPalette)
 		{
-			*lplpDDPalette = nullptr;
 			return DDERR_NOPALETTEATTACHED;
 		}
 

diff --git a/ddraw/IDirectDrawX.cpp b/ddraw/IDirectDrawX.cpp
@@ -215,6 +215,7 @@ HRESULT m_IDirectDrawX::QueryInterface(REFIID riid, LPVOID FAR * ppvObj, DWORD D
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (riid == IID_GetRealInterface)
 	{
@@ -540,6 +541,7 @@ HRESULT m_IDirectDrawX::CreateSurface2(LPDDSURFACEDESC2 lpDDSurfaceDesc2, LPDIRE
 	{
 		return DDERR_INVALIDPARAMS;
 	}
+	*lplpDDSurface = nullptr;
 
 	if (Config.Dd7to9)
 	{

diff --git a/ddraw/InterfaceQuery.cpp b/ddraw/InterfaceQuery.cpp
@@ -100,11 +100,10 @@ HRESULT DdrawWrapper::ProxyQueryInterface(LPVOID ProxyInterface, REFIID riid, LP
 	{
 		return E_POINTER;
 	}
+	*ppvObj = nullptr;
 
 	if (Config.Dd7to9 || !ProxyInterface)
 	{
-		*ppvObj = nullptr;
-
 		genericQueryInterface(riid, ppvObj);
 
 		if (*ppvObj)
@@ -125,8 +124,6 @@ HRESULT DdrawWrapper::ProxyQueryInterface(LPVOID ProxyInterface, REFIID riid, LP
 	}
 	else
 	{
-		*ppvObj = nullptr;
-
 		genericQueryInterface(riid, ppvObj);
 
 		if (*ppvObj)