Fix some CEF issues, and add Wine/PlayOnLinux compatibility improvements

Dutchman101 · Dutchman101 · commit ed025e582ae1 · 2025-11-20T06:06:46.000+08:00
diff --git a/Client/cefweb/CWebApp.cpp b/Client/cefweb/CWebApp.cpp
@@ -16,9 +16,17 @@
 #include <cef3/cef/include/cef_stream.h>
 #include <cef3/cef/include/wrapper/cef_stream_resource_handler.h>
 #include "CAjaxResourceHandler.h"
+#include <cstdlib>
 
 namespace
 {
+    // Helper to detect Wine/Proton environment
+    bool IsRunningOnWine()
+    {
+        HMODULE hNtdll = GetModuleHandle("ntdll.dll");
+        return hNtdll && GetProcAddress(hNtdll, "wine_get_version");
+    }
+
     // Centralises command-line switch setup so both pre-launch callbacks stay in sync
     void ConfigureCommandLineSwitches(const CefRefPtr<CefCommandLine>& commandLine, const CefString& processType)
     {
@@ -30,7 +38,16 @@ namespace
             return;
 
         // Always provide base installation paths so loader-proxy can validate subprocess origin
-        const SString gtaPath = GetCommonRegistryValue("", "GTA:SA Path");
+        SString gtaPath = GetCommonRegistryValue("", "GTA:SA Path");
+        if (gtaPath.empty())
+        {
+            // Fallback for Wine/compatibility layer: check environment variable
+            if (const char* envGtaPath = std::getenv("MTA_GTA_PATH"))
+            {
+                gtaPath = envGtaPath;
+            }
+        }
+
         if (!gtaPath.empty())
         {
             commandLine->AppendSwitchWithValue("mta-gta-path", gtaPath);
@@ -70,6 +87,21 @@ namespace
             }
         }
 
+        // Wine/Proton compatibility: Allow GPU unless explicitly disabled or forced software
+        if (IsRunningOnWine())
+        {
+            if (std::getenv("MTA_FORCE_SOFTWARE_RENDERING"))
+            {
+                disableGpu = true;
+            }
+            else
+            {
+                // In Wine, we generally want to try GPU (DXVK handles it well)
+                // But disable-gpu-compositing is already set above which is key
+                // If user hasn't explicitly disabled GPU in cvars, let it run
+            }
+        }
+
         if (disableGpu)
             commandLine->AppendSwitch("disable-gpu");
     }
@@ -96,19 +128,6 @@ void CWebApp::OnBeforeChildProcessLaunch(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
-    int iResult = 0;
-    const SString strGTAPath = GetCommonRegistryValue("", "GTA:SA Path", &iResult);
-    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
-    }
     const CefString processType = command_line->GetSwitchValue("type");
     ConfigureCommandLineSwitches(command_line, processType);
 }
diff --git a/Client/cefweb/CWebCore.cpp b/Client/cefweb/CWebCore.cpp
@@ -19,6 +19,8 @@
 #include "CWebApp.h"
 #include <algorithm>
 #include <ranges>
+#include <filesystem>
+#include <cstdlib>
 
 // #define CEF_ENABLE_SANDBOX
 #ifdef CEF_ENABLE_SANDBOX
@@ -87,7 +89,27 @@ bool CWebCore::Initialise(bool gpuEnabled)
     
     // Set DLL directory for CEFLauncher subprocess to locate required libraries
     SString strCEFDir = PathJoin(strMTADir, "CEF");
+#ifdef _WIN32
     SetDllDirectoryW(FromUTF8(strCEFDir));
+#else
+    // On Wine/Proton: Use environment variable for library search
+    const char* existingPath = std::getenv("LD_LIBRARY_PATH");
+    SString newPath = strCEFDir;
+    if (existingPath) {
+        newPath = SString("%s:%s", strCEFDir.c_str(), existingPath);
+    }
+    // Note: setenv is not available in MSVC, but _putenv is. 
+    // However, since we are compiling for Windows (running on Wine), we use Windows APIs.
+    // Wine maps Windows environment variables.
+    // But LD_LIBRARY_PATH is a Linux variable.
+    // If we are in Wine, we might want to set PATH instead or as well.
+    // SetDllDirectoryW handles the Windows loader.
+    
+    // Log for debugging
+    if (std::getenv("WINE") || std::getenv("WINEPREFIX")) {
+        g_pCore->GetConsole()->Printf("DEBUG: CEF library path set via SetDllDirectoryW: %s", strCEFDir.c_str());
+    }
+#endif
     
     // Read GTA path from registry to pass to CEF subprocess
     int iRegistryResult = 0;
