Misc coding guidelines conformance fixes (from my recent commits + extended)

Author: Dutchman101

Client/core/CAdditionalVertexStreamManager.cpp

@@ -12,7 +12,7 @@
 #include "StdInc.h"
 #include "CAdditionalVertexStreamManager.h"
 
-CAdditionalVertexStreamManager* CAdditionalVertexStreamManager::ms_Singleton = NULL;
+CAdditionalVertexStreamManager* CAdditionalVertexStreamManager::ms_Singleton = nullptr;
 
 namespace
 {
@@ -69,15 +69,15 @@ CAdditionalVertexStreamManager::~CAdditionalVertexStreamManager()
 {
     SAFE_RELEASE(m_pOldVertexDeclaration);
 
-    for (std::map<void*, SAdditionalStreamInfo>::iterator iter = m_AdditionalStreamInfoMap.begin(); iter != m_AdditionalStreamInfoMap.end(); ++iter)
+    for (auto iter = m_AdditionalStreamInfoMap.begin(); iter != m_AdditionalStreamInfoMap.end(); ++iter)
     {
         SAdditionalStreamInfo& info = iter->second;
         SAFE_RELEASE(info.pStreamData);
         SAFE_RELEASE(info.pVertexDeclaration);
     }
 
     m_AdditionalStreamInfoMap.clear();
-    m_pDevice = NULL;
+    m_pDevice = nullptr;
 }
 
 ///////////////////////////////////////////////////////////////
@@ -94,7 +94,7 @@ CAdditionalVertexStreamManager* CAdditionalVertexStreamManager::GetSingleton()
     return ms_Singleton;
 }
 
-CAdditionalVertexStreamManager* CAdditionalVertexStreamManager::GetExistingSingleton()
+CAdditionalVertexStreamManager* const& CAdditionalVertexStreamManager::GetExistingSingleton() noexcept
 {
     return ms_Singleton;
 }
@@ -104,7 +104,7 @@ void CAdditionalVertexStreamManager::DestroySingleton()
     if (ms_Singleton)
     {
         delete ms_Singleton;
-        ms_Singleton = NULL;
+        ms_Singleton = nullptr;
     }
 }
 
@@ -227,7 +227,7 @@ void CAdditionalVertexStreamManager::MaybeUnsetAdditionalVertexStream()
         SAFE_RELEASE(m_pOldVertexDeclaration);
 
         // Unset additional stream
-        hr = m_pDevice->SetStreamSource(2, NULL, 0, 0);
+        hr = m_pDevice->SetStreamSource(2, nullptr, 0, 0);
     }
 }
 
