Merge branch 'master' into cancelDataChange

Author: Dutchman101

Client/core/CClientVariables.cpp

@@ -265,6 +265,16 @@ void CClientVariables::ValidateValues()
     ClampValue("voicevolume", 0.0f, 1.0f);
     ClampValue("mapalpha", 0, 255);
     ClampValue("mapimage", 0, 1);
+    ClampValue("borderless_gamma_power", 0.5f, 2.0f);
+    ClampValue("borderless_brightness_scale", 0.5f, 2.0f);
+    ClampValue("borderless_contrast_scale", 0.5f, 2.0f);
+    ClampValue("borderless_saturation_scale", 0.5f, 2.0f);
+    ClampValue("borderless_gamma_enabled", false, true);
+    ClampValue("borderless_brightness_enabled", false, true);
+    ClampValue("borderless_contrast_enabled", false, true);
+    ClampValue("borderless_saturation_enabled", false, true);
+    ClampValue("borderless_apply_windowed", false, true);
+    ClampValue("borderless_apply_fullscreen", false, true);
 }
 
 void CClientVariables::LoadDefaults()
@@ -348,6 +358,24 @@ void CClientVariables::LoadDefaults()
     DEFAULT("display_fullscreen_style", 0);                                           // 0-standard 1-borderless 2-borderless keep res 3-borderless stretch
     DEFAULT("display_windowed", 0);                                                   // 0-off 1-on
     DEFAULT("multimon_fullscreen_minimize", 1);                                       // 0-off 1-on
+    DEFAULT("borderless_gamma_power", 0.95f);                                         // Gamma exponent applied to windowed gamma ramp (1.0 = unchanged)
+    DEFAULT("borderless_brightness_scale", 1.03f);                                    // Brightness multiplier for windowed gamma ramp (1.0 = unchanged)
+    DEFAULT("borderless_contrast_scale", 1.0f);                                       // Contrast multiplier for borderless presentation (1.0 = unchanged)
+    DEFAULT("borderless_saturation_scale", 1.0f);                                     // Saturation multiplier for borderless presentation (1.0 = unchanged)
+    DEFAULT("borderless_enable_srgb", false);                                         // Enable sRGB correction when running borderless
+    DEFAULT("borderless_gamma_enabled", false);                                       // Apply gamma adjustment while borderless tuning active
+    DEFAULT("borderless_brightness_enabled", false);                                  // Apply brightness adjustment while borderless tuning active
+    DEFAULT("borderless_contrast_enabled", false);                                    // Apply contrast adjustment while borderless tuning active
+    DEFAULT("borderless_saturation_enabled", false);                                  // Apply saturation adjustment while borderless tuning active
+    DEFAULT("borderless_apply_windowed", false);                                      // Apply display adjustments while windowed/borderless
+    DEFAULT("borderless_apply_fullscreen", false);                                   // Apply display adjustments while in exclusive fullscreen
+
+    if (Exists("borderless_enable_srgb"))
+    {
+    bool legacyEnable = false;
+        Get("borderless_enable_srgb", legacyEnable);
+        Set("borderless_apply_windowed", legacyEnable);
+    }
     DEFAULT("vertical_aim_sensitivity", 0.0015f);                                     // 0.0015f is GTA default setting
     DEFAULT("process_priority", 0);                                                   // 0-normal 1-above normal 2-high
     DEFAULT("process_dpi_aware", false);                                              // Enable DPI awareness in core initialization

Client/core/CCore.cpp

@@ -146,6 +146,11 @@ CCore::CCore()
     // Setup our hooks.
     ApplyHooks();
 
+    m_pModelCacheManager = nullptr;
+    m_iDummyProgressValue = 0;
+    m_DummyProgressTimerHandle = NULL;
+    m_bDummyProgressUpdateAlways = false;
+
     m_iUnminimizeFrameCounter = 0;
     m_bDidRecreateRenderTargets = false;
     m_fMinStreamingMemory = 0;
@@ -187,10 +192,27 @@ CCore::~CCore()
     // Remove input hook
     CMessageLoopHook::GetSingleton().RemoveHook();
 
+    if (m_bWindowsTimerEnabled)
+    {
+        KillTimer(GetHookedWindow(), IDT_TIMER1);
+        m_bWindowsTimerEnabled = false;
+    }
+
+    extern int ms_iDummyProgressTimerCounter;
+
+    if (m_DummyProgressTimerHandle != NULL)
+    {
+        DeleteTimerQueueTimer(NULL, m_DummyProgressTimerHandle, INVALID_HANDLE_VALUE);
+        m_DummyProgressTimerHandle = NULL;
+        ms_iDummyProgressTimerCounter = 0;
+    }
+
     // Delete the mod manager
     delete m_pModManager;
     SAFE_DELETE(m_pMessageBox);
 
+    SAFE_DELETE(m_pModelCacheManager);
+
     // Destroy early subsystems
     m_bModulesLoaded = false;
     DestroyNetwork();
@@ -225,6 +247,8 @@ CCore::~CCore()
     DestroyGUI();
     DestroyXML();
 
+    SAFE_DELETE(g_pLocalization);
+
     // Delete keybinds
     delete m_pKeyBinds;
 
@@ -1072,6 +1096,16 @@ void CCore::CreateXML()
         if (!m_pConfigFile)
         {
             assert(false);
+
+            if (m_pXML)
+            {
+                using PFNReleaseXMLInterface = void (*)();
+                if (auto pfnRelease = reinterpret_cast<PFNReleaseXMLInterface>(m_XMLModule.GetFunctionPointer("ReleaseXMLInterface")))
+                    pfnRelease();
+            }
+
+            m_pXML = NULL;
+            m_XMLModule.UnloadModule();
             return;
         }
 
@@ -1123,10 +1157,14 @@ void CCore::DestroyXML()
     {
         SaveConfig(true);
         delete m_pConfigFile;
+        m_pConfigFile = nullptr;
     }
 
     if (m_pXML)
     {
+        using PFNReleaseXMLInterface = void (*)();
+        if (auto pfnRelease = reinterpret_cast<PFNReleaseXMLInterface>(m_XMLModule.GetFunctionPointer("ReleaseXMLInterface")))
+            pfnRelease();
         m_pXML = NULL;
     }