refactor: modernize NULL to nullptr in two more files

Author: bobtista

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

@@ -24,10 +24,10 @@
 #include "gitinfo.h"
 
 // Globals for storing the pointer to the exception
-_EXCEPTION_POINTERS* g_dumpException = NULL;
+_EXCEPTION_POINTERS* g_dumpException = nullptr;
 DWORD g_dumpExceptionThreadId = 0;
 
-MiniDumper* TheMiniDumper = NULL;
+MiniDumper* TheMiniDumper = nullptr;
 
 // Globals containing state about the current exception that's used for context in the mini dump.
 // These are populated by MiniDumper::DumpingExceptionFilter to store a copy of the exception in case it goes out of scope
@@ -39,7 +39,7 @@ constexpr const char* DumpFileNamePrefix = "Crash";
 
 void MiniDumper::initMiniDumper(const AsciiString& userDirPath)
 {
-	DEBUG_ASSERTCRASH(TheMiniDumper == NULL, ("MiniDumper::initMiniDumper called on already created instance"));
+	DEBUG_ASSERTCRASH(TheMiniDumper == nullptr, ("MiniDumper::initMiniDumper called on already created instance"));
 
 	// Use placement new on the process heap so TheMiniDumper is placed outside the MemoryPoolFactory managed area.
 	// If the crash is due to corrupted MemoryPoolFactory structures, try to mitigate the chances of MiniDumper memory also being corrupted
@@ -54,7 +54,7 @@ void MiniDumper::shutdownMiniDumper()
 		TheMiniDumper->ShutDown();
 		TheMiniDumper->~MiniDumper();
 		::HeapFree(::GetProcessHeap(), NULL, TheMiniDumper);
-		TheMiniDumper = NULL;
+		TheMiniDumper = nullptr;
 	}
 }
 
@@ -63,10 +63,10 @@ MiniDumper::MiniDumper()
 	m_miniDumpInitialized = false;
 	m_loadedDbgHelp = false;
 	m_requestedDumpType = DumpType_Minimal;
-	m_dumpRequested = NULL;
-	m_dumpComplete = NULL;
-	m_quitting = NULL;
-	m_dumpThread = NULL;
+	m_dumpRequested = nullptr;
+	m_dumpComplete = nullptr;
+	m_quitting = nullptr;
+	m_dumpThread = nullptr;
 	m_dumpThreadId = 0;
 	m_dumpDir[0] = 0;
 	m_dumpFile[0] = 0;
@@ -145,7 +145,7 @@ void MiniDumper::Initialize(const AsciiString& userDirPath)
 		return;
 	}
 
-	DWORD executableSize = ::GetModuleFileNameW(NULL, m_executablePath, ARRAY_SIZE(m_executablePath));
+	DWORD executableSize = ::GetModuleFileNameW(nullptr, m_executablePath, ARRAY_SIZE(m_executablePath));
 	if (executableSize == 0 || executableSize == ARRAY_SIZE(m_executablePath))
 	{
 		DEBUG_LOG(("MiniDumper::Initialize: Could not get executable file name. Returned value=%u", executableSize));
@@ -158,18 +158,18 @@ void MiniDumper::Initialize(const AsciiString& userDirPath)
 		return;
 	}
 
-	m_dumpRequested = CreateEvent(NULL, TRUE, FALSE, NULL);
-	m_dumpComplete = CreateEvent(NULL, TRUE, FALSE, NULL);
-	m_quitting = CreateEvent(NULL, TRUE, FALSE, NULL);
+	m_dumpRequested = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+	m_dumpComplete = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+	m_quitting = CreateEvent(nullptr, TRUE, FALSE, nullptr);
 
-	if (m_dumpRequested == NULL || m_dumpComplete == NULL || m_quitting == NULL)
+	if (m_dumpRequested == nullptr || m_dumpComplete == nullptr || m_quitting == nullptr)
 	{
 		// Something went wrong with the creation of the events..
 		DEBUG_LOG(("MiniDumper::Initialize: Unable to create events: error=%u", ::GetLastError()));
 		return;
 	}
 
-	m_dumpThread = ::CreateThread(NULL, 0, MiniDumpThreadProc, this, CREATE_SUSPENDED, &m_dumpThreadId);
+	m_dumpThread = ::CreateThread(nullptr, 0, MiniDumpThreadProc, this, CREATE_SUSPENDED, &m_dumpThreadId);
 	if (!m_dumpThread)
 	{
 		DEBUG_LOG(("MiniDumper::Initialize: Unable to create thread: error=%u", ::GetLastError()));
@@ -194,7 +194,7 @@ Bool MiniDumper::IsInitialized() const
 Bool MiniDumper::IsDumpThreadStillRunning() const
 {
 	DWORD exitCode;
-	if (m_dumpThread != NULL && ::GetExitCodeThread(m_dumpThread, &exitCode) && exitCode == STILL_ACTIVE)
+	if (m_dumpThread != nullptr && ::GetExitCodeThread(m_dumpThread, &exitCode) && exitCode == STILL_ACTIVE)
 	{
 		return true;
 	}
@@ -211,7 +211,7 @@ Bool MiniDumper::InitializeDumpDirectory(const AsciiString& userDirPath)
 	strlcat(m_dumpDir, "CrashDumps\\", ARRAY_SIZE(m_dumpDir));
 	if (::_access(m_dumpDir, 0) != 0)
 	{
-		if (!::CreateDirectory(m_dumpDir, NULL))
+		if (!::CreateDirectory(m_dumpDir, nullptr))
 		{
 			DEBUG_LOG(("MiniDumper::Initialize: Unable to create path for crash dumps at '%s': error=%u", m_dumpDir, ::GetLastError()));
 			return false;
@@ -229,7 +229,7 @@ void MiniDumper::ShutdownDumpThread()
 {
 	if (IsDumpThreadStillRunning())
 	{
-		DEBUG_ASSERTCRASH(m_quitting != NULL, ("MiniDumper::ShutdownDumpThread: Dump thread still running despite m_quitting being NULL"));
+		DEBUG_ASSERTCRASH(m_quitting != nullptr, ("MiniDumper::ShutdownDumpThread: Dump thread still running despite m_quitting being nullptr"));
 		::SetEvent(m_quitting);
 
 		DWORD waitRet = ::WaitForSingleObject(m_dumpThread, 3000);
@@ -256,29 +256,29 @@ void MiniDumper::ShutDown()
 {
 	ShutdownDumpThread();
 
-	if (m_dumpThread != NULL)
+	if (m_dumpThread != nullptr)
 	{
 		DEBUG_ASSERTCRASH(!IsDumpThreadStillRunning(), ("MiniDumper::ShutDown: ShutdownDumpThread() was unable to stop Dump thread"));
 		::CloseHandle(m_dumpThread);
-		m_dumpThread = NULL;
+		m_dumpThread = nullptr;
 	}
 
-	if (m_quitting != NULL)
+	if (m_quitting != nullptr)
 	{
 		::CloseHandle(m_quitting);
-		m_quitting = NULL;
+		m_quitting = nullptr;
 	}
 
-	if (m_dumpComplete != NULL)
+	if (m_dumpComplete != nullptr)
 	{
 		::CloseHandle(m_dumpComplete);
-		m_dumpComplete = NULL;
+		m_dumpComplete = nullptr;
 	}
 
-	if (m_dumpRequested != NULL)
+	if (m_dumpRequested != nullptr)
 	{
 		::CloseHandle(m_dumpRequested);
-		m_dumpRequested = NULL;
+		m_dumpRequested = nullptr;
 	}
 
 	if (m_loadedDbgHelp)
@@ -320,9 +320,9 @@ DWORD MiniDumper::ThreadProcInternal()
 
 DWORD WINAPI MiniDumper::MiniDumpThreadProc(LPVOID lpParam)
 {
-	if (lpParam == NULL)
+	if (lpParam == nullptr)
 	{
-		DEBUG_LOG(("MiniDumper::MiniDumpThreadProc: The provided parameter was NULL, exiting thread."));
+		DEBUG_LOG(("MiniDumper::MiniDumpThreadProc: The provided parameter was nullptr, exiting thread."));
 		return MiniDumperExitCode_FailureParam;
 	}
 
@@ -350,16 +350,16 @@ void MiniDumper::CreateMiniDump(DumpType dumpType)
 		sysTime.wDay, sysTime.wHour, sysTime.wMinute, sysTime.wSecond,
 		GitShortSHA1, currentProcessId);
 
-	HANDLE dumpFile = ::CreateFile(m_dumpFile, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-	if (dumpFile == NULL || dumpFile == INVALID_HANDLE_VALUE)
+	HANDLE dumpFile = ::CreateFile(m_dumpFile, GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
+	if (dumpFile == nullptr || dumpFile == INVALID_HANDLE_VALUE)
 	{
 		DEBUG_LOG(("MiniDumper::CreateMiniDump: Unable to create dump file '%s': error=%u", m_dumpFile, ::GetLastError()));
 		return;
 	}
 
-	PMINIDUMP_EXCEPTION_INFORMATION exceptionInfoPtr = NULL;
+	PMINIDUMP_EXCEPTION_INFORMATION exceptionInfoPtr = nullptr;
 	MINIDUMP_EXCEPTION_INFORMATION exceptionInfo = { 0 };
-	if (g_dumpException != NULL)
+	if (g_dumpException != nullptr)
 	{
 		exceptionInfo.ExceptionPointers = g_dumpException;
 		exceptionInfo.ThreadId = g_dumpExceptionThreadId;
@@ -386,8 +386,8 @@ void MiniDumper::CreateMiniDump(DumpType dumpType)
 		dumpFile,
 		miniDumpType,
 		exceptionInfoPtr,
-		NULL,
-		NULL);
+		nullptr,
+		nullptr);
 
 	if (!success)
 	{

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

@@ -19,7 +19,7 @@
 #include "DbgHelpLoader.h"
 
 
-DbgHelpLoader* DbgHelpLoader::Inst = NULL;
+DbgHelpLoader* DbgHelpLoader::Inst = nullptr;
 CriticalSectionClass DbgHelpLoader::CriticalSection;
 
 DbgHelpLoader::DbgHelpLoader()
@@ -34,7 +34,7 @@ DbgHelpLoader::DbgHelpLoader()
 	, m_symFunctionTableAccess(NULL)
 	, m_stackWalk(NULL)
 #ifdef RTS_ENABLE_CRASHDUMP
-	, m_miniDumpWriteDump(NULL)
+	, m_miniDumpWriteDump(nullptr)
 #endif
 	, m_dllModule(HMODULE(0))
 	, m_referenceCount(0)
@@ -51,7 +51,7 @@ bool DbgHelpLoader::isLoaded()
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	return Inst != NULL && Inst->m_dllModule != HMODULE(0);
+	return Inst != nullptr && Inst->m_dllModule != HMODULE(0);
 }
 
 bool DbgHelpLoader::isLoadedFromSystem()
@@ -65,14 +65,14 @@ bool DbgHelpLoader::isFailed()
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	return Inst != NULL && Inst->m_failed;
+	return Inst != nullptr && Inst->m_failed;
 }
 
 bool DbgHelpLoader::load()
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst == NULL)
+	if (Inst == nullptr)
 	{
 		// Cannot use new/delete here when this is loaded during game memory initialization.
 		void* p = GlobalAlloc(GMEM_FIXED, sizeof(DbgHelpLoader));
@@ -139,7 +139,7 @@ void DbgHelpLoader::unload()
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst == NULL)
+	if (Inst == nullptr)
 		return;
 
 	if (--Inst->m_referenceCount != 0)
@@ -149,7 +149,7 @@ void DbgHelpLoader::unload()
 
 	Inst->~DbgHelpLoader();
 	GlobalFree(Inst);
-	Inst = NULL;
+	Inst = nullptr;
 }
 
 void DbgHelpLoader::freeResources()
@@ -242,7 +242,7 @@ BOOL DbgHelpLoader::symLoadModule(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symLoadModule)
+	if (Inst != nullptr && Inst->m_symLoadModule)
 		return Inst->m_symLoadModule(hProcess, hFile, ImageName, ModuleName, BaseOfDll, SizeOfDll);
 
 	return FALSE;
@@ -254,7 +254,7 @@ DWORD DbgHelpLoader::symGetModuleBase(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symGetModuleBase)
+	if (Inst != nullptr && Inst->m_symGetModuleBase)
 		return Inst->m_symGetModuleBase(hProcess, dwAddr);
 
 	return 0u;
@@ -266,7 +266,7 @@ BOOL DbgHelpLoader::symUnloadModule(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symUnloadModule)
+	if (Inst != nullptr && Inst->m_symUnloadModule)
 		return Inst->m_symUnloadModule(hProcess, BaseOfDll);
 
 	return FALSE;
@@ -280,7 +280,7 @@ BOOL DbgHelpLoader::symGetSymFromAddr(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symGetSymFromAddr)
+	if (Inst != nullptr && Inst->m_symGetSymFromAddr)
 		return Inst->m_symGetSymFromAddr(hProcess, Address, Displacement, Symbol);
 
 	return FALSE;
@@ -294,7 +294,7 @@ BOOL DbgHelpLoader::symGetLineFromAddr(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symGetLineFromAddr)
+	if (Inst != nullptr && Inst->m_symGetLineFromAddr)
 		return Inst->m_symGetLineFromAddr(hProcess, dwAddr, pdwDisplacement, Line);
 
 	return FALSE;
@@ -305,7 +305,7 @@ DWORD DbgHelpLoader::symSetOptions(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symSetOptions)
+	if (Inst != nullptr && Inst->m_symSetOptions)
 		return Inst->m_symSetOptions(SymOptions);
 
 	return 0u;
@@ -317,7 +317,7 @@ LPVOID DbgHelpLoader::symFunctionTableAccess(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_symFunctionTableAccess)
+	if (Inst != nullptr && Inst->m_symFunctionTableAccess)
 		return Inst->m_symFunctionTableAccess(hProcess, AddrBase);
 
 	return NULL;
@@ -336,7 +336,7 @@ BOOL DbgHelpLoader::stackWalk(
 {
 	CriticalSectionClass::LockClass lock(CriticalSection);
 
-	if (Inst != NULL && Inst->m_stackWalk)
+	if (Inst != nullptr && Inst->m_stackWalk)
 		return Inst->m_stackWalk(MachineType, hProcess, hThread, StackFrame, ContextRecord, ReadMemoryRoutine, FunctionTableAccessRoutine, GetModuleBaseRoutine, TranslateAddress);
 
 	return FALSE;