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

Tidy interface and zero RVA outputs

Browse Source
This commit is contained in:
Katy Coe
2017-11-28 16:00:01 +01:00
parent 484bcce7d1
commit 9d72cf3bcf
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Il2CppDumper/Il2CppDumper.cs
View File

@@ -133,6 +133,8 @@ namespace Il2CppInspector
if (type.DeclaredFields.Count > 0) if (type.DeclaredFields.Count > 0)
writer.Write("\n"); writer.Write("\n");
} }
// Enumeration
else { else {
writer.Write(string.Join(",\n", type.GetEnumNames().Zip(type.GetEnumValues().OfType<object>(), writer.Write(string.Join(",\n", type.GetEnumNames().Zip(type.GetEnumValues().OfType<object>(),
(k, v) => new { k, v }).OrderBy(x => x.v).Select(x => $"\t{x.k} = {x.v}")) + "\n"); (k, v) => new { k, v }).OrderBy(x => x.v).Select(x => $"\t{x.k} = {x.v}")) + "\n");
@@ -146,9 +148,13 @@ namespace Il2CppInspector
foreach (var prop in type.DeclaredProperties) { foreach (var prop in type.DeclaredProperties) {
string modifiers = prop.GetMethod?.GetModifierString() ?? prop.SetMethod.GetModifierString(); string modifiers = prop.GetMethod?.GetModifierString() ?? prop.SetMethod.GetModifierString();
writer.Write($"\t{modifiers} {prop.PropertyType.CSharpName} {prop.Name} {{ "); writer.Write($"\t{modifiers}{prop.PropertyType.CSharpName} {prop.Name} {{ ");
writer.Write((prop.GetMethod != null ? "get; " : "") + (prop.SetMethod != null ? "set; " : "") + "} // "); writer.Write((prop.GetMethod != null ? "get; " : "") + (prop.SetMethod != null ? "set; " : "") + "}");
writer.Write((prop.GetMethod != null ? "0x{0:X8} " : "") + (prop.SetMethod != null? "0x{1:X8}" : "") + "\n", prop.GetMethod?.VirtualAddress, prop.SetMethod?.VirtualAddress); if ((prop.GetMethod != null && prop.GetMethod.VirtualAddress != 0) || (prop.SetMethod != null && prop.SetMethod.VirtualAddress != 0))
writer.Write(" // ");
writer.Write((prop.GetMethod != null && prop.GetMethod.VirtualAddress != 0? "0x{0:X8} " : "")
+ (prop.SetMethod != null && prop.SetMethod.VirtualAddress != 0? "0x{1:X8}" : "") + "\n",
prop.GetMethod?.VirtualAddress, prop.SetMethod?.VirtualAddress);
usedMethods.Add(prop.GetMethod); usedMethods.Add(prop.GetMethod);
usedMethods.Add(prop.SetMethod); usedMethods.Add(prop.SetMethod);
} }
@@ -161,7 +167,7 @@ namespace Il2CppInspector
foreach (var evt in type.DeclaredEvents) { foreach (var evt in type.DeclaredEvents) {
string modifiers = evt.AddMethod?.GetModifierString(); string modifiers = evt.AddMethod?.GetModifierString();
writer.Write($"\t{modifiers} event {evt.EventHandlerType.CSharpName} {evt.Name} {{\n"); writer.Write($"\t{modifiers}event {evt.EventHandlerType.CSharpName} {evt.Name} {{\n");
var m = new Dictionary<string, uint>(); var m = new Dictionary<string, uint>();
if (evt.AddMethod != null) m.Add("add", evt.AddMethod.VirtualAddress); if (evt.AddMethod != null) m.Add("add", evt.AddMethod.VirtualAddress);
if (evt.RemoveMethod != null) m.Add("remove", evt.RemoveMethod.VirtualAddress); if (evt.RemoveMethod != null) m.Add("remove", evt.RemoveMethod.VirtualAddress);
@@ -171,20 +177,16 @@ namespace Il2CppInspector
usedMethods.Add(evt.RemoveMethod); usedMethods.Add(evt.RemoveMethod);
usedMethods.Add(evt.RaiseMethod); usedMethods.Add(evt.RaiseMethod);
} }
if (type.DeclaredEvents.Count > 0) if (type.DeclaredEvents.Count > 0)
writer.Write("\n"); writer.Write("\n");
// Methods // Methods
if (type.DeclaredMethods.Count > 0) if (type.DeclaredMethods.Except(usedMethods).Any())
writer.Write("\t// Methods\n"); writer.Write("\t// Methods\n");
foreach (var method in type.DeclaredMethods) { // Don't re-output methods for constructors, properties, events etc.
// Don't re-output methods for constructors, properties, events etc. foreach (var method in type.DeclaredMethods.Except(usedMethods)) {
if (usedMethods.Contains(method)) writer.Write($"\t{method.GetModifierString()}{method.ReturnType.CSharpName} {method.Name}(");
continue;
writer.Write($"\t{method.GetModifierString()} {method.ReturnType.CSharpName} {method.Name}(");
bool first = true; bool first = true;
foreach (var param in method.DeclaredParameters) { foreach (var param in method.DeclaredParameters) {
@@ -197,8 +199,7 @@ namespace Il2CppInspector
writer.Write("out "); writer.Write("out ");
writer.Write($"{param.ParameterType.CSharpName} {param.Name}"); writer.Write($"{param.ParameterType.CSharpName} {param.Name}");
} }
writer.Write("); // 0x{0:X8}\n", writer.Write(");" + (method.VirtualAddress != 0? $" // 0x{method.VirtualAddress:X8}" : "") + "\n");
method.VirtualAddress);
} }
writer.Write("}\n"); writer.Write("}\n");
} }

7
Il2CppInspector/Reflection/MethodBase.cs
View File

@@ -44,6 +44,10 @@ namespace Il2CppInspector.Reflection
protected MethodBase(TypeInfo declaringType) : base(declaringType) { } protected MethodBase(TypeInfo declaringType) : base(declaringType) { }
public string GetModifierString() { public string GetModifierString() {
// Interface methods and properties have no visible modifiers (they are always declared 'public abstract')
if (DeclaringType.IsInterface)
return string.Empty;
StringBuilder modifiers = new StringBuilder(); StringBuilder modifiers = new StringBuilder();
if (IsPrivate) if (IsPrivate)
@@ -72,7 +76,8 @@ namespace Il2CppInspector.Reflection
if ((Attributes & MethodAttributes.PinvokeImpl) != 0) if ((Attributes & MethodAttributes.PinvokeImpl) != 0)
modifiers.Append("extern "); modifiers.Append("extern ");
return modifiers.ToString().Trim(); // Will include a trailing space
return modifiers.ToString();
} }
} }
} }