Synchronize changes from 1.6 branch [ci skip]

fa742c1 Fix memory leak in case screenshot fails
d8db960 Fix potential regressions from recent refactors

Author: github-actions[bot]

Client/core/CScreenGrabber.cpp

@@ -242,6 +242,7 @@ bool CScreenGrabber::GetBackBufferPixels(uint uiSizeX, uint uiSizeY, CBuffer& bu
     if (!m_pScreenShotTemp)
     {
         strOutError = "No ScreenShotTemp";
+        SAFE_RELEASE(pD3DBackBufferSurface);
         return false;
     }
 
@@ -251,6 +252,7 @@ bool CScreenGrabber::GetBackBufferPixels(uint uiSizeX, uint uiSizeY, CBuffer& bu
     if (FAILED(hr))
     {
         strOutError = SString("StretchRect failed (0x%08x)", hr);
+        SAFE_RELEASE(pD3DBackBufferSurface);
         return false;
     }
 
@@ -260,6 +262,7 @@ bool CScreenGrabber::GetBackBufferPixels(uint uiSizeX, uint uiSizeY, CBuffer& bu
     if (!m_pScreenShotTemp->ReadPixels(buffer, strOutError))
     {
         dassert(!strOutError.empty());
+        SAFE_RELEASE(pD3DBackBufferSurface);
         return false;
     }
 

Client/core/DXHook/CDirect3DEvents9.cpp

@@ -86,10 +86,15 @@ bool CDirect3DEvents9::IsDeviceOperational(IDirect3DDevice9* pDevice, bool* pbTe
     {
         if (pbTemporarilyLost)
             *pbTemporarilyLost = true;
+        return false;
     }
-    else
+
+    const bool bSceneActive = g_bInMTAScene.load(std::memory_order_acquire) || g_bInGTAScene.load(std::memory_order_acquire);
+    if (hr == D3DERR_INVALIDCALL && bSceneActive)
     {
-        WriteDebugEvent(SString("IsDeviceOperational: unexpected cooperative level %08x", hr));
+        if (pHrCooperativeLevel)
+            *pHrCooperativeLevel = D3D_OK;
+        return true;
     }
 
     return false;

Client/core/DXHook/CProxyDirect3DDevice9.cpp

@@ -12,10 +12,12 @@
 #include "StdInc.h"
 #include <algorithm>
 #include <atomic>
+#include <cmath>
 #include <mutex>
 #include <game/CSettings.h>
 
 class CProxyDirect3DDevice9;
+extern std::atomic<bool> g_bInMTAScene;
 
 namespace
 {
@@ -46,6 +48,7 @@ std::mutex               g_deviceStateMutex;
 std::atomic<uint64_t>    g_proxyRegistrationCounter{0};
 std::mutex               g_sceneStateMutex;
 uint32_t                 g_gtaSceneActiveCount = 0;
+uint64_t                 g_activeProxyRegistrationId = 0;
 
 uint64_t RegisterProxyDevice(CProxyDirect3DDevice9* instance);
 bool      UnregisterProxyDevice(CProxyDirect3DDevice9* instance, uint64_t registrationId);
@@ -233,7 +236,10 @@ CProxyDirect3DDevice9::~CProxyDirect3DDevice9()
 
     if (bRestoreGamma && m_pDevice)
     {
-        m_pDevice->SetGammaRamp(lastSwapChain, 0, &originalGammaRamp);
+        IDirect3DDevice9* pDevice = m_pDevice;
+        pDevice->AddRef();
+        pDevice->SetGammaRamp(lastSwapChain, 0, &originalGammaRamp);
+        pDevice->Release();
         WriteDebugEvent("Restored original gamma ramp on device destruction");
     }
 
@@ -474,6 +480,41 @@ HRESULT DoResetDevice(IDirect3DDevice9* pDevice, D3DPRESENT_PARAMETERS* pPresent
     return hResult;
 }
 
+static bool WaitForGpuIdle(IDirect3DDevice9* pDevice)
+{
+    if (!pDevice)
+        return false;
+
+    IDirect3DQuery9* pEventQuery = nullptr;
+    const HRESULT    hrCreate = pDevice->CreateQuery(D3DQUERYTYPE_EVENT, &pEventQuery);
+    if (FAILED(hrCreate) || !pEventQuery)
+        return false;
+
+    bool bCompleted = false;
+    if (SUCCEEDED(pEventQuery->Issue(D3DISSUE_END)))
+    {
+        constexpr int kMaxAttempts = 16;
+        for (int attempt = 0; attempt < kMaxAttempts; ++attempt)
+        {
+            const HRESULT hrData = pEventQuery->GetData(nullptr, 0, D3DGETDATA_FLUSH);
+            if (hrData == S_OK)
+            {
+                bCompleted = true;
+                break;
+            }
+            if (hrData == D3DERR_DEVICELOST)
+            {
+                break;
+            }
+
+            Sleep(0);
+        }
+    }
+
+    pEventQuery->Release();
+    return bCompleted;
+}
+
 HRESULT CProxyDirect3DDevice9::Reset(D3DPRESENT_PARAMETERS* pPresentationParameters)
 {
     WriteDebugEvent("CProxyDirect3DDevice9::Reset");
@@ -528,7 +569,12 @@ HRESULT CProxyDirect3DDevice9::Reset(D3DPRESENT_PARAMETERS* pPresentationParamet
     // Release cached state so lingering references can't block Reset on default-pool resources
     ReleaseCachedResources();
 
-    // Give GPU driver time to complete any pending operations
+    // Give GPU driver time to complete any pending operations. We keep the light Sleep as a
+    // conservative fallback but first rely on an event query, as recommended in Microsoft's GPU
+    // synchronization guidance, to ensure outstanding commands finish.
+    if (!WaitForGpuIdle(m_pDevice))
+        WriteDebugEvent("CProxyDirect3DDevice9::Reset - WaitForGpuIdle timed out or failed");
+
     Sleep(1);
 
     // Call the real reset routine.
@@ -538,43 +584,37 @@ HRESULT CProxyDirect3DDevice9::Reset(D3DPRESENT_PARAMETERS* pPresentationParamet
     {
         // Store actual present parameters used
         IDirect3DSwapChain9* pSwapChain = nullptr;
-        HRESULT hrSwapChain = m_pDevice->GetSwapChain(0, &pSwapChain);
-        if (SUCCEEDED(hrSwapChain))
+        HRESULT              hrSwapChain = m_pDevice->GetSwapChain(0, &pSwapChain);
+        if (FAILED(hrSwapChain))
         {
-            if (pSwapChain)
-            {
-                std::lock_guard<std::mutex> stateGuard(g_deviceStateMutex);
-                if (g_pDeviceState)
-                {
-                    pSwapChain->GetPresentParameters(&g_pDeviceState->CreationState.PresentationParameters);
-                }
-            }
-            else
-            {
-                WriteDebugEvent("Warning: GetSwapChain succeeded but returned null swap chain");
-            }
+            WriteDebugEvent(SString("Warning: Failed to get swap chain for parameter storage: %08x", hrSwapChain));
         }
-        else
+        else if (!pSwapChain)
         {
-            WriteDebugEvent(SString("Warning: Failed to get swap chain for parameter storage: %08x", hrSwapChain));
+            WriteDebugEvent("Warning: GetSwapChain succeeded but returned null swap chain");
         }
-        
-    // Always release the swap chain if it was obtained, regardless of success/failure
-    ReleaseInterface(pSwapChain);
 
-        // Store device creation parameters as well
+        // Store device creation parameters as well, keeping both updates atomic relative to device state changes
         HRESULT hrCreationParams = D3D_OK;
         {
             std::lock_guard<std::mutex> stateGuard(g_deviceStateMutex);
             if (g_pDeviceState)
             {
+                if (SUCCEEDED(hrSwapChain) && pSwapChain)
+                {
+                    pSwapChain->GetPresentParameters(&g_pDeviceState->CreationState.PresentationParameters);
+                }
                 hrCreationParams = m_pDevice->GetCreationParameters(&g_pDeviceState->CreationState.CreationParameters);
             }
             else
             {
                 hrCreationParams = D3DERR_INVALIDCALL;
             }
         }
+
+        // Always release the swap chain if it was obtained, regardless of success/failure
+        ReleaseInterface(pSwapChain);
+
         if (FAILED(hrCreationParams))
         {
             WriteDebugEvent(SString("Warning: Failed to get creation parameters: %08x", hrCreationParams));
@@ -599,8 +639,14 @@ HRESULT CProxyDirect3DDevice9::Reset(D3DPRESENT_PARAMETERS* pPresentationParamet
         CDirect3DEvents9::OnRestore(m_pDevice);
 
         // Additional sync point for GPU driver
-        m_pDevice->BeginScene();
-        m_pDevice->EndScene();
+        if (!BeginSceneWithoutProxy(m_pDevice, ESceneOwner::MTA))
+        {
+            WriteDebugEvent("CProxyDirect3DDevice9::Reset - Failed to begin scene for driver sync");
+        }
+        else if (!EndSceneWithoutProxy(m_pDevice, ESceneOwner::MTA))
+        {
+            WriteDebugEvent("CProxyDirect3DDevice9::Reset - Failed to end scene for driver sync");
+        }
 
     WriteDebugEvent(SString("    BackBufferWidth:%d  Height:%d  Format:%d  Count:%d", pPresentationParameters->BackBufferWidth,
                             pPresentationParameters->BackBufferHeight, pPresentationParameters->BackBufferFormat, pPresentationParameters->BackBufferCount));
@@ -712,9 +758,9 @@ VOID CProxyDirect3DDevice9::SetGammaRamp(UINT iSwapChain, DWORD Flags, CONST D3D
         std::lock_guard<std::mutex> gammaLock(g_gammaStateMutex);
         if (!g_GammaState.bOriginalGammaStored || g_GammaState.lastSwapChain != iSwapChain || g_GammaState.bLastWasBorderless != bIsBorderlessMode)
         {
-            if (!bIsBorderlessMode || !g_GammaState.bOriginalGammaStored)
+            if (!g_GammaState.bOriginalGammaStored)
             {
-                // In fullscreen mode or first time - this is likely the original gamma
+                // Capture the original gamma only once per session
                 g_GammaState.originalGammaRamp = *pRamp;
                 g_GammaState.bOriginalGammaStored = true;
                 g_GammaState.lastSwapChain = iSwapChain;
@@ -733,6 +779,12 @@ VOID CProxyDirect3DDevice9::SetGammaRamp(UINT iSwapChain, DWORD Flags, CONST D3D
         const float fGammaCorrection = 1.0f / 1.3f;
         const float fBrightnessBoost = 1.4f;
 
+        const auto convertNormalizedToGammaWord = [](float normalized) -> WORD {
+            const float scaled = std::clamp(normalized * 65535.0f, 0.0f, 65535.0f);
+            const float rounded = std::floor(scaled + 0.5f);
+            return static_cast<WORD>(rounded);
+        };
+
         for (int i = 0; i < 256; i++)
         {
             // Convert to normalized float (0.0 - 1.0)
@@ -756,9 +808,9 @@ VOID CProxyDirect3DDevice9::SetGammaRamp(UINT iSwapChain, DWORD Flags, CONST D3D
             fBlue = std::min(1.0f, fBlue * fBrightnessBoost);
 
             // Convert back to WORD values with proper rounding
-            adjustedRamp.red[i] = static_cast<WORD>(fRed * 65535.0f + 0.5f);
-            adjustedRamp.green[i] = static_cast<WORD>(fGreen * 65535.0f + 0.5f);
-            adjustedRamp.blue[i] = static_cast<WORD>(fBlue * 65535.0f + 0.5f);
+            adjustedRamp.red[i] = convertNormalizedToGammaWord(fRed);
+            adjustedRamp.green[i] = convertNormalizedToGammaWord(fGreen);
+            adjustedRamp.blue[i] = convertNormalizedToGammaWord(fBlue);
         }
 
         // Set the adjusted gamma ramp
@@ -1424,6 +1476,7 @@ uint64_t RegisterProxyDevice(CProxyDirect3DDevice9* instance)
     std::lock_guard<std::mutex> guard(g_proxyDeviceMutex);
     const uint64_t registrationId = g_proxyRegistrationCounter.fetch_add(1, std::memory_order_relaxed) + 1;
     g_pProxyDevice = instance;
+    g_activeProxyRegistrationId = registrationId;
     {
         std::lock_guard<std::mutex> stateGuard(g_deviceStateMutex);
         g_pDeviceState = instance ? &instance->DeviceState : nullptr;
@@ -1437,10 +1490,11 @@ bool UnregisterProxyDevice(CProxyDirect3DDevice9* instance, uint64_t registratio
     if (g_pProxyDevice != instance)
         return false;
 
-    if (g_proxyRegistrationCounter.load(std::memory_order_relaxed) != registrationId)
+    if (g_activeProxyRegistrationId != registrationId)
         return false;
 
     g_pProxyDevice = nullptr;
+    g_activeProxyRegistrationId = 0;
     {
         std::lock_guard<std::mutex> stateGuard(g_deviceStateMutex);
         g_pDeviceState = nullptr;
@@ -1463,6 +1517,54 @@ void ReleaseActiveProxyDevice(CProxyDirect3DDevice9* pProxyDevice)
         pProxyDevice->Release();
 }
 
+bool BeginSceneWithoutProxy(IDirect3DDevice9* pDevice, ESceneOwner owner)
+{
+    if (!pDevice || owner == ESceneOwner::None)
+        return false;
+
+    const HRESULT hr = pDevice->BeginScene();
+    if (FAILED(hr))
+    {
+        WriteDebugEvent(SString("BeginSceneWithoutProxy failed: %08x", hr));
+        return false;
+    }
+
+    if (owner == ESceneOwner::GTA)
+    {
+        IncrementGTASceneState();
+    }
+    else if (owner == ESceneOwner::MTA)
+    {
+        g_bInMTAScene.store(true, std::memory_order_release);
+    }
+
+    return true;
+}
+
+bool EndSceneWithoutProxy(IDirect3DDevice9* pDevice, ESceneOwner owner)
+{
+    if (!pDevice || owner == ESceneOwner::None)
+        return false;
+
+    const HRESULT hr = pDevice->EndScene();
+    if (FAILED(hr))
+    {
+        WriteDebugEvent(SString("EndSceneWithoutProxy failed: %08x", hr));
+        return false;
+    }
+
+    if (owner == ESceneOwner::GTA)
+    {
+        DecrementGTASceneState();
+    }
+    else if (owner == ESceneOwner::MTA)
+    {
+        g_bInMTAScene.store(false, std::memory_order_release);
+    }
+
+    return true;
+}
+
 CScopedActiveProxyDevice::CScopedActiveProxyDevice()
     : m_pProxy(AcquireActiveProxyDevice())
 {

Client/core/DXHook/CProxyDirect3DDevice9.h

@@ -565,6 +565,16 @@ extern CProxyDirect3DDevice9::SD3DDeviceState* g_pDeviceState;
 // GTA scene tracking helpers
 void ResetGTASceneState();
 
+enum class ESceneOwner
+{
+    None,
+    GTA,
+    MTA,
+};
+
+bool BeginSceneWithoutProxy(IDirect3DDevice9* pDevice, ESceneOwner owner);
+bool EndSceneWithoutProxy(IDirect3DDevice9* pDevice, ESceneOwner owner);
+
 CProxyDirect3DDevice9* AcquireActiveProxyDevice();
 void                   ReleaseActiveProxyDevice(CProxyDirect3DDevice9* pProxyDevice);
 

Client/core/Graphics/CGraphics.cpp

@@ -11,6 +11,7 @@
 
 #include "StdInc.h"
 #include <game/CSettings.h>
+#include "DXHook/CProxyDirect3DDevice9.h"
 #include "CTileBatcher.h"
 #include "CLine3DBatcher.h"
 #include "CMaterialLine3DBatcher.h"

Client/core/Graphics/CRenderItemManager.cpp

@@ -11,6 +11,7 @@
 #include <game/CGame.h>
 #include <game/CRenderWare.h>
 #include <game/CSettings.h>
+#include "DXHook/CProxyDirect3DDevice9.h"
 #include "CRenderItem.EffectCloner.h"
 
 extern std::atomic<bool> g_bInMTAScene;
@@ -1366,10 +1367,13 @@ void CRenderItemManager::SaveReadableDepthBuffer()
     if (bDeviceReady && !g_bInMTAScene.load(std::memory_order_acquire) &&
         !g_bInGTAScene.load(std::memory_order_acquire))
         {
-            const HRESULT hBeginScene = m_pDevice->BeginScene();
-            if (SUCCEEDED(hBeginScene))
+            if (!BeginSceneWithoutProxy(m_pDevice, ESceneOwner::MTA))
             {
-                m_pDevice->EndScene();
+                WriteDebugEvent("CRenderItemManager::SaveReadableDepthBuffer - BeginSceneWithoutProxy failed");
+            }
+            else if (!EndSceneWithoutProxy(m_pDevice, ESceneOwner::MTA))
+            {
+                WriteDebugEvent("CRenderItemManager::SaveReadableDepthBuffer - EndSceneWithoutProxy failed");
             }
         }
     }