Fix incorrect NULL to nullptr conversions for non-pointer types

Author: bobtista

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;
 	}
 }

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

@@ -145,7 +145,7 @@ Bool StreamingArchiveFile::open( const Char *filename, Int access, size_t buffer
 		return FALSE;
 	}
 
-	return (open( file ) != nullptr);
+	return open( file );
 }
 
 //============================================================================

Core/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp

@@ -423,7 +423,7 @@ Int	BinkVideoStream::frameCount( void )
 
 void BinkVideoStream::frameGoto( Int index )
 {
-	BinkGoto(m_handle, index, nullptr );
+	BinkGoto(m_handle, index, 0 );
 }
 
 //============================================================================

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp

@@ -278,7 +278,7 @@ Int ScreenBWFilter::init(void)
 	Int res;
 	HRESULT hr;
 
-	m_dwBWPixelShader = nullptr;
+	m_dwBWPixelShader = 0;
 	m_curFadeFrame = 0;
 
 	if (!W3DShaderManager::canRenderToTexture()) {
@@ -478,7 +478,7 @@ Int ScreenBWFilter::shutdown(void)
 	if (m_dwBWPixelShader)
 		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBWPixelShader);
 
-	m_dwBWPixelShader=nullptr;
+	m_dwBWPixelShader=0;
 
 	return TRUE;
 }
@@ -1940,9 +1940,9 @@ Int TerrainShaderPixelShader::shutdown(void)
 	if (m_dwBaseNoise2PixelShader)
 		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise2PixelShader);
 
-	m_dwBasePixelShader=nullptr;
-	m_dwBaseNoise1PixelShader=nullptr;
-	m_dwBaseNoise2PixelShader=nullptr;
+	m_dwBasePixelShader=0;
+	m_dwBaseNoise1PixelShader=0;
+	m_dwBaseNoise2PixelShader=0;
 
 	return TRUE;
 }
@@ -2236,7 +2236,7 @@ Int RoadShaderPixelShader::shutdown(void)
 	if (m_dwBaseNoise2PixelShader)
 		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise2PixelShader);
 
-	m_dwBaseNoise2PixelShader=nullptr;
+	m_dwBaseNoise2PixelShader=0;
 
 	return TRUE;
 }
@@ -3476,10 +3476,10 @@ Int FlatTerrainShaderPixelShader::shutdown(void)
 	if (m_dwBaseNoise2PixelShader)
 		DX8Wrapper::_Get_D3D_Device8()->DeletePixelShader(m_dwBaseNoise2PixelShader);
 
-	m_dwBasePixelShader=nullptr;
-	m_dwBase0PixelShader=nullptr;
-	m_dwBaseNoise1PixelShader=nullptr;
-	m_dwBaseNoise2PixelShader=nullptr;
+	m_dwBasePixelShader=0;
+	m_dwBase0PixelShader=0;
+	m_dwBaseNoise1PixelShader=0;
+	m_dwBaseNoise2PixelShader=0;
 
 	return TRUE;
 }

Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp

@@ -1237,7 +1237,7 @@ WWAudioClass::Remove_From_Playlist (AudibleSoundClass *sound_obj)
 		//
 		if (sound_obj->Get_Loop_Count () != INFINITE_LOOPS) {
 			for (index = 0; index < m_EOSCallbackList.Count (); index ++) {
-				uint32 user_data				= nullptr;
+				uint32 user_data				= 0;
 				LPFNEOSCALLBACK callback	= m_EOSCallbackList.Get_Callback (index, &user_data);
 				if (callback != nullptr) {
 					(*callback) (sound_obj, user_data);

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

@@ -719,7 +719,7 @@ void Dump_Exception_Info(EXCEPTION_POINTERS *e_info)
 
 		if (symload) {
 			if (_SymUnloadModule != nullptr) {
-				_SymUnloadModule(GetCurrentProcess(), nullptr);
+				_SymUnloadModule(GetCurrentProcess(), 0);
 			}
 		}
 
@@ -1263,7 +1263,7 @@ int Stack_Walk(unsigned long *return_addresses, int num_addresses, CONTEXT *cont
 	** Walk the stack by the requested number of return address iterations.
 	*/
 	for (int i = 0; i < num_addresses + 1; i++) {
-		if (_StackWalk(IMAGE_FILE_MACHINE_I386, GetCurrentProcess(), GetCurrentThread(), &stack_frame, nullptr, NULL, _SymFunctionTableAccess, _SymGetModuleBase, nullptr)) {
+		if (_StackWalk(IMAGE_FILE_MACHINE_I386, GetCurrentProcess(), GetCurrentThread(), &stack_frame, nullptr, nullptr, _SymFunctionTableAccess, _SymGetModuleBase, nullptr)) {
 
 			/*
 			** First result will always be the return address we were called from.

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

@@ -360,7 +360,7 @@ long Targa::Load(const char* name, char* palette, char* image,bool invert_image)
 	long error = 0;
 
 	/* Open the Targa */
-	if (Open(name, TGA_READMODE) == nullptr) {
+	if (Open(name, TGA_READMODE) == 0) {
 
 		/* Process ColorMap (palette) */
 		if (Header.ColorMapType == 1) {
@@ -422,7 +422,7 @@ long Targa::Load(const char* name, char* palette, char* image,bool invert_image)
 					break;
 
 				case TGA_TRUECOLOR_ENCODED:
-					if ((error = DecodeImage()) == nullptr) {
+					if ((error = DecodeImage()) == 0) {
 						if (invert_image) InvertImage();
 					}
 					break;
@@ -598,7 +598,7 @@ long Targa::Save(const char* name, long flags, bool addextension)
 	TGA2Footer footer;
 
 	/* Open the Targa for write. */
-	if (Open(name, TGA_WRITEMODE) == nullptr)
+	if (Open(name, TGA_WRITEMODE) == 0)
 		{
 		Header.IDLength = 0;
 

Core/Libraries/Source/debug/debug_stack.cpp

@@ -102,7 +102,7 @@ static void InitDbghelp(void)
   {
     // not all functions found -> clear them all
     while (funcptr!=gDbg.funcPtr)
-      *--funcptr=nullptr;
+      *--funcptr=0;
   }
   else
   {

Core/Tools/W3DView/DataTreeView.cpp

@@ -1105,7 +1105,7 @@ CDataTreeView::OnDeleteItem
 	SAFE_DELETE (asset_info);
 
 	// Reset the data associated with this entry
-	GetTreeCtrl ().SetItemData (pNMTreeView->itemOld.hItem, nullptr);
+	GetTreeCtrl ().SetItemData (pNMTreeView->itemOld.hItem, 0);
 	(*pResult) = 0;
 	return ;
 }

Generals/Code/GameEngine/Source/Common/System/encrypt.cpp

@@ -79,7 +79,7 @@ const char *EncryptString(const char *String)
 	for (Cnt = 0; Cnt < MAX_ENCRYPTED_STRING; Cnt++)
 		Return_Buffer[Cnt] = Base_String[Temp_Buffer[Cnt] & 0x3F];
 
-	Return_Buffer[Cnt] = nullptr;
+	Return_Buffer[Cnt] = '\0';
 	return (Return_Buffer);
 
 }