Update BootstrapInterop.cs

LavaGang · Nov 22, 2023 · ec7c9b6 · ec7c9b6
1 parent b69fff0
commit ec7c9b6
Showing 1 changed file with 23 additions and 8 deletions.
diff --git a/MelonLoader/MelonLoader.Bootstrap/BootstrapInterop.cs b/MelonLoader/MelonLoader.Bootstrap/BootstrapInterop.cs
@@ -9,14 +9,29 @@ public static unsafe class BootstrapInterop
         public static delegate* unmanaged<void*, void*, void*> NativeHookAttach;
         public static delegate* unmanaged<void*, void> NativeHookDetach;
 
-        public unsafe static T HookAttach<T>(T target, T detour) where T : Delegate
-            => Marshal.GetDelegateForFunctionPointer<T>(
-                new IntPtr(
-                    NativeHookAttach(
-                        target.GetFunctionPointer().ToPointer(),
-                        detour.GetFunctionPointer().ToPointer())));
+        public static T HookAttach<T>(T target, T detour) where T : Delegate
+            => Marshal.GetDelegateForFunctionPointer<T>(HookAttach(target.GetFunctionPointer(), detour.GetFunctionPointer()));
+        public static IntPtr HookAttach(IntPtr target, IntPtr detour)
+        {
+            // Dereference Target Pointer to get Actual Pointer
+            IntPtr targetAddr = (IntPtr)(&target);
 
-        public unsafe static void HookDetach<T>(T target) where T : Delegate
-            => NativeHookDetach(target.GetFunctionPointer().ToPointer());
+            // Attach Hook
+            void* originalFunc = NativeHookAttach(targetAddr.ToPointer(), detour.ToPointer());
+
+            // Return Original Func as IntPtr
+            return new IntPtr(originalFunc);
+        }
+
+        public static void HookDetach<T>(T target) where T : Delegate
+            => HookDetach(target.GetFunctionPointer());
+        public static void HookDetach(IntPtr target)
+        {
+            // Dereference Target Delegate to get Actual Pointer
+            IntPtr targetAddr = (IntPtr)(&target);
+
+            // Detach Hook
+            NativeHookDetach(targetAddr.ToPointer());
+        }
     }
 }