Skip to content

Commit dd5259e

Browse files
committed
fix: add nullptr where NULL was removed but not replaced
1 parent 00b26bc commit dd5259e

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,11 @@ HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hComple
267267

268268
#ifdef SUPPORT_DRM
269269

270-
hr = WMCreateReader( , WMT_RIGHT_PLAYBACK, &m_pReader );
270+
hr = WMCreateReader( nullptr, WMT_RIGHT_PLAYBACK, &m_pReader );
271271

272272
#else
273273

274-
hr = WMCreateReader( , 0, &m_pReader );
274+
hr = WMCreateReader( nullptr, 0, &m_pReader );
275275

276276
#endif
277277

@@ -429,7 +429,7 @@ HRESULT CSimplePlayer::Play( LPCWSTR pszUrl, DWORD dwSecDuration, HANDLE hComple
429429

430430
DWORD cbBuffer = 0;
431431

432-
hr = pProps->GetMediaType( , &cbBuffer );
432+
hr = pProps->GetMediaType( nullptr, &cbBuffer );
433433
if ( FAILED( hr ) )
434434
{
435435
pProps->Release( );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3118,7 +3118,7 @@ void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int en
31183118
fprintf( fp, "Begin Pool Info Report\n" );
31193119
fprintf( fp, "------------------------------------------\n" );
31203120
}
3121-
MemoryPool::debugPoolInfoReport( , fp );
3121+
MemoryPool::debugPoolInfoReport( nullptr, fp );
31223122
for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
31233123
{
31243124
MemoryPool::debugPoolInfoReport( pool, fp );
@@ -3210,7 +3210,7 @@ void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int en
32103210
DEBUG_LOG(("Options: Between checkpoints %d and %d, report on (%s)",startCheckpoint,endCheckpoint,buf));
32113211
DEBUG_LOG(("------------------------------------------"));
32123212

3213-
BlockCheckpointInfo::doBlockCheckpointReport( , "", 0, 0, 0 );
3213+
BlockCheckpointInfo::doBlockCheckpointReport( nullptr, "", 0, 0, 0 );
32143214
for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
32153215
{
32163216
pool->debugCheckpointReport(flags, startCheckpoint, endCheckpoint, pool->getPoolName());

Core/Libraries/Source/debug/test2/test2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
129129
wcex.cbWndExtra = 0;
130130
wcex.hInstance = hInstance;
131131
wcex.hIcon = LoadIcon(hInstance, (LPCTSTR)IDI_TEST2);
132-
wcex.hCursor = LoadCursor(, IDC_ARROW);
132+
wcex.hCursor = LoadCursor(nullptr, IDC_ARROW);
133133
wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
134134
wcex.lpszMenuName = (LPCSTR)IDC_TEST2;
135135
wcex.lpszClassName = szWindowClass;

Core/Tools/Autorun/autorun.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5025,7 +5025,7 @@ HBITMAP LoadResourceButton( HINSTANCE hInstance, LPCTSTR lpString, HPALETTE FAR
50255025
//-----------------------------------------------------------------------
50265026
// Free DS and memory used.
50275027
//-----------------------------------------------------------------------
5028-
ReleaseDC( , hdc );
5028+
ReleaseDC( nullptr, hdc );
50295029
UnlockResource( hGlobal );
50305030
FreeResource( hGlobal );
50315031
}

Core/Tools/Launcher/BFISH.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ typedef union {
8181
BlowfishEngine::~BlowfishEngine(void)
8282
{
8383
if (IsKeyed) {
84-
Submit_Key(, 0);
84+
Submit_Key(nullptr, 0);
8585
}
8686
}
8787

Core/Tools/PATCHGET/CHATAPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ char const * Fetch_String(int id)
874874
FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM, nullptr, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), &message_buffer[0], 256, nullptr );
875875
876876
}
877-
HGLOBAL resdata=LoadResource(,hrsrc);
877+
HGLOBAL resdata=LoadResource(nullptr,hrsrc);
878878
LPVOID vdata=LockResource(resdata);
879879
strcpy(stringptr,(char *)vdata);
880880
*********/

Core/Tools/WW3D/max2w3d/InputDlg.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ BOOL CALLBACK InputDlg::DialogProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
160160
if (!OnOK())
161161
return TRUE;
162162

163-
SetCursor(LoadCursor(, IDC_WAIT));
163+
SetCursor(LoadCursor(nullptr, IDC_WAIT));
164164
EndDialog(m_hWnd, 1);
165165
break;
166166

@@ -180,7 +180,7 @@ BOOL CALLBACK InputDlg::DialogProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
180180
LRESULT InputDlg::OnInitDialog (WPARAM wParam, LPARAM lParam)
181181
{
182182
// Set the cursor to the normal arrow.
183-
SetCursor(LoadCursor(, IDC_ARROW));
183+
SetCursor(LoadCursor(nullptr, IDC_ARROW));
184184

185185
// Set the dialog box caption.
186186
SetWindowText(m_hWnd, m_Caption);

Core/Tools/WW3D/max2w3d/hiersave.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ HierarchySaveClass::HierarchySaveClass
117117
/*
118118
** Build our tree from the given tree of nodes
119119
*/
120-
int rootidx = add_node(,-1);
120+
int rootidx = add_node(nullptr,-1);
121121
assert(rootidx == 0);
122122
add_tree(root,rootidx);
123123

@@ -171,7 +171,7 @@ HierarchySaveClass::HierarchySaveClass
171171
/*
172172
** Build the tree with all leaves of all of the nodes given
173173
*/
174-
int rootidx = add_node(,-1);
174+
int rootidx = add_node(nullptr,-1);
175175
assert(rootidx == 0);
176176

177177
for (unsigned int i = 0; i < rootlist->Num_Nodes(); i++) {

Core/Tools/wolSetup/wolInit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ IChat *g_pChat = nullptr;
193193
void checkInstalledWolapiVersion( void )
194194
{
195195
// Initialize this instance
196-
_Module.Init(, g_hInst);
196+
_Module.Init(nullptr, g_hInst);
197197

198198
// Create the WOLAPI instance
199199
CoCreateInstance(CLSID_Chat, nullptr, CLSCTX_INPROC_SERVER, \

0 commit comments

Comments
 (0)