Merge pull request #38 from GeneralsOnlineDevelopmentTeam/seer/dx8-createimagesurface-failure

DX8: Handle failure of CreateImageSurface

Author: x64-dev

Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp

@@ -2371,7 +2371,14 @@ IDirect3DSurface8 * DX8Wrapper::_Create_DX8_Surface(unsigned int width, unsigned
 	// Paletted surfaces not supported!
 	WWASSERT(format!=D3DFMT_P8);
 
-	DX8CALL(CreateImageSurface(width, height, WW3DFormat_To_D3DFormat(format), &surface));
+	HRESULT hr = DX8Wrapper::_Get_D3D_Device8()->CreateImageSurface(width, height, WW3DFormat_To_D3DFormat(format), &surface);
+	number_of_DX8_calls++;
+	
+	if (FAILED(hr)) {
+		// Log the error and return NULL to indicate failure
+		Non_Fatal_Log_DX8_ErrorCode(hr, __FILE__, __LINE__);
+		return NULL;
+	}
 
 	return surface;
 }

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp

@@ -2943,7 +2943,14 @@ IDirect3DSurface8 * DX8Wrapper::_Create_DX8_Surface(unsigned int width, unsigned
 	// Paletted surfaces not supported!
 	WWASSERT(format!=D3DFMT_P8);
 
-	DX8CALL(CreateImageSurface(width, height, WW3DFormat_To_D3DFormat(format), &surface));
+	HRESULT hr = DX8Wrapper::_Get_D3D_Device8()->CreateImageSurface(width, height, WW3DFormat_To_D3DFormat(format), &surface);
+	number_of_DX8_calls++;
+	
+	if (FAILED(hr)) {
+		// Log the error and return NULL to indicate failure
+		Non_Fatal_Log_DX8_ErrorCode(hr, __FILE__, __LINE__);
+		return NULL;
+	}
 
 	return surface;
 }