- make crash report work

- add Lua stack trace when crash occurs

Author: SoapyMan

DriverNGHook/CrashHandlerReporter.cpp

@@ -3,7 +3,9 @@
 #include <DbgHelp.h>
 #include "Logger.h"
 
-bool isExceptionRequierMiniDump(EXCEPTION_POINTERS* frame)
+static std::vector<ReHamster::CrashFunc> s_crashFuncs;
+
+static bool isExceptionRequierMiniDump(EXCEPTION_POINTERS* frame)
 {
     if (frame->ExceptionRecord->ExceptionCode == EXCEPTION_BREAKPOINT  ||
         frame->ExceptionRecord->ExceptionCode == EXCEPTION_SINGLE_STEP)
@@ -13,7 +15,7 @@ bool isExceptionRequierMiniDump(EXCEPTION_POINTERS* frame)
     return true;
 }
 
-void WriteMiniDump(EXCEPTION_POINTERS* exception = nullptr)
+static void WriteMiniDump(EXCEPTION_POINTERS* exception = nullptr)
 {
     //
     //	Credits https://stackoverflow.com/questions/5028781/how-to-write-a-sample-code-that-will-crash-and-produce-dump-file
@@ -57,7 +59,7 @@ void WriteMiniDump(EXCEPTION_POINTERS* exception = nullptr)
     CloseHandle(hFile);
 }
 
-void NotifyAboutException(EXCEPTION_POINTERS* exceptionInfoFrame)
+static void NotifyAboutException(EXCEPTION_POINTERS* exceptionInfoFrame)
 {
     MessageBox(
         NULL,
@@ -84,21 +86,22 @@ void NotifyAboutException(EXCEPTION_POINTERS* exceptionInfoFrame)
     MsgError("             ESP : 0x%x\n", exceptionInfoFrame->ContextRecord->Esp);
     MsgError("******************************************************************************\n");
 
+    // Extra stuff
+    for (auto& func : s_crashFuncs)
+    {
+        func();
+    }
+
     WriteMiniDump(exceptionInfoFrame);
 }
 
-LONG WINAPI ExceptionFilterWin32(EXCEPTION_POINTERS* exceptionInfoFrame)
+static LONG WINAPI ExceptionFilterWin32(EXCEPTION_POINTERS* exceptionInfoFrame)
 {
-    if (isExceptionRequierMiniDump(exceptionInfoFrame))
+    if (exceptionInfoFrame->ExceptionRecord->ExceptionCode < 0x80000000)
     {
-        NotifyAboutException(exceptionInfoFrame);
+        return EXCEPTION_CONTINUE_EXECUTION;
     }
 
-    return EXCEPTION_EXECUTE_HANDLER;
-}
-
-LONG WINAPI VectoredExceptionHandlerWin32(EXCEPTION_POINTERS* exceptionInfoFrame)
-{
     if (isExceptionRequierMiniDump(exceptionInfoFrame))
     {
         NotifyAboutException(exceptionInfoFrame);
@@ -126,18 +129,16 @@ namespace ReHamster
     void CrashHandlerReporter::Install()
     {
         _set_purecall_handler(PureCallhandler);
-        m_prevHandler = reinterpret_cast<std::intptr_t>(SetUnhandledExceptionFilter(ExceptionFilterWin32));
+        m_vectored = reinterpret_cast<std::intptr_t>(AddVectoredExceptionHandler(0UL, ExceptionFilterWin32));
+    }
+
+    void CrashHandlerReporter::AddCrashFunc(CrashFunc onCrash)
+    {
+        s_crashFuncs.push_back(std::move(onCrash));
     }
 
     CrashHandlerReporter::~CrashHandlerReporter()
     {
-        if (m_prevHandler == 0)
-            return;
-
-        SetUnhandledExceptionFilter(reinterpret_cast<LPTOP_LEVEL_EXCEPTION_FILTER>(m_prevHandler));
-        if (!AddVectoredExceptionHandler(0UL, VectoredExceptionHandlerWin32))
-        {
-            MsgWarning("AddVectoredExceptionHandler failed!\n");
-        }
+        RemoveVectoredContinueHandler(reinterpret_cast<PVOID>(m_vectored));
     }
 }

DriverNGHook/CrashHandlerReporter.h

@@ -1,16 +1,21 @@
 #pragma once
 
 #include <cstdint>
+#include <functional>
 
 namespace ReHamster
 {
+    using CrashFunc = std::function<void()>;
+
     class CrashHandlerReporter
     {
-        std::intptr_t m_prevHandler{ 0 };
+        std::intptr_t m_vectored{ 0 };
     public:
         CrashHandlerReporter();
         ~CrashHandlerReporter();
 
         void Install();
+
+        void AddCrashFunc(CrashFunc onCrash);
     };
 }

DriverNGHook/Delegates/LuaDelegate.cpp

@@ -2,6 +2,7 @@
 #include "Delegates/LuaDelegate.h"
 #include "UI/DebugTools.h"
 #include "IInputDelegate.h"
+#include "CrashHandlerReporter.h"
 
 #include "Logger.h"
 
@@ -118,8 +119,15 @@ LuaAsyncQueue g_luaAsyncQueue;
 
 //----------------------------------------------------------------------
 
+namespace ReHamster
+{
+	extern ReHamster::CrashHandlerReporter crashHandlerReporter;
+}
+
 namespace DriverNG
 {	
+
+
 	namespace Consts
 	{
 		static const std::string luaScriptsPath = "plugins/DriverNGHook/scripts/";
@@ -166,6 +174,10 @@ namespace DriverNG
         if (!instance)
         {
             instance = new LuaDelegate();
+
+			ReHamster::crashHandlerReporter.AddCrashFunc([]() {
+				instance->PrintLuaStackTrace();
+			});
         }
 
         return *instance;
@@ -396,4 +408,41 @@ namespace DriverNG
     {
         return m_callLuaFunc;
     }
+
+	void LuaDelegate::PrintLuaStackTrace()
+	{
+		if (!m_gameState)
+			return;
+
+		lua_State* L = m_gameState;
+		lua_Debug ar;
+		int depth = 0;
+
+		Msg("\nLua stack trace:\n");
+
+		while (lua_getstack(L, depth, &ar))
+		{
+			int status = lua_getinfo(L, "Sln", &ar);
+			assert(status);
+
+			Msg("\t %s:", ar.short_src);
+			if (ar.currentline > 0)
+				Msg("%d:", ar.currentline);
+			if (*ar.namewhat != '\0')  /* is there a name? */
+				Msg(" in function '%s'", ar.name);
+			else
+			{
+				if (*ar.what == 'm')  /* main? */
+					Msg(" in main chunk");
+				else if (*ar.what == 'C' || *ar.what == 't')
+					Msg(" ?");  /* C function or tail call */
+				else
+					Msg(" in function <%s:%d>",
+						ar.short_src, ar.linedefined);
+			}
+			Msg("\n");
+			depth++;
+		}
+		Msg("\n");
+	}
 };

DriverNGHook/Delegates/LuaDelegate.h

@@ -26,6 +26,8 @@ namespace DriverNG
 
         CallLuaFunction_t                   GetCallLuaFunction() override;
 
+        void                                PrintLuaStackTrace();
+
     protected:
 
         bool IsValidLuaState() const;