Synchronize changes from 1.6 master branch [ci skip]

9f87408 Fix postbuildcommands for CEF
a6c0027 Use job object to kill CEF process on exit (Fixes #4032)
3a7fa32 Minor refactor for CEFLauncher
4f48500 Remove dead CFileSystemHook code

Author: github-actions[bot]

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/core/CCore.cpp

@@ -136,7 +136,6 @@ CCore::CCore()
     m_pMouseControl = new CMouseControl();
 
     // Create our hook objects.
-    // m_pFileSystemHook           = new CFileSystemHook ( );
     m_pDirect3DHookManager = new CDirect3DHookManager();
     m_pDirectInputHookManager = new CDirectInputHookManager();
     m_pMessageLoopHook = new CMessageLoopHook();
@@ -210,7 +209,6 @@ CCore::~CCore()
 
     // Delete hooks.
     delete m_pSetCursorPosHook;
-    // delete m_pFileSystemHook;
     delete m_pDirect3DHookManager;
     delete m_pDirectInputHookManager;
 
@@ -839,12 +837,8 @@ void CCore::ApplyHooks()
     // Create our hooks.
     m_pDirectInputHookManager->ApplyHook();
     // m_pDirect3DHookManager->ApplyHook ( );
-    // m_pFileSystemHook->ApplyHook ( );
     m_pSetCursorPosHook->ApplyHook();
 
-    // Redirect basic files.
-    // m_pFileSystemHook->RedirectFile ( "main.scm", "../../mta/gtafiles/main.scm" );
-
     // Remove useless DirectPlay dependency (dpnhpast.dll) @ 0x745701
     // We have to patch here as multiplayer_sa and game_sa are loaded too late
     DetourLibraryFunction("kernel32.dll", "LoadLibraryA", Win32LoadLibraryA, SkipDirectPlay_LoadLibraryA);

Client/core/CCore.h

@@ -314,8 +314,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CMessageLoopHook*        m_pMessageLoopHook;
     CDirectInputHookManager* m_pDirectInputHookManager;
     CDirect3DHookManager*    m_pDirect3DHookManager;
-    // CFileSystemHook *           m_pFileSystemHook;
-    CSetCursorPosHook* m_pSetCursorPosHook;
+    CSetCursorPosHook*       m_pSetCursorPosHook;
 
     bool m_bLastFocused;
     int  m_iUnminimizeFrameCounter;

vendor/cef3/premake5.lua

@@ -18,7 +18,7 @@ project "CEF"
 	local path = buildpath(".")
 	local cef_path = "%{wks.location}/../Vendor/cef3/cef/"
 	postbuildcommands {
-		"{COPY} \""..cef_path.."Release/*\" \""..path.."mta\"",
+		"robocopy \""..cef_path.."Release\" \""..path.."mta\" /S /IT /NFL /NDL /NJH /XF d3dcompiler_47.dll /XF *.lib",
 		"{COPY} \""..cef_path.."Resources/icudtl.dat\" \""..path.."mta\"",
 		"{COPY} \""..cef_path.."Resources/*.pak\" \""..path.."mta\"",
 		"{COPY} \""..cef_path.."Resources/locales/*\" \""..path.."mta/cef/locales\""