Skip to content

Commit 8d40308

Browse files
github-actions[bot]github-actions[bot]
committed
Synchronize changes from 1.6 master branch [ci skip]
b66d52c Addendum to 2e56bd0 & ec248d4: Further improve CEF implementation, and fix any bugs encountered along the way.
2 parents 6f342d9 + b66d52c commit 8d40308

28 files changed

+849
-190
lines changed

‎Client/ceflauncher/CEFLauncher.manifest‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,10 @@
5353
</dependency>
5454

5555
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
56+
<security>
57+
<requestedPrivileges>
58+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
59+
</requestedPrivileges>
60+
</security>
5661
</trustInfo>
5762
</assembly>

‎Client/ceflauncher_DLL/Main.cpp‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "CCefApp.h"
2121
#include <string>
2222
#include <cef3/cef/include/cef_sandbox_win.h>
23+
#include <SharedUtil.h>
2324

2425
// #define CEF_ENABLE_SANDBOX
2526
#ifdef CEF_ENABLE_SANDBOX
@@ -30,15 +31,18 @@ DWORD WINAPI CheckParentProcessAliveness(LPVOID);
3031

3132
int _declspec(dllexport) InitCEF()
3233
{
33-
// Get absolute CEFLauncher.exe path
34-
TCHAR buffer[MAX_PATH];
35-
GetModuleFileName(NULL, buffer, MAX_PATH);
36-
std::wstring currentFileName(buffer);
37-
38-
// Extract MTA path and set DLL directory (absolute path is required here)
39-
size_t pos = currentFileName.find_last_of(L'\\');
40-
std::wstring mtaPath = currentFileName.substr(0, pos - 3); // Strip "CEF"
41-
SetDllDirectory(mtaPath.c_str());
34+
// Get MTA base directory and set DLL directory to MTA folder
35+
const SString strBaseDir = SharedUtil::GetMTAProcessBaseDir();
36+
37+
if (strBaseDir.empty())
38+
{
39+
// Unable to determine base directory - CEF cannot initialize
40+
return -1;
41+
}
42+
43+
const SString strMTADir = SharedUtil::PathJoin(strBaseDir, "MTA");
44+
45+
SetDllDirectoryW(SharedUtil::FromUTF8(strMTADir));
4246

4347
// Load libcef.dll from the DLL directory
4448
assert(SUCCEEDED(__HrLoadAllImportsForDll("libcef.dll")));
@@ -70,9 +74,10 @@ static DWORD WINAPI CheckParentProcessAliveness(LPVOID)
7074
{
7175
NTSTATUS(NTAPI * queryInformation)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG) = nullptr;
7276

73-
if (HMODULE const ntdll = GetModuleHandleW(L"ntdll.dll"); ntdll != nullptr)
77+
if (auto ntdll = GetModuleHandleW(L"ntdll.dll"); ntdll != nullptr)
7478
{
75-
queryInformation = reinterpret_cast<decltype(queryInformation)>(GetProcAddress(ntdll, "NtQueryInformationProcess"));
79+
auto procAddr = GetProcAddress(ntdll, "NtQueryInformationProcess");
80+
queryInformation = reinterpret_cast<decltype(queryInformation)>(reinterpret_cast<void*>(procAddr));
7681
}
7782

7883
if (queryInformation == nullptr)

‎Client/ceflauncher_DLL/premake5.lua‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project "CEFLauncher DLL"
44
targetname "CEFLauncher_DLL"
55
targetdir(buildpath("mta/cef"))
66

7-
includedirs { "../../vendor/cef3/cef" }
7+
includedirs { "../../vendor/cef3/cef", "../../Shared/sdk" }
88
libdirs { "../../vendor/cef3/cef/Release" }
99

1010
defines { "UNICODE", "PSAPI_VERSION=1" }
@@ -19,10 +19,11 @@ project "CEFLauncher DLL"
1919
files {
2020
"premake5.lua",
2121
"*.h",
22-
"*.cpp"
22+
"*.cpp",
23+
"../../Shared/sdk/SharedUtil.cpp"
2324
}
2425

25-
links { "delayimp", "CEF", "libcef.lib", "Psapi.lib", "version.lib", "Winmm.lib", "Ws2_32.lib", "DbgHelp.lib" }
26+
links { "delayimp", "CEF", "libcef.lib", "Psapi.lib", "version.lib", "Winmm.lib", "Ws2_32.lib", "DbgHelp.lib" }
2627
linkoptions { "/DELAYLOAD:libcef.dll" }
2728

2829
filter "architecture:not x86"

‎Client/cefweb/CWebApp.cpp‎

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,35 @@ void CWebApp::OnBeforeCommandLineProcessing(const CefString& process_type, CefRe
2929
if (!command_line)
3030
return;
3131

32+
// Add GTA path and MTA base path switches before g_pCore check
33+
// This callback runs in both browser process and subprocess
34+
// In subprocess, g_pCore is NULL, so switches must be added before that check
35+
// Read GTA path from registry
36+
int iResult = 0;
37+
const SString strGTAPath = GetCommonRegistryValue("", "GTA:SA Path", &iResult);
38+
if (!strGTAPath.empty())
39+
{
40+
// Pass GTA directory path to CEFLauncher subprocess via command-line switch
41+
// CEF's AppendSwitchWithValue handles quoting automatically
42+
command_line->AppendSwitchWithValue("mta-gta-path", strGTAPath);
43+
// AddReportLog only available in browser process where g_pCore exists
44+
}
45+
46+
// Pass MTA base directory path to subprocess
47+
// MTA DLLs are in Bin/MTA but parent process may be elsewhere
48+
const SString strMTAPath = GetMTAProcessBaseDir();
49+
if (!strMTAPath.empty())
50+
{
51+
command_line->AppendSwitchWithValue("mta-base-path", strMTAPath);
52+
}
53+
54+
// Disable AutoDeElevate to allow CEF to run with elevated privileges
55+
// Must be added before g_pCore check to apply to both browser process and subprocess
56+
// https://github.com/chromiumembedded/cef/issues/3960
57+
// https://chromium-review.googlesource.com/c/chromium/src/+/6515318
58+
command_line->AppendSwitch("do-not-de-elevate");
59+
60+
// Browser-process-only settings
3261
if (!g_pCore) [[unlikely]]
3362
return;
3463

@@ -39,11 +68,6 @@ void CWebApp::OnBeforeCommandLineProcessing(const CefString& process_type, CefRe
3968
if (!pWebCore->GetGPUEnabled())
4069
command_line->AppendSwitch("disable-gpu");
4170

42-
// Disable the AutoDeElevate feature to make launching CEF with Admin privileges work.
43-
// https://github.com/chromiumembedded/cef/issues/3960
44-
// https://chromium-review.googlesource.com/c/chromium/src/+/6515318
45-
command_line->AppendSwitch("do-not-de-elevate");
46-
4771
command_line->AppendSwitch("disable-gpu-compositing"); // always disable this, causes issues with official builds
4872

4973
// command_line->AppendSwitch("disable-d3d11");
@@ -108,8 +132,8 @@ CefRefPtr<CefResourceHandler> CWebApp::Create(CefRefPtr<CefBrowser> browser, Cef
108132
}
109133
else
110134
{
111-
SString resourceName = path.substr(0, slashPos);
112-
SString resourcePath = path.substr(slashPos + 1);
135+
const SString resourceName = path.substr(0, slashPos);
136+
const SString resourcePath = path.substr(slashPos + 1);
113137

114138
if (resourcePath.empty())
115139
{
@@ -137,7 +161,7 @@ CefRefPtr<CefResourceHandler> CWebApp::Create(CefRefPtr<CefBrowser> browser, Cef
137161

138162
if (urlParts.query.str)
139163
{
140-
SString strGet = UTF16ToMbUTF8(urlParts.query.str);
164+
const SString strGet = UTF16ToMbUTF8(urlParts.query.str);
141165
std::vector<SString> vecTmp;
142166
vecTmp.reserve(8); // Reserve space for common query parameter count
143167
strGet.Split("&", vecTmp);
@@ -153,13 +177,13 @@ CefRefPtr<CefResourceHandler> CWebApp::Create(CefRefPtr<CefBrowser> browser, Cef
153177
}
154178

155179
CefPostData::ElementVector vecPostElements;
156-
if (auto postData = request->GetPostData(); postData)
180+
if (const auto postData = request->GetPostData(); postData)
157181
{
158182
postData->GetElements(vecPostElements);
159183

160184
SString key;
161185
SString value;
162-
for (auto&& post : vecPostElements)
186+
for (const auto& post : vecPostElements)
163187
{
164188
// Limit to 5MiB and allow byte data only
165189
constexpr size_t MAX_POST_SIZE = 5 * 1024 * 1024;
@@ -168,12 +192,12 @@ CefRefPtr<CefResourceHandler> CWebApp::Create(CefRefPtr<CefBrowser> browser, Cef
168192
continue;
169193

170194
// Make string from buffer
171-
auto buffer = std::make_unique<char[]>(bytesCount);
195+
const auto buffer = std::make_unique<char[]>(bytesCount);
172196
// Verify GetBytes succeeded before using buffer
173-
size_t bytesRead = post->GetBytes(bytesCount, buffer.get());
197+
const size_t bytesRead = post->GetBytes(bytesCount, buffer.get());
174198
if (bytesRead != bytesCount)
175199
continue;
176-
SStringX postParam(buffer.get(), bytesCount);
200+
const SStringX postParam(buffer.get(), bytesCount);
177201

178202
// Parse POST data into vector
179203
std::vector<SString> vecTmp;
@@ -197,7 +221,7 @@ CefRefPtr<CefResourceHandler> CWebApp::Create(CefRefPtr<CefBrowser> browser, Cef
197221
{
198222
// Calculate MTA resource path
199223
static constexpr auto LOCAL = "local";
200-
path = (resourceName != LOCAL) ? ":" + resourceName + "/" + resourcePath : resourcePath;
224+
path = (resourceName != LOCAL) ? SString(":" + resourceName + "/" + resourcePath) : resourcePath;
201225

202226
// Calculate absolute path
203227
if (!pWebView->GetFullPathFromLocal(path))

0 commit comments

Comments
 (0)