Fix counter logic, mem leaks and bugs in CProxyDirect3DDevice9.cpp

Fixes for:
- Memory leaks
- QueryInterface reference leaks
- Double release in Release() method
- Missing AddRef in constructor
- Reference counter logic

Author: Dutchman101

Client/core/DXHook/CProxyDirect3DDevice9.cpp

@@ -21,8 +21,17 @@ CProxyDirect3DDevice9::CProxyDirect3DDevice9(IDirect3DDevice9* pDevice)
 {
     WriteDebugEvent(SString("CProxyDirect3DDevice9::CProxyDirect3DDevice9 %08x (device: %08x)", this, pDevice));
 
-    // Set our wrapped device.
+    // Set wrapped device - DO NOT AddRef here since we'll do it in AddRef method
     m_pDevice = pDevice;
+    
+    // Initialize reference count to 1 (the creator holds a reference)
+    m_ulRefCount = 1;
+    
+    // Now add a reference to the underlying device to match initial ref count
+    if (m_pDevice)
+    {
+        m_pDevice->AddRef();
+    }
 
     // Get CDirect3DData pointer.
     m_pData = CDirect3DData::GetSingletonPtr();
@@ -39,12 +48,18 @@ CProxyDirect3DDevice9::CProxyDirect3DDevice9(IDirect3DDevice9* pDevice)
     int iAdapter = creationParameters.AdapterOrdinal;
 
     IDirect3D9* pD3D9 = CProxyDirect3D9::StaticGetDirect3D();
+    bool bNeedRelease = false;
     if (!pD3D9)
+    {
         m_pDevice->GetDirect3D(&pD3D9);
+        bNeedRelease = true; // GetDirect3D increments reference count
+    }
 
-    D3DADAPTER_IDENTIFIER9 adaptIdent;
-    ZeroMemory(&adaptIdent, sizeof(D3DADAPTER_IDENTIFIER9));
-    pD3D9->GetAdapterIdentifier(iAdapter, 0, &adaptIdent);
+    if (pD3D9)
+    {
+        D3DADAPTER_IDENTIFIER9 adaptIdent;
+        ZeroMemory(&adaptIdent, sizeof(D3DADAPTER_IDENTIFIER9));
+        pD3D9->GetAdapterIdentifier(iAdapter, 0, &adaptIdent);
 
     int iVideoCardMemoryKBTotal = GetWMIVideoAdapterMemorySize(adaptIdent.VendorId, adaptIdent.DeviceId) / 1024;
 
@@ -59,6 +74,25 @@ CProxyDirect3DDevice9::CProxyDirect3DDevice9(IDirect3DDevice9* pDevice)
     //
     g_pDeviceState->AdapterState.Name = adaptIdent.Description;
 
+        // Clipping is required for some graphic configurations
+        g_pDeviceState->AdapterState.bRequiresClipping = SStringX(adaptIdent.Description).Contains("Intel");
+
+        // Release D3D9 interface if we obtained it via GetDirect3D
+        if (bNeedRelease)
+        {
+            SAFE_RELEASE(pD3D9);
+        }
+    }
+    else
+    {
+        WriteDebugEvent("Warning: Could not obtain IDirect3D9 interface for adapter info");
+        
+        // Set default values
+        g_pDeviceState->AdapterState.InstalledMemoryKB = m_pDevice->GetAvailableTextureMem() / 1024;
+        g_pDeviceState->AdapterState.Name = "Unknown";
+        g_pDeviceState->AdapterState.bRequiresClipping = false;
+    }
+
     //
     // Get max anisotropic setting
     //
@@ -74,9 +108,6 @@ CProxyDirect3DDevice9::CProxyDirect3DDevice9(IDirect3DDevice9* pDevice)
             g_pDeviceState->AdapterState.MaxAnisotropicSetting++;
     }
 
-    // Clipping is required for some graphic configurations
-    g_pDeviceState->AdapterState.bRequiresClipping = SStringX(adaptIdent.Description).Contains("Intel");
-
     WriteDebugEvent(SString("*** Using adapter: %s (Mem:%d KB, MaxAnisotropy:%d)", (const char*)g_pDeviceState->AdapterState.Name,
                             g_pDeviceState->AdapterState.InstalledMemoryKB, g_pDeviceState->AdapterState.MaxAnisotropicSetting));
 
