[GEN][ZH] Fix uninitialized back-buffer surface

Fighter19 · Fighter19 · commit fa51bad0f0ba · 2025-04-15T22:28:05.000+02:00
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
@@ -2403,10 +2403,11 @@ SurfaceClass * DX8Wrapper::_Get_DX8_Back_Buffer(unsigned int num)
 {
 	DX8_THREAD_ASSERT();
 
-	IDirect3DSurface8 * bb;
+	IDirect3DSurface8 * bb=NULL;
 	SurfaceClass *surf=NULL;
-	DX8CALL(GetBackBuffer(num,D3DBACKBUFFER_TYPE_MONO,&bb));
-	if (bb)
+	HRESULT hres=S_FALSE;
+	DX8CALL_HRES(GetBackBuffer(num,D3DBACKBUFFER_TYPE_MONO,&bb), hres);
+	if (hres==D3D_OK && bb)
 	{
 		surf=NEW_REF(SurfaceClass,(bb));
 		bb->Release();
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
@@ -3161,10 +3161,11 @@ SurfaceClass * DX8Wrapper::_Get_DX8_Back_Buffer(unsigned int num)
 {
 	DX8_THREAD_ASSERT();
 
-	IDirect3DSurface8 * bb;
+	IDirect3DSurface8 * bb=NULL;
 	SurfaceClass *surf=NULL;
-	DX8CALL(GetBackBuffer(num,D3DBACKBUFFER_TYPE_MONO,&bb));
-	if (bb)
+	HRESULT hres=S_FALSE;
+	DX8CALL_HRES(GetBackBuffer(num,D3DBACKBUFFER_TYPE_MONO,&bb), hres);
+	if (hres==D3D_OK && bb)
 	{
 		surf=NEW_REF(SurfaceClass,(bb));
 		bb->Release();

Original file line number	Diff line number	Diff line change
`@@ -2403,10 +2403,11 @@ SurfaceClass * DX8Wrapper::_Get_DX8_Back_Buffer(unsigned int num)`
`2403`	`2403`	`{`
`2404`	`2404`	`DX8_THREAD_ASSERT();`
`2405`	`2405`
`2406`		`- IDirect3DSurface8 * bb;`
	`2406`	`+ IDirect3DSurface8 * bb=NULL;`
`2407`	`2407`	`SurfaceClass *surf=NULL;`
`2408`		`- DX8CALL(GetBackBuffer(num,D3DBACKBUFFER_TYPE_MONO,&bb));`
`2409`		`- if (bb)`
	`2408`	`+ HRESULT hres=S_FALSE;`
	`2409`	`+ DX8CALL_HRES(GetBackBuffer(num,D3DBACKBUFFER_TYPE_MONO,&bb), hres);`
	`2410`	`+ if (hres==D3D_OK && bb)`
`2410`	`2411`	`{`
`2411`	`2412`	`surf=NEW_REF(SurfaceClass,(bb));`
`2412`	`2413`	`bb->Release();`
Original file line number	Diff line number	Diff line change
`@@ -3161,10 +3161,11 @@ SurfaceClass * DX8Wrapper::_Get_DX8_Back_Buffer(unsigned int num)`
`3161`	`3161`	`{`
`3162`	`3162`	`DX8_THREAD_ASSERT();`
`3163`	`3163`
`3164`		`- IDirect3DSurface8 * bb;`
	`3164`	`+ IDirect3DSurface8 * bb=NULL;`
`3165`	`3165`	`SurfaceClass *surf=NULL;`
`3166`		`- DX8CALL(GetBackBuffer(num,D3DBACKBUFFER_TYPE_MONO,&bb));`
`3167`		`- if (bb)`
	`3166`	`+ HRESULT hres=S_FALSE;`
	`3167`	`+ DX8CALL_HRES(GetBackBuffer(num,D3DBACKBUFFER_TYPE_MONO,&bb), hres);`
	`3168`	`+ if (hres==D3D_OK && bb)`
`3168`	`3169`	`{`
`3169`	`3170`	`surf=NEW_REF(SurfaceClass,(bb));`
`3170`	`3171`	`bb->Release();`