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

Model and Output: Handle pointer types correctly

Browse Source
This commit is contained in:
Katy Coe
2019-11-04 19:33:18 +01:00
parent 30897746e2
commit 062182ec11
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Il2CppInspector/Reflection/TypeInfo.cs
View File

@@ -48,17 +48,17 @@ namespace Il2CppInspector.Reflection {
n = ElementType.CSharpName; n = ElementType.CSharpName;
var g = (GenericTypeParameters != null ? "<" + string.Join(", ", GenericTypeParameters.Select(x => x.CSharpName)) + ">" : ""); var g = (GenericTypeParameters != null ? "<" + string.Join(", ", GenericTypeParameters.Select(x => x.CSharpName)) + ">" : "");
g = (GenericTypeArguments != null ? "<" + string.Join(", ", GenericTypeArguments.Select(x => x.CSharpName)) + ">" : g); g = (GenericTypeArguments != null ? "<" + string.Join(", ", GenericTypeArguments.Select(x => x.CSharpName)) + ">" : g);
return (IsPointer ? "void *" : "") + n + g + (IsArray ? "[]" : ""); return n + g + (IsArray ? "[]" : "") + (IsPointer ? "*" : "");
} }
} }
// C# name as it would be written in a type declaration // C# name as it would be written in a type declaration
public string CSharpTypeDeclarationName => public string CSharpTypeDeclarationName =>
(IsPointer ? "void *" : "") (base.Name.IndexOf("`", StringComparison.Ordinal) == -1 ? base.Name : base.Name.Remove(base.Name.IndexOf("`", StringComparison.Ordinal)))
+ (base.Name.IndexOf("`", StringComparison.Ordinal) == -1 ? base.Name : base.Name.Remove(base.Name.IndexOf("`", StringComparison.Ordinal)))
+ (GenericTypeParameters != null ? "<" + string.Join(", ", GenericTypeParameters.Select(x => x.Name)) + ">" : "") + (GenericTypeParameters != null ? "<" + string.Join(", ", GenericTypeParameters.Select(x => x.Name)) + ">" : "")
+ (GenericTypeArguments != null ? "<" + string.Join(", ", GenericTypeArguments.Select(x => x.Name)) + ">" : "") + (GenericTypeArguments != null ? "<" + string.Join(", ", GenericTypeArguments.Select(x => x.Name)) + ">" : "")
+ (IsArray ? "[]" : ""); + (IsArray ? "[]" : "")
+ (IsPointer ? "*" : "");
// Custom attributes for this member // Custom attributes for this member
public override IEnumerable<CustomAttributeData> CustomAttributes => CustomAttributeData.GetCustomAttributes(this); public override IEnumerable<CustomAttributeData> CustomAttributes => CustomAttributeData.GetCustomAttributes(this);
@@ -106,18 +106,19 @@ namespace Il2CppInspector.Reflection {
// Type name including namespace // Type name including namespace
public string FullName => public string FullName =>
IsGenericParameter? null : IsGenericParameter? null :
(IsPointer? "void *" : "") (DeclaringType != null? DeclaringType.FullName + "+" : Namespace + (Namespace.Length > 0? "." : ""))
+ (DeclaringType != null? DeclaringType.FullName + "+" :
Namespace + (Namespace.Length > 0? "." : ""))
+ base.Name + base.Name
+ (GenericTypeParameters != null ? "[" + string.Join(",", GenericTypeParameters.Select(x => x.FullName ?? x.Name)) + "]" : "") + (GenericTypeParameters != null ? "[" + string.Join(",", GenericTypeParameters.Select(x => x.FullName ?? x.Name)) + "]" : "")
+ (GenericTypeArguments != null ? "[" + string.Join(",", GenericTypeArguments.Select(x => x.FullName ?? x.Name)) + "]" : "") + (GenericTypeArguments != null ? "[" + string.Join(",", GenericTypeArguments.Select(x => x.FullName ?? x.Name)) + "]" : "")
+ (IsArray? "[]" : ""); + (IsArray? "[]" : "")
+ (IsPointer? "*" : "");
public List<TypeInfo> GenericTypeParameters { get; } public List<TypeInfo> GenericTypeParameters { get; }
public List<TypeInfo> GenericTypeArguments { get; } public List<TypeInfo> GenericTypeArguments { get; }
// True if an array, pointer or reference, otherwise false
// See: https://docs.microsoft.com/en-us/dotnet/api/system.type.haselementtype?view=netframework-4.8
public bool HasElementType => ElementType != null; public bool HasElementType => ElementType != null;
private readonly int[] implementedInterfaceUsages; private readonly int[] implementedInterfaceUsages;
@@ -344,8 +345,8 @@ namespace Il2CppInspector.Reflection {
arrayRank = descriptor.rank; arrayRank = descriptor.rank;
} }
// Dynamically allocated array // Dynamically allocated array or pointer type
if (pType.type == Il2CppTypeEnum.IL2CPP_TYPE_SZARRAY) { if (pType.type == Il2CppTypeEnum.IL2CPP_TYPE_SZARRAY || pType.type == Il2CppTypeEnum.IL2CPP_TYPE_PTR) {
elementType = model.GetTypeFromVirtualAddress(pType.datapoint); elementType = model.GetTypeFromVirtualAddress(pType.datapoint);
Assembly = ElementType.Assembly; Assembly = ElementType.Assembly;
@@ -354,7 +355,8 @@ namespace Il2CppInspector.Reflection {
Namespace = ElementType.Namespace; Namespace = ElementType.Namespace;
Name = ElementType.Name; Name = ElementType.Name;
IsArray = true; IsPointer = (pType.type == Il2CppTypeEnum.IL2CPP_TYPE_PTR);
IsArray = !IsPointer;
} }
// Generic type parameter // Generic type parameter
@@ -389,10 +391,6 @@ namespace Il2CppInspector.Reflection {
IsGenericType = false; IsGenericType = false;
IsGenericTypeDefinition = false; IsGenericTypeDefinition = false;
} }
// Pointer type
// TODO: Should set ElementType etc.
IsPointer = (pType.type == Il2CppTypeEnum.IL2CPP_TYPE_PTR);
} }
// Initialize a type that is a generic parameter of a generic type // Initialize a type that is a generic parameter of a generic type
@@ -423,11 +421,11 @@ namespace Il2CppInspector.Reflection {
// Display name of object // Display name of object
public override string ToString() => IsGenericParameter ? Name : public override string ToString() => IsGenericParameter ? Name :
(IsPointer ? "void *" : "") (DeclaringType != null ? DeclaringType.Name + "+" : "")
+ (DeclaringType != null ? DeclaringType.Name + "+" : "")
+ base.Name + base.Name
+ (GenericTypeParameters != null ? "[" + string.Join(",", GenericTypeParameters.Select(x => x.Namespace != Namespace? x.FullName ?? x.Name : x.ToString())) + "]" : "") + (GenericTypeParameters != null ? "[" + string.Join(",", GenericTypeParameters.Select(x => x.Namespace != Namespace? x.FullName ?? x.Name : x.ToString())) + "]" : "")
+ (GenericTypeArguments != null ? "[" + string.Join(",", GenericTypeArguments.Select(x => x.Namespace != Namespace? x.FullName ?? x.Name : x.ToString())) + "]" : "") + (GenericTypeArguments != null ? "[" + string.Join(",", GenericTypeArguments.Select(x => x.Namespace != Namespace? x.FullName ?? x.Name : x.ToString())) + "]" : "")
+ (IsArray ? "[]" : ""); + (IsArray ? "[]" : "")
+ (IsPointer ? "*" : "");
} }
} }