From c020c2e247a8f21e7871fbb05614f6fd545cd41a Mon Sep 17 00:00:00 2001 From: KeybadeBlox Date: Wed, 18 Feb 2026 18:15:25 -0500 Subject: [PATCH] jsrf.h scalar deleting destructors return void * They previously returned a pointer to the class type, but this isn't accurate to the signature indicated by MSVC's name mangling. --- ghidra/headerconvert.awk | 2 +- ghidra/make_header.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ghidra/headerconvert.awk b/ghidra/headerconvert.awk index c8383aa..e1bba51 100644 --- a/ghidra/headerconvert.awk +++ b/ghidra/headerconvert.awk @@ -5,7 +5,7 @@ function fn_ptr(cls, signature, ret, fname, args) { # Convert the given method signature to a function pointer if ($1 ~ /^~/) # Special case for virtual destructor - return "\t\t" cls " * __attribute__((thiscall)) "\ + return "\t\t void * __attribute__((thiscall)) "\ "(*scalar_deleting_destructor)("\ cls " *, "\ "BOOL"\ diff --git a/ghidra/make_header.sh b/ghidra/make_header.sh index b99ae22..6b772df 100755 --- a/ghidra/make_header.sh +++ b/ghidra/make_header.sh @@ -9,8 +9,8 @@ printf '%s\n' '// Automatically generated mass header file for Ghidra' > jsrf.h # all the headers here by hand in an order that functions properly HEADERS=" Std.hpp - XDK/Win32.hpp - XDK/D3D.hpp + XDK/Win32.h + XDK/D3D.h Smilebit/MMatrix.hpp JSRF/Core.hpp JSRF/GameData.hpp