Merge branch 'master' into new/custom_upgrades

Author: Xenius97

.git-blame-ignore-revs

@@ -259,3 +259,15 @@ e7c3619a5d5e0b6bf352befde6ff33c5921032b2
 # Date:   Wed Jan 7 16:42:45 2026 -0500
 #
 # codemod: disable clang-format for `__asm` directives (#4611)
+
+7cd17bc67c5c2d631b6aaac1ac48521b6922045e
+# Author: qaisjp <[email protected]>
+# Date:   Mon Jan 19 01:50:18 2026 -0500
+#
+# fastmod '}  // namespace [a-zA-Z0-9]+$' '}' Client/ Server/ Shared/
+
+e75ba93362c6ae99d30a95d3f20a1e04ba46a22e
+# Author: qaisjp <[email protected]>
+# Date:   Mon Jan 19 02:08:21 2026 -0500
+#
+# Run utils/clang-format.ps1

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

@@ -10,7 +10,7 @@
 #include <cef3/cef/include/cef_app.h>
 #include <string>
 #include "V8Helpers.h"
-#include "CCefAppAuth.h"            // IPC message append helpers
+#include "CCefAppAuth.h"  // IPC message append helpers
 using V8Helpers::CV8Handler;
 
 class CCefApp : public CefApp, public CefRenderProcessHandler
@@ -41,7 +41,12 @@ class CCefApp : public CefApp, public CefRenderProcessHandler
             if (!node)
                 return;
 
-            if (node->GetType() == CefDOMNode::Type::DOM_NODE_TYPE_ELEMENT && node->GetFormControlElementType() != CefDOMNode::FormControlType::DOM_FORM_CONTROL_TYPE_UNSUPPORTED)
+#ifdef MTA_MAETRO
+            if (node->GetType() == CefDOMNode::Type::DOM_NODE_TYPE_ELEMENT && !node->GetFormControlElementType().empty())
+#else
+            if (node->GetType() == CefDOMNode::Type::DOM_NODE_TYPE_ELEMENT &&
+                node->GetFormControlElementType() != CefDOMNode::FormControlType::DOM_FORM_CONTROL_TYPE_UNSUPPORTED)
+#endif
             {
                 auto message = CefProcessMessage::Create("InputFocus");
                 message->GetArgumentList()->SetBool(0, true);
@@ -77,7 +82,7 @@ class CCefApp : public CefApp, public CefRenderProcessHandler
             return;
 
         CefRefPtr<CefProcessMessage> message = V8Helpers::SerialiseV8Arguments("TriggerLuaEvent", arguments);
-        if (!CefAppAuth::AppendAuthCodeToMessage(message)) [[unlikely]]            // AUTH: race condition check
+        if (!CefAppAuth::AppendAuthCodeToMessage(message)) [[unlikely]]  // AUTH: race condition check
             return;
         frame->GetBrowser()->GetMainFrame()->SendProcessMessage(PID_BROWSER, message);
     }

Client/ceflauncher_DLL/CCefApp.h

@@ -29,13 +29,13 @@ namespace CefAppAuth
             return false;
 
         auto& authCode = AuthCodeStorage();
-        
+
         // Block messages until initialized (prevents race condition)
         if (authCode.empty()) [[unlikely]]
             return false;
-        
+
         CefRefPtr<CefListValue> args = message->GetArgumentList();
-        const auto size = args->GetSize();
+        const auto              size = args->GetSize();
         args->SetSize(size + 1);
         args->SetString(size, authCode.c_str());
         return true;

Client/ceflauncher_DLL/CCefAppAuth.h

@@ -30,27 +30,27 @@
 #include <SharedUtil.h>
 
 #ifdef CEF_ENABLE_SANDBOX
-#include <cef3/cef/include/cef_sandbox_win.h>
-#pragma comment(lib, "cef_sandbox.lib")
+    #include <cef3/cef/include/cef_sandbox_win.h>
+    #pragma comment(lib, "cef_sandbox.lib")
 #endif
 
 // Return codes
