Round #1: Fix 10 memory leaks in Client\core\Graphics

Author: Dutchman101

Client/core/Graphics/CGraphics.cpp

@@ -1837,6 +1837,7 @@ void CGraphics::DrawQueueItem(const sDrawQueueItem& Item)
             const sDrawQueuePrimitiveMaterial primitive = Item.PrimitiveMaterial;
             CheckModes(EDrawMode::PRIMITIVE_MATERIAL, Item.blendMode);
             m_pPrimitiveMaterialBatcher->AddPrimitive(primitive.eType, primitive.pMaterial, primitive.pVecVertices);
+            RemoveQueueRef(primitive.pMaterial);
             break;
         }
     }
@@ -1873,9 +1874,25 @@ void CGraphics::ClearDrawQueue(std::vector<sDrawQueueItem>& Queue)
     {
         const sDrawQueueItem& item = *iter;
         if (item.eType == QUEUE_TEXTURE || item.eType == QUEUE_SHADER)
+        {
             RemoveQueueRef(item.Texture.pMaterial);
+        }
+        else if (item.eType == QUEUE_PRIMITIVEMATERIAL)
+        {
+            if (item.PrimitiveMaterial.pMaterial)
+                RemoveQueueRef(item.PrimitiveMaterial.pMaterial);
+            // Flush any queued geometry that never reached the batcher
+            delete item.PrimitiveMaterial.pVecVertices;
+        }
+        else if (item.eType == QUEUE_PRIMITIVE)
+        {
+            // Prevent per-primitive allocations from leaking when we clear the queue early
+            delete item.Primitive.pVecVertices;
+        }
         else if (item.eType == QUEUE_TEXT)
+        {
             RemoveQueueRef(item.Text.pDXFont);
+        }
     }
     Queue.clear();
 }

Client/core/Graphics/CMaterialLine3DBatcher.cpp

@@ -36,6 +36,12 @@ CMaterialLine3DBatcher::CMaterialLine3DBatcher(bool bPreGUI)
 ////////////////////////////////////////////////////////////////
 CMaterialLine3DBatcher::~CMaterialLine3DBatcher()
 {
+    for (SMaterialLine3DItem& item : m_LineList)
+    {
+        if (item.pMaterial)
+            item.pMaterial->Release();
+    }
+    m_LineList.clear();
 }
 
 ////////////////////////////////////////////////////////////////

Client/core/Graphics/CMaterialPrimitive3DBatcher.cpp

@@ -21,6 +21,11 @@
 CMaterialPrimitive3DBatcher::CMaterialPrimitive3DBatcher(bool bPreGUI, CGraphics* pGraphics) : m_bPreGUI(bPreGUI), m_pGraphics(pGraphics)
 {
 }
+
+CMaterialPrimitive3DBatcher::~CMaterialPrimitive3DBatcher()
+{
+    ClearQueue();
+}
 ////////////////////////////////////////////////////////////////
 //
 // CMaterialPrimitive3DBatcher::OnDeviceCreate
@@ -158,6 +163,7 @@ void CMaterialPrimitive3DBatcher::Flush()
         }
         pLastMaterial = pMaterial;
         pMaterial->Release();
+        primitive.pMaterial = nullptr;
     }
 
     // Clean up
@@ -175,7 +181,9 @@ void CMaterialPrimitive3DBatcher::ClearQueue()
     // Clean up
     for (auto& primitive : m_primitiveList)
     {
+        SAFE_RELEASE(primitive.pMaterial);
         delete primitive.pVecVertices;
+        primitive.pVecVertices = nullptr;
     }
 
     m_primitiveList.clear();

Client/core/Graphics/CMaterialPrimitive3DBatcher.h

@@ -26,6 +26,7 @@ class CMaterialPrimitive3DBatcher
 {
 public:
     CMaterialPrimitive3DBatcher(bool bPreGUI, CGraphics* pGraphics);
+    ~CMaterialPrimitive3DBatcher();
     void OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewportSizeX, float fViewportSizeY);
     void Flush();
     void AddPrimitive(D3DPRIMITIVETYPE eType, CMaterialItem* pMaterial, std::vector<PrimitiveMaterialVertice>* pVecVertices);

Client/core/Graphics/CPrimitive3DBatcher.cpp

@@ -21,6 +21,11 @@
 CPrimitive3DBatcher::CPrimitive3DBatcher(bool bPreGUI) : m_bPreGUI(bPreGUI)
 {
 }
+
+CPrimitive3DBatcher::~CPrimitive3DBatcher()
+{
+    ClearQueue();
+}
 ////////////////////////////////////////////////////////////////
 //
 // CPrimitive3DBatcher::OnDeviceCreate
@@ -97,13 +102,8 @@ void CPrimitive3DBatcher::Flush()
         DrawPrimitive(primitive.eType, primitive.pVecVertices->size(), &primitive.pVecVertices->at(0), VertexStreamZeroStride);
     }
 
-    // Clean up
-    for (auto& primitive : m_primitiveList)
-    {
-        delete primitive.pVecVertices;
-    }
-
-    m_primitiveList.clear();
+    // Clean up queued primitives now that they are flushed
+    ClearQueue();
 
     if (g_pDeviceState->AdapterState.bRequiresClipping)
         m_pDevice->SetRenderState(D3DRS_CLIPPING, FALSE);
