use custom function table access

Prevter · Jun 20, 2024 · 8df1e78 · 8df1e78
1 parent c474202
commit 8df1e78
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 14 deletions.
diff --git a/src/analyzer/analyzer.cpp b/src/analyzer/analyzer.cpp
@@ -493,6 +493,21 @@ namespace analyzer {
         return nullptr;
     }
 
+    /// @brief Import a TulipHook function
+    PVOID GeodeFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase);
+
+    PVOID CustomSymFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase) {
+        auto ret = GeodeFunctionTableAccess64(hProcess, AddrBase);
+        if (ret) return ret;
+        return SymFunctionTableAccess64(hProcess, AddrBase);
+    }
+
+    DWORD64 CustomSymGetModuleBase64(HANDLE hProcess, DWORD64 dwAddr) {
+        auto ret = GeodeFunctionTableAccess64(hProcess, dwAddr);
+        if (ret) return dwAddr & (~0xffffull);
+        return SymGetModuleBase64(hProcess, dwAddr);
+    }
+
     const std::vector<StackTraceLine> &Analyzer::getStackTrace() {
         if (!stackTrace.empty())
             return stackTrace;
@@ -523,8 +538,8 @@ namespace analyzer {
         HANDLE process = GetCurrentProcess();
         HANDLE thread = GetCurrentThread();
 
-        while (StackWalk64(machineType, process, thread, &stackFrame, ctx, nullptr, SymFunctionTableAccess64,
-                           SymGetModuleBase64, nullptr)) {
+        while (StackWalk64(machineType, process, thread, &stackFrame, ctx, nullptr, 
+                           CustomSymFunctionTableAccess64, CustomSymGetModuleBase64, nullptr)) {
             if (stackFrame.AddrPC.Offset == 0) {
                 break;
             }

diff --git a/src/main.cpp b/src/main.cpp
@@ -303,13 +303,6 @@ LONG WINAPI HandleCrash(LPEXCEPTION_POINTERS ExceptionInfo) {
     return result;
 }
 
-inline bool isWine() {
-    HMODULE hModule = GetModuleHandleA("ntdll.dll");
-    if (!hModule) return false;
-    FARPROC func = GetProcAddress(hModule, "wine_get_version");
-    return func != nullptr;
-}
-
 LONG WINAPI ContinueHandler(LPEXCEPTION_POINTERS info) {
     if (info->ExceptionRecord->ExceptionCode == EH_EXCEPTION_NUMBER) {
         HandleCrash(info);
@@ -392,8 +385,9 @@ inline std::string getBindingsUrl() {
     }
 
     geode::log::info("Setting up crash handler...");
-    AddVectoredExceptionHandler(0, ExceptionHandler);
-    AddVectoredContinueHandler(0, ContinueHandler);
-    if (isWine()) SetUnhandledExceptionFilter(ContinueHandler);
+    // AddVectoredExceptionHandler(0, ExceptionHandler);
+    // AddVectoredContinueHandler(0, ContinueHandler);
+    // if (isWine()) SetUnhandledExceptionFilter(ContinueHandler);
+    SetUnhandledExceptionFilter(ExceptionHandler);
 }
 
diff --git a/src/utils/geode-util.cpp b/src/utils/geode-util.cpp
@@ -85,7 +85,7 @@ namespace utils::geode {
         auto problems = ::geode::Loader::get()->getProblems();
 
         message = fmt::format(
-                "- Working Directory: {}\n"
+                "- Working Directory: {}\n{}"
                 "- Loader Version: {} (Geometry Dash v{})\n"
                 "- Loader Commit: {}\n"
                 "- Bindings Commit: {}\n"
@@ -94,7 +94,8 @@ namespace utils::geode {
                 "- 4GB Patch: {}\n"
 #endif
                 "- Problems: {}{}",
-                wd, getLoaderVersion(), getGameVersion(),
+                wd, isWine() ? "- Wine detected\n" : "",
+                getLoaderVersion(), getGameVersion(),
                 about::getLoaderCommitHash(), about::getBindingsCommitHash(),
                 getModCount(), getLoadedModCount(), getEnabledModCount(),
 #ifndef _WIN64
@@ -281,4 +282,22 @@ namespace utils::geode {
         return it == functions.end() ? std::make_pair(methodStart, "") : *it;
     }
 
+    bool isWine() {
+        static bool checked = false;
+        static bool result = false;
+
+        if (checked) return result;
+
+        HMODULE hModule = GetModuleHandleA("ntdll.dll");
+        if (!hModule) {
+            checked = true;
+            return false;
+        }
+
+        FARPROC func = GetProcAddress(hModule, "wine_get_version");
+        checked = true;
+        result = func != nullptr;
+        return result;
+    }
+
 }
diff --git a/src/utils/geode-util.hpp b/src/utils/geode-util.hpp
@@ -76,4 +76,7 @@ namespace utils::geode {
     /// @param address The address to search for
     /// @param moduleBase The base address of the module
     std::pair<uintptr_t, std::string> getFunctionAddress(uintptr_t address, uintptr_t moduleBase);
+
+    /// @brief Check whether current system is running Wine.
+    bool isWine();
 }