[GEN][ZH] Prevent using uninitialized memory 'hr' in W3DShaderManager::LoadAndCreateD3DShader() (#1123)

xezon · web-flow · commit 42bf7b9db93e · 2025-06-21T11:19:08.000+02:00
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
@@ -2773,11 +2773,11 @@ HRESULT W3DShaderManager::LoadAndCreateD3DShader(const char* strFilePath, const
 		file->close();
 		file = NULL;
 
-		if (ShaderType == TRUE)//SHADERTYPE_VERTEX)
+		if (ShaderType) // SHADERTYPE_VERTEX
 		{
 			hr = DX8Wrapper::_Get_D3D_Device8()->CreateVertexShader(pDeclaration, pShader, pHandle, Usage);
 		}
-		else if (ShaderType == FALSE)//SHADERTYPE_PIXEL)
+		else // SHADERTYPE_PIXEL
 		{
 			hr = DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader(pShader, pHandle);
 		}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
@@ -3043,11 +3043,11 @@ HRESULT W3DShaderManager::LoadAndCreateD3DShader(const char* strFilePath, const
 		file->close();
 		file = NULL;
 
-		if (ShaderType == TRUE)//SHADERTYPE_VERTEX)
+		if (ShaderType) // SHADERTYPE_VERTEX
 		{
 			hr = DX8Wrapper::_Get_D3D_Device8()->CreateVertexShader(pDeclaration, pShader, pHandle, Usage);
 		}
-		else if (ShaderType == FALSE)//SHADERTYPE_PIXEL)
+		else // SHADERTYPE_PIXEL
 		{
 			hr = DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader(pShader, pHandle);
 		}

Original file line number	Diff line number	Diff line change
`@@ -2773,11 +2773,11 @@ HRESULT W3DShaderManager::LoadAndCreateD3DShader(const char* strFilePath, const`
`2773`	`2773`	`file->close();`
`2774`	`2774`	`file = NULL;`
`2775`	`2775`
`2776`		`- if (ShaderType == TRUE)//SHADERTYPE_VERTEX)`
	`2776`	`+ if (ShaderType) // SHADERTYPE_VERTEX`
`2777`	`2777`	`{`
`2778`	`2778`	`hr = DX8Wrapper::_Get_D3D_Device8()->CreateVertexShader(pDeclaration, pShader, pHandle, Usage);`
`2779`	`2779`	`}`
`2780`		`- else if (ShaderType == FALSE)//SHADERTYPE_PIXEL)`
	`2780`	`+ else // SHADERTYPE_PIXEL`
`2781`	`2781`	`{`
`2782`	`2782`	`hr = DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader(pShader, pHandle);`
`2783`	`2783`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3043,11 +3043,11 @@ HRESULT W3DShaderManager::LoadAndCreateD3DShader(const char* strFilePath, const`
`3043`	`3043`	`file->close();`
`3044`	`3044`	`file = NULL;`
`3045`	`3045`
`3046`		`- if (ShaderType == TRUE)//SHADERTYPE_VERTEX)`
	`3046`	`+ if (ShaderType) // SHADERTYPE_VERTEX`
`3047`	`3047`	`{`
`3048`	`3048`	`hr = DX8Wrapper::_Get_D3D_Device8()->CreateVertexShader(pDeclaration, pShader, pHandle, Usage);`
`3049`	`3049`	`}`
`3050`		`- else if (ShaderType == FALSE)//SHADERTYPE_PIXEL)`
	`3050`	`+ else // SHADERTYPE_PIXEL`
`3051`	`3051`	`{`
`3052`	`3052`	`hr = DX8Wrapper::_Get_D3D_Device8()->CreatePixelShader(pShader, pHandle);`
`3053`	`3053`	`}`