@@ -254,7 +254,7 @@ bool CAdditionalVertexStreamManager::UpdateAdditionalStreamContent(SCurrentState
     sourceArray.resize(ReadSize);
     uchar* pSourceArrayBytes = &sourceArray[0];
     {
-        void* pVertexBytesPT = NULL;
+        void* pVertexBytesPT = nullptr;
         if (FAILED(pStreamDataPT->Lock(ReadOffsetStart, ReadSize, &pVertexBytesPT, D3DLOCK_NOSYSLOCK | D3DLOCK_READONLY)))
             return false;
         memcpy(pSourceArrayBytes, pVertexBytesPT, ReadSize);
@@ -290,7 +290,7 @@ bool CAdditionalVertexStreamManager::UpdateAdditionalStreamContent(SCurrentState
         indexArray.resize(ReadSize);
         uchar* pIndexArrayBytes = &indexArray[0];
         {
-            void* pIndexBytes = NULL;
+            void* pIndexBytes = nullptr;
             if (FAILED(state.pIndexData->Lock(state.args.startIndex * 2, numIndices * 2, &pIndexBytes, D3DLOCK_NOSYSLOCK | D3DLOCK_READONLY)))
                 return false;
             memcpy(pIndexArrayBytes, pIndexBytes, numIndices * 2);
@@ -372,7 +372,7 @@ bool CAdditionalVertexStreamManager::UpdateAdditionalStreamContent(SCurrentState
 
     // Set the dest bytes
     {
-        void* pVertexBytesN = NULL;
+        void* pVertexBytesN = nullptr;
         if (FAILED(pStreamDataN->Lock(WriteOffsetStart, WriteSize, &pVertexBytesN, D3DLOCK_NOSYSLOCK)))
             return false;
         memcpy(pVertexBytesN, pDestArrayBytes, WriteSize);
@@ -407,7 +407,7 @@ bool CAdditionalVertexStreamManager::UpdateCurrentStateInfo(SCurrentStateInfo& s
 
     // Get vertex stream
     if (FAILED(m_pDevice->GetStreamSource(1, &state.stream1.pStreamData, &state.stream1.OffsetInBytes, &state.stream1.Stride)))
-        return NULL;
+        return false;
 
     // Get vertex stream desc
     if (state.stream1.pStreamData)
@@ -505,7 +505,7 @@ SAdditionalStreamInfo* CAdditionalVertexStreamManager::CreateAdditionalStreamInf
         // Create new stream
         info.Stride = sizeof(float) * 3;
         UINT Size2 = ConvertPTSize(state.decl.VertexBufferDesc1.Size);
-        if (FAILED(m_pDevice->CreateVertexBuffer(Size2, D3DUSAGE_WRITEONLY, 0, D3DPOOL_MANAGED, &info.pStreamData, NULL)))
+        if (FAILED(m_pDevice->CreateVertexBuffer(Size2, D3DUSAGE_WRITEONLY, 0, D3DPOOL_MANAGED, &info.pStreamData, nullptr)))
         {
             SAFE_RELEASE(info.pVertexDeclaration);
             return nullptr;

Client/core/CAdditionalVertexStreamManager.h

@@ -84,7 +84,7 @@ class CAdditionalVertexStreamManager
     void OnVertexBufferRangeInvalidated(IDirect3DVertexBuffer9* pStreamData, uint Offset, uint Size);
 
     static CAdditionalVertexStreamManager* GetSingleton();
-    static CAdditionalVertexStreamManager* GetExistingSingleton();
+    static CAdditionalVertexStreamManager* const& GetExistingSingleton() noexcept;
     static void DestroySingleton();
 
 protected:

Client/core/DXHook/CDirect3DEvents9.cpp

@@ -95,15 +95,15 @@ void CDirect3DEvents9::OnInvalidate(IDirect3DDevice9* pDevice)
     // Force completion of all GPU operations if a scene is currently active
     if (g_bInMTAScene || g_bInGTAScene)
     {
-        const HRESULT hEndScene = pDevice->EndScene();
-        if (SUCCEEDED(hEndScene))
+        const HRESULT hrEndScene = pDevice->EndScene();
+        if (SUCCEEDED(hrEndScene))
         {
             g_bInMTAScene = false;
             g_bInGTAScene = false;
         }
         else
         {
-            WriteDebugEvent(SString("OnInvalidate: EndScene failed: %08x", hEndScene));
+            WriteDebugEvent(SString("OnInvalidate: EndScene failed: %08x", hrEndScene));
         }
     }
 
@@ -138,10 +138,10 @@ void CDirect3DEvents9::OnPresent(IDirect3DDevice9* pDevice)
     // Start a new scene. This isn't ideal and is not really recommended by MSDN.
     // I tried disabling EndScene from GTA and just end it after this code ourselves
     // before present, but that caused graphical issues randomly with the sky.
-    const HRESULT hBeginScene = pDevice->BeginScene();
-    if (FAILED(hBeginScene))
+    const HRESULT hrBeginScene = pDevice->BeginScene();
+    if (FAILED(hrBeginScene))
     {
-        WriteDebugEvent(SString("OnPresent: BeginScene failed: %08x", hBeginScene));
+        WriteDebugEvent(SString("OnPresent: BeginScene failed: %08x", hrBeginScene));
         g_bInMTAScene = false;
         return;
     }

Client/core/DXHook/CProxyDirect3DVertexBuffer.cpp

@@ -66,7 +66,7 @@ CProxyDirect3DVertexBuffer::~CProxyDirect3DVertexBuffer()
 /////////////////////////////////////////////////////////////
 HRESULT CProxyDirect3DVertexBuffer::QueryInterface(REFIID riid, void** ppvObj)
 {
-    *ppvObj = NULL;
+    *ppvObj = nullptr;
 
     // Looking for me?
     if (riid == CProxyDirect3DVertexBuffer_GUID)
@@ -113,11 +113,11 @@ HRESULT CProxyDirect3DVertexBuffer::Lock(UINT OffsetToLock, UINT SizeToLock, voi
             pBoundingBoxManager->OnVertexBufferRangeInvalidated(m_pOriginal, OffsetToLock, SizeToLock);
     }
 
-    *ppbData = NULL;
+    *ppbData = nullptr;
     HRESULT hr = DoLock(OffsetToLock, SizeToLock, ppbData, Flags);
     HRESULT originalHr = hr;
 
-    if (SUCCEEDED(hr) && *ppbData == NULL)
+    if (SUCCEEDED(hr) && *ppbData == nullptr)
     {
         hr = D3DERR_INVALIDCALL;
     }