Merge branch 'master' into fix-dildo-vibrator-names

Author: Fernando-A-Rocha

.github/workflows/codeql.yml

@@ -0,0 +1,104 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: '19 17 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: actions
+          build-mode: none
+        - language: c-cpp
+          build-mode: autobuild
+        - language: javascript-typescript
+          build-mode: none
+        - language: python
+          build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Add any setup steps before running the `github/codeql-action/init` action.
+    # This includes steps like installing compilers or runtimes (`actions/setup-node`
+    # or others). This is typically only required for manual builds.
+    # - name: Setup runtime (example)
+    #   uses: actions/setup-example@v1
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

Client/ceflauncher/CEFLauncher.manifest

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:v3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity type="win32" version="1.0.0.0" processorArchitecture="*" name="CEFLauncher" />
+
+    <v3:application>
+        <windowsSettings>
+            <dpiAware     xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware>
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+        </windowsSettings>
+    </v3:application>
+
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /> <!-- Windows 10 and Windows 11 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /> <!-- Windows 8.1 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /> <!-- Windows 8 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /> <!-- Windows 7 -->
+        </application>
+    </compatibility>
+
+    <dependency optional="yes">
+        <dependentAssembly>
+            <!-- Automatically use ComCtl32.dll version 6 or later. -->
+            <assemblyIdentity
+                type="win32"
+                name="Microsoft.Windows.Common-Controls"
+                version="6.0.0.0"
+                processorArchitecture="*"
+                publicKeyToken="6595b64144ccf1df"
+                language="*" />
+        </dependentAssembly>
+    </dependency>
+</assembly>

Client/ceflauncher/premake5.lua

@@ -9,13 +9,15 @@ project "CEFLauncher"
 	vpaths {
 		["Headers/*"] = "**.h",
 		["Sources/*"] = "**.cpp",
+		["Resources/*"] = {"*.rc", "**.ico", "**.xml", "**.manifest"},
 		["*"] = "premake5.lua"
 	}
 
 	files {
 		"premake5.lua",
 		"*.h",
-		"*.cpp"
+		"*.cpp",
+		"*.manifest",
 	}
 
 	filter "architecture:not x86"

Client/ceflauncher_DLL/Main.cpp

@@ -9,8 +9,13 @@
  *
  *****************************************************************************/
 
+#define WIN32_NO_STATUS
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#undef WIN32_NO_STATUS
+#include <ntstatus.h>
+#include <winnt.h>
+#include <winternl.h>
 #include <delayimp.h>
 #include "CCefApp.h"
 #include <string>
@@ -21,6 +26,8 @@
     #pragma comment(lib, "cef_sandbox.lib")
 #endif
 
