diff --git a/CMakeLists.txt b/CMakeLists.txt index 1822e00a..d8fe6fe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -239,7 +239,7 @@ if (DEFINED GEODE_TULIPHOOK_REPO_PATH) message(STATUS "Using ${GEODE_TULIPHOOK_REPO_PATH} for TulipHook") add_subdirectory(${GEODE_TULIPHOOK_REPO_PATH} ${GEODE_TULIPHOOK_REPO_PATH}/build) else() - CPMAddPackage("gh:geode-sdk/TulipHook#0021301") + CPMAddPackage("gh:geode-sdk/TulipHook#b8357de") endif() set(CMAKE_WARN_DEPRECATED ON CACHE BOOL "" FORCE) diff --git a/loader/src/platform/windows/crashlog.cpp b/loader/src/platform/windows/crashlog.cpp index 8296c0da..989e2276 100644 --- a/loader/src/platform/windows/crashlog.cpp +++ b/loader/src/platform/windows/crashlog.cpp @@ -144,7 +144,7 @@ static void printAddr(std::ostream& stream, void const* addr, bool fullPath = tr } } -PVOID CustomFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase); +PVOID GeodeFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase); // https://stackoverflow.com/a/50208684/9124836 static std::string getStacktrace(PCONTEXT context) { @@ -174,14 +174,14 @@ static std::string getStacktrace(PCONTEXT context) { if (!StackWalk64( IMAGE_FILE_MACHINE_AMD64, process, thread, &stack, context, nullptr, +[](HANDLE hProcess, DWORD64 AddrBase) { - auto ret = CustomFunctionTableAccess64(hProcess, AddrBase); + auto ret = GeodeFunctionTableAccess64(hProcess, AddrBase); if (ret) { return ret; } return SymFunctionTableAccess64(hProcess, AddrBase); }, +[](HANDLE hProcess, DWORD64 dwAddr) -> DWORD64 { - auto ret = CustomFunctionTableAccess64(hProcess, dwAddr); + auto ret = GeodeFunctionTableAccess64(hProcess, dwAddr); if (ret) { return dwAddr & (~0xffffull); }