Add support for v39

Author: roytu

Il2CppDumper/IO/BinaryStream.cs

@@ -215,6 +215,40 @@ public GenericContainerIndex ReadGenericContainerIndex()
                 }
             }
         }
+        public ParameterIndex ReadParameterIndex()
+        {
+            if (Version < 39)
+            {
+                // Before Version 39, these were always Int32
+                int value = ReadInt32();
+                return new ParameterIndex(value);
+            }
+            else
+            {
+                switch (Metadata.parameterIndexSize)
+                {
+                    case 1:
+                        {
+                            uint value = ReadByte();
+                            if (value == Byte.MaxValue) return new ParameterIndex(-1);
+                            return new ParameterIndex((int)value);
+                        }
+                    case 2:
+                        {
+                            uint value = ReadUInt16();
+                            if (value == UInt16.MaxValue) return new ParameterIndex(-1);
+                            return new ParameterIndex((int)value);
+                        }
+                    case 4:
+                    default:
+                        {
+                            uint value = ReadUInt32();
+                            if (value == UInt32.MaxValue) return new ParameterIndex(-1);
+                            return new ParameterIndex((int)value);
+                        }
+                }
+            }
+        }
 
         public T ReadClass<T>() where T : new()
         {
@@ -284,6 +318,10 @@ public GenericContainerIndex ReadGenericContainerIndex()
                     {
                         i.SetValue(t, ReadGenericContainerIndex());
                     }
+                    else if (fieldType == typeof(ParameterIndex))
+                    {
+                        i.SetValue(t, ReadParameterIndex());
+                    }
                     else if (fieldType == typeof(Il2CppSectionMetadata))
                     {
                         i.SetValue(t, ReadClass<Il2CppSectionMetadata>());

Il2CppDumper/Il2Cpp/Metadata.cs

@@ -18,7 +18,7 @@ public sealed class Metadata : BinaryStream
         public Il2CppParameterDefinition[] parameterDefs;
         public Il2CppFieldDefinition[] fieldDefs;
         private readonly Dictionary<int, Il2CppFieldDefaultValue> fieldDefaultValuesDic;
-        private readonly Dictionary<int, Il2CppParameterDefaultValue> parameterDefaultValuesDic;
+        private readonly Dictionary<ParameterIndex, Il2CppParameterDefaultValue> parameterDefaultValuesDic;
         public Il2CppPropertyDefinition[] propertyDefs;
         public Il2CppCustomAttributeTypeRange[] attributeTypeRanges;
         public Il2CppCustomAttributeDataRange[] attributeDataRanges;
@@ -46,6 +46,7 @@ public sealed class Metadata : BinaryStream
         public static int typeIndexSize;
         public static int typeDefinitionIndexSize;
         public static int genericContainerIndexSize;
+        public static int parameterIndexSize;
 
         public Metadata(Stream stream) : base(stream)
         {
@@ -59,7 +60,7 @@ public Metadata(Stream stream) : base(stream)
             {
                 throw new InvalidDataException("ERROR: Metadata file supplied is not valid metadata file.");
             }
-            if (version < 16 || version > 38)
+            if (version < 16 || version > 39)
             {
                 throw new NotSupportedException($"ERROR: Metadata file supplied is not a supported version[{version}].");
             }
@@ -102,13 +103,15 @@ public Metadata(Stream stream) : base(stream)
                 typeIndexSize = sizeOfIl2CppParameterDefinition - 8;
                 typeDefinitionIndexSize = GetIndexSize((int)header.typeDefinitions.count);
                 genericContainerIndexSize = GetIndexSize((int)header.genericContainers.count);
+                parameterIndexSize = GetIndexSize((int)header.parameters.count);
             }
             else
             {
                 // Before version 38, these were always ints
                 typeIndexSize = 4;
                 typeDefinitionIndexSize = 4;
                 genericContainerIndexSize = 4;
+                parameterIndexSize = 4;
             }
 
             imageDefs = Version < 38
@@ -251,7 +254,7 @@ public bool GetFieldDefaultValueFromIndex(int index, out Il2CppFieldDefaultValue
 
         public bool GetParameterDefaultValueFromIndex(int index, out Il2CppParameterDefaultValue value)
         {
-            return parameterDefaultValuesDic.TryGetValue(index, out value);
+            return parameterDefaultValuesDic.TryGetValue(new ParameterIndex(index), out value);
         }
 
         public uint GetDefaultValueFromIndex(int index)
@@ -385,6 +388,10 @@ public int SizeOf(Type type)
                 {
                     size += genericContainerIndexSize;
                 }
+                else if (fieldType == typeof(ParameterIndex))
+                {
+                    size += parameterIndexSize;
+                }
                 else
                 {
                     size += SizeOf(fieldType);

Il2CppDumper/Il2Cpp/MetadataClass.cs

@@ -385,7 +385,7 @@ public class Il2CppMethodDefinition
         public TypeIndex returnType;
         [Version(Min = 31)]
         public int returnParameterToken;
-        public int parameterStart;
+        public ParameterIndex parameterStart;
         [Version(Max = 24)]
         public int customAttributeIndex;
         public GenericContainerIndex genericContainerIndex;
@@ -480,7 +480,7 @@ public class Il2CppStringLiteral
 
     public class Il2CppParameterDefaultValue
     {
-        public int parameterIndex;
+        public ParameterIndex parameterIndex;
         public TypeIndex typeIndex;
         public int dataIndex;
     }
@@ -618,7 +618,16 @@ public static implicit operator int(GenericContainerIndex genericContainer)
             return genericContainer.value;
         }
     }
-
-
-
+    public class ParameterIndex : ICustomType
+    {
+        public int value;
+        public ParameterIndex(int value)
+        {
+            this.value = value;
+        }
+        public static implicit operator int(ParameterIndex parameter)
+        {
+            return parameter.value;
+        }
+    }
 }

Il2CppDumper/Outputs/Il2CppDecompiler.cs

@@ -281,9 +281,10 @@ public void Decompile(Config config, string outputDir)
                                 }
                                 writer.Write($"{executor.GetTypeName(methodReturnType, false, false)} {methodName}(");
                                 var parameterStrs = new List<string>();
-                                for (var j = 0; j < methodDef.parameterCount; ++j)
+                                for (int j = 0; j < methodDef.parameterCount; ++j)
                                 {
                                     var parameterStr = "";
+
                                     var parameterDef = metadata.parameterDefs[methodDef.parameterStart + j];
                                     var parameterName = metadata.GetStringFromIndex(parameterDef.nameIndex);
                                     var parameterType = il2Cpp.types[parameterDef.typeIndex];

Il2CppDumper/Outputs/StructGenerator.cs

@@ -421,6 +421,7 @@ public void WriteScript(string outputDir)
                 case 31:
                 case 35:
                 case 38:
+                case 39:
                     sb.Append(HeaderConstants.HeaderV29);
                     break;
                 default: