From 901eed782851340a1ef8b5d2e763efc24970407a Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 10 Mar 2018 15:15:41 +0100 Subject: Core/CrashHandler: Fixed generating crash logs from CRT debug assertions (cherry picked from commit abdf6479ddbf42c8b53cb943c54203211ceb0691) --- src/common/Debugging/WheatyExceptionReport.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/common/Debugging/WheatyExceptionReport.h') diff --git a/src/common/Debugging/WheatyExceptionReport.h b/src/common/Debugging/WheatyExceptionReport.h index 6a3560f1993..a6f871bfb13 100644 --- a/src/common/Debugging/WheatyExceptionReport.h +++ b/src/common/Debugging/WheatyExceptionReport.h @@ -155,6 +155,8 @@ class WheatyExceptionReport static LONG WINAPI WheatyUnhandledExceptionFilter( PEXCEPTION_POINTERS pExceptionInfo); + static void __cdecl WheatyCrtHandler(wchar_t const* expression, wchar_t const* function, wchar_t const* file, unsigned int line, uintptr_t pReserved); + static void printTracesForAllThreads(bool); private: // where report info is extracted and generated @@ -192,6 +194,7 @@ class WheatyExceptionReport static TCHAR m_szLogFileName[MAX_PATH]; static TCHAR m_szDumpFileName[MAX_PATH]; static LPTOP_LEVEL_EXCEPTION_FILTER m_previousFilter; + static _invalid_parameter_handler m_previousCrtHandler; static HANDLE m_hReportFile; static HANDLE m_hDumpFile; static HANDLE m_hProcess; -- cgit v1.2.3