Synchronize changes from 1.6 branch [ci skip]

c5fd124 Addendum to 47e0492
bc81c45 Part 4 of "Rewrite crash handler"

Author: github-actions[bot]

Client/core/CCore.cpp

@@ -969,11 +969,7 @@ T* InitModule(CModuleLoader& m_Loader, const SString& strName, const SString& st
     }
 
     // If we have a valid initializer, call it.
-    T* pResult = nullptr;
-    if (pfnInit != nullptr)
-    {
-        pResult = pfnInit(pObj);
-    }
+    T* pResult = pfnInit(pObj);
 
     // Restore current directory
     SetCurrentDirectory(strSavedCwd);

Client/core/CCrashDumpWriter.cpp

@@ -42,7 +42,7 @@ class CCrashDumpWriter
     static long WINAPI HandleExceptionGlobal(_EXCEPTION_POINTERS* pException);
     static void        DumpCoreLog(_EXCEPTION_POINTERS* pException, CExceptionInformation* pExceptionInformation);
     static void        DumpMiniDump(_EXCEPTION_POINTERS* pException, CExceptionInformation* pExceptionInformation);
-    static void        RunErrorTool(CExceptionInformation* pExceptionInformation);
+    [[nodiscard]] static bool RunErrorTool(CExceptionInformation* pExceptionInformation);
     static void        AppendToDumpFile(const SString& strPathFilename, const CBuffer& dataBuffer, DWORD dwMagicStart, DWORD dwMagicEnd);
     static void        GetPoolInfo(CBuffer& buffer);
     static void        GetD3DInfo(CBuffer& buffer);

Client/core/CCrashDumpWriter.h

@@ -3201,8 +3201,8 @@ void CVersionUpdater::_UseCrashDumpQueryURLs()
             return;
     }
 
-        auto is_control_char = [](const unsigned char c) noexcept -> bool { 
-            return c < CONTROL_CHAR_THRESHOLD || c == DELETE_CHAR; 
+        const auto is_control_char = [CONTROL_CHAR_THRESHOLD, DELETE_CHAR](unsigned char c) noexcept -> bool {
+            return c < CONTROL_CHAR_THRESHOLD || c == DELETE_CHAR;
         };
 
         SString strSanitizedFilename = strFilename;
@@ -3406,14 +3406,14 @@ void CVersionUpdater::_UseCrashDumpPostContent()
             const int iCurrentRetry = GetApplicationSettingInt(DIAGNOSTICS_SECTION, LAST_DUMP_LOAD_RETRY);
 
             // Lambda for backoff calculation with explicit return type
-                constexpr auto calculate_backoff = [](const int retry_count) constexpr noexcept -> int {
-                    if (retry_count <= 0)
-                        return 0;
-                    int backoff = INITIAL_BACKOFF_SECONDS;
-                    for (int i = 1; i < retry_count; ++i)
-                        backoff *= BACKOFF_MULTIPLIER;
-                    return backoff;
-                };
+            const auto calculate_backoff = [INITIAL_BACKOFF_SECONDS, BACKOFF_MULTIPLIER](int retry_count) noexcept -> int {
+                if (retry_count <= 0)
+                    return 0;
+                int backoff = INITIAL_BACKOFF_SECONDS;
+                for (int i = 1; i < retry_count; ++i)
+                    backoff *= BACKOFF_MULTIPLIER;
+                return backoff;
+            };
 
             // Calculate backoff for current retry
             const int iBackoffSeconds = calculate_backoff(iCurrentRetry);

Client/core/CExceptionInformation_Impl.cpp

@@ -5,7 +5,8 @@
  *  FILE:        core/CrashHandler.h
  *  PURPOSE:     Header file for crash handling functions
  *
- *  THIS FILE CREDITS: "Debugging Applications" (Microsoft Press) by John Robbins
+ *  THIS FILE CREDITS (IS BASED ON): "Debugging Applications" (Microsoft Press) by John Robbins
+ *  Copyright (c) 1997-2000 John Robbins -- All rights reserved
  *
  *  Multi Theft Auto is available from https://www.multitheftauto.com/
  *
@@ -15,7 +16,11 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <algorithm>
 #include <chrono>
+#include <cstdarg>
+#include <cstdio>
+#include <cstring>
 #include <exception>
 #include <optional>
 #include <string>
@@ -31,6 +36,7 @@
 #endif
 
 constexpr std::size_t DEBUG_BUFFER_SIZE = 256;
+static_assert(DEBUG_BUFFER_SIZE > 1, "DEBUG_BUFFER_SIZE must allow for null termination");
 
 constexpr DWORD CPP_EXCEPTION_CODE = 0xE06D7363;
 constexpr DWORD STATUS_INVALID_CRUNTIME_PARAMETER_CODE = 0xC0000417;
@@ -73,12 +79,25 @@ inline constexpr std::string_view DEBUG_SEPARATOR = "!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 inline void SafeDebugOutput(std::string_view message) noexcept
 {
-    if (!message.empty() && message.data() != nullptr)
+    const char* data = message.data();
+    std::size_t remaining = message.size();
+
+    if (data == nullptr || remaining == 0)
     {
-        // string_view from string literal is null-terminated, but views from substrings may not be
-        // Create temporary null-terminated string for safety with OutputDebugStringA
-        const std::string temp{message};
-        OutputDebugStringA(temp.c_str());
+        return;
+    }
+
+    char buffer[DEBUG_BUFFER_SIZE] = {};
+
+    while (remaining > 0)
+    {
+        const std::size_t chunkLength = std::min<std::size_t>(remaining, DEBUG_BUFFER_SIZE - 1);
+        std::memcpy(buffer, data, chunkLength);
+        buffer[chunkLength] = '\0';
+        OutputDebugStringA(buffer);
+
+        data += chunkLength;
+        remaining -= chunkLength;
     }
 }
 
@@ -100,33 +119,81 @@ inline void SafeDebugOutput(const std::string& message) noexcept
     }
 }
 
