Merge remote-tracking branch 'mta_main/master' into TheNormalnij/remove_vtbl

Author: TheNormalnij

.github/workflows/crowdin-auto-merge.yml

@@ -0,0 +1,31 @@
+name: Crowdin Auto-Merge
+
+on:
+  schedule:
+    - cron: '0 0 * * 5'  # This cron expression runs the workflow every Friday at midnight (UTC)
+  workflow_dispatch:
+
+jobs:
+  crowdin-auto-merge:
+    if: github.event.repository.fork == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Git
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+      - name: Auto-merge pull request
+        run: |
+          PR_NUMBER=$(gh pr list --repo ${{ github.repository }} --author 'MTABot' --base 'master' --head 'l10n/master' --state open --json number --jq '.[0].number')
+          if [ -n "$PR_NUMBER" ]; then
+            gh pr merge $PR_NUMBER --squash --repo ${{ github.repository }} --admin --subject "New Crowdin updates (PR #$PR_NUMBER)" --body ""
+            git push origin --delete l10n/master
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dockerimage.yaml

@@ -26,6 +26,7 @@ jobs:
           dockerfile: Dockerfile.armhf
         - tag: arm64
           dockerfile: Dockerfile.arm64
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

.github/workflows/rebuild-pots.yaml

@@ -4,6 +4,7 @@ on: [push, workflow_dispatch]
 
 jobs:
   test:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -23,6 +24,7 @@ jobs:
         run: pytest "utils/localization/tests"
         shell: bash -l {0}
   rebuild-pots:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     needs: test
     steps:

.github/workflows/stale.yaml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   stale:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: multitheftauto/[email protected]

.github/workflows/sync-master-to-maetro.yaml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   sync-master-to-maetro:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

Client/ceflauncher/Main.cpp

@@ -1,15 +1,13 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
- *               (Shared logic for modifications)
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        ceflauncher/Main.cpp
  *  PURPOSE:     CEF launcher entry point
  *
+ *  Multi Theft Auto is available from https://multitheftauto.com/
+ *
  *****************************************************************************/
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <string>
 
 /*
     IMPORTANT
@@ -24,7 +22,10 @@
 
 int _declspec(dllimport) InitCEF();
 
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdShow, int nCmdShow)
+using HINSTANCE = struct HINSTANCE__*;
+using LPSTR = char*;
+
+int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdShow, int nCmdShow)
 {
     return InitCEF();
 }

Client/ceflauncher/premake5.lua

@@ -3,19 +3,15 @@ project "CEFLauncher"
 	kind "WindowedApp"
 	targetname "CEFLauncher"
 	targetdir(buildpath("mta/cef"))
-
 	includedirs { "../sdk" }
-
 	links { "CEFLauncher DLL"}
-	entrypoint "WinMainCRTStartup"
 
 	vpaths {
 		["Headers/*"] = "**.h",
 		["Sources/*"] = "**.cpp",
 		["*"] = "premake5.lua"
 	}
 
-
 	files {
 		"premake5.lua",
 		"*.h",

Client/ceflauncher_DLL/Main.cpp

@@ -1,12 +1,14 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
- *               (Shared logic for modifications)
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
  *  FILE:        ceflauncher/Main.cpp
  *  PURPOSE:     CEF launcher entry point
  *
+ *  Multi Theft Auto is available from https://multitheftauto.com/
+ *
  *****************************************************************************/
+
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <delayimp.h>
@@ -44,5 +46,20 @@ int _declspec(dllexport) InitCEF()
     sandboxInfo = scopedSandbox.sandbox_info();
 #endif
 
+    if (HANDLE job = CreateJobObjectW(nullptr, nullptr); job != nullptr)
+    {
+        JOBOBJECT_EXTENDED_LIMIT_INFORMATION limits{};
+        limits.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
+
+        if (SetInformationJobObject(job, JobObjectExtendedLimitInformation, &limits, sizeof(limits)))
+        {
+            AssignProcessToJobObject(job, GetCurrentProcess());
+        }
+        else
+        {
+            CloseHandle(job);
+        }
+    }
+
     return CefExecuteProcess(mainArgs, app, sandboxInfo);
 }

Client/cefweb/CWebView.cpp

@@ -936,10 +936,10 @@ void CWebView::OnBeforeClose(CefRefPtr<CefBrowser> browser)
 // //
 //                                                                //
 ////////////////////////////////////////////////////////////////////
-bool CWebView::OnBeforePopup(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, const CefString& target_url, const CefString& target_frame_name,
-                             CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture, const CefPopupFeatures& popupFeatures,
-                             CefWindowInfo& windowInfo, CefRefPtr<CefClient>& client, CefBrowserSettings& settings, CefRefPtr<CefDictionaryValue>& extra_info,
-                             bool* no_javascript_access)
+bool CWebView::OnBeforePopup(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int popup_id, const CefString& target_url,
+                             const CefString& target_frame_name, CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture,
+                             const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo, CefRefPtr<CefClient>& client, CefBrowserSettings& settings,
+                             CefRefPtr<CefDictionaryValue>& extra_info, bool* no_javascript_access)
 {
     // ATTENTION: This method is called on the IO thread
 

Client/cefweb/CWebView.h

@@ -152,10 +152,10 @@ class CWebView : public CWebViewInterface,
 
     // CefLifeSpawnHandler methods
     virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) override;
-    virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, const CefString& target_url, const CefString& target_frame_name,
-                               CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture, const CefPopupFeatures& popupFeatures,
-                               CefWindowInfo& windowInfo, CefRefPtr<CefClient>& client, CefBrowserSettings& settings, CefRefPtr<CefDictionaryValue>& extra_info,
-                               bool* no_javascript_access) override;
+    virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int popup_id, const CefString& target_url,
+                               const CefString& target_frame_name, CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture,
+                               const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo, CefRefPtr<CefClient>& client, CefBrowserSettings& settings,
+                               CefRefPtr<CefDictionaryValue>& extra_info, bool* no_javascript_access) override;
     virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) override;
 
     // CefJSDialogHandler methods