+DWORD WINAPI CheckParentProcessAliveness(LPVOID);
+
 int _declspec(dllexport) InitCEF()
 {
     // Get absolute CEFLauncher.exe path
@@ -46,20 +53,62 @@ int _declspec(dllexport) InitCEF()
     sandboxInfo = scopedSandbox.sandbox_info();
 #endif
 
-    if (HANDLE job = CreateJobObjectW(nullptr, nullptr); job != nullptr)
+    const HANDLE parentCheckThread = CreateThread(nullptr, 0, CheckParentProcessAliveness, nullptr, 0, nullptr);
+
+    const int exitCode = CefExecuteProcess(mainArgs, app, sandboxInfo);
+
+    if (parentCheckThread != nullptr)
     {
-        JOBOBJECT_EXTENDED_LIMIT_INFORMATION limits{};
-        limits.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
+        TerminateThread(parentCheckThread, 0);
+        CloseHandle(parentCheckThread);
+    }
 
-        if (SetInformationJobObject(job, JobObjectExtendedLimitInformation, &limits, sizeof(limits)))
-        {
-            AssignProcessToJobObject(job, GetCurrentProcess());
-        }
-        else
+    return exitCode;
+}
+
+static DWORD WINAPI CheckParentProcessAliveness(LPVOID)
+{
+    NTSTATUS(NTAPI * queryInformation)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG) = nullptr;
+
+    if (HMODULE const ntdll = GetModuleHandleW(L"ntdll.dll"); ntdll != nullptr)
+    {
+        queryInformation = reinterpret_cast<decltype(queryInformation)>(GetProcAddress(ntdll, "NtQueryInformationProcess"));
+    }
+
+    if (queryInformation == nullptr)
+        return 1;
+
+    PROCESS_BASIC_INFORMATION info{};
+
+    ULONG    returnLength = 0;
+    NTSTATUS status = queryInformation(GetCurrentProcess(), ProcessBasicInformation, &info, sizeof(info), &returnLength);
+
+    if (!NT_SUCCESS(status) || returnLength < sizeof(PROCESS_BASIC_INFORMATION))
+        return 2;
+
+    const auto   parentProcessId = static_cast<DWORD>(reinterpret_cast<ULONG_PTR>(info.Reserved3));
+    const HANDLE parentProcess = OpenProcess(SYNCHRONIZE | PROCESS_QUERY_LIMITED_INFORMATION, FALSE, parentProcessId);
+
+    if (parentProcess == nullptr)
+    {
+        if (GetLastError() == ERROR_INVALID_PARAMETER)
+            ExitProcess(0);
+
+        return 3;
+    }
+
+    while (true)
+    {
+        DWORD exitCode{};
+
+        if (!GetExitCodeProcess(parentProcess, &exitCode) || exitCode != STILL_ACTIVE)
         {
-            CloseHandle(job);
+            CloseHandle(parentProcess);
+            ExitProcess(exitCode);
         }
+
+        Sleep(1000);
     }
 
-    return CefExecuteProcess(mainArgs, app, sandboxInfo);
+    return 0;
 }

Client/cefweb/CWebApp.cpp

@@ -26,6 +26,11 @@ void CWebApp::OnBeforeCommandLineProcessing(const CefString& process_type, CefRe
     if (!pWebCore->GetGPUEnabled())
         command_line->AppendSwitch("disable-gpu");
 
+    // Disable the AutoDeElevate feature to make launching CEF with Admin privileges work.
+    // https://github.com/chromiumembedded/cef/issues/3960
+    // https://chromium-review.googlesource.com/c/chromium/src/+/6515318
+    command_line->AppendSwitch("do-not-de-elevate");
+
     command_line->AppendSwitch("disable-gpu-compositing"); // always disable this, causes issues with official builds
 
     // command_line->AppendSwitch("disable-d3d11");

Client/cefweb/CefWeb.cpp

@@ -22,6 +22,8 @@ extern "C" _declspec(dllexport) CWebCoreInterface* InitWebCoreInterface(CCoreInt
     // Ensure main thread identification is consistent
     IsMainThread();
 
+    SetMemoryAllocationFailureHandler();
+
     CWebCore* pWebCore = new CWebCore;
     return pWebCore;
 }

Client/core/CClientVariables.cpp

@@ -359,6 +359,7 @@ void CClientVariables::LoadDefaults()
     DEFAULT("browser_enable_gpu", true);                                              // Enable GPU in CEF? (allows stuff like WebGL to function)
     DEFAULT("process_cpu_affinity", true);                                            // Set CPU 0 affinity to improve game performance and fix the known issue in single-threaded games
     DEFAULT("ask_before_disconnect", true);                                           // Ask before disconnecting from a server
+    DEFAULT("allow_steam_client", false);                                             // Allow connecting with the local Steam client (to set GTA:SA ingame status)
 
     if (!Exists("locale"))
     {

Client/core/CCommandFuncs.cpp

@@ -427,6 +427,19 @@ void CCommandFuncs::Test(const char* szParameters)
             }
         }
     }
+#if defined(MTA_DEBUG) || MTASA_VERSION_TYPE == VERSION_TYPE_CUSTOM
+    else if (SStringX(szParameters) == "bad_alloc")
+    {
+        if (FileExists(CalcMTASAPath("debug.txt")))
+        {
+            while (true)
+            {
+                new int[100 * 1024 * 1024]();
+                g_pCore->GetConsole()->Print("Allocated 100 MiB");
+            }
+        }
+    }
+#endif
 }
 
 void CCommandFuncs::Serial(const char* szParameters)

