Add Delegate constraint to detour provider

Kasuromi · Kasuromi · commit 7b586442ddf9 · 2022-06-16T08:56:49.000-07:00
diff --git a/Il2CppInterop.HarmonySupport/Il2CppDetourMethodPatcher.cs b/Il2CppInterop.HarmonySupport/Il2CppDetourMethodPatcher.cs
@@ -143,10 +143,8 @@ public override MethodBase DetourTo(MethodBase replacement)
 
         DelegateCache[Original] = unmanagedDelegate;
 
-        var detourPtr =
-            Marshal.GetFunctionPointerForDelegate(unmanagedDelegate);
         nativeDetour =
-            Il2CppInteropRuntime.Instance.DetourProvider.Create(originalNativeMethodInfo.MethodPointer, detourPtr);
+            Il2CppInteropRuntime.Instance.DetourProvider.Create(originalNativeMethodInfo.MethodPointer, unmanagedDelegate);
         nativeDetour.Apply();
         modifiedNativeMethodInfo.MethodPointer = nativeDetour.OriginalTrampoline;
 
diff --git a/Il2CppInterop.Runtime/Injection/DetourProvider.cs b/Il2CppInterop.Runtime/Injection/DetourProvider.cs
@@ -15,7 +15,7 @@ public interface IDetour : IDisposable
 
 public interface IDetourProvider
 {
-    IDetour Create<TDelegate>(nint original, TDelegate target);
+    IDetour Create<TDelegate>(nint original, TDelegate target) where TDelegate : Delegate;
 }
 
 internal static class Detour

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public interface IDetour : IDisposable`
`15`	`15`
`16`	`16`	`public interface IDetourProvider`
`17`	`17`	`{`
`18`		`- IDetour Create<TDelegate>(nint original, TDelegate target);`
	`18`	`+ IDetour Create<TDelegate>(nint original, TDelegate target) where TDelegate : Delegate;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`internal static class Detour`