refactor: convert pointer assignments and comparisons from NULL to nullptr

Author: bobtista

Core/GameEngine/Include/Common/AsciiString.h

@@ -353,7 +353,7 @@ class AsciiString
 		token was found. (note that this modifies 'this' as well, stripping
 		the token off!)
 	*/
-	Bool nextToken(AsciiString* token, const char* seps = NULL);
+	Bool nextToken(AsciiString* token, const char* seps = nullptr);
 
 	/**
 		return true iff the string is "NONE" (case-insensitive).
@@ -420,7 +420,7 @@ inline int AsciiString::getByteCount() const
 inline Bool AsciiString::isEmpty() const
 {
 	validate();
-	return m_data == NULL || peek()[0] == 0;
+	return m_data == nullptr || peek()[0] == 0;
 }
 
 // -----------------------------------------------------

Core/GameEngine/Include/Common/UnicodeString.h

@@ -394,7 +394,7 @@ inline int UnicodeString::getByteCount() const
 inline Bool UnicodeString::isEmpty() const
 {
 	validate();
-	return m_data == NULL || peek()[0] == 0;
+	return m_data == nullptr || peek()[0] == 0;
 }
 
 // -----------------------------------------------------

Core/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h

@@ -60,7 +60,7 @@ public C
 		HRESULT TypeLibraryLoadResult;
 		char filename[256];
 
-		GetModuleFileName(NULL, filename, sizeof(filename));
+		GetModuleFileName(nullptr, filename, sizeof(filename));
 		_bstr_t bstr(filename);
 
 		TypeLibraryLoadResult = LoadTypeLib(bstr, &ptlib);

Core/GameEngine/Source/Common/Audio/simpleplayer.cpp

@@ -38,12 +38,12 @@ CSimplePlayer::CSimplePlayer( HRESULT* phr )
 
 	*phr = S_OK;
 
-    m_hOpenEvent = CreateEvent( NULL, FALSE, FALSE, SIMPLE_PLAYER_OPEN_EVENT );
+    m_hOpenEvent = CreateEvent( nullptr, FALSE, FALSE, SIMPLE_PLAYER_OPEN_EVENT );
 	if ( NULL == m_hOpenEvent )
 	{
 		*phr = E_OUTOFMEMORY;
 	}
-    m_hCloseEvent = CreateEvent( NULL, FALSE, FALSE, SIMPLE_PLAYER_CLOSE_EVENT );
+    m_hCloseEvent = CreateEvent( nullptr, FALSE, FALSE, SIMPLE_PLAYER_CLOSE_EVENT );
 	if ( NULL == m_hCloseEvent )
 	{
 		*phr = E_OUTOFMEMORY;
@@ -267,11 +267,11 @@ HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hComple
 
 #ifdef SUPPORT_DRM
 
-    hr = WMCreateReader( NULL, WMT_RIGHT_PLAYBACK, &m_pReader );
+    hr = WMCreateReader( , WMT_RIGHT_PLAYBACK, &m_pReader );
 
 #else
 
-    hr = WMCreateReader( NULL, 0, &m_pReader );
+    hr = WMCreateReader( , 0, &m_pReader );
 
 #endif
 
@@ -429,7 +429,7 @@ HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hComple
 
     DWORD cbBuffer = 0;
 
-    hr = pProps->GetMediaType( NULL, &cbBuffer );
+    hr = pProps->GetMediaType( , &cbBuffer );
     if ( FAILED( hr ) )
     {
         pProps->Release( );

Core/GameEngine/Source/Common/Audio/urllaunch.cpp

@@ -26,7 +26,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL )
 {
-    if( ( NULL == pszInURL ) || ( NULL == ppszOutURL ) )
+    if( ( nullptr == pszInURL ) || ( nullptr == ppszOutURL ) )
     {
         return( E_INVALIDARG );
     }
@@ -46,7 +46,7 @@ HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL )
     {
         LPWSTR pchToEscape = wcspbrk( pszTemp, L" #$%&\\+,;=@[]^{}" );
 
-        if( NULL == pchToEscape )
+        if( nullptr == pchToEscape )
         {
             break;
         }
@@ -68,7 +68,7 @@ HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL )
 
     *ppszOutURL = new WCHAR[ cchNeeded ];
 
-    if( NULL == *ppszOutURL )
+    if( nullptr == *ppszOutURL )
     {
         return( E_OUTOFMEMORY );
     }
@@ -90,7 +90,7 @@ HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL )
     {
         LPWSTR pchToEscape = wcspbrk( pszTemp, L" #$%&\\+,;=@[]^{}" );
 
-        if( NULL == pchToEscape )
+        if( nullptr == pchToEscape )
         {
             //
             // Copy the rest of the input string and get out
@@ -187,7 +187,7 @@ HRESULT GetShellOpenCommand( LPTSTR ptszShellOpenCommand, DWORD cbShellOpenComma
     //
     if( !fFoundExtensionCommand )
     {
-        if( NULL != hKey )
+        if( nullptr != hKey )
         {
             RegCloseKey( hKey );
         }
@@ -211,12 +211,12 @@ HRESULT GetShellOpenCommand( LPTSTR ptszShellOpenCommand, DWORD cbShellOpenComma
         while( FALSE );
     }
 
-    if( NULL != hKey )
+    if( nullptr != hKey )
     {
         RegCloseKey( hKey );
     }
 
-    if( NULL != hFileKey )
+    if( nullptr != hFileKey )
     {
         RegCloseKey( hFileKey );
     }
@@ -249,12 +249,12 @@ HRESULT LaunchURL( LPCWSTR pszURL )
 
     LPTSTR pszParam = _tcsstr( szShellOpenCommand, _T( "\"%1\"" ) );
 
-    if( NULL == pszParam )
+    if( nullptr == pszParam )
     {
         pszParam = _tcsstr( szShellOpenCommand, _T( "\"%*\"" ) );
     }
 
-    if( NULL != pszParam )
+    if( nullptr != pszParam )
     {
         *pszParam = _T( '\0' ) ;
 
@@ -288,7 +288,7 @@ HRESULT LaunchURL( LPCWSTR pszURL )
         pchNext = _tcschr( pchFirst + 1, _T( ' ' ) );
     }
 
-    if( NULL == pchNext )
+    if( nullptr == pchNext )
     {
         pchNext = szShellOpenCommand + _tcslen( szShellOpenCommand );
     }
@@ -313,8 +313,8 @@ HRESULT LaunchURL( LPCWSTR pszURL )
 
     StartUp.cb = sizeof(STARTUPINFO);
 
-    if( !CreateProcess( szExe, szLaunchCommand, nullptr, NULL,
-                        FALSE, 0, nullptr, NULL, &StartUp, &ProcInfo) )
+    if( !CreateProcess( szExe, szLaunchCommand, nullptr, nullptr,
+                        FALSE, 0, nullptr, nullptr, &StartUp, &ProcInfo) )
     {
         hr = HRESULT_FROM_WIN32( GetLastError() );
     }
@@ -324,12 +324,12 @@ HRESULT LaunchURL( LPCWSTR pszURL )
         // CreateProcess succeeded and we do not need the handles to the thread
         // or the process, so close them now.
         //
-        if( NULL != ProcInfo.hThread )
+        if( nullptr != ProcInfo.hThread )
         {
             CloseHandle( ProcInfo.hThread );
         }
 
-        if( NULL != ProcInfo.hProcess )
+        if( nullptr != ProcInfo.hProcess )
         {
             CloseHandle( ProcInfo.hProcess );
         }

Core/GameEngine/Source/Common/CRCDebug.cpp

@@ -188,7 +188,7 @@ static AsciiString getFname(AsciiString path)
 
 static void addCRCDebugLineInternal(bool count, const char *fmt, va_list args)
 {
-	if (TheGameLogic == NULL || !(IS_FRAME_OK_TO_LOG))
+	if (TheGameLogic == nullptr || !(IS_FRAME_OK_TO_LOG))
 		return;
 
 	if (lastCRCDebugFrame != TheGameLogic->getFrame())

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

@@ -378,7 +378,7 @@ void DebugInit(int flags)
 			return;
 
 		char dirbuf[ _MAX_PATH ];
-		::GetModuleFileName( NULL, dirbuf, sizeof( dirbuf ) );
+		::GetModuleFileName( nullptr, dirbuf, sizeof( dirbuf ) );
 		if (char *pEnd = strrchr(dirbuf, '\\'))
 		{
 			*(pEnd + 1) = 0;
@@ -809,7 +809,7 @@ void ReleaseCrash(const char *reason)
 #if defined(RTS_DEBUG)
 	/* static */ char buff[8192]; // not so static so we can be threadsafe
 	snprintf(buff, 8192, "Sorry, a serious error occurred. (%s)", reason);
