Synchronize changes from 1.6 branch [ci skip]

1e35a6a 1.6: Addendum to 05ae2ac (Fixes crash)

Author: github-actions[bot]

Client/cefweb/CWebApp.cpp

@@ -9,10 +9,69 @@
 #include "StdInc.h"
 #include "CWebApp.h"
 
-#include <cef3/cef/include/wrapper/cef_stream_resource_handler.h>
+#include <cef3/cef/include/cef_command_line.h>
 #include <cef3/cef/include/cef_parser.h>
+#include <cef3/cef/include/cef_resource_handler.h>
+#include <cef3/cef/include/cef_response.h>
+#include <cef3/cef/include/cef_stream.h>
+#include <cef3/cef/include/wrapper/cef_stream_resource_handler.h>
 #include "CAjaxResourceHandler.h"
 
+namespace
+{
+    // Centralises command-line switch setup so both pre-launch callbacks stay in sync
+    void ConfigureCommandLineSwitches(const CefRefPtr<CefCommandLine>& commandLine, const CefString& processType)
+    {
+        if (!commandLine)
+            return;
+
+        // CEF occasionally forwards dangling pointers when destroying
+        if (!IsReadablePointer(commandLine.get(), sizeof(void*)))
+            return;
+
+        // Always provide base installation paths so loader-proxy can validate subprocess origin
+        const SString gtaPath = GetCommonRegistryValue("", "GTA:SA Path");
+        if (!gtaPath.empty())
+        {
+            commandLine->AppendSwitchWithValue("mta-gta-path", gtaPath);
+        }
+
+        const SString mtaPath = GetMTAProcessBaseDir();
+        if (!mtaPath.empty())
+        {
+            commandLine->AppendSwitchWithValue("mta-base-path", mtaPath);
+        }
+
+        // Prevent Chromium from dropping privileges; required for elevated launches (see chromium/3960)
+        commandLine->AppendSwitch("do-not-de-elevate");
+
+        if (!g_pCore || !IsReadablePointer(g_pCore, sizeof(void*))) [[unlikely]]
+            return;
+
+        const auto webCore = static_cast<CWebCore*>(g_pCore->GetWebCore());
+        if (!webCore || !IsReadablePointer(webCore, sizeof(void*)))
+            return;
+
+        // Honour the GPU toggle exposed through settings and hard-disable compositor for stability
+        if (!webCore->GetGPUEnabled())
+        {
+            commandLine->AppendSwitch("disable-gpu");
+        }
+
+        commandLine->AppendSwitch("disable-gpu-compositing");
+        commandLine->AppendSwitch("enable-begin-frame-scheduling");
+        // Explicitly block account sign-in to avoid crashes when Google API keys are registered on the system
+        commandLine->AppendSwitchWithValue("allow-browser-signin", "false");
+
+        if (processType.empty())
+        {
+            // Browser process only: unlock autoplay and legacy Blink features for resource compatibility
+            commandLine->AppendSwitchWithValue("autoplay-policy", "no-user-gesture-required");
+            commandLine->AppendSwitchWithValue("enable-blink-features", "ShadowDOMV0,CustomElementsV0,HTMLImports");
+        }
+    }
+}            // namespace
+
 [[nodiscard]] CefRefPtr<CefResourceHandler> CWebApp::HandleError(const SString& strError, unsigned int uiError)
 {
     auto stream = CefStreamReader::CreateForData(
@@ -26,60 +85,21 @@
 
 void CWebApp::OnBeforeCommandLineProcessing(const CefString& process_type, CefRefPtr<CefCommandLine> command_line)
 {
-    if (!command_line)
-        return;
-
-    // Add GTA path and MTA base path switches before g_pCore check
-    // This callback runs in both browser process and subprocess
-    // In subprocess, g_pCore is NULL, so switches must be added before that check
-    // Read GTA path from registry
-    const SString strGTAPath = GetCommonRegistryValue("", "GTA:SA Path");
-    if (!strGTAPath.empty())
-    {
-        // Pass GTA directory path to CEFLauncher subprocess via command-line switch
-        // CEF's AppendSwitchWithValue handles quoting automatically
-        command_line->AppendSwitchWithValue("mta-gta-path", strGTAPath);
-        // AddReportLog only available in browser process where g_pCore exists
-    }
-
-    // Pass MTA base directory path to subprocess
-    // MTA DLLs are in Bin/MTA but parent process may be elsewhere
-    const SString strMTAPath = GetMTAProcessBaseDir();
-    if (!strMTAPath.empty())
-    {
-        command_line->AppendSwitchWithValue("mta-base-path", strMTAPath);
-    }
-
-    // Disable AutoDeElevate to allow CEF to run with elevated privileges
-    // Must be added before g_pCore check to apply to both browser process and subprocess
-    // https://github.com/chromiumembedded/cef/issues/3960
-    // https://chromium-review.googlesource.com/c/chromium/src/+/6515318
-    command_line->AppendSwitch("do-not-de-elevate");
-
-    // Browser-process-only settings
-    if (!g_pCore) [[unlikely]]
-        return;
+    ConfigureCommandLineSwitches(command_line, process_type);
+}
 
-    const auto pWebCore = static_cast<CWebCore*>(g_pCore->GetWebCore());
-    if (!pWebCore)
+void CWebApp::OnBeforeChildProcessLaunch(CefRefPtr<CefCommandLine> command_line)
+{
+    if (!command_line)
         return;
 
-    if (!pWebCore->GetGPUEnabled())
-        command_line->AppendSwitch("disable-gpu");
-
-    command_line->AppendSwitch("disable-gpu-compositing"); // always disable this, causes issues with official builds
-
-    // command_line->AppendSwitch("disable-d3d11");
-    command_line->AppendSwitch("enable-begin-frame-scheduling");
-
-    // browser-signin switch(or lack thereof) produces crashes when GOOGLE API keys are present in the OS registry
-    command_line->AppendSwitchWithValue("allow-browser-signin", "false");
+    const CefString processType = command_line->GetSwitchValue("type");
+    ConfigureCommandLineSwitches(command_line, processType);
+}
 
-    if (process_type.empty())
-    {
-        command_line->AppendSwitchWithValue("autoplay-policy", "no-user-gesture-required");
-        command_line->AppendSwitchWithValue("enable-blink-features", "ShadowDOMV0,CustomElementsV0,HTMLImports");
-    }
+CefRefPtr<CefBrowserProcessHandler> CWebApp::GetBrowserProcessHandler()
+{
+    return this;
 }
 
 CefRefPtr<CefResourceHandler> CWebApp::Create(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, const CefString& scheme_name,

Client/cefweb/CWebApp.h

@@ -9,14 +9,18 @@
 #pragma once
 #include <cef3/cef/include/cef_app.h>
 #include <cef3/cef/include/cef_scheme.h>
+#include <cef3/cef/include/cef_browser_process_handler.h>
 
-class CWebApp : public CefApp, public CefSchemeHandlerFactory
+class CWebApp : public CefApp, public CefSchemeHandlerFactory, public CefBrowserProcessHandler
 {
 public:
     // Error Handler
     static CefRefPtr<CefResourceHandler> HandleError(const SString& strError, unsigned int uiError);
 
     virtual void OnBeforeCommandLineProcessing(const CefString& process_type, CefRefPtr<CefCommandLine> command_line) override;
+    virtual void OnBeforeChildProcessLaunch(CefRefPtr<CefCommandLine> command_line) override;
+
+    virtual CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() override;
 
     // CefSchemeHandlerFactory methods
     virtual CefRefPtr<CefResourceHandler> Create(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, const CefString& scheme_name,