@@ -156,3 +156,14 @@ void CPrimitive3DBatcher::AddPrimitive(D3DPRIMITIVETYPE eType, std::vector<Primi
 {
     m_primitiveList.push_back({eType, pVecVertices});
 }
+
+void CPrimitive3DBatcher::ClearQueue()
+{
+    for (auto& primitive : m_primitiveList)
+    {
+        delete primitive.pVecVertices;
+        primitive.pVecVertices = nullptr;
+    }
+
+    m_primitiveList.clear();
+}

Client/core/Graphics/CPrimitive3DBatcher.h

@@ -25,11 +25,13 @@ class CPrimitive3DBatcher
 {
 public:
     CPrimitive3DBatcher(bool bPreGUI);
+    ~CPrimitive3DBatcher();
     void OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewportSizeX, float fViewportSizeY);
     void Flush();
     void AddPrimitive(D3DPRIMITIVETYPE eType, std::vector<PrimitiveVertice>* pVecVertices);
     void DrawPrimitive(D3DPRIMITIVETYPE eType, size_t iCollectionSize, const void* pDataAddr, size_t uiVertexStride);
     bool HasItems() const { return !m_primitiveList.empty(); }
+    void ClearQueue();
 
 protected:
     bool                      m_bPreGUI;

Client/core/Graphics/CPrimitiveBatcher.cpp

@@ -30,6 +30,7 @@ CPrimitiveBatcher::CPrimitiveBatcher()
 ////////////////////////////////////////////////////////////////
 CPrimitiveBatcher::~CPrimitiveBatcher()
 {
+    ClearQueue();
 }
 ////////////////////////////////////////////////////////////////
 //
@@ -195,6 +196,7 @@ void CPrimitiveBatcher::ClearQueue()
     for (auto& primitive : m_primitiveList)
     {
         delete primitive.pVecVertices;
+        primitive.pVecVertices = nullptr;
     }
     size_t prevSize = m_primitiveList.size();
     m_primitiveList.clear();

Client/core/Graphics/CPrimitiveMaterialBatcher.cpp

@@ -30,6 +30,7 @@ CPrimitiveMaterialBatcher::CPrimitiveMaterialBatcher(CGraphics* graphics)
 ////////////////////////////////////////////////////////////////
 CPrimitiveMaterialBatcher::~CPrimitiveMaterialBatcher()
 {
+    ClearQueue();
 }
 ////////////////////////////////////////////////////////////////
 //
@@ -203,6 +204,7 @@ void CPrimitiveMaterialBatcher::Flush()
         }
         pLastMaterial = pMaterial;
         m_pGraphics->RemoveQueueRef(pMaterial);
+        primitive.pMaterial = nullptr;
     }
 
     // Clean up
@@ -257,7 +259,13 @@ void CPrimitiveMaterialBatcher::ClearQueue()
     // Clean up
     for (auto& primitive : m_primitiveList)
     {
+        if (primitive.pMaterial)
+        {
+            m_pGraphics->RemoveQueueRef(primitive.pMaterial);
+            primitive.pMaterial = nullptr;
+        }
         delete primitive.pVecVertices;
+        primitive.pVecVertices = nullptr;
     }
 
     size_t prevSize = m_primitiveList.size();
@@ -273,5 +281,7 @@ void CPrimitiveMaterialBatcher::ClearQueue()
 ////////////////////////////////////////////////////////////////
 void CPrimitiveMaterialBatcher::AddPrimitive(D3DPRIMITIVETYPE eType, CMaterialItem* pMaterial, std::vector<PrimitiveMaterialVertice>* pVecVertices)
 {
+    if (pMaterial)
+        m_pGraphics->AddQueueRef(pMaterial);
     m_primitiveList.push_back({eType, pMaterial, pVecVertices});
 }

Client/core/Graphics/CRenderItem.EffectCloner.cpp

@@ -24,6 +24,21 @@ CEffectCloner::CEffectCloner(CRenderItemManager* pManager)
     m_pManager = pManager;
 }
 
+CEffectCloner::~CEffectCloner()
+{
+    for (auto& entry : m_ValidMap)
+    {
+        SAFE_RELEASE(entry.second);
+    }
+    m_ValidMap.clear();
+
+    for (CEffectTemplate* pTemplate : m_OldList)
+    {
+        SAFE_RELEASE(pTemplate);
+    }
+    m_OldList.clear();
+}
+
 ////////////////////////////////////////////////////////////////
 //
 // CEffectCloner::CreateD3DEffect

Client/core/Graphics/CRenderItem.EffectCloner.h

@@ -46,6 +46,7 @@ class CEffectCloner
 {
 public:
     CEffectCloner(CRenderItemManager* pManager);
+    ~CEffectCloner();
     void         DoPulse();
     CEffectWrap* CreateD3DEffect(const SString& strFile, const SString& strRootPath, bool bIsRawData, SString& strOutStatus, bool bDebug,
                                  const EffectMacroList& macros);