Remember injected types and reuse in GetIl2CppTypeFullName

BepInEx · Feb 26, 2024 · 8ffd601 · 8ffd601
1 parent 8ea82dd
commit 8ffd601
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/Il2CppInterop.Runtime/Injection/ClassInjector.cs b/Il2CppInterop.Runtime/Injection/ClassInjector.cs
@@ -522,7 +522,8 @@ INativeMethodInfoStruct HandleAbstractMethod(int position)
         RuntimeSpecificsStore.SetClassInfo(classPointer.Pointer, true);
         Il2CppClassPointerStore.SetNativeClassPointer(type, classPointer.Pointer);
 
-        InjectorHelpers.AddTypeToLookup(type, classPointer.Pointer);
+        var classTypePtr = IL2CPP.il2cpp_class_get_type(classPointer.Pointer);
+        InjectorHelpers.AddTypeToLookup(type, classTypePtr);
 
         if (options.LogSuccess)
             Logger.Instance.LogInformation("Registered mono type {Type} in il2cpp domain", type);
@@ -1147,10 +1148,16 @@ private static string GetIl2CppTypeFullName(Il2CppTypeStruct* typePointer)
 
     internal static Type SystemTypeFromIl2CppType(Il2CppTypeStruct* typePointer)
     {
+        INativeTypeStruct wrappedType = UnityVersionHandler.Wrap(typePointer);
+
+        if (InjectorHelpers.TryGetType((IntPtr)wrappedType.TypePointer, out var type))
+        {
+            return RewriteType(type);
+        }
+
         var fullName = GetIl2CppTypeFullName(typePointer);
-        var type = Type.GetType(fullName) ?? throw new NullReferenceException($"Couldn't find System.Type for Il2Cpp type: {fullName}");
+        type = Type.GetType(fullName) ?? throw new NullReferenceException($"Couldn't find System.Type for Il2Cpp type: {fullName}");
 
-        INativeTypeStruct wrappedType = UnityVersionHandler.Wrap(typePointer);
         if (wrappedType.Type == Il2CppTypeEnum.IL2CPP_TYPE_GENERICINST)
         {
             Il2CppGenericClass* genericClass = (Il2CppGenericClass*)wrappedType.Data;

diff --git a/Il2CppInterop.Runtime/Injection/InjectorHelpers.cs b/Il2CppInterop.Runtime/Injection/InjectorHelpers.cs
@@ -8,16 +8,11 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using Il2CppInterop.Common;
-using Il2CppInterop.Common.Extensions;
-using Il2CppInterop.Common.XrefScans;
 using Il2CppInterop.Runtime.Injection.Hooks;
 using Il2CppInterop.Runtime.Runtime;
 using Il2CppInterop.Runtime.Runtime.VersionSpecific.Assembly;
-using Il2CppInterop.Runtime.Runtime.VersionSpecific.Class;
-using Il2CppInterop.Runtime.Runtime.VersionSpecific.FieldInfo;
 using Il2CppInterop.Runtime.Runtime.VersionSpecific.Image;
 using Il2CppInterop.Runtime.Runtime.VersionSpecific.MethodInfo;
-using Il2CppInterop.Runtime.Startup;
 using Microsoft.Extensions.Logging;
 
 namespace Il2CppInterop.Runtime.Injection
@@ -100,6 +95,13 @@ internal static void AddTypeToLookup(Type type, IntPtr typePointer)
             {
                 s_ClassNameLookup.Add((namespaze, klass, image), typePointer);
             }
+
+            s_TypeLookup[typePointer] = type;
+        }
+
+        internal static bool TryGetType(IntPtr typePointer, out Type type)
+        {
+            return s_TypeLookup.TryGetValue(typePointer, out type);
         }
 
         internal static IntPtr GetIl2CppExport(string name)
@@ -139,6 +141,7 @@ internal static IntPtr GetIl2CppMethodPointer(MethodBase proxyMethod)
         internal static readonly ConcurrentDictionary<long, IntPtr> s_InjectedClasses = new();
         /// <summary> (namespace, class, image) : class </summary>
         internal static readonly Dictionary<(string _namespace, string _class, IntPtr imagePtr), IntPtr> s_ClassNameLookup = new();
+        internal static readonly Dictionary<IntPtr, Type> s_TypeLookup = new();
 
         #region Class::Init
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]