chore: add check to hook pauser

LiteLDev · Oct 19, 2024 · a58e2d8 · a58e2d8
1 parent 0cea1f1
commit a58e2d8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/src/ll/api/memory/Hook.cpp b/src/ll/api/memory/Hook.cpp
@@ -14,19 +14,21 @@
 
 namespace ll::memory {
 
+bool shouldHookSuspendThreads() { return getGamingStatus() != GamingStatus::Default; }
+
 int hook(FuncPtr target, FuncPtr detour, FuncPtr* originalFunc, HookPriority priority, bool suspendThreads) {
     if (target == nullptr) {
         return -1;
     }
     std::optional<thread::GlobalThreadPauser> pauser;
-    if (suspendThreads && getGamingStatus() != GamingStatus::Default) {
+    if (suspendThreads && shouldHookSuspendThreads()) {
         pauser.emplace();
     }
     return pl::hook::pl_hook(target, detour, originalFunc, static_cast<pl::hook::Priority>(priority));
 }
 bool unhook(FuncPtr target, FuncPtr detour, bool suspendThreads) {
     std::optional<thread::GlobalThreadPauser> pauser;
-    if (suspendThreads && getGamingStatus() != GamingStatus::Default) {
+    if (suspendThreads && shouldHookSuspendThreads()) {
         pauser.emplace();
     }
     return pl::hook::pl_unhook(target, detour);

diff --git a/src/ll/api/memory/Hook.h b/src/ll/api/memory/Hook.h
@@ -50,6 +50,8 @@ enum class HookPriority : int {
     Lowest  = 400,
 };
 
+LLNDAPI bool shouldHookSuspendThreads();
+
 LLAPI int
 hook(FuncPtr target, FuncPtr detour, FuncPtr* originalFunc, HookPriority priority, bool suspendThreads = true);
 
@@ -96,11 +98,17 @@ template <class... Ts>
 class HookRegistrar {
 public:
     static void hook() {
-        thread::GlobalThreadPauser pauser;
+        std::optional<thread::GlobalThreadPauser> pauser;
+        if (shouldHookSuspendThreads()) {
+            pauser.emplace();
+        }
         (((++Ts::_AutoHookCount == 1) ? Ts::hook(false) : 0), ...);
     }
     static void unhook() {
-        thread::GlobalThreadPauser pauser;
+        std::optional<thread::GlobalThreadPauser> pauser;
+        if (shouldHookSuspendThreads()) {
+            pauser.emplace();
+        }
         (((--Ts::_AutoHookCount == 0) ? Ts::unhook(false) : 0), ...);
     }
     HookRegistrar() noexcept { hook(); }

diff --git a/src/ll/api/utils/StacktraceUtils.h b/src/ll/api/utils/StacktraceUtils.h
@@ -14,11 +14,12 @@ class Stacktrace;
 class StacktraceEntry {
     friend ::ll::Stacktrace;
     void* address{};
-    StacktraceEntry(void* address) : address(address) {}
 
 public:
     using native_handle_type = void*;
 
+    explicit StacktraceEntry(void* address) : address(address) {}
+
     void* native_handle() const { return address; }
 };
 class Stacktrace {

diff --git a/src/ll/api/utils/StacktraceUtils_win.cpp b/src/ll/api/utils/StacktraceUtils_win.cpp
@@ -24,7 +24,7 @@ LLNDAPI Stacktrace Stacktrace::current(size_t skip, size_t maxDepth) {
     Stacktrace res;
     res.entries.reserve(s.size());
     for (auto& entry : s) {
-        res.entries.push_back({entry.native_handle()});
+        res.entries.emplace_back(entry.native_handle());
     }
     res.hash = std::hash<std::stacktrace>{}(s);
     return res;

diff --git a/src/ll/core/mod/ModRegistrar.cpp b/src/ll/core/mod/ModRegistrar.cpp
@@ -308,11 +308,13 @@ void ModRegistrar::disableAllMods() noexcept try {
     error_utils::printCurrentException(getLogger());
 }
 void ModRegistrar::releaseAllMods() noexcept try {
-    std::lock_guard lock(impl->mutex);
-    if (auto res = ModManagerRegistry::getInstance().releaseManagers(); !res) {
-        res.error().log(getLogger(), io::LogLevel::Warn);
-    }
-    impl->deps.clear();
+    // TODO: check lifetime
+    // std::lock_guard lock(impl->mutex);
+    // if (auto res = ModManagerRegistry::getInstance().releaseManagers(); !res) {
+    //     res.error().log(getLogger(), io::LogLevel::Warn);
+    // }
+    // impl->deps.clear();
+    return;
 } catch (...) {
     error_utils::printCurrentException(getLogger());
 }