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

Implement and output type modifiers correctly

Browse Source
This commit is contained in:
Katy Coe
2017-11-10 13:21:50 +01:00
parent e6488615de
commit 8871254e1b
2 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Il2CppDumper/Il2CppDumper.cs
View File

@@ -25,14 +25,31 @@ namespace Il2CppInspector
foreach (var type in model.Assemblies.SelectMany(x => x.DefinedTypes)) { foreach (var type in model.Assemblies.SelectMany(x => x.DefinedTypes)) {
writer.Write($"\n// Namespace: {type.Namespace}\n"); writer.Write($"\n// Namespace: {type.Namespace}\n");
if (type.IsImport)
writer.Write("[ComImport]");
if (type.IsSerializable) if (type.IsSerializable)
writer.Write("[Serializable]\n"); writer.Write("[Serializable]\n");
if (type.IsPublic) if (type.IsPublic || type.IsNestedPublic)
writer.Write("public "); writer.Write("public ");
if (type.IsNestedPrivate)
writer.Write("private ");
if (type.IsNestedFamily)
writer.Write("protected ");
if (type.IsNestedAssembly || type.IsNotPublic)
writer.Write("internal ");
if (type.IsNestedFamORAssem)
writer.Write("protected internal ");
if (type.IsNestedFamANDAssem)
writer.Write("[family and assembly] ");
// An abstract sealed class is a static class
if (type.IsAbstract && type.IsSealed)
writer.Write("static ");
else {
if (type.IsAbstract && !type.IsInterface) if (type.IsAbstract && !type.IsInterface)
writer.Write("abstract "); writer.Write("abstract ");
if (type.IsSealed && !type.IsValueType) if (type.IsSealed && !type.IsValueType)
writer.Write("sealed "); writer.Write("sealed ");
}
if (type.IsInterface) if (type.IsInterface)
writer.Write("interface "); writer.Write("interface ");
else if (type.IsValueType) else if (type.IsValueType)

44
Il2CppInspector/Reflection/TypeInfo.cs
View File

@@ -74,20 +74,27 @@ namespace Il2CppInspector.Reflection {
public bool IsAbstract => (Attributes & TypeAttributes.Abstract) == TypeAttributes.Abstract; public bool IsAbstract => (Attributes & TypeAttributes.Abstract) == TypeAttributes.Abstract;
public bool IsArray { get; } public bool IsArray { get; }
public bool IsByRef => throw new NotImplementedException(); public bool IsByRef => throw new NotImplementedException();
public bool IsClass => (Attributes & TypeAttributes.Class) == TypeAttributes.Class; public bool IsClass => (Attributes & TypeAttributes.ClassSemanticsMask) == TypeAttributes.Class;
public bool IsEnum => throw new NotImplementedException(); public bool IsEnum => throw new NotImplementedException();
public bool IsGenericParameter { get; } public bool IsGenericParameter { get; }
public bool IsGenericType => throw new NotImplementedException(); public bool IsGenericType => throw new NotImplementedException();
public bool IsGenericTypeDefinition => throw new NotImplementedException(); public bool IsGenericTypeDefinition => throw new NotImplementedException();
public bool IsInterface => (Attributes & TypeAttributes.Interface) == TypeAttributes.Interface; public bool IsImport => (Attributes & TypeAttributes.Import) == TypeAttributes.Import;
public bool IsInterface => (Attributes & TypeAttributes.ClassSemanticsMask) == TypeAttributes.Interface;
public bool IsNested { get; } // TODO: Partially implemented public bool IsNested { get; } // TODO: Partially implemented
public bool IsNestedPrivate => throw new NotImplementedException(); public bool IsNestedAssembly => (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedAssembly;
public bool IsNestedPublic => throw new NotImplementedException(); public bool IsNestedFamANDAssem => (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedFamANDAssem;
public bool IsNestedFamily => (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedFamily;
public bool IsNestedFamORAssem => (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedFamORAssem;
public bool IsNestedPrivate => (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedPrivate;
public bool IsNestedPublic => (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedPublic;
public bool IsNotPublic => (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NotPublic;
public bool IsPointer { get; } public bool IsPointer { get; }
public bool IsPrimitive => throw new NotImplementedException(); public bool IsPrimitive => Namespace == "System" && new[] { "Boolean", "Byte", "SByte", "Int16", "UInt16", "Int32", "UInt32", "Int64", "UInt64", "IntPtr", "UIntPtr", "Char", "Double", "Single" }.Contains(Name);
public bool IsPublic => (Attributes & TypeAttributes.Public) == TypeAttributes.Public; public bool IsPublic => (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.Public;
public bool IsSealed => (Attributes & TypeAttributes.Sealed) == TypeAttributes.Sealed; public bool IsSealed => (Attributes & TypeAttributes.Sealed) == TypeAttributes.Sealed;
public bool IsSerializable => (Attributes & TypeAttributes.Serializable) == TypeAttributes.Serializable; public bool IsSerializable => (Attributes & TypeAttributes.Serializable) == TypeAttributes.Serializable;
public bool IsSpecialName => (Attributes & TypeAttributes.SpecialName) == TypeAttributes.SpecialName;
public bool IsValueType => BaseType?.FullName == "System.ValueType"; public bool IsValueType => BaseType?.FullName == "System.ValueType";
public override MemberTypes MemberType { get; } public override MemberTypes MemberType { get; }
@@ -133,17 +140,33 @@ namespace Il2CppInspector.Reflection {
Attributes |= TypeAttributes.Serializable; Attributes |= TypeAttributes.Serializable;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_VISIBILITY_MASK) == Il2CppConstants.TYPE_ATTRIBUTE_PUBLIC) if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_VISIBILITY_MASK) == Il2CppConstants.TYPE_ATTRIBUTE_PUBLIC)
Attributes |= TypeAttributes.Public; Attributes |= TypeAttributes.Public;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_VISIBILITY_MASK) == Il2CppConstants.TYPE_ATTRIBUTE_NOT_PUBLIC)
Attributes |= TypeAttributes.NotPublic;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_VISIBILITY_MASK) == Il2CppConstants.TYPE_ATTRIBUTE_NESTED_PUBLIC)
Attributes |= TypeAttributes.NestedPublic;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_VISIBILITY_MASK) == Il2CppConstants.TYPE_ATTRIBUTE_NESTED_PRIVATE)
Attributes |= TypeAttributes.NestedPrivate;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_VISIBILITY_MASK) == Il2CppConstants.TYPE_ATTRIBUTE_NESTED_ASSEMBLY)
Attributes |= TypeAttributes.NestedAssembly;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_VISIBILITY_MASK) == Il2CppConstants.TYPE_ATTRIBUTE_NESTED_FAMILY)
Attributes |= TypeAttributes.NestedFamily;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_VISIBILITY_MASK) == Il2CppConstants.TYPE_ATTRIBUTE_NESTED_FAM_AND_ASSEM)
Attributes |= TypeAttributes.NestedFamANDAssem;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_VISIBILITY_MASK) == Il2CppConstants.TYPE_ATTRIBUTE_NESTED_FAM_OR_ASSEM)
Attributes |= TypeAttributes.NestedFamORAssem;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_ABSTRACT) != 0) if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_ABSTRACT) != 0)
Attributes |= TypeAttributes.Abstract; Attributes |= TypeAttributes.Abstract;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_SEALED) != 0) if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_SEALED) != 0)
Attributes |= TypeAttributes.Sealed; Attributes |= TypeAttributes.Sealed;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_SPECIAL_NAME) != 0)
Attributes |= TypeAttributes.SpecialName;
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_IMPORT) != 0)
Attributes |= TypeAttributes.Import;
// TypeAttributes.Class == 0 so we only care about setting TypeAttributes.Interface (it's a non-interface class by default)
if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_INTERFACE) != 0) if ((Definition.flags & Il2CppConstants.TYPE_ATTRIBUTE_INTERFACE) != 0)
Attributes |= TypeAttributes.Interface; Attributes |= TypeAttributes.Interface;
// Not sure about this, works for now
if (!IsInterface)
Attributes |= TypeAttributes.Class;
// Add all implemented interfaces // Add all implemented interfaces
implementedInterfaces = new Il2CppType[Definition.interfaces_count]; implementedInterfaces = new Il2CppType[Definition.interfaces_count];
for (var i = 0; i < Definition.interfaces_count; i++) for (var i = 0; i < Definition.interfaces_count; i++)
@@ -226,6 +249,7 @@ namespace Il2CppInspector.Reflection {
} }
// Pointer type // Pointer type
// TODO: Should set ElementType etc.
IsPointer = (pType.type == Il2CppTypeEnum.IL2CPP_TYPE_PTR); IsPointer = (pType.type == Il2CppTypeEnum.IL2CPP_TYPE_PTR);
} }
} }