GUI: Show progress messages in busy indicator

This commit is contained in:
Katy Coe
2020-02-09 04:11:16 +01:00
parent 4129785e17
commit 755a8ec88c
5 changed files with 40 additions and 12 deletions

View File

@@ -125,6 +125,8 @@ namespace Il2CppInspector
public override int Bits => (elf_header.m_arch == (uint) Elf.ELFCLASS64) ? 64 : 32;
//public override event EventHandler<string> OnStatusUpdate;
private elf_shdr<TWord> getSection(Elf sectionIndex) => section_header_table.FirstOrDefault(x => x.sh_type == (uint) sectionIndex);
private IEnumerable<elf_shdr<TWord>> getSections(Elf sectionIndex) => section_header_table.Where(x => x.sh_type == (uint) sectionIndex);
private TPHdr getProgramHeader(Elf programIndex) => program_header_table.FirstOrDefault(x => x.p_type == (uint) programIndex);
@@ -167,6 +169,8 @@ namespace Il2CppInspector
// Find all relocations; target address => (rela header (rels are converted to rela), symbol table base address, is rela?)
var rels = new HashSet<ElfReloc>();
StatusUpdate("Processing relocations");
// Two types: add value from offset in image, and add value from specified addend
foreach (var relSection in getSections(Elf.SHT_REL))
rels.UnionWith(
@@ -253,6 +257,7 @@ namespace Il2CppInspector
var xorKey = rodataFirstBytes.GroupBy(b => b).OrderByDescending(f => f.Count()).First().Key;
if (xorKey != 0x00) {
StatusUpdate("Decrypting");
Console.WriteLine($"Performing trivial XOR decryption (key: 0x{xorKey:X2})");
xorSection(".text", xorKey);

View File

@@ -47,28 +47,29 @@ namespace Il2CppInspector
U ReadObject<U>() where U : new();
string ReadMappedNullTerminatedString(ulong uiAddr);
List<U> ReadMappedObjectPointerArray<U>(ulong uiAddr, int count) where U : new();
event EventHandler<string> OnStatusUpdate;
}
public class FileFormatReader
{
// Helper method to try all defined file formats when the contents of the binary is unknown
public static IFileFormatReader Load(string filename) => Load(new FileStream(filename, FileMode.Open, FileAccess.Read));
public static IFileFormatReader Load(string filename, EventHandler<string> statusCallback = null) => Load(new FileStream(filename, FileMode.Open, FileAccess.Read), statusCallback);
public static IFileFormatReader Load(Stream stream) {
public static IFileFormatReader Load(Stream stream, EventHandler<string> statusCallback = null) {
var types = Assembly.GetExecutingAssembly().DefinedTypes
.Where(x => x.ImplementedInterfaces.Contains(typeof(IFileFormatReader)) && !x.IsGenericTypeDefinition);
foreach (var type in types) {
if (type.GetMethod("Load", BindingFlags.FlattenHierarchy | BindingFlags.Static | BindingFlags.Public,
null, new [] {typeof(Stream)}, null)
.Invoke(null, new object[] { stream }) is IFileFormatReader loaded)
null, new [] {typeof(Stream), typeof(EventHandler<string>)}, null)
.Invoke(null, new object[] { stream, statusCallback }) is IFileFormatReader loaded)
return loaded;
}
return null;
}
}
public class FileFormatReader<T> : BinaryObjectReader, IFileFormatReader where T : FileFormatReader<T>
public abstract class FileFormatReader<T> : BinaryObjectReader, IFileFormatReader where T : FileFormatReader<T>
{
public FileFormatReader(Stream stream) : base(stream) { }
@@ -86,6 +87,10 @@ namespace Il2CppInspector
public virtual int Bits => throw new NotImplementedException();
public event EventHandler<string> OnStatusUpdate;
protected void StatusUpdate(string status) => OnStatusUpdate?.Invoke(this, status);
public IEnumerable<IFileFormatReader> Images {
get {
for (uint i = 0; i < NumImages; i++)
@@ -93,12 +98,12 @@ namespace Il2CppInspector
}
}
public static T Load(string filename) {
public static T Load(string filename, EventHandler<string> statusCallback = null) {
using var stream = new FileStream(filename, FileMode.Open, FileAccess.Read);
return Load(stream);
return Load(stream, statusCallback);
}
public static T Load(Stream stream) {
public static T Load(Stream stream, EventHandler<string> statusCallback = null) {
// Copy the original stream in case we modify it
var ms = new MemoryStream();
stream.Position = 0;
@@ -106,7 +111,12 @@ namespace Il2CppInspector
ms.Position = 0;
var pe = (T) Activator.CreateInstance(typeof(T), ms);
return pe.Init() ? pe : null;
return pe.InitImpl(statusCallback) ? pe : null;
}
private bool InitImpl(EventHandler<string> statusCallback = null) {
OnStatusUpdate += statusCallback;
return Init();
}
// Confirm file is valid and set up RVA mappings