Merge pull request #30 from Kasuromi/metadata-29-detour-fix

Support metadata v29 in injector detours
BepInEx · Apr 22, 2022 · e1f77fc · e1f77fc
2 parents 493854d + 5167d62
commit e1f77fc
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/UnhollowerBaseLib/Injection/InjectorHelpers.cs b/UnhollowerBaseLib/Injection/InjectorHelpers.cs
@@ -151,7 +151,19 @@ private static d_GetTypeInfoFromTypeDefinitionIndex FindGetTypeInfoFromTypeDefin
             var imageGetType = XrefScannerLowLevel.JumpTargets(imageGetClassAPI).Single();
             LogSupport.Trace($"Image::GetType: 0x{imageGetType.ToInt64():X2}");
 
-            var getTypeInfoFromTypeDefinitionIndex = XrefScannerLowLevel.JumpTargets(imageGetType).Single();
+            var imageGetTypeXrefs = XrefScannerLowLevel.JumpTargets(imageGetType);
+            var getTypeInfoFromTypeDefinitionIndex = imageGetTypeXrefs.First();
+
+            if (imageGetTypeXrefs.Count() > 1) {
+                // (Kasuromi): metadata v29 introduces handles and adds extra calls, a check for unity versions might be necessary in the future
+
+                // Second call after obtaining handle, if there are any more calls in the future - correctly index into it if issues occur
+                var getTypeInfoFromHandle = imageGetTypeXrefs.Last();
+
+                // Two calls, second one (GetIndexForTypeDefinitionInternal) is inlined
+                getTypeInfoFromTypeDefinitionIndex = XrefScannerLowLevel.JumpTargets(getTypeInfoFromHandle).Single();
+            }
+
             LogSupport.Trace($"MetadataCache::GetTypeInfoFromTypeDefinitionIndex: 0x{getTypeInfoFromTypeDefinitionIndex.ToInt64():X2}");
 
             GetTypeInfoFromTypeDefinitionIndexOriginal = ClassInjector.Detour.Detour<d_GetTypeInfoFromTypeDefinitionIndex>(