Merge with updated DbgHelpLoader behavior

Author: slurmlord

Core/GameEngine/Include/Common/MiniDumper.h

@@ -81,6 +81,7 @@ class MiniDumper
 
 private:
 	Bool m_miniDumpInitialized;
+	Bool m_loadedDbgHelp;
 	DumpType m_requestedDumpType;
 
 	// Path buffers

Core/GameEngine/Source/Common/System/MiniDumper.cpp

@@ -59,6 +59,7 @@ void MiniDumper::shutdownMiniDumper()
 MiniDumper::MiniDumper()
 {
 	m_miniDumpInitialized = false;
+	m_loadedDbgHelp = false;
 	m_requestedDumpType = DUMP_TYPE_MINIMAL;
 	m_dumpRequested = NULL;
 	m_dumpComplete = NULL;
@@ -145,10 +146,10 @@ void MiniDumper::TriggerMiniDumpForException(struct _EXCEPTION_POINTERS* e_info,
 
 void MiniDumper::Initialize(const AsciiString& userDirPath)
 {
-	bool success = DbgHelpLoader::load();
+	m_loadedDbgHelp = DbgHelpLoader::load();
 
 	// We want to only use the dbghelp.dll from the OS installation, as the one bundled with the game does not support MiniDump functionality
-	if (!(success && DbgHelpLoader::isLoadedFromSystem()))
+	if (!(m_loadedDbgHelp && DbgHelpLoader::isLoadedFromSystem()))
 	{
 		DEBUG_LOG(("MiniDumper::Initialize: Unable to load system-provided dbghelp.dll, minidump functionality disabled."));
 		return;
@@ -265,12 +266,20 @@ void MiniDumper::CleanupResources()
 	}
 
 	DbgHelpLoader::unload();
+	m_loadedDbgHelp = false;
 }
 
 void MiniDumper::ShutDown()
 {
 	if (!m_miniDumpInitialized)
 	{
+		// Even if we failed to initialize, DbgHelpLoader could still have loaded its library
+		if (m_loadedDbgHelp)
+		{
+			DbgHelpLoader::unload();
+			m_loadedDbgHelp = false;
+		}
+
 		return;
 	}
 
@@ -399,7 +408,7 @@ void MiniDumper::CreateMiniDump(DumpType dumpType)
 		dumpTypeFlags |= MiniDumpWithFullMemory;
 		FALLTHROUGH;
 	case DUMP_TYPE_GAMEMEMORY:
-		dumpTypeFlags |= MiniDumpWithDataSegs | MiniDumpWithHandleData | MiniDumpWithThreadInfo | MiniDumpWithFullMemoryInfo;
+		dumpTypeFlags |= MiniDumpWithDataSegs | MiniDumpWithHandleData | MiniDumpWithThreadInfo | MiniDumpWithFullMemoryInfo | MiniDumpWithPrivateReadWriteMemory;
 		FALLTHROUGH;
 	case DUMP_TYPE_MINIMAL:
 		dumpTypeFlags |= MiniDumpWithIndirectlyReferencedMemory | MiniDumpScanMemory;
@@ -455,7 +464,7 @@ BOOL MiniDumper::CallbackInternal(const MINIDUMP_CALLBACK_INPUT& input, MINIDUMP
 		// Only include data segments for the game and ntdll modules to keep dump size low
 		if (output.ModuleWriteFlags & ModuleWriteDataSeg)
 		{
-			if (!::StrCmpIW(input.Module.FullPath, m_executablePath) && !::StrStrIW(input.Module.FullPath, L"ntdll.dll"))
+			if (::StrCmpIW(input.Module.FullPath, m_executablePath) && !::StrStrIW(input.Module.FullPath, L"ntdll.dll"))
 			{
 				// Exclude data segments for the module
 				output.ModuleWriteFlags &= (~ModuleWriteDataSeg);

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

@@ -24,9 +24,6 @@ CriticalSectionClass DbgHelpLoader::CriticalSection;
 
 DbgHelpLoader::DbgHelpLoader()
 	: m_symInitialize(NULL)
-#ifdef RTS_ENABLE_CRASHDUMP
-	, m_miniDumpWriteDump(NULL)
-#endif
 	, m_symCleanup(NULL)
 	, m_symLoadModule(NULL)
 	, m_symUnloadModule(NULL)
@@ -36,6 +33,9 @@ DbgHelpLoader::DbgHelpLoader()
 	, m_symSetOptions(NULL)
 	, m_symFunctionTableAccess(NULL)
 	, m_stackWalk(NULL)
+#ifdef RTS_ENABLE_CRASHDUMP
+	, m_miniDumpWriteDump(NULL)
+#endif
 	, m_dllModule(HMODULE(0))
 	, m_referenceCount(0)
 	, m_failed(false)
@@ -111,9 +111,6 @@ bool DbgHelpLoader::load()
 		Inst->m_loadedFromSystem = true;
 	}
 
-#ifdef RTS_ENABLE_CRASHDUMP
-	Inst->m_miniDumpWriteDump = reinterpret_cast<MiniDumpWriteDump_t>(::GetProcAddress(Inst->m_dllModule, "MiniDumpWriteDump"));
-#endif
 	Inst->m_symInitialize = reinterpret_cast<SymInitialize_t>(::GetProcAddress(Inst->m_dllModule, "SymInitialize"));
 	Inst->m_symCleanup = reinterpret_cast<SymCleanup_t>(::GetProcAddress(Inst->m_dllModule, "SymCleanup"));
 	Inst->m_symLoadModule = reinterpret_cast<SymLoadModule_t>(::GetProcAddress(Inst->m_dllModule, "SymLoadModule"));
@@ -124,6 +121,9 @@ bool DbgHelpLoader::load()
 	Inst->m_symSetOptions = reinterpret_cast<SymSetOptions_t>(::GetProcAddress(Inst->m_dllModule, "SymSetOptions"));
 	Inst->m_symFunctionTableAccess = reinterpret_cast<SymFunctionTableAccess_t>(::GetProcAddress(Inst->m_dllModule, "SymFunctionTableAccess"));
 	Inst->m_stackWalk = reinterpret_cast<StackWalk_t>(::GetProcAddress(Inst->m_dllModule, "StackWalk"));
+#ifdef RTS_ENABLE_CRASHDUMP
+	Inst->m_miniDumpWriteDump = reinterpret_cast<MiniDumpWriteDump_t>(::GetProcAddress(Inst->m_dllModule, "MiniDumpWriteDump"));
+#endif
 
 	if (Inst->m_symInitialize == NULL || Inst->m_symCleanup == NULL)
 	{
@@ -177,26 +177,12 @@ void DbgHelpLoader::freeResources()
 	Inst->m_symSetOptions = NULL;
 	Inst->m_symFunctionTableAccess = NULL;
 	Inst->m_stackWalk = NULL;
-
-	Inst->m_loadedFromSystem = false;
-}
-
 #ifdef RTS_ENABLE_CRASHDUMP
-BOOL DbgHelpLoader::miniDumpWriteDump(
-	HANDLE hProcess,
-	DWORD ProcessId,
-	HANDLE hFile,
-	MINIDUMP_TYPE DumpType,
-	PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
-	PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
-	PMINIDUMP_CALLBACK_INFORMATION CallbackParam)
-{
-	if (Inst != NULL && Inst->m_miniDumpWriteDump)
-		return Inst->m_miniDumpWriteDump(hProcess, ProcessId, hFile, DumpType, ExceptionParam, UserStreamParam, CallbackParam);
+	Inst->m_miniDumpWriteDump = NULL;
+#endif
 
-	return FALSE;
+	Inst->m_loadedFromSystem = false;
 }
-#endif
 
 BOOL DbgHelpLoader::symInitialize(
 	HANDLE hProcess,
@@ -355,3 +341,22 @@ BOOL DbgHelpLoader::stackWalk(
 
 	return FALSE;
 }
+
+#ifdef RTS_ENABLE_CRASHDUMP
+BOOL DbgHelpLoader::miniDumpWriteDump(
+	HANDLE hProcess,
+	DWORD ProcessId,
+	HANDLE hFile,
+	MINIDUMP_TYPE DumpType,
+	PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+	PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
+	PMINIDUMP_CALLBACK_INFORMATION CallbackParam)
+{
+	CriticalSectionClass::LockClass lock(CriticalSection);
+
+	if (Inst != NULL && Inst->m_miniDumpWriteDump)
+		return Inst->m_miniDumpWriteDump(hProcess, ProcessId, hFile, DumpType, ExceptionParam, UserStreamParam, CallbackParam);
+
+	return FALSE;
+}
+#endif

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

@@ -58,17 +58,6 @@ class DbgHelpLoader
 	static bool load();
 	static void unload();
 
-#ifdef RTS_ENABLE_CRASHDUMP
-	static BOOL WINAPI miniDumpWriteDump(
-		HANDLE hProcess,
-		DWORD ProcessId,
-		HANDLE hFile,
-		MINIDUMP_TYPE DumpType,
-		PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
-		PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
-		PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
-#endif
-
 	static BOOL WINAPI symInitialize(
 		HANDLE hProcess,
 		LPSTR UserSearchPath,
@@ -123,6 +112,17 @@ class DbgHelpLoader
 		PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine,
 		PTRANSLATE_ADDRESS_ROUTINE TranslateAddress);
 
+#ifdef RTS_ENABLE_CRASHDUMP
+	static BOOL WINAPI miniDumpWriteDump(
+		HANDLE hProcess,
+		DWORD ProcessId,
+		HANDLE hFile,
+		MINIDUMP_TYPE DumpType,
+		PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+		PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
+		PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
+#endif
+
 private:
 
 	static void freeResources();
@@ -192,9 +192,6 @@ class DbgHelpLoader
 		PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
 #endif
 
-#ifdef RTS_ENABLE_CRASHDUMP
-	MiniDumpWriteDump_t m_miniDumpWriteDump;
-#endif
 	SymInitialize_t m_symInitialize;
 	SymCleanup_t m_symCleanup;
 	SymLoadModule_t m_symLoadModule;
@@ -205,13 +202,15 @@ class DbgHelpLoader
 	SymSetOptions_t m_symSetOptions;
 	SymFunctionTableAccess_t m_symFunctionTableAccess;
 	StackWalk_t m_stackWalk;
+#ifdef RTS_ENABLE_CRASHDUMP
+	MiniDumpWriteDump_t m_miniDumpWriteDump;
+#endif
 
 	typedef std::set<HANDLE, std::less<HANDLE>, stl::system_allocator<HANDLE> > Processes;
 
 	Processes m_initializedProcesses;
 	HMODULE m_dllModule;
 	int m_referenceCount;
-	CriticalSectionClass m_criticalSection;
 	bool m_failed;
 	bool m_loadedFromSystem;
 };