Fixed memory and thread safety issues in CProxyDirect3D

Author: Dutchman101

Client/core/CAdditionalVertexStreamManager.cpp

@@ -259,7 +259,14 @@ bool CAdditionalVertexStreamManager::SetAdditionalVertexStream(SCurrentStateInfo
     if (FAILED(m_pDevice->GetVertexDeclaration(&pPreviousDecl)))
         return false;
 
-    if (FAILED(g_pProxyDevice->SetVertexDeclaration(pAdditionalInfo->pVertexDeclaration)))
+    CScopedActiveProxyDevice proxyDevice;
+    if (!proxyDevice)
+    {
+        SAFE_RELEASE(pPreviousDecl);
+        return false;
+    }
+
+    if (FAILED(proxyDevice->SetVertexDeclaration(pAdditionalInfo->pVertexDeclaration)))
     {
         SAFE_RELEASE(pPreviousDecl);
         return false;
@@ -268,7 +275,7 @@ bool CAdditionalVertexStreamManager::SetAdditionalVertexStream(SCurrentStateInfo
     uint OffsetInBytes = ConvertPTOffset(state.stream1.OffsetInBytes);
     if (FAILED(m_pDevice->SetStreamSource(2, pAdditionalInfo->pStreamData, OffsetInBytes, pAdditionalInfo->Stride)))
     {
-        g_pProxyDevice->SetVertexDeclaration(pPreviousDecl);
+        proxyDevice->SetVertexDeclaration(pPreviousDecl);
         SAFE_RELEASE(pPreviousDecl);
         return false;
     }
@@ -298,7 +305,9 @@ void CAdditionalVertexStreamManager::MaybeUnsetAdditionalVertexStream()
         if (bDeviceOperational)
         {
             // Set prev declaration
-            g_pProxyDevice->SetVertexDeclaration(m_pOldVertexDeclaration);
+            CScopedActiveProxyDevice proxyDevice;
+            if (proxyDevice)
+                proxyDevice->SetVertexDeclaration(m_pOldVertexDeclaration);
 
             // Unset additional stream
             m_pDevice->SetStreamSource(2, nullptr, 0, 0);

Client/core/DXHook/CDirect3DEvents9.cpp

@@ -24,6 +24,7 @@
 
 bool g_bInMTAScene = false;
 extern bool g_bInGTAScene;
+void ResetGTASceneState();
 
 // Other variables
 static uint                 ms_RequiredAnisotropicLevel = 1;
@@ -177,7 +178,7 @@ void CDirect3DEvents9::OnInvalidate(IDirect3DDevice9* pDevice)
     }
 
     g_bInMTAScene = false;
-    g_bInGTAScene = false;
+    ResetGTASceneState();
 
     // Invalidate the VMR9 Manager
     // CVideoManager::GetSingleton ().OnLostDevice ();
@@ -2098,9 +2099,13 @@ HRESULT CDirect3DEvents9::SetVertexDeclaration(IDirect3DDevice9* pDevice, IDirec
             pDecl = pProxy->GetOriginal();
 
             // Update state info
-            CProxyDirect3DDevice9::SD3DVertexDeclState* pInfo = MapFind(g_pProxyDevice->m_VertexDeclMap, pProxy);
-            if (pInfo)
-                g_pDeviceState->VertexDeclState = *pInfo;
+            CScopedActiveProxyDevice proxyDevice;
+            if (proxyDevice)
+            {
+                CProxyDirect3DDevice9::SD3DVertexDeclState* pInfo = MapFind(proxyDevice->m_VertexDeclMap, pProxy);
+                if (pInfo)
+                    g_pDeviceState->VertexDeclState = *pInfo;
+            }
 
             SAFE_RELEASE(pProxy);
         }