-inline constexpr int CEF_INIT_SUCCESS                = 0;
-inline constexpr int CEF_INIT_ERROR_NO_BASE_DIR      = -1;
-inline constexpr int CEF_INIT_ERROR_DLL_LOAD_FAILED  = -2;
+inline constexpr int CEF_INIT_SUCCESS = 0;
+inline constexpr int CEF_INIT_ERROR_NO_BASE_DIR = -1;
+inline constexpr int CEF_INIT_ERROR_DLL_LOAD_FAILED = -2;
 
-inline constexpr DWORD       CEF_PARENT_CHECK_INTERVAL       = 1000;
-inline constexpr const char* CEF_DLL_NAME                    = "libcef.dll";
-inline constexpr const char* CEF_MTA_SUBDIR                  = "MTA";
+inline constexpr DWORD       CEF_PARENT_CHECK_INTERVAL = 1000;
+inline constexpr const char* CEF_DLL_NAME = "libcef.dll";
+inline constexpr const char* CEF_MTA_SUBDIR = "MTA";
 
-inline constexpr DWORD PARENT_CHECK_ERROR_NO_QUERY_FUNC    = 1;
-inline constexpr DWORD PARENT_CHECK_ERROR_QUERY_FAILED     = 2;
-inline constexpr DWORD PARENT_CHECK_ERROR_OPEN_FAILED      = 3;
+inline constexpr DWORD PARENT_CHECK_ERROR_NO_QUERY_FUNC = 1;
+inline constexpr DWORD PARENT_CHECK_ERROR_QUERY_FAILED = 2;
+inline constexpr DWORD PARENT_CHECK_ERROR_OPEN_FAILED = 3;
 
 using NtQueryInformationProcessFunc = NTSTATUS(NTAPI*)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG);
 
 // Safe parent monitor thread shutdown
-std::atomic<bool> g_bShouldTerminateMonitor{false};
+std::atomic<bool>   g_bShouldTerminateMonitor{false};
 std::atomic<HANDLE> g_hMonitorThread{nullptr};
 
 namespace
@@ -60,19 +60,19 @@ namespace
         const auto ntdll = GetModuleHandleW(L"ntdll.dll");
         if (!ntdll)
             return nullptr;
-            
+
         const auto procAddr = GetProcAddress(ntdll, "NtQueryInformationProcess");
         if (!procAddr)
             return nullptr;
-            
+
         return reinterpret_cast<NtQueryInformationProcessFunc>(procAddr);
     }
 
     [[nodiscard]] auto GetParentProcessId(NtQueryInformationProcessFunc queryFunc) noexcept -> DWORD
     {
         PROCESS_BASIC_INFORMATION info{};
-        ULONG returnLength = 0;
-        
+        ULONG                     returnLength = 0;
+
         if (const auto status = queryFunc(GetCurrentProcess(), ProcessBasicInformation, &info, sizeof(info), &returnLength);
             !NT_SUCCESS(status) || returnLength < sizeof(PROCESS_BASIC_INFORMATION))
         {
@@ -87,7 +87,7 @@ namespace
         while (!g_bShouldTerminateMonitor.load(std::memory_order_acquire))
         {
             const DWORD result = WaitForSingleObject(parentProcess, CEF_PARENT_CHECK_INTERVAL);
-            
+
             if (result == WAIT_OBJECT_0)
             {
                 DWORD exitCode = 0;
@@ -104,7 +104,7 @@ namespace
             }
         }
     }
-}            // namespace
+}  // namespace
 
 DWORD WINAPI CheckParentProcessAliveness(LPVOID) noexcept;
 
@@ -120,7 +120,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD dwReason, [[maybe_unused]] LPVOID l
     {
         g_bShouldTerminateMonitor.store(true, std::memory_order_release);
     }
-    
+
     return TRUE;
 }
 