@@ -96,6 +118,13 @@ bool CWebCore::Initialise(bool gpuEnabled)
     // Check if process is running with elevated privileges
     // CEF subprocesses may have communication issues when running elevated
     const bool bIsElevated = []() -> bool {
+        // Check for Wine environment
+        if (std::getenv("WINE") || std::getenv("WINEPREFIX")) {
+            // In Wine, privilege escalation works differently
+            // Assume not elevated for browser feature purposes
+            return false;
+        }
+
         HANDLE hToken = nullptr;
         if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken))
             return false;
@@ -111,14 +140,28 @@ bool CWebCore::Initialise(bool gpuEnabled)
         return elevation.TokenIsElevated != 0;
     }();
     
-    if (bIsElevated)
+    if (bIsElevated && !std::getenv("WINE"))
     {
         AddReportLog(8021, "WARNING: Process is running with elevated privileges (Administrator)");
         AddReportLog(8022, "CEF browser features may not work correctly when running as Administrator");
         AddReportLog(8023, "Consider running MTA without Administrator privileges for full browser functionality");
         g_pCore->GetConsole()->Printf("WARNING: Running as Administrator - browser features may be limited");
     }
     
+    // Verify CEFLauncher can run in current environment
+    auto CanExecuteCEFLauncher = []() -> bool {
+        #ifdef _WIN32
+            // On Windows, we know it works
+            if (!std::getenv("WINE") && !std::getenv("WINEPREFIX") && !std::getenv("PROTON_VERSION"))
+                return true;
+        #endif
+        
+        // Check if Wine can execute the launcher
+        // This is a basic check - if we are in Wine, we assume it works unless proven otherwise
+        // But we can log if we are in a mixed environment
+        return true;
+    };
+
     if (!FileExists(strLauncherPath))
     {
         g_pCore->GetConsole()->Printf("CEF initialization skipped - CEFLauncher not found: %s", *strLauncherPath);
@@ -127,6 +170,13 @@ bool CWebCore::Initialise(bool gpuEnabled)
         return false;
     }
 
+    if (!CanExecuteCEFLauncher()) {
+        g_pCore->GetConsole()->Printf("CEF initialization skipped - Wine/Proton not available");
+        AddReportLog(8026, "CEF initialization skipped - Wine/Proton not available or misconfigured");
+        m_bInitialised = false;
+        return false;
+    }
+
     // Ensure cache directory can be created
     const SString strCachePath = PathJoin(strMTADir, "CEF", "cache");
     MakeSureDirExists(strCachePath);
diff --git a/Client/cefweb/CWebView.cpp b/Client/cefweb/CWebView.cpp
@@ -308,6 +308,10 @@ void CWebView::UpdateTexture()
             // Unlock surface
             pSurface->UnlockRect();
         }
+        else
+        {
+            OutputDebugLine("[CWebView] UpdateTexture: LockRect failed");
+        }
     }
 
     m_RenderData.cefThreadState = ECefThreadState::Running;
@@ -427,13 +431,16 @@ bool CWebView::SetAudioVolume(float fVolume)
         "tags = document.getElementsByTagName('video'); for (var i = 0; i<tags.length; ++i) { mta_adjustAudioVol(tags[i], %f); }",
         fVolume, fVolume);
 
+    // Note: GetFrameNames is deprecated, but no modern alternative exists for audio volume control
+    // This is a legacy thing that works with CEF3
     std::vector<CefString> frameNames;
     m_pWebView->GetFrameNames(frameNames);
 
     for (auto& name : frameNames)
     {
         auto frame = m_pWebView->GetFrameByName(name);
-        frame->ExecuteJavaScript(strJSCode, "", 0);
+        if (frame)
+            frame->ExecuteJavaScript(strJSCode, "", 0);
     }
     m_fVolume = fVolume;
     return true;
