fix(w3d): Fix crashes, leaks and memory exhaustion on device reset

Core/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp

@@ -180,6 +180,7 @@ void FlatHeightMapRenderObjClass::adjustTerrainLOD(Int adj)
 //=============================================================================
 void FlatHeightMapRenderObjClass::ReleaseResources()
 {
+	releaseTiles();
 	BaseHeightMapRenderObjClass::ReleaseResources();
 }
 

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp

@@ -1175,6 +1175,8 @@ void W3DTreeBuffer::allocateTreeBuffers()
 		m_curNumTreeVertices[i] = 0;
 		m_curNumTreeIndices[i] = 0;
 	}
+	// TheSuperHackers @bugfix arcticdolphin 09/10/2026 Refill the new buffers after a device reset.
+	m_anythingChanged = true;
 
 	//shader decleration
 // DX8_FVF_XYZNDUV1

Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp

@@ -156,6 +156,7 @@ bool								DX8Wrapper::IsRenderToTexture = false;
 unsigned							DX8Wrapper::_MainThreadID = 0;
 bool								DX8Wrapper::CurrentDX8LightEnables[4];
 bool								DX8Wrapper::IsDeviceLost;
+bool								DX8Wrapper::DeviceResetFailed = false;
 int								DX8Wrapper::ZBias;
 float								DX8Wrapper::ZNear;
 float								DX8Wrapper::ZFar;
@@ -302,7 +303,11 @@ bool DX8Wrapper::Init(void* hwnd, bool lite)
 		if (D3D8Lib == nullptr) return false;	// Return false at this point if init failed
 
 		Direct3DCreate8Ptr = (Direct3DCreate8Type)GetProcAddress(D3D8Lib, "Direct3DCreate8");
