7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-02-17 00:30:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

some exception handling improvements

Browse source
This commit is contained in:
dank_meme01 2023-10-24 12:05:37 +02:00
parent fdd78aca3f
commit 0d09162622
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
loader/src/platform/windows/crashlog.cpp
View file

@ -205,19 +205,20 @@ static std::string getInfo(LPEXCEPTION_POINTERS info, Mod* faultyMod) {
// This executes when a C++ exception was thrown and not handled.
// https://devblogs.microsoft.com/oldnewthing/20100730-00/?p=13273
// since you can throw virtually anything, we need to figure out if it's an std::exception* or not
bool isStdException = false;
auto exceptionRecord = info->ExceptionRecord;
auto* exceptionRecord = info->ExceptionRecord;
auto exceptionObject = exceptionRecord->ExceptionInformation[1];
auto throwInfo = reinterpret_cast<_ThrowInfo*>(exceptionRecord->ExceptionInformation[2]);
auto catchableTypeArray = reinterpret_cast<_CatchableTypeArray*>(throwInfo->pCatchableTypeArray);
auto* throwInfo = reinterpret_cast<_ThrowInfo*>(exceptionRecord->ExceptionInformation[2]);
auto* catchableTypeArray = reinterpret_cast<_CatchableTypeArray*>(throwInfo->pCatchableTypeArray);
auto ctaSize = catchableTypeArray->nCatchableTypes;
for (int i = 0; i < ctaSize; i++) {
auto catchableType = reinterpret_cast<_CatchableType*>(catchableTypeArray->arrayOfCatchableTypes[i]);
auto ctDescriptor = reinterpret_cast<_TypeDescriptor*>(catchableType->pType);
auto classname = ctDescriptor->name;
auto* catchableType = reinterpret_cast<_CatchableType*>(catchableTypeArray->arrayOfCatchableTypes[i]);
auto* ctDescriptor = reinterpret_cast<_TypeDescriptor*>(catchableType->pType);
const char* classname = ctDescriptor->name;
if (strcmp(classname, ".?AVexception@std@@") == 0) {
isStdException = true;
@ -226,7 +227,7 @@ static std::string getInfo(LPEXCEPTION_POINTERS info, Mod* faultyMod) {
}
if (isStdException) {
auto excObject = reinterpret_cast<std::exception*>(exceptionObject);
std::exception* excObject = reinterpret_cast<std::exception*>(exceptionObject);
// stream << "C++ Exception Type: " << typeid(excObject).name() << "\n"; // always const std::exception *
stream << "C++ Exception: " << excObject->what() << "\n";
} else {

15
loader/src/platform/windows/ehdata_structs.hpp
View file

@ -1,7 +1,12 @@
#pragma once
// All of those are defined in <ehdata.h> but the header fails to compile for some reason.
#define EH_EXCEPTION_NUMBER ('msc' | 0xE0000000)
// _ThrowInfo and all of those other structs are hardcoded into MSVC,
// but don't exist in other compilers like Clang, causing <ehdata.h> to not compile.
//
// We check if they don't exist and define them manually.
// source: https://www.geoffchappell.com/studies/msvc/language/predefined/index.htm
#ifndef _ThrowInfo
typedef struct _PMD
{
@ -43,4 +48,8 @@ typedef const struct _s__ThrowInfo {
_PMFN pmfnUnwind;
int (__cdecl *pForwardCompat) (...);
_CatchableTypeArray *pCatchableTypeArray;
} _ThrowInfo;
} _ThrowInfo;
#endif // _ThrowInfo
#include <ehdata.h>