Synchronize changes from 1.6 branch [ci skip]

bb98fb6 1.6: Addendum to ea33335 (C++ 17 constraints)
ea33335 Crash handler: Minor improvements
f09ede6 Better crash handling of disastrous exception types, including STATUS_FATAL_USER_CALLBACK_EXCEPTION (0xC000041D)
4bc0334 1.6: CEF reworks #2: Miscelanneous + compile fix

Author: github-actions[bot]

Client/ceflauncher/Main.cpp

@@ -38,7 +38,7 @@ int __stdcall WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
     {
         try
         {
-            return std::invoke_r<int>(init);
+            return std::invoke(init);
         }
         catch (...)
         {

Client/cefweb/CAjaxResourceHandler.cpp

@@ -84,13 +84,16 @@ bool CAjaxResourceHandler::ReadResponse(void* data_out, int bytes_to_read, int&
     }
 
     // Are we done?
-    if (m_strResponse.length() - m_DataOffset <= 0)
+    if (m_strResponse.length() - m_DataOffset <= 0) [[unlikely]]
         return false;
 
-    int copyBytes = std::min((uint)bytes_to_read, m_strResponse.length() - m_DataOffset);
+    if (bytes_to_read <= 0) [[unlikely]]
+        return false;
+
+    const size_t copyBytes = std::min(static_cast<size_t>(bytes_to_read), m_strResponse.length() - m_DataOffset);
 
     memcpy(data_out, m_strResponse.c_str() + m_DataOffset, copyBytes);
-    bytes_read = copyBytes;
+    bytes_read = static_cast<int>(copyBytes);
 
     m_DataOffset += copyBytes;
 

Client/cefweb/CWebApp.cpp

@@ -29,6 +29,9 @@ void CWebApp::OnBeforeCommandLineProcessing(const CefString& process_type, CefRe
     if (!command_line)
         return;
 
+    if (!g_pCore) [[unlikely]]
+        return;
+
     const auto pWebCore = static_cast<CWebCore*>(g_pCore->GetWebCore());
     if (!pWebCore)
         return;
@@ -65,6 +68,9 @@ CefRefPtr<CefResourceHandler> CWebApp::Create(CefRefPtr<CefBrowser> browser, Cef
     if (!browser || !frame || !request)
         return nullptr;
 
+    if (!g_pCore) [[unlikely]]
+        return nullptr;
+
     const auto pWebCore = static_cast<CWebCore*>(g_pCore->GetWebCore());
     if (!pWebCore)
         return nullptr;

Client/cefweb/CWebCore.cpp

@@ -31,6 +31,9 @@ CWebCore::CWebCore()
     m_bTestmodeEnabled = false;
     m_pXmlConfig = nullptr;
     m_pFocusedWebView = nullptr;
+    m_bGPUEnabled = false;
+    m_iWhitelistRevision = 0;
+    m_iBlacklistRevision = 0;
 
     MakeSureXMLNodesExist();
     InitialiseWhiteAndBlacklist();
@@ -92,12 +95,14 @@ bool CWebCore::Initialise(bool gpuEnabled)
     settings.multi_threaded_message_loop = true;
     settings.windowless_rendering_enabled = true;
 
-    bool state = CefInitialize(mainArgs, settings, app, sandboxInfo);
-
-    // Register custom scheme handler factory
-    CefRegisterSchemeHandlerFactory("http", "mta", app);
+    if (const bool state = CefInitialize(mainArgs, settings, app, sandboxInfo); state) [[likely]]
+    {
+        // Register custom scheme handler factory only if initialization succeeded
+        CefRegisterSchemeHandlerFactory("http", "mta", app);
+        return true;
+    }
 
-    return state;
+    return false;
 }
 
 CWebViewInterface* CWebCore::CreateWebView(unsigned int uiWidth, unsigned int uiHeight, bool bIsLocal, CWebBrowserItem* pWebBrowserRenderItem,
@@ -243,19 +248,17 @@ void CWebCore::WaitForTask(std::function<void(bool)> task, CWebView* webView)
     {
         std::scoped_lock lock(m_TaskQueueMutex);
 
-        // Prevent unbounded queue growth - if queue is too large, oldest tasks will be dropped during pulse
-        if (m_TaskQueue.size() >= MAX_TASK_QUEUE_SIZE)
+        // Prevent unbounded queue growth - abort new task if queue is too large
+        if (m_TaskQueue.size() >= MAX_TASK_QUEUE_SIZE) [[unlikely]]
         {
 #ifdef MTA_DEBUG
-            g_pCore->GetConsole()->Printf("Warning: Task queue size limit reached (%d), task will be aborted", MAX_TASK_QUEUE_SIZE);
+            static constexpr auto WARNING_MSG = "Warning: Task queue size limit reached (%d), aborting new task";
+            g_pCore->GetConsole()->Printf(WARNING_MSG, MAX_TASK_QUEUE_SIZE);
 #endif
-            // Must still queue the task to fulfill the future, but it will be aborted during processing
-            // Removing oldest task to make room
-            if (!m_TaskQueue.empty())
-            {
-                m_TaskQueue.front().task(true);  // Abort oldest task
-                m_TaskQueue.pop_front();
-            }
+            // Abort the new task immediately to prevent deadlock
+            // Don't add it to the queue
+            task(true);
+            return;
         }
 
         m_TaskQueue.emplace_back(TaskEntry{task, webView});
@@ -269,14 +272,19 @@ void CWebCore::RemoveWebViewTasks(CWebView* webView)
 {
     std::scoped_lock lock(m_TaskQueueMutex);
 
-    for (auto iter = m_TaskQueue.begin(); iter != m_TaskQueue.end(); ++iter)
-    {
-        if (iter->webView != webView)
-            continue;
-
-        iter->task(true);
-        iter = m_TaskQueue.erase(iter);
-    }
+    // C++17-compatible erase-remove idiom (std::erase_if is C++20)
+    m_TaskQueue.erase(
+        std::remove_if(m_TaskQueue.begin(), m_TaskQueue.end(),
+            [webView](TaskEntry& entry) {
+                if (entry.webView == webView)
+                {
+                    entry.task(true);
+                    return true;
+                }
+                return false;
+            }),
+        m_TaskQueue.end()
+    );
 }
 
 void CWebCore::DoTaskQueuePulse()
@@ -298,12 +306,12 @@ eURLState CWebCore::GetDomainState(const SString& strURL, bool bOutputDebug)
     std::lock_guard<std::recursive_mutex> lock(m_FilterMutex);
 
     // Initialize wildcard whitelist (be careful with modifying) | Todo: Think about the following
-    static SString wildcardWhitelist[] = {"*.googlevideo.com", "*.google.com",  "*.youtube.com",    "*.ytimg.com",
-                                          "*.vimeocdn.com",    "*.gstatic.com", "*.googleapis.com", "*.ggpht.com"};
+    static constexpr const char* wildcardWhitelist[] = {"*.googlevideo.com", "*.google.com",  "*.youtube.com",    "*.ytimg.com",
+                                                         "*.vimeocdn.com",    "*.gstatic.com", "*.googleapis.com", "*.ggpht.com"};
 
-    for (int i = 0; i < sizeof(wildcardWhitelist) / sizeof(SString); ++i)
+    for (const auto& pattern : wildcardWhitelist)
     {
-        if (WildcardMatch(wildcardWhitelist[i], strURL))
+        if (WildcardMatch(pattern, strURL))
             return eURLState::WEBPAGE_ALLOWED;
     }
 
@@ -602,6 +610,11 @@ bool CWebCore::SetGlobalAudioVolume(float fVolume)
     return true;
 }
 
+CWebViewInterface* CWebCore::GetFocusedWebView()
+{
+    return m_pFocusedWebView;
+}
+
 bool CWebCore::UpdateListsFromMaster()
 {
     if (!m_pXmlConfig)
@@ -813,7 +826,7 @@ void CWebCore::GetFilterEntriesByType(std::vector<std::pair<SString, bool>>& out
                 outEntries.push_back(std::pair<SString, bool>(iter->first, iter->second.first));
             else if (state == eWebFilterState::WEBFILTER_ALLOWED && iter->second.first == true)
                 outEntries.push_back(std::pair<SString, bool>(iter->first, iter->second.first));
-            else
+            else if (state == eWebFilterState::WEBFILTER_DISALLOWED && iter->second.first == false)
                 outEntries.push_back(std::pair<SString, bool>(iter->first, iter->second.first));
         }
     }
@@ -822,6 +835,9 @@ void CWebCore::GetFilterEntriesByType(std::vector<std::pair<SString, bool>>& out
 void CWebCore::StaticFetchRevisionFinished(const SHttpDownloadResult& result)
 {
     CWebCore* pWebCore = static_cast<CWebCore*>(result.pObj);
+    if (!pWebCore) [[unlikely]]
+        return;
+
     if (result.bSuccess)
     {
         SString strData = result.pData;
@@ -862,6 +878,9 @@ void CWebCore::StaticFetchWhitelistFinished(const SHttpDownloadResult& result)
         return;
 
     CWebCore* pWebCore = static_cast<CWebCore*>(result.pObj);
+    if (!pWebCore) [[unlikely]]
+        return;
+
     if (!pWebCore->m_pXmlConfig)
         return;
 
@@ -905,6 +924,9 @@ void CWebCore::StaticFetchBlacklistFinished(const SHttpDownloadResult& result)
         return;
 
     CWebCore* pWebCore = static_cast<CWebCore*>(result.pObj);
+    if (!pWebCore) [[unlikely]]
+        return;
+
     if (!pWebCore->m_pXmlConfig)
         return;
 

Client/cefweb/CWebCore.h

@@ -29,6 +29,7 @@
 class CWebBrowserItem;
 class CWebsiteRequests;
 class CWebView;
+class CWebViewInterface;
 
 class CWebCore : public CWebCoreInterface
 {
@@ -88,7 +89,7 @@ class CWebCore : public CWebCoreInterface
     void SetTestModeEnabled(bool bEnabled) { m_bTestmodeEnabled = bEnabled; };
     void DebugOutputThreadsafe(const SString& message, unsigned char R, unsigned char G, unsigned char B);
 
-    CWebViewInterface* GetFocusedWebView() { return (CWebViewInterface*)m_pFocusedWebView; };
+    CWebViewInterface* GetFocusedWebView();
     void               SetFocusedWebView(CWebView* pWebView) { m_pFocusedWebView = pWebView; };
     void               ProcessInputMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
     void               ClearTextures();

Client/cefweb/CWebView.cpp

@@ -37,8 +37,11 @@ CWebView::~CWebView()
 {
     if (IsMainThread())
     {
-        if (g_pCore->GetWebCore()->GetFocusedWebView() == this)
-            g_pCore->GetWebCore()->SetFocusedWebView(nullptr);
+        if (auto pWebCore = g_pCore->GetWebCore(); pWebCore) [[likely]]
+        {
+            if (pWebCore->GetFocusedWebView() == this)
+                pWebCore->SetFocusedWebView(nullptr);
+        }
     }
 
     // Make sure we don't dead lock the CEF render thread
@@ -936,13 +939,16 @@ CefResourceRequestHandler::ReturnValue CWebView::OnBeforeResourceLoad(CefRefPtr<
 void CWebView::OnBeforeClose(CefRefPtr<CefBrowser> browser)
 {
     // Remove events owned by this webview and invoke left callbacks
-    g_pCore->GetWebCore()->RemoveWebViewEvents(this);
+    if (auto pWebCore = g_pCore->GetWebCore(); pWebCore) [[likely]]
+    {
+        pWebCore->RemoveWebViewEvents(this);
 
-    m_pWebView = nullptr;
+        // Remove focused web view reference
+        if (pWebCore->GetFocusedWebView() == this)
+            pWebCore->SetFocusedWebView(nullptr);
+    }
 
-    // Remove focused web view reference
-    if (g_pCore->GetWebCore()->GetFocusedWebView() == this)
-        g_pCore->GetWebCore()->SetFocusedWebView(nullptr);
+    m_pWebView = nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////

Client/cefweb/CefWeb.cpp

@@ -3,27 +3,66 @@
  *  PROJECT:     Multi Theft Auto v1.0
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        CefWeb.cpp
+ *  PURPOSE:     CEF web browser module initialization entry point
  *
  *  Multi Theft Auto is available from https://www.multitheftauto.com/
  *
  *****************************************************************************/
 
 #include "StdInc.h"
-#include "SharedUtil.hpp"
+#include <memory>
+#include <SharedUtil.Memory.h>
 
-CCoreInterface*         g_pCore = NULL;
+CCoreInterface*         g_pCore = nullptr;
 CLocalizationInterface* g_pLocalization = nullptr;
 
-extern "C" _declspec(dllexport) CWebCoreInterface* InitWebCoreInterface(CCoreInterface* pCore)
+namespace
 {
-    g_pCore = pCore;
-    g_pLocalization = pCore->GetLocalization();
+    [[nodiscard]] inline bool InitializeGlobalInterfaces(CCoreInterface* pCore) noexcept
+    {
+        if (!pCore) [[unlikely]]
+            return false;
 
-    // Ensure main thread identification is consistent
-    IsMainThread();
+        g_pCore = pCore;
+        g_pLocalization = pCore->GetLocalization();
 
-    SetMemoryAllocationFailureHandler();
+        // Localization is critical for browser GUI (request dialogs, etc.)
+        if (!g_pLocalization) [[unlikely]]
+            return false;
 
-    CWebCore* pWebCore = new CWebCore;
-    return pWebCore;
+        return true;
+    }
+
+    //
+    // Performs required runtime initialization
+    // Must be called on the main thread before creating CWebCore
+    //
+    inline void PerformRuntimeInitialization() noexcept
+    {
+        // Ensure main thread identification is consistent
+        IsMainThread();
+
+        // Set up memory allocation failure handler for CEF processes
+        SharedUtil::SetMemoryAllocationFailureHandler();
+    }
+}            // namespace
+
+//
+// DLL export: Initialize the web browser subsystem
+// Called by CCore::GetWebCore() during initialization
+// Returns CWebCoreInterface pointer on success, nullptr on failure
+// Thread safety: Must be called from the main thread only
+//
+extern "C" _declspec(dllexport) CWebCoreInterface* InitWebCoreInterface(CCoreInterface* pCore) noexcept
+{
+    // Validate and initialize global interfaces
+    if (!InitializeGlobalInterfaces(pCore)) [[unlikely]]
+        return nullptr;
+
+    // Perform runtime initialization
+    PerformRuntimeInitialization();
+
+    // Create and return the web core instance
+    // Using make_unique for exception safety, then releasing ownership to caller
+    return std::make_unique<CWebCore>().release();
 }

Client/cefweb/StdInc.cpp

@@ -1,2 +1,3 @@
 // StdInc.h
 #include "StdInc.h"
+#include "SharedUtil.hpp"

Client/cefweb/premake5.lua

@@ -1,6 +1,6 @@
 project "Client Webbrowser"
 	language "C++"
-	cppdialect "C++23"
+	cppdialect "C++20"
 	kind "SharedLib"
 	targetname "cefweb"
 	targetdir(buildpath("mta"))
@@ -39,6 +39,8 @@ project "Client Webbrowser"
 		"**.cpp"
 	}
 
+	filter {}
+
 	links {
 		"libcef", "CEF", "Psapi.lib", "version.lib", "Winmm.lib", "Ws2_32.lib", "DbgHelp.lib"
 	}

Client/core/CCore.cpp

@@ -1157,7 +1157,14 @@ CWebCoreInterface* CCore::GetWebCore()
         cvars->Get("browser_enable_gpu", gpuEnabled);
 
         m_pWebCore = CreateModule<CWebCoreInterface>(m_WebCoreModule, "CefWeb", "cefweb", "InitWebCoreInterface", this);
-        m_pWebCore->Initialise(gpuEnabled);
+        if (!m_pWebCore) [[unlikely]]
+            return nullptr;
+
+        if (!m_pWebCore->Initialise(gpuEnabled)) [[unlikely]]
+        {
+            SAFE_DELETE(m_pWebCore);
+            return nullptr;
+        }
     }
     return m_pWebCore;
 }