@@ -132,28 +132,26 @@ extern "C" [[nodiscard]] __declspec(dllexport) auto InitCEF() noexcept -> int
     {
         const auto valueStart = pos + 11;  // Skip "--kgfiv8n="
         const auto valueEnd = cmdLine.find_first_of(L" \t\"", valueStart);
-        const auto authCodeW = cmdLine.substr(valueStart, 
-            valueEnd == std::wstring_view::npos ? 30 : std::min<size_t>(30, valueEnd - valueStart));
-        
+        const auto authCodeW = cmdLine.substr(valueStart, valueEnd == std::wstring_view::npos ? 30 : std::min<size_t>(30, valueEnd - valueStart));
+
         std::string authCode;
         authCode.reserve(30);
-        std::transform(authCodeW.begin(), authCodeW.end(), std::back_inserter(authCode),
-            [](const wchar_t wc) { return static_cast<char>(wc); });
-        
+        std::transform(authCodeW.begin(), authCodeW.end(), std::back_inserter(authCode), [](const wchar_t wc) { return static_cast<char>(wc); });
+
         CefAppAuth::AuthCodeStorage() = std::move(authCode);
     }
 
     const auto baseDir = SharedUtil::GetMTAProcessBaseDir();
     if (baseDir.empty())
         return CEF_INIT_ERROR_NO_BASE_DIR;
-    
+
     const auto mtaDir = SharedUtil::PathJoin(baseDir, CEF_MTA_SUBDIR);
     SetDllDirectoryW(SharedUtil::FromUTF8(mtaDir));
 
     if (FAILED(__HrLoadAllImportsForDll(CEF_DLL_NAME)))
         return CEF_INIT_ERROR_DLL_LOAD_FAILED;
 
-    const CefMainArgs mainArgs(GetModuleHandleW(nullptr));
+    const CefMainArgs        mainArgs(GetModuleHandleW(nullptr));
     const CefRefPtr<CCefApp> app{new CCefApp};
 
     void* sandboxInfo = nullptr;

Client/ceflauncher_DLL/Main.cpp

@@ -94,4 +94,4 @@ namespace V8Helpers
         CefRefPtr<CefV8Value> func = CefV8Value::CreateFunction(name, handler);
         object->SetValue(name, func, V8_PROPERTY_ATTRIBUTE_NONE);
     }
-}            // namespace V8Helpers
+}  // namespace V8Helpers

Client/ceflauncher_DLL/V8Helpers.h

@@ -66,13 +66,13 @@ void CAjaxResourceHandler::GetResponseHeaders(CefRefPtr<CefResponse> response, i
     constexpr int HTTP_OK = 200;
     response->SetStatus(HTTP_OK);
     response->SetStatusText("OK");
-    
+
     // Use default MIME type if none provided
     if (!m_strMime.empty())
         response->SetMimeType(m_strMime);
     else
         response->SetMimeType("application/octet-stream");
-    
+
     response_length = -1;
 }
 
@@ -116,10 +116,10 @@ bool CAjaxResourceHandler::ReadResponse(void* data_out, int bytes_to_read, int&
     const auto copyBytes = std::min(static_cast<size_t>(bytes_to_read), remainingBytes);
 
     memcpy(data_out, m_strResponse.c_str() + m_DataOffset, copyBytes);
-    
+
     // copyBytes is bounded by bytes_to_read (an int), so cast is always safe
     bytes_read = static_cast<int>(copyBytes);
-    
+
     m_DataOffset += copyBytes;
 
     return true;

Client/cefweb/CAjaxResourceHandler.cpp

@@ -25,7 +25,7 @@ class CAjaxResourceHandler : public CefResourceHandler, public CAjaxResourceHand
 
     std::vector<std::string>& GetGetData() override { return m_vecGetData; }
     std::vector<std::string>& GetPostData() override { return m_vecPostData; }
-    void SetResponse(std::string data) override;
+    void                      SetResponse(std::string data) override;
 
     // CefResourceHandler
     virtual void Cancel() override;
@@ -37,7 +37,7 @@ class CAjaxResourceHandler : public CefResourceHandler, public CAjaxResourceHand
     DISALLOW_COPY_AND_ASSIGN(CAjaxResourceHandler);
 
 private:
-    CefRefPtr<CefCallback> m_callback;
+    CefRefPtr<CefCallback>   m_callback;
     std::vector<std::string> m_vecGetData;
     std::vector<std::string> m_vecPostData;
     std::string              m_strResponse;