implement special return buffer

Author: XtraCube

BepInEx.Core/Bootstrap/BaseChainloader.cs

@@ -486,10 +486,11 @@ private static bool IsAssemblySafe(string assemblyPath)
                         return false;
                     }
 
-                    if (module.Attributes.Has(ModuleAttributes.ILOnly) == false)
+                    // TODO: better unsafe blocking
+                    /*if (!module.Attributes.Has(ModuleAttributes.ILOnly))
                     {
                         return false;
-                    }
+                    }*/
 
                     if (!method.HasBody) continue;
 

Runtimes/Unity/BepInEx.Unity.IL2CPP/BepInEx.Unity.IL2CPP.csproj

@@ -17,10 +17,10 @@
     <ItemGroup>
         <PackageReference Include="Disarm" Version="2022.1.0-master.99" />
         <PackageReference Include="HarmonyX" Version="2.16.0" />
-        <PackageReference Include="Il2CppInterop.Generator" Version="1.5.2-data-hook" />
-        <PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.5.2-data-hook" />
+        <PackageReference Include="Il2CppInterop.Generator" Version="1.5.2-ci.star.5" />
+        <PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.5.2-ci.star.5" />
         <PackageReference Include="Il2CppInterop.ReferenceLibs" Version="1.0.0" IncludeAssets="compile" PrivateAssets="all"/>
-        <PackageReference Include="Il2CppInterop.Runtime" Version="1.5.2-data-hook" />
+        <PackageReference Include="Il2CppInterop.Runtime" Version="1.5.2-ci.star.5" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" IncludeAssets="compile" PrivateAssets="all"/>
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" IncludeAssets="compile" PrivateAssets="all"/>
         <PackageReference Include="MonoMod.Core" Version="1.3.4-star" />

Runtimes/Unity/BepInEx.Unity.IL2CPP/Hook/NativeDetour.cs

@@ -9,18 +9,20 @@ public unsafe class NativeDetour : IDetour
     public IntPtr Target { get; }
     public IntPtr Detour { get; }
     public bool UnityFunction { get; }
+    public bool SpecialReturnBuffer { get; }
     public IntPtr OriginalTrampoline { get; private set; }
 
     public NativeDetour(IntPtr target, Delegate detour)
-        : this(target, detour, false)
+        : this(target, detour, false, false)
     {
     }
 
-    public NativeDetour(IntPtr target, Delegate detour, bool unityFunction)
+    public NativeDetour(IntPtr target, Delegate detour, bool unityFunction, bool specialReturnBuffer)
     {
         Target = target;
         Detour = Marshal.GetFunctionPointerForDelegate(detour);
         UnityFunction = unityFunction;
+        SpecialReturnBuffer = specialReturnBuffer;
         Apply();
     }
 
@@ -30,7 +32,7 @@ public void Apply()
         {
             return;
         }
-        OriginalTrampoline = StarlightInterop.hook(Target, Detour, UnityFunction);
+        OriginalTrampoline = StarlightInterop.hook(Target, Detour, UnityFunction, SpecialReturnBuffer);
     }
 
     public void Dispose()

Runtimes/Unity/BepInEx.Unity.IL2CPP/Hook/NativeDetourProvider.cs

@@ -5,9 +5,9 @@ namespace BepInEx.Unity.IL2CPP.Hook;
 
 public class NativeDetourProvider : IDetourProvider
 {
-    public IDetour Create<TDelegate>(IntPtr original, TDelegate target, bool unityFunction) where TDelegate : Delegate
+    public IDetour Create<TDelegate>(IntPtr original, TDelegate target, bool unityFunction, bool specialReturnBuffer) where TDelegate : Delegate
     {
-        var detour = new NativeDetour(original, target, unityFunction);
+        var detour = new NativeDetour(original, target, unityFunction, specialReturnBuffer);
         return new CacheDetourWrapper(detour, target);
     }
 }

Runtimes/Unity/BepInEx.Unity.IL2CPP/IL2CPPChainloader.cs

@@ -11,6 +11,7 @@
 using BepInEx.Unity.IL2CPP.Hook;
 using BepInEx.Unity.IL2CPP.Logging;
 using BepInEx.Unity.IL2CPP.Utils;
+using Il2CppInterop.HarmonySupport;
 using Il2CppInterop.Runtime.InteropTypes;
 using Logger = BepInEx.Logging.Logger;
 
@@ -76,6 +77,8 @@ public override void Execute()
     {
         try
         {
+            BridgeInterop.Initialize();
+            StarlightInterop.init_bridge_helper(BridgeInterop.LibraryPath);
             StarlightInterop.set_loading(true);
 
             var paths = new Dictionary<string, bool>

Runtimes/Unity/BepInEx.Unity.IL2CPP/StarlightInterop.cs

@@ -13,7 +13,12 @@ internal static partial class StarlightInterop
     public static unsafe partial void write_log([MarshalAs(UnmanagedType.LPStr)] string message);
 
     [LibraryImport(LIBRARY_NAME)]
-    public static unsafe partial IntPtr hook(IntPtr target, IntPtr detour, [MarshalAs(UnmanagedType.I1)] bool unityFunction);
+    public static unsafe partial void init_bridge_helper([MarshalAs(UnmanagedType.LPStr)] string bridgeLibPath);
+
+    [LibraryImport(LIBRARY_NAME)]
+    public static unsafe partial IntPtr hook(IntPtr target, IntPtr detour, 
+                                             [MarshalAs(UnmanagedType.I1)] bool unityFunction,  
+                                             [MarshalAs(UnmanagedType.I1)] bool specialReturnBuffer);
 
     [LibraryImport(LIBRARY_NAME)]
     public static unsafe partial void unhook(IntPtr target);