Merge branch 'master' into bugfix/animations_progress

Author: FileEX

Client/core/CConsole.cpp

@@ -123,7 +123,7 @@ bool CConsole::IsEnabled()
 
 void CConsole::SetEnabled(bool bEnabled)
 {
-    // Hide it if neccessary
+    // Hide it if necessary
     if (!bEnabled && m_pWindow->IsVisible())
     {
         SetVisible(false);

Client/core/CCrashDumpWriter.cpp

@@ -282,62 +282,8 @@ static bool InvokeClientHandleExceptionSafe(CClientBase* pClient, CExceptionInfo
 
 namespace
 {
-    void ConfigureDbgHelpOptions()
-    {
-        static std::atomic_flag configured = ATOMIC_FLAG_INIT;
-        if (!configured.test_and_set(std::memory_order_acq_rel))
-        {
-            SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_UNDNAME | SYMOPT_FAIL_CRITICAL_ERRORS | SYMOPT_DEFERRED_LOADS);
-        }
-    }
-
-    std::mutex& GetSymInitMutex()
-    {
-        static std::mutex symMutex;
-        return symMutex;
-    }
 }  // namespace
 
-class SymbolHandlerGuard
-{
-public:
-    explicit SymbolHandlerGuard(HANDLE process, bool enableSymbols) : m_process(process), m_initialized(false)
-    {
-        if (!enableSymbols)
-            return;
-
-        if (m_process != nullptr)
-        {
-            std::lock_guard<std::mutex> lock{GetSymInitMutex()};
-
-            ConfigureDbgHelpOptions();
-
-            const SString& processDir = SharedUtil::GetMTAProcessBaseDir();
-            const char*    searchPath = processDir.empty() ? nullptr : processDir.c_str();
-
-            if (SymInitialize(m_process, searchPath, TRUE) != FALSE)
-                m_initialized = true;
-        }
-    }
-
-    ~SymbolHandlerGuard()
-    {
-        if (m_initialized)
-            SymCleanup(m_process);
-    }
-
-    SymbolHandlerGuard(const SymbolHandlerGuard&) = delete;
-    SymbolHandlerGuard& operator=(const SymbolHandlerGuard&) = delete;
-    SymbolHandlerGuard(SymbolHandlerGuard&&) = delete;
-    SymbolHandlerGuard& operator=(SymbolHandlerGuard&&) = delete;
-
-    bool IsInitialized() const { return m_initialized; }
-
-private:
-    HANDLE m_process;
-    bool   m_initialized;
-};
-
 [[nodiscard]] static bool NormalizePathForValidation(const SString& inputPath, SString& outputPath)
 {
     if (inputPath.empty())
@@ -767,9 +713,11 @@ static void AppendCrashDiagnostics(const SString& text)
     frame.AddrFrame.Mode = AddrModeFlat;
     frame.AddrStack.Mode = AddrModeFlat;
 
-    SymbolHandlerGuard symbolGuard(hProcess, hasSymbols);
-
-    const bool useDbgHelp = symbolGuard.IsInitialized();
+    bool useDbgHelp = false;
+    if (hasSymbols)
+    {
+        useDbgHelp = CrashHandler::InitializeSymbolHandler();
+    }
     const auto routines = useDbgHelp ? StackTraceHelpers::MakeStackWalkRoutines(true) : StackTraceHelpers::MakeStackWalkRoutines(false);
 
     static_assert(MAX_SYM_NAME > 1, "MAX_SYM_NAME must include room for a terminator");
@@ -1475,19 +1423,6 @@ long WINAPI CCrashDumpWriter::HandleExceptionGlobal(_EXCEPTION_POINTERS* pExcept
         return EXCEPTION_EXECUTE_HANDLER;
     }
 
-    if (IsFatalException(exceptionCode) == FALSE)
-    {
-        std::array<char, DEBUG_BUFFER_SIZE> szDebug;
-        SAFE_DEBUG_PRINT_C(szDebug.data(), szDebug.size(), "CCrashDumpWriter: Non-fatal exception 0x%08X - ignoring\n", exceptionCode);
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-
-    const BOOL exceptionLogged = LogExceptionDetails(pException);
-    if (exceptionLogged == FALSE)
-    {
-        SAFE_DEBUG_OUTPUT("CCrashDumpWriter: WARNING - LogExceptionDetails failed\n");
-    }
-
     SAFE_DEBUG_OUTPUT("CCrashDumpWriter: ======================================\n");
     SAFE_DEBUG_OUTPUT("CCrashDumpWriter: FATAL EXCEPTION - Begin crash processing\n");
     SAFE_DEBUG_OUTPUT("CCrashDumpWriter: ======================================\n");
@@ -1557,6 +1492,7 @@ long WINAPI CCrashDumpWriter::HandleExceptionGlobal(_EXCEPTION_POINTERS* pExcept
             {
                 SAFE_DEBUG_OUTPUT("CCrashDumpWriter: Client handled exception - continuing execution\n");
                 delete pExceptionInformation;
+                ms_bInCrashHandler.store(false, std::memory_order_release);
                 return EXCEPTION_CONTINUE_SEARCH;
             }
 

Client/core/CExceptionInformation_Impl.cpp

@@ -129,59 +129,6 @@ struct StackFrameInfo
 };
 constexpr std::size_t MAX_FILE_NAME = 260;
 
-class SymbolHandlerGuard
-{
-public:
-    explicit SymbolHandlerGuard(HANDLE process, bool enableSymbols) : m_process(process), m_initialized(false), m_uncaughtExceptions(std::uncaught_exceptions())
-    {
-        if (!enableSymbols)
-        {
-            return;
-        }
-
-        if (m_process != nullptr)
-        {
-            SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_UNDNAME | SYMOPT_FAIL_CRITICAL_ERRORS);
-
-            if (SymInitialize(m_process, nullptr, TRUE) != FALSE)
-            {
-                m_initialized = true;
-            }
-            else
-            {
-                const DWORD dwError = GetLastError();
-                char        debugBuffer[DEBUG_BUFFER_SIZE] = {};
-                SAFE_DEBUG_PRINT_C(debugBuffer, DEBUG_BUFFER_SIZE, "%.*sSymbolHandlerGuard: SymInitialize failed, error: %u\n",
-                                   static_cast<int>(DEBUG_PREFIX_EXCEPTION_INFO.size()), DEBUG_PREFIX_EXCEPTION_INFO.data(), dwError);
-            }
-        }
-    }
-
-    ~SymbolHandlerGuard()
-    {
-        if (m_initialized)
-        {
-            if (std::uncaught_exceptions() <= m_uncaughtExceptions)
-            {
-                SymCleanup(m_process);
-            }
-            m_initialized = false;
-        }
-    }
-
-    SymbolHandlerGuard(const SymbolHandlerGuard&) = delete;
-    SymbolHandlerGuard& operator=(const SymbolHandlerGuard&) = delete;
-    SymbolHandlerGuard(SymbolHandlerGuard&&) = delete;
-    SymbolHandlerGuard& operator=(SymbolHandlerGuard&&) = delete;
-
-    bool IsInitialized() const { return m_initialized; }
-
-private:
-    HANDLE m_process;
-    bool   m_initialized;
-    int    m_uncaughtExceptions;
-};
-
 [[nodiscard]] static std::optional<std::vector<std::string>> CaptureEnhancedStackTrace(_EXCEPTION_POINTERS* pException)
 {
     if (pException == nullptr || pException->ContextRecord == nullptr)
@@ -214,9 +161,11 @@ class SymbolHandlerGuard
     frame.AddrFrame.Mode = AddrModeFlat;
     frame.AddrStack.Mode = AddrModeFlat;
 
-    SymbolHandlerGuard symbolGuard(hProcess, hasSymbols);
-
-    const bool useDbgHelp = symbolGuard.IsInitialized();
+    bool useDbgHelp = false;
+    if (hasSymbols)
+    {
+        useDbgHelp = CrashHandler::InitializeSymbolHandler();
+    }
 
     const auto                        routines = useDbgHelp ? StackTraceHelpers::MakeStackWalkRoutines(true) : StackTraceHelpers::MakeStackWalkRoutines(false);
     alignas(SYMBOL_INFO) std::uint8_t symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME];

Client/core/CGUI.cpp

@@ -745,7 +745,7 @@ bool CLocalGUI::ProcessMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
                 return true;
             case WM_IME_KEYDOWN:
             {
-                // Handle space/return seperately in this case
+                // Handle space/return separately in this case
                 if (wParam == VK_SPACE)
                     pGUI->ProcessCharacter(MapVirtualKey(wParam, MAPVK_VK_TO_CHAR));
 

Client/core/CScreenShot.cpp

@@ -26,7 +26,7 @@ static bool ms_bBeforeGUI = false;
 
 static SString ms_strScreenDirectoryPath;
 
-// Last save time, seperated per given type
+// Last save time, separated per given type
 // (normal screenshot or camera weapon initiated)
 static long long ms_lLastSaveTime[2] = {0, 0};
 

Client/core/CTrayIcon.cpp

@@ -69,7 +69,7 @@ bool CTrayIcon::CreateTrayIcon()
         return false;
     }
 
-    // The handle to the core.dll is neccessary here,
+    // The handle to the core.dll is necessary here,
     // because Windows will search for the ICON in the executable and not in the DLL
     // Note: Changing the size will not show a higher quality icon in the balloon
     auto hIcon = LoadImage(g_hModule, MAKEINTRESOURCE(IDI_ICON1), IMAGE_ICON, LR_DEFAULTSIZE, LR_DEFAULTSIZE, LR_SHARED | LR_LOADTRANSPARENT);