SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-09-22 06:45:11 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

COFF naming doesn't need to continue

Browse Source
This commit is contained in:
Matt Nadareski
2025-09-22 12:56:19 -04:00
parent 2b356b37b1
commit 4f685187e9
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SabreTools.Serialization/Deserializers/PortableExecutable.cs
View File

@@ -54,16 +54,16 @@ namespace SabreTools.Serialization.Deserializers
#endregion
#region COFF File Header
#region File Header
// Parse the COFF file header
// Parse the file header
var coffFileHeader = ParseCOFFFileHeader(data);
if (coffFileHeader == null)
return null;
if (coffFileHeader.NumberOfSections > 96)
return null;
// Set the COFF file header
// Set the file header
pex.COFFFileHeader = coffFileHeader;
#endregion
@@ -88,7 +88,7 @@ namespace SabreTools.Serialization.Deserializers
// Get the section table offset
long offset = newExeOffset
+ 24 // Signature size + COFF file header size
+ 24 // Signature size + file header size
+ pex.COFFFileHeader.SizeOfOptionalHeader;
if (offset < initialOffset || offset >= data.Length)
return null;
@@ -105,15 +105,15 @@ namespace SabreTools.Serialization.Deserializers
#endregion
#region COFF Symbol Table and COFF String Table
#region Symbol Table and String Table
offset = initialOffset + coffFileHeader.PointerToSymbolTable;
if (offset > initialOffset && offset < data.Length)
{
// Seek to the COFF symbol table
// Seek to the symbol table
data.Seek(offset, SeekOrigin.Begin);
// Set the COFF symbol and string tables
// Set the symbol and string tables
pex.COFFSymbolTable = ParseCOFFSymbolTable(data, coffFileHeader.NumberOfSymbols);
pex.COFFStringTable = ParseCOFFStringTable(data);
}

28
SabreTools.Serialization/Printers/PortableExecutable.cs
View File

@@ -85,11 +85,11 @@ namespace SabreTools.Serialization.Printers
private static void Print(StringBuilder builder, string? signature, COFFFileHeader? header)
{
builder.AppendLine(" COFF File Header Information:");
builder.AppendLine(" File Header Information:");
builder.AppendLine(" -------------------------");
if (header == null)
{
builder.AppendLine(" No COFF file header");
builder.AppendLine(" No file header");
builder.AppendLine();
return;
}
@@ -314,11 +314,11 @@ namespace SabreTools.Serialization.Printers
private static void Print(StringBuilder builder, BaseEntry[]? entries)
{
builder.AppendLine(" COFF Symbol Table Information:");
builder.AppendLine(" Symbol Table Information:");
builder.AppendLine(" -------------------------");
if (entries == null || entries.Length == 0)
{
builder.AppendLine(" No COFF symbol table items");
builder.AppendLine(" No symbol table items");
builder.AppendLine();
return;
}
@@ -344,7 +344,7 @@ namespace SabreTools.Serialization.Printers
private static void Print(StringBuilder builder, StandardRecord entry, int i)
{
builder.AppendLine($" COFF Symbol Table Entry {i} (Standard Record)");
builder.AppendLine($" Symbol Table Entry {i} (Standard Record)");
if (entry.ShortName != null)
{
builder.AppendLine(entry.ShortName, " Short name", Encoding.ASCII);
@@ -363,7 +363,7 @@ namespace SabreTools.Serialization.Printers
private static void Print(StringBuilder builder, FunctionDefinition entry, int i)
{
builder.AppendLine($" COFF Symbol Table Entry {i} (Function Definition)");
builder.AppendLine($" Symbol Table Entry {i} (Function Definition)");
builder.AppendLine(entry.TagIndex, " Tag index");
builder.AppendLine(entry.TotalSize, " Total size");
builder.AppendLine(entry.PointerToLinenumber, " Pointer to linenumber");
@@ -373,7 +373,7 @@ namespace SabreTools.Serialization.Printers
private static void Print(StringBuilder builder, Descriptor entry, int i)
{
builder.AppendLine($" COFF Symbol Table Entry {i} (.bf and .ef Symbol)");
builder.AppendLine($" Symbol Table Entry {i} (.bf and .ef Symbol)");
builder.AppendLine(entry.Unused1, " Unused");
builder.AppendLine(entry.Linenumber, " Linenumber");
builder.AppendLine(entry.Unused2, " Unused");
@@ -383,7 +383,7 @@ namespace SabreTools.Serialization.Printers
private static void Print(StringBuilder builder, WeakExternal entry, int i)
{
builder.AppendLine($" COFF Symbol Table Entry {i} (Weak External)");
builder.AppendLine($" Symbol Table Entry {i} (Weak External)");
builder.AppendLine(entry.TagIndex, " Tag index");
builder.AppendLine(entry.Characteristics, " Characteristics");
builder.AppendLine(entry.Unused, " Unused");
@@ -391,13 +391,13 @@ namespace SabreTools.Serialization.Printers
private static void Print(StringBuilder builder, FileRecord entry, int i)
{
builder.AppendLine($" COFF Symbol Table Entry {i} (File)");
builder.AppendLine($" Symbol Table Entry {i} (File)");
builder.AppendLine(entry.FileName, " File name", Encoding.ASCII);
}
private static void Print(StringBuilder builder, SectionDefinition entry, int i)
{
builder.AppendLine($" COFF Symbol Table Entry {i} (Section Defintion)");
builder.AppendLine($" Symbol Table Entry {i} (Section Defintion)");
builder.AppendLine(entry.Length, " Length");
builder.AppendLine(entry.NumberOfRelocations, " Number of relocations");
builder.AppendLine(entry.NumberOfLinenumbers, " Number of linenumbers");
@@ -409,7 +409,7 @@ namespace SabreTools.Serialization.Printers
private static void Print(StringBuilder builder, CLRTokenDefinition entry, int i)
{
builder.AppendLine($" COFF Symbol Table Entry {i} (CLR Token Defintion)");
builder.AppendLine($" Symbol Table Entry {i} (CLR Token Defintion)");
builder.AppendLine(entry.AuxType, " Aux type");
builder.AppendLine(entry.Reserved1, " Reserved");
builder.AppendLine(entry.SymbolTableIndex, " Symbol table index");
@@ -418,11 +418,11 @@ namespace SabreTools.Serialization.Printers
private static void Print(StringBuilder builder, COFFStringTable? stringTable)
{
builder.AppendLine(" COFF String Table Information:");
builder.AppendLine(" String Table Information:");
builder.AppendLine(" -------------------------");
if (stringTable?.Strings == null || stringTable.Strings.Length == 0)
{
builder.AppendLine(" No COFF string table items");
builder.AppendLine(" No string table items");
builder.AppendLine();
return;
}
@@ -431,7 +431,7 @@ namespace SabreTools.Serialization.Printers
for (int i = 0; i < stringTable.Strings.Length; i++)
{
string? entry = stringTable.Strings[i];
builder.AppendLine($" COFF String Table Entry {i})");
builder.AppendLine($" String Table Entry {i})");
builder.AppendLine(entry, " Value");
}

2
SabreTools.Serialization/Wrappers/PortableExecutable.cs
View File

@@ -493,7 +493,7 @@ namespace SabreTools.Serialization.Wrappers
// Get the offset from the end of the section table
long endOfSectionTable = Stub.Header.NewExeHeaderAddr
+ 24 // Signature size + COFF file header size
+ 24 // Signature size + file header size
+ COFFFileHeader.SizeOfOptionalHeader
+ (COFFFileHeader.NumberOfSections * 40); // Size of a section header