Speculative v106.1 support

Author: SamboyCoding

LibCpp2IL/BinarySearcher.cs

@@ -305,7 +305,7 @@ public static bool ValidateCodeRegistration(Il2CppCodeRegistration codeReg, Dict
     public ulong FindMetadataRegistrationPre24_5()
     {
         //We're looking for TypeDefinitionsSizesCount, which is the 4th-to-last field
-        var sizeOfMr = (ulong)Il2CppMetadataRegistration.GetStructSize(binary.is32Bit);
+        var sizeOfMr = (ulong)Il2CppMetadataRegistration.GetStructSize(binary.is32Bit, metadata.MetadataVersion);
         var ptrSize = binary.is32Bit ? 4ul : 8ul;
 
         var bytesToSubtract = sizeOfMr - ptrSize * 4;
@@ -335,7 +335,7 @@ public ulong FindMetadataRegistrationPre24_5()
     public ulong FindMetadataRegistrationPost24_5()
     {
         var ptrSize = binary.is32Bit ? 4ul : 8ul;
-        var sizeOfMr = (uint)Il2CppMetadataRegistration.GetStructSize(binary.is32Bit);
+        var sizeOfMr = (uint)Il2CppMetadataRegistration.GetStructSize(binary.is32Bit, metadata.MetadataVersion);
 
         LibLogger.VerboseNewline($"\t\t\tLooking for the number of type definitions, 0x{typeDefinitionsCount:X}");
         var ptrsToNumberOfTypes = FindAllMappedWords((ulong)typeDefinitionsCount).ToList();

LibCpp2IL/BinaryStructures/Il2CppMetadataRegistration.cs

@@ -15,8 +15,8 @@ public class Il2CppMetadataRegistration : ReadableClass
      * Regardless of how we do it, the fact of the matter is that the count fields are (as well as the pointers which of course are) in practice [pointer size] bytes before the next field, not always 4,
      * so when calculating the total size of this struct, we need to take that into account.
      */
-    public static int GetStructSize(bool isBinary32Bit)
-        => (NumIntFields + NumPointerFields) * (isBinary32Bit ? sizeof(int) : sizeof(long)); //On 32-bit platforms, all pointers (represented in fields by long/ulong) are 32-bit. If this struct is updated, update the number of fields above.
+    public static int GetStructSize(bool isBinary32Bit, float metadataMetadataVersion)
+        => (NumIntFields + NumPointerFields + (metadataMetadataVersion >= 106.1f ? 2 : 0)) * (isBinary32Bit ? sizeof(int) : sizeof(long)); //On 32-bit platforms, all pointers (represented in fields by long/ulong) are 32-bit. If this struct is updated, update the number of fields above.
 
     public long genericClassesCount;
     public ulong genericClasses;
@@ -36,6 +36,9 @@ public static int GetStructSize(bool isBinary32Bit)
     public ulong typeDefinitionsSizes;
     public ulong metadataUsagesCount; //this one, and only this one, is defined as size_t. The rest of the counts are int32_t.
     public ulong metadataUsages;
+    [Version(Min = 106.1f)] public ulong alwaysInitMetadataUsagesCount;
+    [Version(Min = 106.1f)] public ulong alwaysInitMetadataUsages;
+    
 
     public override void Read(ClassReadingBinaryReader reader)
     {
@@ -58,5 +61,11 @@ public override void Read(ClassReadingBinaryReader reader)
         typeDefinitionsSizes = reader.ReadNUint();
         metadataUsagesCount = reader.ReadNUint();
         metadataUsages = reader.ReadNUint();
+        
+        if(IsAtLeast(106.1f))
+        {
+            alwaysInitMetadataUsagesCount = reader.ReadNUint();
+            alwaysInitMetadataUsages = reader.ReadNUint();
+        }
     }
 }

LibCpp2IL/Metadata/Il2CppMetadata.cs

@@ -144,6 +144,19 @@ public static Il2CppMetadata ReadFrom(byte[] bytes, UnityVersion unityVersion)
                 //v31 WITHOUT changes in codereg 
                 actualVersion = 31;
         }
+        else if (version == 106)
+        {
+            //6.5.0a6 => v106
+            //  - changes GenericParameterIndex, FieldIndex, DefaultValueDataIndex to variable size
+            //  - changes Il2CppGenericContainer type_argc int32 => uint16, is_method int32 => uint8
+            //6.6.0a6 => 106.1
+            //  - adds 2 new fields to Il2CppMetadataRegistration
+            //  - removes the first value of MetadataUsageType
+            if(unityVersion.GreaterThanOrEquals(6000, 6, 0, UnityVersionType.Alpha, 6))
+                actualVersion = 106.1f;
+            else
+                actualVersion = 106;
+        }
         else
         {
             //6000.3 and 6000.5 alphas made a bunch of quick-succession version changes:
@@ -165,9 +178,6 @@ public static Il2CppMetadata ReadFrom(byte[] bytes, UnityVersion unityVersion)
             //6.5.0a5 => v105
             //  - changes MethodIndex to variable size.
             //  - brings the Il2CppClass changes from v38 to v10x.
-            //6.5.0a6 => v106
-            //  - changes GenericParameterIndex, FieldIndex, DefaultValueDataIndex to variable size
-            //  - changes Il2CppGenericContainer type_argc int32 => uint16, is_method int32 => uint8
             actualVersion = version;
         }
 

LibCpp2IL/MetadataUsage.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using LibCpp2IL.BinaryStructures;
 using LibCpp2IL.Metadata;
 using LibCpp2IL.Reflection;
@@ -158,6 +158,9 @@ public override string ToString()
     {
         var encodedType = encoded & 0xE000_0000;
         var type = (MetadataUsageType)(encodedType >> 29);
+        if (context.Metadata.MetadataVersion > 106.1f)
+            type += 1; //TypeInfo removed in v106.1
+        
         if (type <= MetadataUsageType.MethodRef && type >= MetadataUsageType.TypeInfo)
         {
             var index = (uint)(encoded & 0x1FFF_FFFF);

LibCpp2IL/MetadataUsageType.cs

@@ -2,7 +2,7 @@
 
 public enum MetadataUsageType : uint
 {
-    TypeInfo = 1,
+    TypeInfo = 1, //REMOVED in v106.1
     Type = 2,
     MethodDef = 3,
     FieldInfo = 4,