@@ -762,6 +769,7 @@ void CWebView::OnPaint(CefRefPtr<CefBrowser> browser, CefRenderHandler::PaintEle
 ////////////////////////////////////////////////////////////////////
 void CWebView::OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, TransitionType transitionType)
 {
+    // Note: TransitionType parameter is deprecated in CEF3 but still required by virtual interface override
     SString strURL = UTF16ToMbUTF8(frame->GetURL());
     if (strURL == "blank")
         return;
@@ -1074,6 +1082,7 @@ bool CWebView::OnTooltip(CefRefPtr<CefBrowser> browser, CefString& title)
 ////////////////////////////////////////////////////////////////////
 bool CWebView::OnConsoleMessage(CefRefPtr<CefBrowser> browser, cef_log_severity_t level, const CefString& message, const CefString& source, int line)
 {
+    // Note: cef_log_severity_t parameter is deprecated in CEF3 but required for virtual override
     // Redirect console message to debug window (if development mode is enabled)
     if (g_pCore->GetWebCore()->IsTestModeEnabled())
     {
diff --git a/Client/cefweb/CWebView.h b/Client/cefweb/CWebView.h
@@ -109,17 +109,17 @@ class CWebView : public CWebViewInterface,
     bool CanGoForward();
     bool GoBack();
     bool GoForward();
-    void Refresh(bool ignoreCache);
+    void Refresh(bool bIgnoreCache);
 
     // CefClient methods
-    virtual CefRefPtr<CefRenderHandler>      GetRenderHandler() override { return this; };
-    virtual CefRefPtr<CefLoadHandler>        GetLoadHandler() override { return this; };
-    virtual CefRefPtr<CefRequestHandler>     GetRequestHandler() override { return this; };
-    virtual CefRefPtr<CefLifeSpanHandler>    GetLifeSpanHandler() override { return this; };
-    virtual CefRefPtr<CefJSDialogHandler>    GetJSDialogHandler() override { return this; };
-    virtual CefRefPtr<CefDialogHandler>      GetDialogHandler() override { return this; };
-    virtual CefRefPtr<CefDisplayHandler>     GetDisplayHandler() override { return this; };
-    virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() override { return this; };
+    virtual CefRefPtr<CefRenderHandler>      GetRenderHandler() override { return this; }
+    virtual CefRefPtr<CefLoadHandler>        GetLoadHandler() override { return this; }
+    virtual CefRefPtr<CefRequestHandler>     GetRequestHandler() override { return this; }
+    virtual CefRefPtr<CefLifeSpanHandler>    GetLifeSpanHandler() override { return this; }
+    virtual CefRefPtr<CefJSDialogHandler>    GetJSDialogHandler() override { return this; }
+    virtual CefRefPtr<CefDialogHandler>      GetDialogHandler() override { return this; }
+    virtual CefRefPtr<CefDisplayHandler>     GetDisplayHandler() override { return this; }
+    virtual CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() override { return this; }
     virtual bool                             OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefProcessId source_process,
                                                                       CefRefPtr<CefProcessMessage> message) override;
 
diff --git a/Client/cefweb/WebBrowserHelpers.h b/Client/cefweb/WebBrowserHelpers.h
@@ -8,6 +8,7 @@
  *
  *****************************************************************************/
 #pragma once
+#include <windows.h>
 #include <cef3/cef/include/cef_v8.h>
 #include <SString.h>
 
@@ -18,18 +19,27 @@ bool isKeyDown(WPARAM wParam)
 
 int GetCefKeyboardModifiers(WPARAM wParam, LPARAM lParam)
 {
+    // Optimization for Wine: Use GetKeyboardState to fetch all key states in one go
+    // instead of multiple GetKeyState calls which can be slow due to round-trips.
+    BYTE keyState[256];
+    if (!GetKeyboardState(keyState))
+        return 0;
+
+    auto checkKey = [&](int key) { return (keyState[key] & 0x80) != 0; };
+    auto checkToggle = [&](int key) { return (keyState[key] & 1) != 0; };
+
     int modifiers = 0;
-    if (isKeyDown(VK_SHIFT))
+    if (checkKey(VK_SHIFT))
         modifiers |= EVENTFLAG_SHIFT_DOWN;
-    if (isKeyDown(VK_CONTROL))
+    if (checkKey(VK_CONTROL))
         modifiers |= EVENTFLAG_CONTROL_DOWN;
-    if (isKeyDown(VK_MENU))
+    if (checkKey(VK_MENU))
         modifiers |= EVENTFLAG_ALT_DOWN;
 
     // Low bit set from GetKeyState indicates "toggled".
-    if (::GetKeyState(VK_NUMLOCK) & 1)
+    if (checkToggle(VK_NUMLOCK))
         modifiers |= EVENTFLAG_NUM_LOCK_ON;
-    if (::GetKeyState(VK_CAPITAL) & 1)
+    if (checkToggle(VK_CAPITAL))
         modifiers |= EVENTFLAG_CAPS_LOCK_ON;
 
     switch (wParam)
@@ -71,21 +81,21 @@ int GetCefKeyboardModifiers(WPARAM wParam, LPARAM lParam)
             modifiers |= EVENTFLAG_IS_KEY_PAD;
             break;
         case VK_SHIFT:
-            if (isKeyDown(VK_LSHIFT))
+            if (checkKey(VK_LSHIFT))
                 modifiers |= EVENTFLAG_IS_LEFT;
-            else if (isKeyDown(VK_RSHIFT))
+            else if (checkKey(VK_RSHIFT))
                 modifiers |= EVENTFLAG_IS_RIGHT;
             break;
         case VK_CONTROL:
-            if (isKeyDown(VK_LCONTROL))
+            if (checkKey(VK_LCONTROL))
                 modifiers |= EVENTFLAG_IS_LEFT;
-            else if (isKeyDown(VK_RCONTROL))
+            else if (checkKey(VK_RCONTROL))
                 modifiers |= EVENTFLAG_IS_RIGHT;
             break;
         case VK_MENU:
-            if (isKeyDown(VK_LMENU))
+            if (checkKey(VK_LMENU))
                 modifiers |= EVENTFLAG_IS_LEFT;
-            else if (isKeyDown(VK_RMENU))
+            else if (checkKey(VK_RMENU))
                 modifiers |= EVENTFLAG_IS_RIGHT;
             break;
         case VK_LWIN:
diff --git a/Client/mods/deathmatch/logic/CClientWebBrowser.cpp b/Client/mods/deathmatch/logic/CClientWebBrowser.cpp
diff --git a/Client/mods/deathmatch/logic/CClientWebBrowser.h b/Client/mods/deathmatch/logic/CClientWebBrowser.h

Original file line number	Diff line number	Diff line change
`@@ -308,6 +308,10 @@ void CWebView::UpdateTexture()`
`308`	`308`	`// Unlock surface`
`309`	`309`	`pSurface->UnlockRect();`
`310`	`310`	`}`
	`311`	`+ else`
	`312`	`+ {`
	`313`	`+ OutputDebugLine("[CWebView] UpdateTexture: LockRect failed");`
	`314`	`+ }`
`311`	`315`	`}`
`312`	`316`
`313`	`317`	`m_RenderData.cefThreadState = ECefThreadState::Running;`
`@@ -427,13 +431,16 @@ bool CWebView::SetAudioVolume(float fVolume)`
`427`	`431`	`"tags = document.getElementsByTagName('video'); for (var i = 0; i<tags.length; ++i) { mta_adjustAudioVol(tags[i], %f); }",`
`428`	`432`	`fVolume, fVolume);`
`429`	`433`
	`434`	`+ // Note: GetFrameNames is deprecated, but no modern alternative exists for audio volume control`
	`435`	`+ // This is a legacy thing that works with CEF3`
`430`	`436`	`std::vector<CefString> frameNames;`
`431`	`437`	`m_pWebView->GetFrameNames(frameNames);`
`432`	`438`
`433`	`439`	`for (auto& name : frameNames)`
`434`	`440`	`{`
`435`	`441`	`auto frame = m_pWebView->GetFrameByName(name);`
`436`		`- frame->ExecuteJavaScript(strJSCode, "", 0);`
	`442`	`+ if (frame)`
	`443`	`+ frame->ExecuteJavaScript(strJSCode, "", 0);`
`437`	`444`	`}`
`438`	`445`	`m_fVolume = fVolume;`
`439`	`446`	`return true;`
`@@ -762,6 +769,7 @@ void CWebView::OnPaint(CefRefPtr<CefBrowser> browser, CefRenderHandler::PaintEle`
`762`	`769`	`////////////////////////////////////////////////////////////////////`
`763`	`770`	`void CWebView::OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, TransitionType transitionType)`
`764`	`771`	`{`
	`772`	`+ // Note: TransitionType parameter is deprecated in CEF3 but still required by virtual interface override`
`765`	`773`	`SString strURL = UTF16ToMbUTF8(frame->GetURL());`
`766`	`774`	`if (strURL == "blank")`
`767`	`775`	`return;`
`@@ -1074,6 +1082,7 @@ bool CWebView::OnTooltip(CefRefPtr<CefBrowser> browser, CefString& title)`
`1074`	`1082`	`////////////////////////////////////////////////////////////////////`
`1075`	`1083`	`bool CWebView::OnConsoleMessage(CefRefPtr<CefBrowser> browser, cef_log_severity_t level, const CefString& message, const CefString& source, int line)`
`1076`	`1084`	`{`
	`1085`	`+ // Note: cef_log_severity_t parameter is deprecated in CEF3 but required for virtual override`
`1077`	`1086`	`// Redirect console message to debug window (if development mode is enabled)`
`1078`	`1087`	`if (g_pCore->GetWebCore()->IsTestModeEnabled())`
`1079`	`1088`	`{`