-		if (Direct3DCreate8Ptr == nullptr) return false;
+		if (Direct3DCreate8Ptr == nullptr)
+		{
+			Shutdown();
+			return false;
+		}
 
 		/*
 		** Create the D3D interface object
@@ -316,6 +321,7 @@ bool DX8Wrapper::Init(void* hwnd, bool lite)
 			D3DInterface = Direct3DCreate8Ptr(D3D_SDK_VERSION);		// TODO: handle failure cases...
 		}
 		if (D3DInterface == nullptr) {
+			Shutdown();
 			return(false);
 		}
 		IsInitted = true;
@@ -345,16 +351,12 @@ void DX8Wrapper::Shutdown()
 
 	}
 
-	if (CurrentCaps)
+	for (size_t i = 0; i < ARRAY_SIZE(Textures); ++i)
 	{
-		int max = CurrentCaps->Get_Max_Textures_Per_Pass();
-		for (int i = 0; i < max; i++)
+		if (Textures[i])
 		{
-			if (Textures[i])
-			{
-				Textures[i]->Release();
-				Textures[i] = nullptr;
-			}
+			Textures[i]->Release();
+			Textures[i] = nullptr;
 		}
 	}
 
@@ -436,7 +438,7 @@ void DX8Wrapper::Invalidate_Cached_Render_States()
 		}
 		//Need to explicitly set texture to null, otherwise app will not be able to
 		//set it to null because of redundant state checker. MW
-		if (_Get_D3D_Device8())
+		if (_Get_D3D_Device8() && !DeviceResetFailed)
 			_Get_D3D_Device8()->SetTexture(a, nullptr);
 		if (Textures[a] != nullptr) {
 			Textures[a]->Release();
@@ -490,6 +492,7 @@ void DX8Wrapper::Do_Onetime_Device_Dependent_Shutdowns()
 bool DX8Wrapper::Create_Device()
 {
 	WWASSERT(D3DDevice == nullptr);	// for now, once you've created a device, you're stuck with it!
+	DeviceResetFailed = false;
 
 	D3DCAPS8 caps;
 	if
@@ -610,83 +613,95 @@ bool DX8Wrapper::Reset_Device(bool reload_assets)
 {
 	WWDEBUG_SAY(("Resetting device."));
 	DX8_THREAD_ASSERT();
-	if ((IsInitted) && (D3DDevice != nullptr)) {
-		// Release all non-MANAGED stuff
-		WW3D::_Invalidate_Textures();
+	if (!IsInitted || D3DDevice == nullptr) {
+		WWDEBUG_SAY(("Device reset failed"));
+		return false;
+	}
 
-		for (unsigned i = 0;i < MAX_VERTEX_STREAMS;++i)
-		{
-			Set_Vertex_Buffer(nullptr, i);
-		}
-		Set_Index_Buffer(nullptr, 0);
-		if (m_pCleanupHook) {
-			m_pCleanupHook->ReleaseResources();
-		}
-		DynamicVBAccessClass::_Deinit();
-		DynamicIBAccessClass::_Deinit();
-		DX8TextureManagerClass::Release_Textures();
-		SHD_SHUTDOWN_SHADERS;
+	// Release all non-MANAGED stuff
+	WW3D::_Invalidate_Textures();
 
-		// Reset frame count to reflect the flipping chain being reset by Reset()
-		FrameCount = 0;
+	for (unsigned i = 0;i < MAX_VERTEX_STREAMS;++i)
+	{
+		Set_Vertex_Buffer(nullptr, i);
+	}
+	Set_Index_Buffer(nullptr, 0);
+	if (m_pCleanupHook) {
+		m_pCleanupHook->ReleaseResources();
+	}
+	DynamicVBAccessClass::_Deinit();
+	DynamicIBAccessClass::_Deinit();
+	DX8TextureManagerClass::Release_Textures();
+	SHD_SHUTDOWN_SHADERS;
 
-		memset(Vertex_Shader_Constants, 0, sizeof(Vector4) * MAX_VERTEX_SHADER_CONSTANTS);
-		memset(Pixel_Shader_Constants, 0, sizeof(Vector4) * MAX_PIXEL_SHADER_CONSTANTS);
+	// Reset frame count to reflect the flipping chain being reset by Reset()
+	FrameCount = 0;
 
-		// Set_Vertex_Buffer/Set_Index_Buffer are deferred, so unbind on the device itself.
-		// Resources still bound during Reset() crash the runtime in DestroyResource.
-		for (unsigned i = 0; i < MAX_VERTEX_STREAMS; ++i)
-		{
-			DX8CALL(SetStreamSource(i, nullptr, 0));
-		}
-		DX8CALL(SetIndices(nullptr, 0));
-		Invalidate_Cached_Render_States();
+	memset(Vertex_Shader_Constants, 0, sizeof(Vector4) * MAX_VERTEX_SHADER_CONSTANTS);
+	memset(Pixel_Shader_Constants, 0, sizeof(Vector4) * MAX_PIXEL_SHADER_CONSTANTS);
 
-		// Rebind the back buffer and release all surface
-		// references before Reset(), otherwise it crashes in DestroyResource.
-		Set_Render_Target((IDirect3DSurface8*)nullptr);
+	HRESULT hr = _Get_D3D_Device8()->TestCooperativeLevel();
+	if (hr == D3DERR_DEVICELOST) {
+		return false;	//device is lost and can't be reset.
+	}
 
-		HRESULT hr = _Get_D3D_Device8()->TestCooperativeLevel();
-		if (hr != D3DERR_DEVICELOST)
-		{
-			// TheSuperHackers @bugfix xezon 13/06/2025 Front load the system dbghelp.dll to prevent
-			// the graphics driver from potentially loading the old game dbghelp.dll and then crashing the game process.
-			DbgHelpGuard dbgHelpGuard;
-			DX8CALL_HRES(Reset(&_PresentParameters), hr)
-				if (hr != D3D_OK)
-					return false;	//reset failed.
-		}
-		else
-			return false;	//device is lost and can't be reset.
+	// TheSuperHackers @bugfix arcticdolphin 09/10/2026 Reset() fails while resources are still bound
+	if (!DeviceResetFailed) {
+		Unbind_Device_Buffers();
+	}
+	Invalidate_Cached_Render_States();
+	Set_Render_Target((IDirect3DSurface8*)nullptr);
 
-		if (reload_assets)
-		{
-			DX8TextureManagerClass::Recreate_Textures();
-			if (m_pCleanupHook) {
-				m_pCleanupHook->ReAcquireResources();
-			}
+	{
+		// TheSuperHackers @bugfix xezon 13/06/2025 Front load the system dbghelp.dll to prevent
+		// the graphics driver from potentially loading the old game dbghelp.dll and then crashing the game process.
+		DbgHelpGuard dbgHelpGuard;
+		hr = _Get_D3D_Device8()->Reset(&_PresentParameters);
+		Increment_DX8_CallCount();
+	}
+	DeviceResetFailed = (hr != D3D_OK);
+	if (DeviceResetFailed) {
+		Non_Fatal_Log_DX8_ErrorCode(hr, __FILE__, __LINE__);
+		return false;	//reset failed.
+	}
+
+	if (reload_assets)
+	{
+		DX8TextureManagerClass::Recreate_Textures();
+		if (m_pCleanupHook) {
+			m_pCleanupHook->ReAcquireResources();
 		}
-		Invalidate_Cached_Render_States();
-		Set_Default_Global_Render_States();
-		SHD_INIT_SHADERS;
-		WWDEBUG_SAY(("Device reset completed"));
-		return true;
 	}
-	WWDEBUG_SAY(("Device reset failed"));
-	return false;
+	Invalidate_Cached_Render_States();
+	Set_Default_Global_Render_States();
+	SHD_INIT_SHADERS;
+	WWDEBUG_SAY(("Device reset completed"));
+	return true;
+}
+
+// Set_Vertex_Buffer and Set_Index_Buffer are deferred
+void DX8Wrapper::Unbind_Device_Buffers()
+{
+	for (unsigned stream = 0; stream < MAX_VERTEX_STREAMS; ++stream)
+	{
+		DX8CALL(SetStreamSource(stream, nullptr, 0));
+	}
+	DX8CALL(SetIndices(nullptr, 0));
 }
 
 void DX8Wrapper::Release_Device()
 {
 	if (D3DDevice) {
 
-		for (int a = 0;a < MAX_TEXTURE_STAGES;++a)
-		{	//release references to any textures that were used in last rendering call
-			DX8CALL(SetTexture(a, nullptr));
-		}
+		if (!DeviceResetFailed)
+		{
+			for (int a = 0;a < MAX_TEXTURE_STAGES;++a)
+			{	//release references to any textures that were used in last rendering call
+				DX8CALL(SetTexture(a, nullptr));
+			}
 
-		DX8CALL(SetStreamSource(0, nullptr, 0));	//release reference count on last rendered vertex buffer
-		DX8CALL(SetIndices(nullptr, 0));	//release reference count on last rendered index buffer
+			Unbind_Device_Buffers();
+		}
 
 
 		/*

Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h

@@ -572,6 +572,7 @@ class DX8Wrapper
 
 	static bool	Create_Device();
 	static void Release_Device();
+	static void Unbind_Device_Buffers();
 
 	static void Reset_Statistics();
 	static void Enumerate_Devices();
@@ -634,6 +635,7 @@ class DX8Wrapper
 
 	static bool								IsInitted;
 	static bool								IsDeviceLost;
+	static bool								DeviceResetFailed;	///< Until a Reset() succeeds the device only takes TestCooperativeLevel, Reset and Release
 	static void *							Hwnd;
 	static unsigned						_MainThreadID;
 

Core/Libraries/Source/WWVegas/WW3D2/missingtexture.cpp

@@ -20,7 +20,6 @@
 #include "missingtexture.h"
 #include "texture.h"
 #include "dx8wrapper.h"
-#include <d3dx8core.h>
 
 static unsigned missing_image_width=128;
 static unsigned missing_image_height=128;
@@ -69,51 +68,24 @@ void MissingTexture::_Init()
 		MIP_LEVELS_ALL
 	);
 
-	D3DLOCKED_RECT locked_rect;
-	RECT rect;
-	rect.left=0;
-	rect.right=missing_image_width;
-	rect.top=0;
-	rect.bottom=missing_image_height;
-	DX8_ErrorCode(
-		tex->LockRect(
-			0,
-			&locked_rect,
-			&rect,
-			0));
-
-	unsigned *buffer=(unsigned*)locked_rect.pBits;
-	unsigned char *pixels=(unsigned char *)missing_image_pixels;
-	for (unsigned y=0;y<missing_image_height;y++)
+	// TheSuperHackers @fix bobtista 09/10/2026 Fill every mip level with the solid color.
+	for (unsigned level=0;level<tex->GetLevelCount();++level)
 	{
-		for (unsigned x=0; x<missing_image_width; x++)
+		D3DSURFACE_DESC desc;
+		D3DLOCKED_RECT locked_rect;
+		DX8_ErrorCode(tex->GetLevelDesc(level,&desc));
+		DX8_ErrorCode(tex->LockRect(level,&locked_rect,nullptr,0));
+
+		for (unsigned y=0;y<desc.Height;y++)
 		{
-			//*buffer++=missing_image_palette[*pixels++];
-			*buffer++=0x7FFF00FF;
+			unsigned *buffer=reinterpret_cast<unsigned*>(static_cast<unsigned char*>(locked_rect.pBits)+y*locked_rect.Pitch);
+			for (unsigned x=0;x<desc.Width;x++)
+			{
+				buffer[x]=0x7FFF00FF;
+			}
 		}
-		buffer=(unsigned*)locked_rect.pBits;
-		buffer+=locked_rect.Pitch/sizeof(unsigned)*y;
-	}
-
-	DX8_ErrorCode(tex->UnlockRect(0));
-
-	for (unsigned i=1;i<tex->GetLevelCount();++i) {
-		IDirect3DSurface8 *src,*dst;
-		DX8_ErrorCode(tex->GetSurfaceLevel(i-1,&src));
-		DX8_ErrorCode(tex->GetSurfaceLevel(i,&dst));
-
-		DX8_ErrorCode(D3DXLoadSurfaceFromSurface(
-			dst,
-			nullptr,	// palette
-			nullptr,	// rect
-			src,
-			nullptr,	// palette
-			nullptr,	// rect
-			D3DX_FILTER_BOX,	// box is good for 2:1 filtering
-			0));
 
-		src->Release();
-		dst->Release();
+		DX8_ErrorCode(tex->UnlockRect(level));
 	}
 
 	_MissingTexture=tex;

Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp

@@ -1555,7 +1555,8 @@ bool TextureLoadTaskClass::Begin_Compressed_Load()
 #endif
 	);
 
-	return true;
+	// Texture creation can fail, e.g. when out of memory
+	return D3DTexture != nullptr;
 }
 
 bool TextureLoadTaskClass::Begin_Uncompressed_Load()
@@ -1624,7 +1625,7 @@ bool TextureLoadTaskClass::Begin_Uncompressed_Load()
 #endif
 	);
 
-	return true;
+	return D3DTexture != nullptr;
 }
 
 
@@ -2106,7 +2107,7 @@ bool CubeTextureLoadTaskClass::Begin_Compressed_Load()
 #endif
 	);
 
-	return true;
+	return D3DTexture != nullptr;
 }
 
 bool CubeTextureLoadTaskClass::Begin_Uncompressed_Load()
@@ -2175,7 +2176,7 @@ bool CubeTextureLoadTaskClass::Begin_Uncompressed_Load()
 #endif
 	);
 
-	return true;
+	return D3DTexture != nullptr;
 }
 
 bool CubeTextureLoadTaskClass::Load_Compressed_Mipmap()
@@ -2414,7 +2415,7 @@ bool VolumeTextureLoadTaskClass::Begin_Compressed_Load()
 #endif
 	);
 
-	return true;
+	return D3DTexture != nullptr;
 }
 
 bool VolumeTextureLoadTaskClass::Begin_Uncompressed_Load()
@@ -2486,7 +2487,7 @@ bool VolumeTextureLoadTaskClass::Begin_Uncompressed_Load()
 #endif
 	);
 
-	return true;
+	return D3DTexture != nullptr;
 }
 
 bool VolumeTextureLoadTaskClass::Load_Compressed_Mipmap()

Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h

@@ -105,10 +105,7 @@ class W3DShroud
 	Int m_numMaxVisibleCellsY;				///<maximum number of shroud cells that can be visible
 	Real m_cellWidth;						///<spacing between adjacent cells
 	Real m_cellHeight;						///<spacing between adjacent cells
-	Byte *m_shroudData;						///<holds amount of shroud per cell.
-	IDirect3DSurface8 *m_pSrcTexture;		///<stores sysmem copy of visible shroud.
-	void *m_srcTextureData;					///<pointer to shroud data
-	UnsignedInt m_srcTexturePitch;			///<width (in bytes) of shroud data buffer.
+	UnsignedShort *m_shroudData;			///<sysmem copy of visible shroud.
 	TextureClass *m_pDstTexture;			///<stores vidmem copy of visible shroud.
 	Int m_dstTextureWidth;					///<dimensions of m_pDstTexture
 	Int m_dstTextureHeight;					///<dimensions of m_pDstTexture