@@ -91,36 +122,66 @@ CProxyDirect3DDevice9::CProxyDirect3DDevice9(IDirect3DDevice9* pDevice)
 CProxyDirect3DDevice9::~CProxyDirect3DDevice9()
 {
     WriteDebugEvent(SString("CProxyDirect3DDevice9::~CProxyDirect3DDevice9 %08x", this));
-    g_pDeviceState = NULL;
-    g_pProxyDevice = NULL;
+    
+    // Release our reference to the wrapped device
+    // Note: We don't check m_ulRefCount here because destructor is only called
+    // when Release() determined the count reached 0
+    if (m_pDevice)
+    {
+        m_pDevice->Release();
+        m_pDevice = nullptr;
+    }
+    
+    if (g_pProxyDevice == this)
+    {
+        g_pDeviceState = NULL;
+        g_pProxyDevice = NULL;
+    }
 }
 
 /*** IUnknown methods ***/
 HRESULT CProxyDirect3DDevice9::QueryInterface(REFIID riid, void** ppvObj)
 {
+    if (!ppvObj)
+        return E_POINTER;
+        
+    *ppvObj = nullptr;
+    
+    // Check if its for IUnknown or IDirect3DDevice9
+    if (riid == IID_IUnknown || riid == IID_IDirect3DDevice9)
+    {
+        *ppvObj = static_cast<IDirect3DDevice9*>(this);
+        AddRef();
+        return S_OK;
+    }
+    
+    // For any other interface, forward to underlying device
+    // But this means the caller gets the underlying device, not our proxy
     return m_pDevice->QueryInterface(riid, ppvObj);
 }
 
 ULONG CProxyDirect3DDevice9::AddRef()
 {
-    return m_pDevice->AddRef();
+    // Only increment proxy reference count
+    // We keep a single reference to the underlying device throughout the lifetime
+    return InterlockedIncrement(&m_ulRefCount);
 }
 
 ULONG CProxyDirect3DDevice9::Release()
 {
-    // Check if will be final release
-    m_pDevice->AddRef();
-    ULONG ulRefCount = m_pDevice->Release();
-    if (ulRefCount == 1)
+    // Only decrement proxy reference count  
+    ULONG ulNewRefCount = InterlockedDecrement(&m_ulRefCount);
+    
+    if (ulNewRefCount == 0)
     {
         WriteDebugEvent("Releasing IDirect3DDevice9 Proxy...");
         // Call event handler
         CDirect3DEvents9::OnDirect3DDeviceDestroy(m_pDevice);
         delete this;
-        return ulRefCount - 1;
+        return 0;
     }
 
-    return m_pDevice->Release();
+    return ulNewRefCount;
 }
 
 /*** IDirect3DDevice9 methods ***/
@@ -314,15 +375,24 @@ HRESULT CProxyDirect3DDevice9::Reset(D3DPRESENT_PARAMETERS* pPresentationParamet
         // Store actual present parameters used
         IDirect3DSwapChain9* pSwapChain = nullptr;
         HRESULT hrSwapChain = m_pDevice->GetSwapChain(0, &pSwapChain);
-        if (SUCCEEDED(hrSwapChain) && pSwapChain)
+        if (SUCCEEDED(hrSwapChain))
         {
-            pSwapChain->GetPresentParameters(&g_pDeviceState->CreationState.PresentationParameters);
-            SAFE_RELEASE(pSwapChain);
+            if (pSwapChain)
+            {
+                pSwapChain->GetPresentParameters(&g_pDeviceState->CreationState.PresentationParameters);
+            }
+            else
+            {
+                WriteDebugEvent("Warning: GetSwapChain succeeded but returned null swap chain");
+            }
         }
         else
         {
             WriteDebugEvent(SString("Warning: Failed to get swap chain for parameter storage: %08x", hrSwapChain));
         }
+        
+        // Always release the swap chain if it was obtained, regardless of success/failure
+        SAFE_RELEASE(pSwapChain);
 
         // Store device creation parameters as well
         HRESULT hrCreationParams = m_pDevice->GetCreationParameters(&g_pDeviceState->CreationState.CreationParameters);