zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash reporter for 64 bit

This commit is contained in:
Magnus Norddahl 2016-12-08 13:07:52 +01:00 committed by Christoph Oelckers
parent d741e0eb26
commit fb4e34d178
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/win32/i_main.cpp
View File

@ -1184,6 +1184,11 @@ void CALLBACK ExitFatally (ULONG_PTR dummy)
// //
//========================================================================== //==========================================================================
namespace
{
CONTEXT MainThreadContext;
}
LONG WINAPI CatchAllExceptions (LPEXCEPTION_POINTERS info) LONG WINAPI CatchAllExceptions (LPEXCEPTION_POINTERS info)
{ {
#ifdef _DEBUG #ifdef _DEBUG
@ -1208,11 +1213,7 @@ LONG WINAPI CatchAllExceptions (LPEXCEPTION_POINTERS info)
// Otherwise, put the crashing thread to sleep and signal the main thread to clean up. // Otherwise, put the crashing thread to sleep and signal the main thread to clean up.
if (GetCurrentThreadId() == MainThreadID) if (GetCurrentThreadId() == MainThreadID)
{ {
#ifndef _M_X64 *info->ContextRecord = MainThreadContext;
info->ContextRecord->Eip = (DWORD_PTR)ExitFatally;
#else
info->ContextRecord->Rip = (DWORD_PTR)ExitFatally;
#endif
} }
else else
{ {
@ -1304,6 +1305,15 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE nothing, LPSTR cmdline, int n
if (MainThread != INVALID_HANDLE_VALUE) if (MainThread != INVALID_HANDLE_VALUE)
{ {
SetUnhandledExceptionFilter (CatchAllExceptions); SetUnhandledExceptionFilter (CatchAllExceptions);
static bool setJumpResult = false;
RtlCaptureContext(&MainThreadContext);
if (setJumpResult)
{
ExitFatally(0);
return 0;
}
setJumpResult = true;
} }
#endif #endif