[GEN][ZH] Prevent AMD/ATI driver crash on game launch by temporarily unloading and renaming dbghelp.dll

Author: xezon

CMakeLists.txt

@@ -43,7 +43,6 @@ if((WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows") AND ${CMAKE_SIZEOF_VOID_P} EQU
     include(cmake/miles.cmake)
     include(cmake/bink.cmake)
     include(cmake/dx8.cmake)
-    include(cmake/dbghelp.cmake)
 endif()
 
 # Define a dummy stlport target when not on VC6.

Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt

@@ -32,6 +32,10 @@ set(WWLIB_SRC
     #crcstraw.h
     cstraw.cpp
     cstraw.h
+    DbgHelpGuard.cpp
+    DbgHelpGuard.h
+    DbgHelpLoader.cpp
+    DbgHelpLoader.h
     Except.cpp
     Except.h
     FastAllocator.cpp
@@ -66,6 +70,7 @@ set(WWLIB_SRC
     #lzostraw.cpp
     #lzostraw.h
     #lzo_conf.h
+    MallocAllocator.h
     #md5.cpp
     #md5.h
     mempool.h
@@ -98,6 +103,8 @@ set(WWLIB_SRC
     #regexpr.cpp
     #regexpr.h
     #search.h
+    ScopedFileRenamer.cpp
+    ScopedFileRenamer.h
     sharebuf.h
     Signaler.h
     simplevec.h

Core/Libraries/Source/WWVegas/WWLib/DbgHelpGuard.cpp

@@ -0,0 +1,63 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "DbgHelpGuard.h"
+
+#include "DbgHelpLoader.h"
+
+
+DbgHelpGuard::DbgHelpGuard()
+{
+	deactivate();
+}
+
+DbgHelpGuard::~DbgHelpGuard()
+{
+	reactivate();
+}
+
+void DbgHelpGuard::deactivate()
+{
+	DbgHelpLoader::blockLoad();
+
+	if (DbgHelpLoader::isLoadedFromSystem())
+	{
+		// This is ok. Do nothing.
+	}
+	else if (DbgHelpLoader::isLoaded())
+	{
+		DbgHelpLoader::unload();
+		m_wasLoaded = true;
+		m_dbgHelpRenamer.rename("dbghelp.dll", "dbghelp.dll.bak");
+	}
+	else
+	{
+		m_dbgHelpRenamer.rename("dbghelp.dll", "dbghelp.dll.bak");
+	}
+}
+
+void DbgHelpGuard::reactivate()
+{
+	m_dbgHelpRenamer.revert();
+	DbgHelpLoader::unblockLoad();
+
+	if (m_wasLoaded)
+	{
+		DbgHelpLoader::load();
+	}
+}

Core/Libraries/Source/WWVegas/WWLib/DbgHelpGuard.h

@@ -0,0 +1,47 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 TheSuperHackers
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "always.h"
+
+#include "ScopedFileRenamer.h"
+
+
+// This class temporarily unloads dbghelp.dll and prevents it from loading during its lifetime.
+// This helps avoid crashing on boot using recent AMD/ATI drivers, which attempt to load and use
+// dbghelp.dll from the game install directory but are unable to do so correctly because
+// the dbghelp.dll that ships with the game is very old and the AMD/ATI code does not handle
+// that correctly. This workaround is not required if the dbghelp.dll was loaded from the system
+// directory.
+
+class DbgHelpGuard
+{
+public:
+
+	DbgHelpGuard();
+	~DbgHelpGuard();
+
+	void deactivate();
+	void reactivate();
+
+private:
+
+	ScopedFileRenamer m_dbgHelpRenamer;
+	bool m_wasLoaded;
+};