-	::MessageBox(NULL, buff, "Technical Difficulties...", MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
+	::MessageBox(nullptr, buff, "Technical Difficulties...", MB_OK|MB_SYSTEMMODAL|MB_ICONERROR);
 #else
 // crash error messaged changed 3/6/03 BGC
 //	::MessageBox(NULL, "Sorry, a serious error occurred.", "Technical Difficulties...", MB_OK|MB_TASKMODAL|MB_ICONERROR);

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

@@ -616,7 +616,7 @@ inline MemoryPoolSingleBlock *MemoryPoolSingleBlock::getNextRawBlock()
 */
 inline void MemoryPoolSingleBlock::setNextRawBlock(MemoryPoolSingleBlock *b)
 {
-	DEBUG_ASSERTCRASH(m_owningBlob == NULL && (!b || b->m_owningBlob == nullptr), ("must be called on raw block"));
+	DEBUG_ASSERTCRASH(m_owningBlob == nullptr && (!b || b->m_owningBlob == nullptr), ("must be called on raw block"));
 	m_nextBlock = b;
 #ifdef MPSB_DLINK
 	if (b)
@@ -942,7 +942,7 @@ void MemoryPoolSingleBlock::removeBlockFromList(MemoryPoolSingleBlock **pHead)
 {
 	DEBUG_ASSERTCRASH(this->m_owningBlob == nullptr, ("this function should only be used on raw blocks"));
 #ifdef MPSB_DLINK
-	DEBUG_ASSERTCRASH(this->m_nextBlock == NULL || this->m_nextBlock->m_owningBlob == nullptr, ("this function should only be used on raw blocks"));
+	DEBUG_ASSERTCRASH(this->m_nextBlock == nullptr || this->m_nextBlock->m_owningBlob == nullptr, ("this function should only be used on raw blocks"));
 	if (this->m_prevBlock)
 	{
 		DEBUG_ASSERTCRASH(this->m_prevBlock->m_owningBlob == nullptr, ("this function should only be used on raw blocks"));
@@ -1038,11 +1038,11 @@ void MemoryPoolSingleBlock::debugVerifyBlock()
 	DEBUG_ASSERTCRASH(m_debugLiteralTagString != nullptr, ("bad tagstring"));
 	/// @todo Put this check back in after the AI memory usage is under control (MSB)
 	//DEBUG_ASSERTCRASH(m_logicalSize>0 && m_logicalSize < 0x00ffffff, ("unlikely value for m_logicalSize"));
-	DEBUG_ASSERTCRASH(m_nextBlock == NULL
+	DEBUG_ASSERTCRASH(m_nextBlock == nullptr
 		|| memcmp(&m_nextBlock->m_owningBlob, &s_initFillerValue, sizeof(s_initFillerValue)) == 0
 		|| m_nextBlock->m_owningBlob == m_owningBlob, ("owning blob mismatch..."));
 #ifdef MPSB_DLINK
-	DEBUG_ASSERTCRASH(m_prevBlock == NULL
+	DEBUG_ASSERTCRASH(m_prevBlock == nullptr
 		|| memcmp(&m_prevBlock->m_owningBlob, &s_initFillerValue, sizeof(s_initFillerValue)) == 0
 		|| m_prevBlock->m_owningBlob == m_owningBlob, ("owning blob mismatch..."));
 #endif
@@ -3118,7 +3118,7 @@ void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int en
 			fprintf( fp, "Begin Pool Info Report\n" );
 			fprintf( fp, "------------------------------------------\n" );
 		}
-		MemoryPool::debugPoolInfoReport( NULL, fp );
+		MemoryPool::debugPoolInfoReport( , fp );
 		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
 		{
 			MemoryPool::debugPoolInfoReport( pool, fp );
@@ -3210,7 +3210,7 @@ void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int en
 		DEBUG_LOG(("Options: Between checkpoints %d and %d, report on (%s)",startCheckpoint,endCheckpoint,buf));
 		DEBUG_LOG(("------------------------------------------"));
 
-		BlockCheckpointInfo::doBlockCheckpointReport( NULL, "", 0, 0, 0 );
+		BlockCheckpointInfo::doBlockCheckpointReport( , "", 0, 0, 0 );
 		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
 		{
 			pool->debugCheckpointReport(flags, startCheckpoint, endCheckpoint, pool->getPoolName());

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

@@ -108,7 +108,7 @@ void MemoryPoolFactory::debugSetInitFillerIndex(Int index)
 */
 void initMemoryManager()
 {
-	if (TheMemoryPoolFactory == NULL && TheDynamicMemoryAllocator == nullptr)
+	if (TheMemoryPoolFactory == nullptr && TheDynamicMemoryAllocator == nullptr)
 	{
 		TheMemoryPoolFactory = new (malloc(sizeof MemoryPoolFactory)) MemoryPoolFactory;
 		TheDynamicMemoryAllocator = new (malloc(sizeof DynamicMemoryAllocator)) DynamicMemoryAllocator;

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

@@ -54,7 +54,7 @@ void MiniDumper::shutdownMiniDumper()
 	{
 		TheMiniDumper->ShutDown();
 		TheMiniDumper->~MiniDumper();
-		::HeapFree(::GetProcessHeap(), nullptr, TheMiniDumper);
+		::HeapFree(::GetProcessHeap(), 0, TheMiniDumper);
 		TheMiniDumper = nullptr;
 	}
 }
@@ -146,7 +146,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));
@@ -159,9 +159,9 @@ void MiniDumper::Initialize(const AsciiString& userDirPath)
 		return;
 	}
 
-	m_dumpRequested = CreateEvent(NULL, TRUE, FALSE, nullptr);
-	m_dumpComplete = CreateEvent(NULL, TRUE, FALSE, nullptr);
-	m_quitting = CreateEvent(NULL, TRUE, FALSE, nullptr);
+	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 == nullptr)
 	{
@@ -170,7 +170,7 @@ void MiniDumper::Initialize(const AsciiString& userDirPath)
 		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()));
@@ -351,7 +351,7 @@ 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);
+	HANDLE dumpFile = ::CreateFile(m_dumpFile, GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
 	if (dumpFile == NULL || dumpFile == INVALID_HANDLE_VALUE)
 	{
 		DEBUG_LOG(("MiniDumper::CreateMiniDump: Unable to create dump file '%s': error=%u", m_dumpFile, ::GetLastError()));
@@ -387,8 +387,8 @@ void MiniDumper::CreateMiniDump(DumpType dumpType)
 		dumpFile,
 		miniDumpType,
 		exceptionInfoPtr,
-		NULL,
-		NULL);
+		nullptr,
+		nullptr);
 
 	if (!success)
 	{