Client/core/CCore.cpp

@@ -26,6 +26,7 @@
 #include <SharedUtil.Detours.h>
 #include <ServerBrowser/CServerCache.h>
 #include "CDiscordRichPresence.h"
+#include "CSteamClient.h"
 
 using SharedUtil::CalcMTASAPath;
 using namespace std;
@@ -160,6 +161,7 @@ CCore::CCore()
 
     // Create tray icon
     m_pTrayIcon = new CTrayIcon();
+    m_steamClient = std::make_unique<CSteamClient>();
 
     // Create discord rich presence
     m_pDiscordRichPresence = std::shared_ptr<CDiscordRichPresence>(new CDiscordRichPresence());
@@ -173,6 +175,8 @@ CCore::~CCore()
     if (m_pDiscordRichPresence)
         m_pDiscordRichPresence.reset();
 
+    m_steamClient.reset();
+
     // Destroy tray icon
     delete m_pTrayIcon;
 
@@ -1228,6 +1232,12 @@ void CCore::DoPostFramePulse()
         ApplyConsoleSettings();
         ApplyGameSettings();
 
+        // Allow connecting with the local Steam client
+        bool allowSteamClient = false;
+        CVARS_GET("allow_steam_client", allowSteamClient);
+        if (allowSteamClient)
+            m_steamClient->Connect();
+
         m_pGUI->SelectInputHandlers(INPUT_CORE);
     }
 
@@ -1273,7 +1283,8 @@ void CCore::DoPostFramePulse()
             }
         }
 
-        if (m_menuFrame >= 75 && m_requestNewNickname && GetLocalGUI()->GetMainMenu()->IsVisible() && !GetLocalGUI()->GetMainMenu()->IsFading())
+        if (m_menuFrame >= 75 && m_requestNewNickname && GetLocalGUI()->GetMainMenu()->IsVisible() && !GetLocalGUI()->GetMainMenu()->IsFading() &&
+            !GetLocalGUI()->GetMainMenu()->GetQuestionWindow()->IsVisible())
         {
             // Request a new nickname if we're waiting for one
             GetLocalGUI()->GetMainMenu()->GetSettingsWindow()->RequestNewNickname();
@@ -1452,6 +1463,10 @@ void CCore::Quit(bool bInstantly)
 
         WatchDogBeginSection("Q0");            // Allow loader to detect freeze on exit
 
+        // Hide game window to make quit look instant
+        PostQuitMessage(0);
+        ShowWindow(GetHookedWindow(), SW_HIDE);
+
         // Destroy the client
         CModManager::GetSingleton().Unload();
 
@@ -1462,7 +1477,6 @@ void CCore::Quit(bool bInstantly)
 
         // Use TerminateProcess for now as exiting the normal way crashes
         TerminateProcess(GetCurrentProcess(), 0);
-        // PostQuitMessage ( 0 );
     }
     else
     {

Client/core/CCore.h

@@ -70,6 +70,8 @@ class CDiscordInterface;
 #define CONFIG_HISTORY_LIST_TAG    "connected_server"
 #define IDT_TIMER1                 1234
 
+class CSteamClient;
+
 extern class CCore*         g_pCore;
 extern class CGraphics*     g_pGraphics;
 extern class CLocalization* g_pLocalization;
@@ -104,6 +106,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CWebCoreInterface*                 GetWebCore();
     CTrayIconInterface*                GetTrayIcon() { return m_pTrayIcon; };
     std::shared_ptr<CDiscordInterface> GetDiscord();
+    CSteamClient*                      GetSteamClient() { return m_steamClient.get(); }
 
     void SaveConfig(bool bWaitUntilFinished = false);
 
@@ -311,6 +314,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CClientVariables                      m_ClientVariables;
     CWebCoreInterface*                    m_pWebCore = nullptr;
     CTrayIcon*                            m_pTrayIcon;
+    std::unique_ptr<CSteamClient>         m_steamClient;
     std::shared_ptr<CDiscordRichPresence> m_pDiscordRichPresence;
 
     // Hook interfaces.