From b417229ee69d69fdf76ccc663150485920bcbb8e Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 10 Jan 2023 23:15:59 -0800 Subject: [PATCH] Add print debug, fix NE printing --- BurnOutSharp.Wrappers/NewExecutable.cs | 54 +++++++++++++------------- Test/Printer.cs | 14 ++++--- Test/Program.cs | 2 +- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/BurnOutSharp.Wrappers/NewExecutable.cs b/BurnOutSharp.Wrappers/NewExecutable.cs index ece74f56..24989493 100644 --- a/BurnOutSharp.Wrappers/NewExecutable.cs +++ b/BurnOutSharp.Wrappers/NewExecutable.cs @@ -395,10 +395,10 @@ namespace BurnOutSharp.Wrappers { var entry = SegmentTable[i]; Console.WriteLine($" Segment Table Entry {i}"); - Console.WriteLine($" Offset: {entry.Offset}"); - Console.WriteLine($" Length: {entry.Length}"); - Console.WriteLine($" Flag word: {entry.FlagWord}"); - Console.WriteLine($" Minimum allocation size: {entry.MinimumAllocationSize}"); + Console.WriteLine($" Offset: {entry.Offset} (0x{entry.Offset:X})"); + Console.WriteLine($" Length: {entry.Length} (0x{entry.Length:X})"); + Console.WriteLine($" Flag word: {entry.FlagWord} (0x{entry.FlagWord:X})"); + Console.WriteLine($" Minimum allocation size: {entry.MinimumAllocationSize} (0x{entry.MinimumAllocationSize:X})"); } } Console.WriteLine(); @@ -424,8 +424,8 @@ namespace BurnOutSharp.Wrappers var entry = ResourceTable.ResourceTypes[i]; Console.WriteLine($" Resource Table Entry {i}"); Console.WriteLine($" Type ID: {entry.TypeID} (0x{entry.TypeID:X}) (Is Integer Type: {entry.IsIntegerType()})"); - Console.WriteLine($" Resource count: {entry.ResourceCount}"); - Console.WriteLine($" Reserved: {entry.Reserved}"); + Console.WriteLine($" Resource count: {entry.ResourceCount} (0x{entry.ResourceCount:X})"); + Console.WriteLine($" Reserved: {entry.Reserved} (0x{entry.Reserved:X})"); Console.WriteLine($" Resources = "); if (entry.ResourceCount == 0 || entry.Resources.Length == 0) { @@ -438,11 +438,11 @@ namespace BurnOutSharp.Wrappers // TODO: If not integer type, print out name var resource = entry.Resources[j]; Console.WriteLine($" Resource Entry {i}"); - Console.WriteLine($" Offset: {resource.Offset}"); - Console.WriteLine($" Length: {resource.Length}"); - Console.WriteLine($" Flag word: {resource.FlagWord}"); - Console.WriteLine($" Resource ID: {resource.ResourceID} (Is Integer Type: {resource.IsIntegerType()})"); - Console.WriteLine($" Reserved: {resource.Reserved}"); + Console.WriteLine($" Offset: {resource.Offset} (0x{resource.Offset:X})"); + Console.WriteLine($" Length: {resource.Length} (0x{resource.Length:X})"); + Console.WriteLine($" Flag word: {resource.FlagWord} (0x{resource.FlagWord:X})"); + Console.WriteLine($" Resource ID: {resource.ResourceID} (0x{resource.ResourceID:X}) (Is Integer Type: {resource.IsIntegerType()})"); + Console.WriteLine($" Reserved: {resource.Reserved} (0x{resource.Reserved:X})"); } } } @@ -457,8 +457,8 @@ namespace BurnOutSharp.Wrappers foreach (var typeAndNameString in ResourceTable.TypeAndNameStrings) { Console.WriteLine($" Resource Type/Name Offset {typeAndNameString.Key}"); - Console.WriteLine($" Length: {typeAndNameString.Value.Length}"); - Console.WriteLine($" Text: {Encoding.ASCII.GetString(typeAndNameString.Value.Text)}"); + Console.WriteLine($" Length: {typeAndNameString.Value.Length} (0x{typeAndNameString.Value.Length:X})"); + Console.WriteLine($" Text: {(typeAndNameString.Value.Text != null ? Encoding.ASCII.GetString(typeAndNameString.Value.Text).TrimEnd('\0') : "[EMPTY]")}"); } } Console.WriteLine(); @@ -481,9 +481,9 @@ namespace BurnOutSharp.Wrappers { var entry = ResidentNameTable[i]; Console.WriteLine($" Resident-Name Table Entry {i}"); - Console.WriteLine($" Length: {entry.Length}"); - Console.WriteLine($" Name string: {(entry.NameString != null ? Encoding.ASCII.GetString(entry.NameString) : "[EMPTY]")}"); - Console.WriteLine($" Ordinal number: {entry.OrdinalNumber}"); + Console.WriteLine($" Length: {entry.Length} (0x{entry.Length:X})"); + Console.WriteLine($" Name string: {(entry.NameString != null ? Encoding.ASCII.GetString(entry.NameString).TrimEnd('\0') : "[EMPTY]")}"); + Console.WriteLine($" Ordinal number: {entry.OrdinalNumber} (0x{entry.OrdinalNumber:X})"); } } Console.WriteLine(); @@ -529,7 +529,7 @@ namespace BurnOutSharp.Wrappers foreach (var entry in ImportedNameTable) { Console.WriteLine($" Imported-Name Table at Offset {entry.Key}"); - Console.WriteLine($" Length: {entry.Value.Length}"); + Console.WriteLine($" Length: {entry.Value.Length} (0x{entry.Value.Length:X})"); Console.WriteLine($" Name string: {(entry.Value.NameString != null ? Encoding.ASCII.GetString(entry.Value.NameString) : "[EMPTY]")}"); } } @@ -553,19 +553,19 @@ namespace BurnOutSharp.Wrappers { var entry = EntryTable[i]; Console.WriteLine($" Entry Table Entry {i}"); - Console.WriteLine($" Entry count: {entry.EntryCount}"); - Console.WriteLine($" Segment indicator: {entry.SegmentIndicator} ({entry.GetEntryType()})"); + Console.WriteLine($" Entry count: {entry.EntryCount} (0x{entry.EntryCount:X})"); + Console.WriteLine($" Segment indicator: {entry.SegmentIndicator} (0x{entry.SegmentIndicator:X}) ({entry.GetEntryType()})"); switch (entry.GetEntryType()) { case BurnOutSharp.Models.NewExecutable.SegmentEntryType.FixedSegment: - Console.WriteLine($" Flag word: {entry.FixedFlagWord}"); - Console.WriteLine($" Offset: {entry.FixedOffset}"); + Console.WriteLine($" Flag word: {entry.FixedFlagWord} (0x{entry.FixedFlagWord:X})"); + Console.WriteLine($" Offset: {entry.FixedOffset} (0x{entry.FixedOffset:X})"); break; case BurnOutSharp.Models.NewExecutable.SegmentEntryType.MoveableSegment: - Console.WriteLine($" Flag word: {entry.MoveableFlagWord}"); - Console.WriteLine($" Reserved: {entry.MoveableReserved}"); - Console.WriteLine($" Segment number: {entry.MoveableSegmentNumber}"); - Console.WriteLine($" Offset: {entry.MoveableOffset}"); + Console.WriteLine($" Flag word: {entry.MoveableFlagWord} (0x{entry.MoveableFlagWord:X})"); + Console.WriteLine($" Reserved: {entry.MoveableReserved} (0x{entry.MoveableReserved:X})"); + Console.WriteLine($" Segment number: {entry.MoveableSegmentNumber} (0x{entry.MoveableSegmentNumber:X})"); + Console.WriteLine($" Offset: {entry.MoveableOffset} (0x{entry.MoveableOffset:X})"); break; } } @@ -590,9 +590,9 @@ namespace BurnOutSharp.Wrappers { var entry = NonResidentNameTable[i]; Console.WriteLine($" Nonresident-Name Table Entry {i}"); - Console.WriteLine($" Length: {entry.Length}"); + Console.WriteLine($" Length: {entry.Length} (0x{entry.Length:X})"); Console.WriteLine($" Name string: {(entry.NameString != null ? Encoding.ASCII.GetString(entry.NameString) : "[EMPTY]")}"); - Console.WriteLine($" Ordinal number: {entry.OrdinalNumber}"); + Console.WriteLine($" Ordinal number: {entry.OrdinalNumber} (0x{entry.OrdinalNumber:X})"); } } Console.WriteLine(); diff --git a/Test/Printer.cs b/Test/Printer.cs index 4ffc4184..30d70b71 100644 --- a/Test/Printer.cs +++ b/Test/Printer.cs @@ -13,20 +13,21 @@ namespace Test /// Wrapper to print information for a single path /// /// File or directory path - public static void PrintPathInfo(string path) + /// Enable debug output + public static void PrintPathInfo(string path, bool debug) { Console.WriteLine($"Checking possible path: {path}"); // Check if the file or directory exists if (File.Exists(path)) { - PrintFileInfo(path); + PrintFileInfo(path, debug); } else if (Directory.Exists(path)) { foreach (string file in Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories)) { - PrintFileInfo(file); + PrintFileInfo(file, debug); } } else @@ -38,7 +39,7 @@ namespace Test /// /// Print information for a single file, if possible /// - private static void PrintFileInfo(string file) + private static void PrintFileInfo(string file, bool debug) { Console.WriteLine($"Attempting to print info for {file}"); @@ -77,7 +78,7 @@ namespace Test // Check for a valid new executable address if (msdos.NewExeHeaderAddr >= stream.Length) { - Console.WriteLine("New EXE header address invalid, skipping additional reading..."); + if (debug) Console.WriteLine("New EXE header address invalid, skipping additional reading..."); Console.WriteLine(); return; } @@ -130,7 +131,7 @@ namespace Test // Unknown else { - Console.WriteLine($"Unrecognized header signature: {BitConverter.ToString(magic).Replace("-", string.Empty)}"); + if (debug) Console.WriteLine($"Unrecognized header signature: {BitConverter.ToString(magic).Replace("-", string.Empty)}"); Console.WriteLine(); return; } @@ -469,6 +470,7 @@ namespace Test // Everything else else { + if (debug) Console.WriteLine($"File format found: {ft}"); Console.WriteLine("Not a recognized file format, skipping..."); Console.WriteLine(); return; diff --git a/Test/Program.cs b/Test/Program.cs index 224623d9..9ea69c65 100644 --- a/Test/Program.cs +++ b/Test/Program.cs @@ -130,7 +130,7 @@ namespace Test foreach (string inputPath in inputPaths) { if (info) - Printer.PrintPathInfo(inputPath); + Printer.PrintPathInfo(inputPath, debug); else if (extract) Extractor.ExtractPath(inputPath, outputPath); else