From b5d52732e0add94bf70c89fb20f9c355f36dfb0e Mon Sep 17 00:00:00 2001
From: MidoriKami <9083275+MidoriKami@users.noreply.github.com>
Date: Sat, 1 Jun 2024 15:04:06 -0700
Subject: [PATCH] Add hooking overloads (#1820)

---
 .../GameInteropProviderPluginScoped.cs        | 12 ++++++--
 .../Plugin/Services/IGameInteropProvider.cs   | 28 +++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Dalamud/Hooking/Internal/GameInteropProviderPluginScoped.cs b/Dalamud/Hooking/Internal/GameInteropProviderPluginScoped.cs
index 1138d4e07..eb096a771 100644
--- a/Dalamud/Hooking/Internal/GameInteropProviderPluginScoped.cs
+++ b/Dalamud/Hooking/Internal/GameInteropProviderPluginScoped.cs
@@ -47,7 +47,7 @@ internal class GameInteropProviderPluginScoped : IGameInteropProvider, IInternal
     }
 
     /// <inheritdoc/>
-    public Hook<T> HookFromFunctionPointerVariable<T>(IntPtr address, T detour) where T : Delegate
+    public Hook<T> HookFromFunctionPointerVariable<T>(nint address, T detour) where T : Delegate
     {
         var hook = Hook<T>.FromFunctionPointerVariable(address, detour);
         this.trackedHooks.Add(hook);
@@ -71,13 +71,21 @@ internal class GameInteropProviderPluginScoped : IGameInteropProvider, IInternal
     }
 
     /// <inheritdoc/>
-    public Hook<T> HookFromAddress<T>(IntPtr procAddress, T detour, IGameInteropProvider.HookBackend backend = IGameInteropProvider.HookBackend.Automatic) where T : Delegate
+    public Hook<T> HookFromAddress<T>(nint procAddress, T detour, IGameInteropProvider.HookBackend backend = IGameInteropProvider.HookBackend.Automatic) where T : Delegate
     {
         var hook = Hook<T>.FromAddress(procAddress, detour, backend == IGameInteropProvider.HookBackend.MinHook);
         this.trackedHooks.Add(hook);
         return hook;
     }
 
+    /// <inheritdoc/>
+    public Hook<T> HookFromAddress<T>(UIntPtr procAddress, T detour, IGameInteropProvider.HookBackend backend = IGameInteropProvider.HookBackend.Automatic) where T : Delegate
+        => this.HookFromAddress((nint)procAddress, detour, backend);
+
+    /// <inheritdoc/>
+    public unsafe Hook<T> HookFromAddress<T>(void* procAddress, T detour, IGameInteropProvider.HookBackend backend = IGameInteropProvider.HookBackend.Automatic) where T : Delegate
+        => this.HookFromAddress((nint)procAddress, detour, backend);
+
     /// <inheritdoc/>
     public Hook<T> HookFromSignature<T>(string signature, T detour, IGameInteropProvider.HookBackend backend = IGameInteropProvider.HookBackend.Automatic) where T : Delegate
         => this.HookFromAddress(this.scanner.ScanText(signature), detour, backend);
diff --git a/Dalamud/Plugin/Services/IGameInteropProvider.cs b/Dalamud/Plugin/Services/IGameInteropProvider.cs
index 217e08445..99e36c7ed 100644
--- a/Dalamud/Plugin/Services/IGameInteropProvider.cs
+++ b/Dalamud/Plugin/Services/IGameInteropProvider.cs
@@ -48,7 +48,7 @@ public interface IGameInteropProvider
     /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
     /// <returns>The hook with the supplied parameters.</returns>
     /// <typeparam name="T">Delegate of detour.</typeparam>
-    public Hook<T> HookFromFunctionPointerVariable<T>(IntPtr address, T detour) where T : Delegate;
+    public Hook<T> HookFromFunctionPointerVariable<T>(nint address, T detour) where T : Delegate;
     
     /// <summary>
     /// Creates a hook by rewriting import table address.
@@ -85,7 +85,31 @@ public interface IGameInteropProvider
     /// <param name="backend">Hooking library to use.</param>
     /// <returns>The hook with the supplied parameters.</returns>
     /// <typeparam name="T">Delegate of detour.</typeparam>
-    Hook<T> HookFromAddress<T>(IntPtr procAddress, T detour, HookBackend backend = HookBackend.Automatic) where T : Delegate;
+    Hook<T> HookFromAddress<T>(nint procAddress, T detour, HookBackend backend = HookBackend.Automatic) where T : Delegate;
+    
+    /// <summary>
+    /// Creates a hook. Hooking address is inferred by calling to GetProcAddress() function.
+    /// The hook is not activated until Enable() method is called.
+    /// Please do not use MinHook unless you have thoroughly troubleshot why Reloaded does not work.
+    /// </summary>
+    /// <param name="procAddress">A memory address to install a hook.</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    /// <param name="backend">Hooking library to use.</param>
+    /// <returns>The hook with the supplied parameters.</returns>
+    /// <typeparam name="T">Delegate of detour.</typeparam>
+    Hook<T> HookFromAddress<T>(nuint procAddress, T detour, HookBackend backend = HookBackend.Automatic) where T : Delegate;
+    
+    /// <summary>
+    /// Creates a hook. Hooking address is inferred by calling to GetProcAddress() function.
+    /// The hook is not activated until Enable() method is called.
+    /// Please do not use MinHook unless you have thoroughly troubleshot why Reloaded does not work.
+    /// </summary>
+    /// <param name="procAddress">A memory address to install a hook.</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    /// <param name="backend">Hooking library to use.</param>
+    /// <returns>The hook with the supplied parameters.</returns>
+    /// <typeparam name="T">Delegate of detour.</typeparam>
+    unsafe Hook<T> HookFromAddress<T>(void* procAddress, T detour, HookBackend backend = HookBackend.Automatic) where T : Delegate;
     
     /// <summary>
     /// Creates a hook from a signature into the Dalamud target module.