Centralize the delegate workaround

This commit is contained in:
js6pak authored and ghorsington committed 2022-08-14 17:18:58 +03:00
1 parent 5dce49007e
commit 8d26da3cda
2 files changed
+50 -5

No files matched your search

+50
View File
@@ -1,4 +1,6 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.InteropServices;
using BepInEx.Configuration;
using BepInEx.IL2CPP.Hook.Dobby;
@@ -38,9 +40,57 @@ public interface INativeDetour : IDetour
var detour = Create(from, toPtr);
original = detour.GenerateTrampoline<T>();
detour.Apply();
// TODO check if this is still needed and remove if not
// if (!ReflectionHelper.IsMono)
// {
// return new CacheDetourWrapper<T>(detour, original, to);
// }
return detour;
}
// Workaround for CoreCLR collecting all delegates
private class CacheDetourWrapper<T> : INativeDetour where T : Delegate
{
private readonly INativeDetour _wrapped;
private List<T> _cache = new();
public CacheDetourWrapper(INativeDetour wrapped, T original, T to)
{
_wrapped = wrapped;
_cache.Add(original);
_cache.Add(to);
}
public void Dispose()
{
_wrapped.Dispose();
_cache.Clear();
}
public void Apply() => _wrapped.Apply();
public void Undo() => _wrapped.Undo();
public void Free() => _wrapped.Free();
public MethodBase GenerateTrampoline(MethodBase signature = null) => _wrapped.GenerateTrampoline(signature);
public T GenerateTrampoline<T>() where T : Delegate => _wrapped.GenerateTrampoline<T>();
public bool IsValid => _wrapped.IsValid;
public bool IsApplied => _wrapped.IsApplied;
public nint OriginalMethodPtr => _wrapped.OriginalMethodPtr;
public nint DetourMethodPtr => _wrapped.DetourMethodPtr;
public nint TrampolinePtr => _wrapped.TrampolinePtr;
}
internal enum DetourProvider
{
Default,
-5
View File
@@ -33,7 +33,6 @@ public class IL2CPPChainloader : BaseChainloader<BasePlugin>
false,
"Include unity log messages in log file output.");
private static List<object> DetourCache = new();
private static INativeDetour RuntimeInvokeDetour { get; set; }
@@ -75,8 +74,6 @@ public class IL2CPPChainloader : BaseChainloader<BasePlugin>
RuntimeInvokeDetour =
INativeDetour.CreateAndApply(runtimeInvokePtr, invokeMethodDetour, out originalInvoke);
DetourCache.Add(invokeMethodDetour);
DetourCache.Add(originalInvoke);
PreloaderLogger.Log.Log(LogLevel.Debug, "Runtime invoke patched");
}
@@ -113,8 +110,6 @@ public class IL2CPPChainloader : BaseChainloader<BasePlugin>
{
RuntimeInvokeDetour.Dispose();
DetourCache.Clear();
PreloaderLogger.Log.Log(LogLevel.Debug, "Runtime invoke unpatched");
}