fix: correct incorrect nullptr conversions and syntax errors

Author: bobtista

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

@@ -267,11 +267,11 @@ HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hComple
 
 #ifdef SUPPORT_DRM
 
-    hr = WMCreateReader( , WMT_RIGHT_PLAYBACK, &m_pReader );
+    hr = WMCreateReader( nullptr, WMT_RIGHT_PLAYBACK, &m_pReader );
 
 #else
 
-    hr = WMCreateReader( , 0, &m_pReader );
+    hr = WMCreateReader( nullptr, 0, &m_pReader );
 
 #endif
 
@@ -429,7 +429,7 @@ HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hComple
 
     DWORD cbBuffer = 0;
 
-    hr = pProps->GetMediaType( , &cbBuffer );
+    hr = pProps->GetMediaType( nullptr, &cbBuffer );
     if ( FAILED( hr ) )
     {
         pProps->Release( );

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

@@ -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( , fp );
+		MemoryPool::debugPoolInfoReport( nullptr, 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( , "", 0, 0, 0 );
+		BlockCheckpointInfo::doBlockCheckpointReport( nullptr, "", 0, 0, 0 );
 		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
 		{
 			pool->debugCheckpointReport(flags, startCheckpoint, endCheckpoint, pool->getPoolName());

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/Include/Lib/BaseTypeCore.h

@@ -90,7 +90,8 @@
 
 #ifndef NULL
 //#define NULL ((void *)0)
-#define NULL 0						// C++ doesn't like casting void *'s into other pointers
+//#define NULL 0						// C++ doesn't like casting void *'s into other pointers
+// NULL is now deprecated - use nullptr instead
 #endif
 
 // MSVC math.h defines overloaded functions with this name...

Core/Libraries/Source/WWVegas/WW3D2/rddesc.h

@@ -62,9 +62,9 @@ class RenderDeviceDescClass
 
 public:
 
-	RenderDeviceDescClass(void) : DeviceName(nullptr), DeviceVendor(nullptr), DevicePlatform(nullptr),
-											DriverName(nullptr), DriverVendor(nullptr), DriverVersion(nullptr),
-											HardwareName(nullptr), HardwareVendor(nullptr), HardwareChipset(NULL)
+	RenderDeviceDescClass(void) : DeviceName(static_cast<const TCHAR*>(nullptr)), DeviceVendor(static_cast<const TCHAR*>(nullptr)), DevicePlatform(static_cast<const TCHAR*>(nullptr)),
+											DriverName(static_cast<const TCHAR*>(nullptr)), DriverVendor(static_cast<const TCHAR*>(nullptr)), DriverVersion(static_cast<const TCHAR*>(nullptr)),
+											HardwareName(static_cast<const TCHAR*>(nullptr)), HardwareVendor(static_cast<const TCHAR*>(nullptr)), HardwareChipset(static_cast<const TCHAR*>(nullptr))
 	{
 	}
 

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/HASHLIST.h

@@ -52,7 +52,8 @@
 #include <memory.h>
 
 #ifndef NULL
-#define NULL (0L)
+//#define NULL (0L)
+// NULL is now deprecated - use nullptr instead
 #endif
 
 #define A_LARGE_PRIME_NUMBER	257