refactored icalls using icall helper

sinai-dev · sinai-dev · commit bc0ad5eab66a · 2020-10-16T19:40:01.000+11:00
diff --git a/src/CacheObject/CacheFactory.cs b/src/CacheObject/CacheFactory.cs
@@ -2,6 +2,7 @@
 using System.Reflection;
 using Explorer.CacheObject;
 using UnityEngine;
+using Explorer.Helpers;
 
 namespace Explorer
 {
diff --git a/src/CacheObject/CacheField.cs b/src/CacheObject/CacheField.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Reflection;
 using Explorer.UI;
+using Explorer.Helpers;
 
 namespace Explorer.CacheObject
 {
diff --git a/src/CacheObject/CacheMethod.cs b/src/CacheObject/CacheMethod.cs
@@ -4,6 +4,7 @@
 using System.Reflection;
 using UnityEngine;
 using Explorer.UI.Shared;
+using Explorer.Helpers;
 
 namespace Explorer.CacheObject
 {
diff --git a/src/CacheObject/CacheObjectBase.cs b/src/CacheObject/CacheObjectBase.cs
@@ -5,6 +5,7 @@
 using UnityEngine;
 using Explorer.UI;
 using Explorer.UI.Shared;
+using Explorer.Helpers;
 
 namespace Explorer.CacheObject
 {
diff --git a/src/CacheObject/CacheProperty.cs b/src/CacheObject/CacheProperty.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Reflection;
 using Explorer.UI;
+using Explorer.Helpers;
 
 namespace Explorer.CacheObject
 {
diff --git a/src/Explorer.csproj b/src/Explorer.csproj
@@ -264,6 +264,7 @@
     <Compile Include="Unstrip\ImageConversion\ImageConversionUnstrip.cs" />
     <Compile Include="Unstrip\IMGUI\Internal_GUIUtility.cs" />
     <Compile Include="Unstrip\IMGUI\Internal_TextEditor.cs" />
+    <Compile Include="Helpers\ICallHelper.cs" />
     <Compile Include="Unstrip\LayerMask\LayerMaskUnstrip.cs" />
     <Compile Include="Unstrip\Scene\SceneUnstrip.cs" />
     <Compile Include="Unstrip\IMGUI\GUIUnstrip.cs" />
diff --git a/src/Extensions/ReflectionExtensions.cs b/src/Extensions/ReflectionExtensions.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Explorer.Helpers;
 
 namespace Explorer
 {
diff --git a/src/Helpers/ICallHelper.cs b/src/Helpers/ICallHelper.cs
@@ -0,0 +1,45 @@
+﻿#if CPP
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Reflection;
+
+namespace Explorer.Helpers
+{
+    public static class ICallHelper
+    {
+        private static readonly Dictionary<string, Delegate> iCallCache = new Dictionary<string, Delegate>();
+
+        public static T GetICall<T>(string iCallName) where T : Delegate
+        {
+            if (iCallCache.ContainsKey(iCallName))
+            {
+                return (T)iCallCache[iCallName];
+            }
+
+            var ptr = il2cpp_resolve_icall(iCallName);
+
+            if (ptr == IntPtr.Zero)
+            {
+                throw new MissingMethodException($"Could not resolve internal call by name '{iCallName}'!");
+            }
+
+            var iCall = Marshal.GetDelegateForFunctionPointer(ptr, typeof(T));
+            iCallCache.Add(iCallName, iCall);
+
+            return (T)iCall;
+        }
+
+        #region External
+        #pragma warning disable IDE1006 // Naming Styles
+
+        [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public static extern IntPtr il2cpp_resolve_icall([MarshalAs(UnmanagedType.LPStr)] string name);
+
+        #pragma warning restore IDE1006
+        #endregion
+    }
+}
+#endif
diff --git a/src/Helpers/ReflectionHelpers.cs b/src/Helpers/ReflectionHelpers.cs
@@ -12,7 +12,7 @@
 using UnhollowerRuntimeLib;
 #endif
 
-namespace Explorer
+namespace Explorer.Helpers
 {
     public class ReflectionHelpers
     {
diff --git a/src/Helpers/UnityHelpers.cs b/src/Helpers/UnityHelpers.cs
@@ -1,6 +1,6 @@
 ﻿using UnityEngine;
 
-namespace Explorer
+namespace Explorer.Helpers
 {
     public class UnityHelpers
     {
diff --git a/src/Input/InputManager.cs b/src/Input/InputManager.cs
@@ -2,6 +2,7 @@
 using System.Reflection;
 using UnityEngine;
 using Explorer.Input;
+using Explorer.Helpers;
 #if CPP
 using UnhollowerBaseLib;
 #endif
@@ -42,10 +43,7 @@ public static void Init()
 
 #if CPP
         internal delegate void d_ResetInputAxes();
-        internal static d_ResetInputAxes ResetInputAxes_iCall =
-            IL2CPP.ResolveICall<d_ResetInputAxes>("UnityEngine.Input::ResetInputAxes");
-
-        public static void ResetInputAxes() => ResetInputAxes_iCall();
+        public static void ResetInputAxes() => ICallHelper.GetICall<d_ResetInputAxes>("UnityEngine.Input::ResetInputAxes").Invoke();
 #else
         public static void ResetInputAxes() => UnityEngine.Input.ResetInputAxes();
 #endif
@@ -55,29 +53,34 @@ public static void Init()
         // public extern static string compositionString { get; }
 
         internal delegate IntPtr d_get_compositionString();
-        internal static d_get_compositionString get_compositionString_iCall =
-            IL2CPP.ResolveICall<d_get_compositionString>("UnityEngine.Input::get_compositionString");
 
-        public static string compositionString => IL2CPP.Il2CppStringToManaged(get_compositionString_iCall());
+        public static string compositionString
+        {
+            get
+            {
+                var iCall = ICallHelper.GetICall<d_get_compositionString>("UnityEngine.Input::get_compositionString");
+                return IL2CPP.Il2CppStringToManaged(iCall.Invoke());
+            }
+        }
 
         // public extern static Vector2 compositionCursorPos { get; set; }
 
         internal delegate void d_get_compositionCursorPos(out Vector2 ret);
-        internal static d_get_compositionCursorPos get_compositionCursorPos_iCall =
-            IL2CPP.ResolveICall<d_get_compositionCursorPos>("UnityEngine.Input::get_compositionCursorPos_Injected");
-
-        internal delegate void set_compositionCursorPos_delegate(ref Vector2 value);
-        internal static set_compositionCursorPos_delegate set_compositionCursorPos_iCall =
-            IL2CPP.ResolveICall<set_compositionCursorPos_delegate>("UnityEngine.Input::set_compositionCursorPos_Injected");
+        internal delegate void d_set_compositionCursorPos(ref Vector2 value);
 
         public static Vector2 compositionCursorPos
         {
             get
             {
-                get_compositionCursorPos_iCall(out Vector2 ret);
+                var iCall = ICallHelper.GetICall<d_get_compositionCursorPos>("UnityEngine.Input::get_compositionCursorPos_Injected");
+                iCall.Invoke(out Vector2 ret);
                 return ret;
             }
-            set => set_compositionCursorPos_iCall(ref value);
+            set
+            {
+                var iCall = ICallHelper.GetICall<d_set_compositionCursorPos>("UnityEngine.Input::set_compositionCursorPos_Injected");
+                iCall.Invoke(ref value);
+            }
         }
 
 #pragma warning restore IDE1006
diff --git a/src/Input/InputSystem.cs b/src/Input/InputSystem.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using UnityEngine;
+using Explorer.Helpers;
 
 namespace Explorer.Input
 {
diff --git a/src/Input/LegacyInput.cs b/src/Input/LegacyInput.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using UnityEngine;
+using Explorer.Helpers;
 
 namespace Explorer.Input
 {
diff --git a/src/Tests/TestClass.cs b/src/Tests/TestClass.cs
@@ -46,14 +46,6 @@ public static bool SetOnlyProperty
         public static int StaticField = 5;
         public int NonStaticField;
 
-#if CPP
-        public static IntPtr FindICall(string name) => il2cpp_resolve_icall(name);
-
-        [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
-        private static extern IntPtr il2cpp_resolve_icall([MarshalAs(UnmanagedType.LPStr)] string name);
-
-#endif
-
 #if CPP
         public static Il2CppSystem.Collections.Generic.HashSet<string> ILHashSetTest;
 #endif
diff --git a/src/UI/ForceUnlockCursor.cs b/src/UI/ForceUnlockCursor.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using UnityEngine;
+using Explorer.Helpers;
 #if ML
 using Harmony;
 #else
diff --git a/src/UI/Inspectors/GameObjectInspector.cs b/src/UI/Inspectors/GameObjectInspector.cs
@@ -4,6 +4,7 @@
 using Explorer.UI.Shared;
 using Explorer.UI.Main;
 using Explorer.Unstrip.LayerMasks;
+using Explorer.Helpers;
 #if CPP
 using UnhollowerRuntimeLib;
 #endif
diff --git a/src/UI/Inspectors/InspectUnderMouse.cs b/src/UI/Inspectors/InspectUnderMouse.cs
@@ -1,4 +1,5 @@
 ﻿using UnityEngine;
+using Explorer.Helpers;
 
 namespace Explorer.UI.Inspectors
 {
diff --git a/src/UI/Inspectors/ReflectionInspector.cs b/src/UI/Inspectors/ReflectionInspector.cs
@@ -7,6 +7,7 @@
 using Explorer.UI.Shared;
 using Explorer.CacheObject;
 using Explorer.UI.Inspectors;
+using Explorer.Helpers;
 #if CPP
 using UnhollowerBaseLib;
 #endif
diff --git a/src/UI/InteractiveValue/InteractiveValue.cs b/src/UI/InteractiveValue/InteractiveValue.cs
@@ -5,6 +5,7 @@
 using UnityEngine;
 using Explorer.UI.Shared;
 using Explorer.CacheObject;
+using Explorer.Helpers;
 
 namespace Explorer.UI
 {
diff --git a/src/UI/InteractiveValue/Object/InteractiveDictionary.cs b/src/UI/InteractiveValue/Object/InteractiveDictionary.cs
@@ -2,11 +2,12 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using Explorer.UI.Shared;
+using Explorer.CacheObject;
+using Explorer.Helpers;
 #if CPP
 using UnhollowerBaseLib;
 #endif
-using Explorer.UI.Shared;
-using Explorer.CacheObject;
 
 namespace Explorer.UI
 {
diff --git a/src/UI/InteractiveValue/Object/InteractiveEnumerable.cs b/src/UI/InteractiveValue/Object/InteractiveEnumerable.cs
@@ -7,6 +7,7 @@
 using Explorer.UI.Shared;
 using Explorer.CacheObject;
 using System.Linq;
+using Explorer.Helpers;
 #if CPP
 using UnhollowerBaseLib;
 #endif
diff --git a/src/UI/Main/ScenePage.cs b/src/UI/Main/ScenePage.cs
@@ -5,6 +5,7 @@
 using UnityEngine.SceneManagement;
 using Explorer.UI.Shared;
 using Explorer.CacheObject;
+using Explorer.Helpers;
 
 namespace Explorer.UI.Main
 {
diff --git a/src/UI/Main/SearchPage.cs b/src/UI/Main/SearchPage.cs
@@ -6,7 +6,7 @@
 using UnityEngine;
 using Explorer.UI.Shared;
 using Explorer.CacheObject;
-using System.Threading;
+using Explorer.Helpers;
 
 namespace Explorer.UI.Main
 {
diff --git a/src/Unstrip/IMGUI/Internal_GUIUtility.cs b/src/Unstrip/IMGUI/Internal_GUIUtility.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using UnityEngine;
+using Explorer.Helpers;
 
 namespace Explorer.Unstrip.IMGUI
 {
diff --git a/src/Unstrip/ImageConversion/ImageConversionUnstrip.cs b/src/Unstrip/ImageConversion/ImageConversionUnstrip.cs
@@ -6,36 +6,35 @@
 using UnhollowerBaseLib;
 using UnityEngine;
 using System.IO;
+using Explorer.Helpers;
 
 namespace Explorer.Unstrip.ImageConversion
 {
     public static class ImageConversionUnstrip
     {
         // byte[] ImageConversion.EncodeToPNG(this Texture2D image);
 
+        internal delegate byte[] d_EncodeToPNG(IntPtr tex);
+
         public static byte[] EncodeToPNG(this Texture2D tex)
         {
-            return EncodeToPNG_iCall(tex.Pointer);
+            return ICallHelper.GetICall<d_EncodeToPNG>("UnityEngine.ImageConversion::EncodeToPNG")
+                .Invoke(tex.Pointer);
         }
 
-        internal delegate byte[] EncodeToPNG_delegate(IntPtr tex);
-        internal static EncodeToPNG_delegate EncodeToPNG_iCall =
-            IL2CPP.ResolveICall<EncodeToPNG_delegate>("UnityEngine.ImageConversion::EncodeToPNG");
-
         // bool ImageConversion.LoadImage(this Texture2D tex, byte[] data, bool markNonReadable);
 
+        internal delegate bool d_LoadImage(IntPtr tex, byte[] data, bool markNonReadable);
+
         public static bool LoadImage(this Texture2D tex, byte[] data, bool markNonReadable)
         {
-            return LoadImage_iCall(tex.Pointer, data, markNonReadable);
+            return ICallHelper.GetICall<d_LoadImage>("UnityEngine.ImageConversion::LoadImage")
+                .Invoke(tex.Pointer, data, markNonReadable);
         }
 
-        internal delegate bool LoadImage_delegate(IntPtr tex, byte[] data, bool markNonReadable);
-        internal static LoadImage_delegate LoadImage_iCall =
-            IL2CPP.ResolveICall<LoadImage_delegate>("UnityEngine.ImageConversion::LoadImage");
-
-        // Helper for LoadImage
+        // Helper for LoadImage from filepath
 
-        public static bool LoadImage(this Texture2D tex, string filePath, bool markNonReadable)
+        public static bool LoadImage(Texture2D tex, string filePath, bool markNonReadable)
         {
             if (!File.Exists(filePath))
             {
diff --git a/src/Unstrip/LayerMask/LayerMaskUnstrip.cs b/src/Unstrip/LayerMask/LayerMaskUnstrip.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using UnityEngine;
+using Explorer.Helpers;
 #if CPP
 using UnhollowerBaseLib;
 #endif
@@ -13,20 +14,14 @@ public static class LayerMaskUnstrip
     {
 #if CPP
         internal delegate IntPtr d_LayerToName(int layer);
-        internal static d_LayerToName LayerToName_iCall =
-            IL2CPP.ResolveICall<d_LayerToName>("UnityEngine.LayerMask::LayerToName");
 
         public static string LayerToName(int layer)
         {
-            var ptr = LayerToName_iCall(layer);
-
-            return IL2CPP.Il2CppStringToManaged(ptr);
+            var iCall = ICallHelper.GetICall<d_LayerToName>("UnityEngine.LayerMask::LayerToName");
+            return IL2CPP.Il2CppStringToManaged(iCall.Invoke(layer));
         }
 #else
-        public static string LayerToName(int layer)
-        {
-            return LayerMask.LayerToName(layer);
-        }
+        public static string LayerToName(int layer) => LayerMask.LayerToName(layer);
 #endif
     }
 }
diff --git a/src/Unstrip/Scene/SceneUnstrip.cs b/src/Unstrip/Scene/SceneUnstrip.cs

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Reflection;`
`3`	`3`	`using Explorer.CacheObject;`
`4`	`4`	`using UnityEngine;`
	`5`	`+using Explorer.Helpers;`
`5`	`6`
`6`	`7`	`namespace Explorer`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Text;`
`5`	`5`	`using System.Reflection;`
`6`	`6`	`using Explorer.UI;`
	`7`	`+using Explorer.Helpers;`
`7`	`8`
`8`	`9`	`namespace Explorer.CacheObject`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using UnityEngine;`
`6`	`6`	`using Explorer.UI;`
`7`	`7`	`using Explorer.UI.Shared;`
	`8`	`+using Explorer.Helpers;`
`8`	`9`
`9`	`10`	`namespace Explorer.CacheObject`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Reflection;`
	`5`	`+using Explorer.Helpers;`
`5`	`6`
`6`	`7`	`namespace Explorer`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`using UnhollowerRuntimeLib;`
`13`	`13`	`#endif`
`14`	`14`
`15`		`-namespace Explorer`
	`15`	`+namespace Explorer.Helpers`
`16`	`16`	`{`
`17`	`17`	`public class ReflectionHelpers`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using UnityEngine;`
`2`	`2`
`3`		`-namespace Explorer`
	`3`	`+namespace Explorer.Helpers`
`4`	`4`	`{`
`5`	`5`	`public class UnityHelpers`
`6`	`6`	`{`