chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Model: Set Assembly, BaseType, Definition and Index for arrays

Browse Source
This commit is contained in:
Katy Coe
2019-11-04 18:32:41 +01:00
parent 15f2623ae9
commit 30897746e2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Il2CppInspector/Reflection/TypeInfo.cs
View File

@@ -25,6 +25,7 @@ namespace Il2CppInspector.Reflection {
public TypeInfo BaseType => baseTypeUsage != -1 public TypeInfo BaseType => baseTypeUsage != -1
? Assembly.Model.GetTypeFromUsage(baseTypeUsage, MemberTypes.TypeInfo) ? Assembly.Model.GetTypeFromUsage(baseTypeUsage, MemberTypes.TypeInfo)
: IsArray? Assembly.Model.TypesByDefinitionIndex.First(t => t.FullName == "System.Array")
: Assembly.Model.TypesByDefinitionIndex.First(t => t.FullName == "System.Object"); : Assembly.Model.TypesByDefinitionIndex.First(t => t.FullName == "System.Object");
// True if the type contains unresolved generic type parameters // True if the type contains unresolved generic type parameters
@@ -326,13 +327,16 @@ namespace Il2CppInspector.Reflection {
} }
} }
// TODO: Set Assembly, BaseType and DeclaringType for the two below // TODO: Set DeclaringType for the two below
// Array with known dimensions and bounds // Array with known dimensions and bounds
if (pType.type == Il2CppTypeEnum.IL2CPP_TYPE_ARRAY) { if (pType.type == Il2CppTypeEnum.IL2CPP_TYPE_ARRAY) {
var descriptor = image.ReadMappedObject<Il2CppArrayType>(pType.datapoint); var descriptor = image.ReadMappedObject<Il2CppArrayType>(pType.datapoint);
elementType = model.GetTypeFromVirtualAddress(descriptor.etype); elementType = model.GetTypeFromVirtualAddress(descriptor.etype);
Assembly = ElementType.Assembly;
Definition = ElementType.Definition;
Index = ElementType.Index;
Namespace = ElementType.Namespace; Namespace = ElementType.Namespace;
Name = ElementType.Name; Name = ElementType.Name;
@@ -344,6 +348,9 @@ namespace Il2CppInspector.Reflection {
if (pType.type == Il2CppTypeEnum.IL2CPP_TYPE_SZARRAY) { if (pType.type == Il2CppTypeEnum.IL2CPP_TYPE_SZARRAY) {
elementType = model.GetTypeFromVirtualAddress(pType.datapoint); elementType = model.GetTypeFromVirtualAddress(pType.datapoint);
Assembly = ElementType.Assembly;
Definition = ElementType.Definition;
Index = ElementType.Index;
Namespace = ElementType.Namespace; Namespace = ElementType.Namespace;
Name = ElementType.Name; Name = ElementType.Name;