-#define SAFE_DEBUG_PRINT(buffer, format, ...) \
-    do \
-    { \
-        if ((buffer).data() != nullptr && (buffer).size() > 0) \
-        { \
-            memset((buffer).data(), 0, (buffer).size()); \
-            int result = _snprintf_s((buffer).data(), (buffer).size(), _TRUNCATE, format, __VA_ARGS__); \
-            if (result > 0) \
-            { \
-                OutputDebugStringA((buffer).data()); \
-            } \
-        } \
-    } while (false)
-
-#define SAFE_DEBUG_PRINT_C(buffer, bufferSize, format, ...) \
-    do \
-    { \
-        if (buffer != nullptr && bufferSize > 0) \
-        { \
-            int result = _snprintf_s(buffer, bufferSize, _TRUNCATE, format, __VA_ARGS__); \
-            if (result > 0) \
-            { \
-                OutputDebugStringA(buffer); \
-            } \
-        } \
-    } while (false)
+template <typename Buffer>
+inline void SafeDebugPrint(Buffer& buffer, const char* format, ...) noexcept
+{
+    if (format == nullptr)
+        return;
+
+    auto* data = buffer.data();
+    const std::size_t size = buffer.size();
+
+    if (data == nullptr || size == 0)
+        return;
+
+    std::memset(data, 0, size);
+
+    va_list args;
+    va_start(args, format);
+    const int written = _vsnprintf_s(data, size, _TRUNCATE, format, args);
+    va_end(args);
+
+    if (written > 0)
+    {
+        OutputDebugStringA(data);
+    }
+}
+
+inline void SafeDebugPrintC(char* buffer, std::size_t bufferSize, const char* format, ...) noexcept
+{
+    if (buffer == nullptr || bufferSize == 0 || format == nullptr)
+        return;
+
+    va_list args;
+    va_start(args, format);
+    const int written = _vsnprintf_s(buffer, bufferSize, _TRUNCATE, format, args);
+    va_end(args);
+
+    if (written > 0)
+    {
+        OutputDebugStringA(buffer);
+    }
+}
+
+#define SAFE_DEBUG_PRINT(buffer, ...) SafeDebugPrint((buffer), __VA_ARGS__)
+#define SAFE_DEBUG_PRINT_C(buffer, bufferSize, ...) SafeDebugPrintC((buffer), (bufferSize), __VA_ARGS__)
+
+inline void SafeDebugPrintPrefixed(std::string_view prefix, const char* format, ...) noexcept
+{
+    if (format == nullptr)
+        return;
+
+    char buffer[DEBUG_BUFFER_SIZE] = {};
+
+    std::size_t offset = 0;
+    if (!prefix.empty())
+    {
+        offset = std::min<std::size_t>(prefix.size(), DEBUG_BUFFER_SIZE - 1);
+        std::memcpy(buffer, prefix.data(), offset);
+    }
+
+    if (offset >= DEBUG_BUFFER_SIZE - 1)
+    {
+        buffer[DEBUG_BUFFER_SIZE - 1] = '\0';
+        OutputDebugStringA(buffer);
+        return;
+    }
 
+    va_list args;
+    va_start(args, format);
+    const int written = _vsnprintf_s(buffer + offset, DEBUG_BUFFER_SIZE - offset, _TRUNCATE, format, args);
+    va_end(args);
+
+    if (written > 0 || offset > 0)
+    {
+        OutputDebugStringA(buffer);
+    }
+}
 #ifdef __cplusplus
 extern "C"
 {

Client/core/CVersionUpdater.cpp

@@ -11,7 +11,7 @@
 #include "D3DStuff.h"
 #include "Utils.h"
 #include "Dialogs.h"
-#include "../core/CrashHandler.h"
+#include "../sdk/core/CrashHandlerExports.h"
 
 #include <atomic>
 #include <d3d9.h>

Client/core/CrashHandler.cpp

@@ -648,20 +648,14 @@ void HideCrashedDialog()
 {
     if (hwndCrashedDialog)
     {
-        try {
-            if (IsWindow(hwndCrashedDialog))
-                DestroyWindow(hwndCrashedDialog);
-        }
-        catch (...) {
-        }
-        (void)std::exchange(hwndCrashedDialog, nullptr);
-    }
-    
-    try {
-        ResumeSplash();
-    }
-    catch (...) {
+        const HWND crashedDialog = hwndCrashedDialog;
+        hwndCrashedDialog = nullptr;
+
+        if (crashedDialog && IsWindow(crashedDialog))
+            DestroyWindow(crashedDialog);
     }
+
+    ResumeSplash();
 }
 
 void ShowOOMMessageBox([[maybe_unused]] HINSTANCE hInstance)

Client/core/CrashHandler.h

@@ -288,7 +288,8 @@ MTAEXPORT int DoWinMain(HINSTANCE hLauncherInstance, MAYBE_UNUSED HINSTANCE hPre
     // Get current process ID for logging
     DWORD currentPid = GetSafeProcessId();
 
-    AddReportLog(LOG_ID_END, SString("* End (0x%X)* pid:%d", iReturnCode, currentPid));
-    
+    const DWORD exitCodeForLog = static_cast<DWORD>(static_cast<unsigned int>(iReturnCode));
+    AddReportLog(LOG_ID_END, SString("* End (0x%08X)* pid:%lu", exitCodeForLog, static_cast<unsigned long>(currentPid)));
+
     return iReturnCode;
 }