R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix VEH.

Browse Source 
* Make sure IsMaterialInternal won't be inlined.
* Fix recurssive VEH throwing.
* Check if IsMaterialInternal caused exception and ignore it.
This commit is contained in:
Marvin D 2022-12-24 16:40:04 +01:00
parent d1ec3aaf71
commit 22506fa689
3 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/materialsystem/cmaterialsystem.cpp
View File

@ -66,7 +66,7 @@ void* __fastcall DispatchDrawCall(int64_t a1, uint64_t a2, int a3, int a4, int64
// Input : **pCandidate -
// Output : true if valid and material, false otherwise
//-----------------------------------------------------------------------------
bool IsMaterialInternal(void** pCandidate)
__declspec(noinline) bool IsMaterialInternal(void** pCandidate)
{
// NOTE: this is a dirty fix, but for running technically broken BSP's, this is the only fix
// besides going bare metal inline assembly (which on its own isn't directly the problem, but

2
r5dev/materialsystem/cmaterialsystem.h
View File

@ -43,7 +43,7 @@ inline int* g_nUnfreeStreamingTextureMemory = nullptr;
inline int* g_nUnusableStreamingTextureMemory = nullptr;
#endif // !DEDICATED
bool IsMaterialInternal(void** pCandidate);
__declspec(noinline) bool IsMaterialInternal(void** pCandidate);
void CMaterialSystem_Attach();
void CMaterialSystem_Detach();
///////////////////////////////////////////////////////////////////////////////

45
r5dev/public/utility/crashhandler.cpp
View File

@ -8,6 +8,14 @@
#ifndef _DEBUG
#include "tier1/cvar.h"
#include "vpc/keyvalues.h"
#include "rtech/rtech_utils.h"
#include "engine/cmodel_bsp.h"
#include "materialsystem/cmaterialglue.h"
#include "materialsystem/cmaterialsystem.h"
#include "bsplib/bsplib.h"
// Class is just for DLL init and DLL close, so we can actually define it here fine.
class CCrashHandler
{
@ -135,6 +143,34 @@ long __stdcall ExceptionFilter(EXCEPTION_POINTERS* exceptionInfo)
if (g_ExceptionToString.find(exceptionInfo->ExceptionRecord->ExceptionCode) == g_ExceptionToString.end())
return EXCEPTION_CONTINUE_SEARCH;
#ifndef _DEBUG
// THIS WONT WORK ON DEBUG!!!
// THIS IS DUE TO A JMP TABLE CREATED BY MSVC!!
static void* imiRetAddr = nullptr;
static auto find_IMI_ref = CMemory(IsMaterialInternal).FindAllCallReferences(reinterpret_cast<uintptr_t>(BuildPropStaticFrustumCullMap), 1000);
if (!find_IMI_ref.empty())
{
imiRetAddr = find_IMI_ref.at(0).Offset(0x5).RCast<void*>();
}
#endif // _DEBUG
// Now get the callstack..
constexpr DWORD NUM_FRAMES_TO_CAPTURE = 60;
void* pStackTrace[NUM_FRAMES_TO_CAPTURE] = { 0 };
WORD nCapturedFrames = RtlCaptureStackBackTrace(0, NUM_FRAMES_TO_CAPTURE, pStackTrace, NULL);
#ifndef _DEBUG
// Check if we found IMI.
if (imiRetAddr)
{
for (WORD i = 0; i < 10; i++)
{
if (imiRetAddr == pStackTrace[i])
return EXCEPTION_CONTINUE_SEARCH;
}
}
#endif // _DEBUG
CONTEXT* pExceptionContext = exceptionInfo->ContextRecord;
// Setup message.
@ -157,11 +193,6 @@ long __stdcall ExceptionFilter(EXCEPTION_POINTERS* exceptionInfo)
svMessage += "\r\nStacktrace:\r\n\r\n";
// Now get the callstack..
constexpr DWORD NUM_FRAMES_TO_CAPTURE = 60;
void* pStackTrace[NUM_FRAMES_TO_CAPTURE] = { 0 };
WORD nCapturedFrames = RtlCaptureStackBackTrace(0, NUM_FRAMES_TO_CAPTURE, pStackTrace, NULL);
for (WORD i = 0; i < nCapturedFrames; i++)
{
svMessage += GetModuleCrashOffsetAndName(reinterpret_cast<uintptr_t>(pStackTrace[i])) + "\n";
@ -177,6 +208,8 @@ long __stdcall ExceptionFilter(EXCEPTION_POINTERS* exceptionInfo)
MessageBoxA(0, svMessage.c_str(), "R5R Crashed :/", MB_ICONERROR | MB_OK);
bLogged = true;
return EXCEPTION_EXECUTE_HANDLER;
}
@ -192,6 +225,6 @@ CCrashHandler::~CCrashHandler()
// Init on DLL init!
// Needs fixing for frustum culling, it triggers the SEH handler there which also triggers this, add address to whitelist/whitelist whole code page.
//CCrashHandler* g_CrashHandler = new CCrashHandler();
CCrashHandler* g_CrashHandler = new CCrashHandler();
#endif // _DEBUG