fix(hooks): Not calling the callbacks

Author: skuzzis

src/memory/hooks/functions.cpp

@@ -61,6 +61,14 @@ void FunctionHook::Initialize()
     hookFunc->addCallback(m_callbackType, m_handler);
 }
 
+dyno::IHook* FunctionHook::GetHookFunction()
+{
+    if (!m_pfn) return nullptr;
+
+    dyno::IHookManager& manager = dyno::IHookManager::Get();
+    return manager.findDetour(m_pfn).get();
+}
+
 extern bool shuttingDown;
 
 FunctionHook::~FunctionHook()

src/memory/hooks/functions.h

@@ -44,6 +44,8 @@ class FunctionHook
     void Enable();
     void Disable();
 
+    dyno::IHook* GetHookFunction();
+
     std::any Call(std::vector<std::any> arguments);
 };
 

src/memory/hooks/vfunctions.cpp

@@ -55,6 +55,14 @@ void VFunctionHook::Initialize()
     hookFunc->addCallback(m_callbackType, m_handler);
 }
 
+dyno::IHook* VFunctionHook::GetHookFunction()
+{
+    if (!m_pvtable) return nullptr;
+
+    dyno::IHookManager& manager = dyno::IHookManager::Get();
+    return manager.findVirtual(m_pvtable, m_ioffset).get();
+}
+
 void VFunctionHook::Enable()
 {
     if (enabled) return;

src/memory/hooks/vfunctions.h

@@ -47,6 +47,8 @@ class VFunctionHook
     void Enable();
     void Disable();
 
+    dyno::IHook* GetHookFunction();
+
     std::any Call(std::vector<std::any> arguments);
 };
 

src/scripting/memory/hooks.cpp

@@ -68,13 +68,15 @@ std::map<uint64_t, std::vector<std::string>> outputHooksList;
 
 dyno::ReturnAction HookCallback(dyno::CallbackType type, dyno::IHook& hook) {
     dyno::IHook* hptr = &hook;
+
     std::string callbackType = (type == dyno::CallbackType::Pre ? "Pre" : "Post");
     if (hooksList.find(hptr) == hooksList.end())
         return dyno::ReturnAction::Ignored;
 
     ClassData* ev = new ClassData({ { "plugin_name", std::string("core") }, { "hook_ptr", hptr } }, "Event", nullptr);
     for (auto hk : hooksList[hptr])
     {
+        printf("Hook called: %s\n", hk.id.c_str());
         if (g_pluginManager.ExecuteEvent("core", "hook:" + callbackType + ":" + hk.id, {}, ev) != EventResult::Continue) {
             delete ev;
             return dyno::ReturnAction::Supercede;
@@ -202,6 +204,9 @@ LoadScriptingComponent(hooks, [](PluginObject plugin, EContext* ctx) -> void {
             false
         };
 
+        auto foundhook = ((FunctionHook*)(hk.hookPtrPre))->GetHookFunction();
+        hooksList[foundhook].push_back(hk);
+
         std::vector<Hook> hookArr = data->GetData<std::vector<Hook>>("hooks_arr");
         hookArr.push_back(hk);
         data->SetData("hooks_arr", hookArr);
@@ -227,6 +232,9 @@ LoadScriptingComponent(hooks, [](PluginObject plugin, EContext* ctx) -> void {
             true
         };
 
+        auto foundhook = ((VFunctionHook*)(hk.hookPtrPre))->GetHookFunction();
+        hooksList[foundhook].push_back(hk);
+
         std::vector<Hook> hookArr = data->GetData<std::vector<Hook>>("hooks_arr");
         hookArr.push_back(hk);
         data->SetData("hooks_arr", hookArr);