Remove ScopeFileRenamer and use dbghelp front loading strategy instead of file renaming

Author: xezon

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

@@ -103,8 +103,6 @@ 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

@@ -22,43 +22,38 @@
 
 
 DbgHelpGuard::DbgHelpGuard()
+	: m_hasLoaded(false)
 {
-	deactivate();
+	activate();
 }
 
 DbgHelpGuard::~DbgHelpGuard()
 {
-	reactivate();
+	deactivate();
 }
 
-void DbgHelpGuard::deactivate()
+void DbgHelpGuard::activate()
 {
-	DbgHelpLoader::blockLoad();
-
 	if (DbgHelpLoader::isLoadedFromSystem())
 	{
 		// This is ok. Do nothing.
 	}
 	else if (DbgHelpLoader::isLoaded())
 	{
-		DbgHelpLoader::unload();
-		m_requiresLoad = true;
-		m_dbgHelpRenamer.rename("dbghelp.dll", "dbghelp.dll.bak");
+		// This is maybe not ok. But do nothing until this becomes a user facing problem.
 	}
 	else
 	{
-		m_dbgHelpRenamer.rename("dbghelp.dll", "dbghelp.dll.bak");
+		// Front load the DLL now to prevent other code from loading the potentially wrong DLL.
+		m_hasLoaded = DbgHelpLoader::load();
 	}
 }
 
-void DbgHelpGuard::reactivate()
+void DbgHelpGuard::deactivate()
 {
-	m_dbgHelpRenamer.revert();
-	DbgHelpLoader::unblockLoad();
-
-	if (m_requiresLoad)
+	if (m_hasLoaded)
 	{
-		DbgHelpLoader::load();
-		m_requiresLoad = false;
+		DbgHelpLoader::unload();
+		m_hasLoaded = false;
 	}
 }

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

@@ -20,15 +20,13 @@
 
 #include "always.h"
 
-#include "ScopedFileRenamer.h"
 
-
-// This class temporarily unloads dbghelp.dll and prevents it from loading during its lifetime.
+// This class temporarily loads and unloads dbghelp.dll from the desired location to prevent
+// other code from potentially loading it from an undesired location.
 // 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.
+// that correctly.
 
 class DbgHelpGuard
 {
@@ -37,11 +35,10 @@ class DbgHelpGuard
 	DbgHelpGuard();
 	~DbgHelpGuard();
 
+	void activate();
 	void deactivate();
-	void reactivate();
 
 private:
 
-	ScopedFileRenamer m_dbgHelpRenamer;
-	bool m_requiresLoad;
+	bool m_hasLoaded;
 };

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

@@ -19,7 +19,6 @@
 #include "DbgHelpLoader.h"
 
 
-int DbgHelpLoader::BlockLoadCounter = 0;
 DbgHelpLoader* DbgHelpLoader::Inst = NULL;
 
 DbgHelpLoader::DbgHelpLoader()
@@ -53,21 +52,8 @@ bool DbgHelpLoader::isLoadedFromSystem()
   return Inst != NULL && Inst->m_loadedFromSystem;
 }
 
-void DbgHelpLoader::blockLoad()
-{
-  ++BlockLoadCounter;
-}
-
-bool DbgHelpLoader::unblockLoad()
-{
-  return --BlockLoadCounter == 0;
-}
-
 bool DbgHelpLoader::load()
 {
-  if (BlockLoadCounter > 0)
-    return false;
-
   if (Inst == NULL)
   {
     // Cannot use new/delete here when this is loaded during game memory initialization.

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

@@ -33,7 +33,6 @@ class DbgHelpLoader
 {
 private:
 
-  static int BlockLoadCounter;
   static DbgHelpLoader* Inst; // Is singleton class
 
   DbgHelpLoader();
@@ -47,12 +46,6 @@ class DbgHelpLoader
   // Returns whether dbghelp.dll is loaded from the system directory
   static bool isLoadedFromSystem();
 
-  // Blocks loading a dbghelp.dll
-  static void blockLoad();
-
-  // Unblocks loading a dbghelp.dll. Returns true if unblocked.
-  static bool unblockLoad();
-
   static bool load();
   static bool reload();
   static void unload();