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

Correct a couple of things

Browse Source
This commit is contained in:
Matt Nadareski
2026-02-12 12:27:36 -05:00
parent e1da5f192c
commit 3a485d34a1
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SabreTools.Serialization/Models/PortableExecutable/Resource/DirectoryEntry.cs
View File

@@ -17,6 +17,7 @@
/// IMAGE_DIRECTORY_ENTRY_RESOURCE DataDirectory.
/// </summary>
/// <see href="https://learn.microsoft.com/en-us/windows/win32/debug/pe-format"/>
/// <see href="https://learn.microsoft.com/en-us/previous-versions/ms809762(v=msdn.10)#pe-file-resources"/>
public sealed class DirectoryEntry
{
#region Offset 0x00

25
SabreTools.Serialization/Readers/PortableExecutable.cs
View File

@@ -326,8 +326,9 @@ namespace SabreTools.Serialization.Readers
tableData,
ref tableOffset,
offset,
(int)optionalHeader.ResourceTable.Size,
pex.ResourceDirectoryTable, pex.SectionTable);
optionalHeader.ResourceTable.Size,
pex.ResourceDirectoryTable,
pex.SectionTable);
#region Hidden Resources
@@ -1513,21 +1514,16 @@ namespace SabreTools.Serialization.Readers
/// </summary>
/// <param name="data">Byte array to parse</param>
/// <param name="offset">Offset into the byte array</param>
/// <param name="nameEntry">Indicates if the value is a name entry or not</param>
/// <returns>Filled ResourceDirectoryEntry on success, null on error</returns>
public static Data.Models.PortableExecutable.Resource.DirectoryEntry ParseResourceDirectoryEntry(byte[] data, ref int offset, bool nameEntry)
public static Data.Models.PortableExecutable.Resource.DirectoryEntry ParseResourceDirectoryEntry(byte[] data, ref int offset)
{
var obj = new Data.Models.PortableExecutable.Resource.DirectoryEntry();
// TODO: Figure out why the high bit is set for names
// The original version of this code also had this fix, but there
// was no comment or documentation as to why. The official MSDN
// documentation makes no mention of the high bit being set here,
// only for the offset below.
if (nameEntry)
obj.NameOffset = data.ReadUInt32LittleEndian(ref offset) & ~0x80000000U;
uint nameField = data.ReadUInt32LittleEndian(ref offset);
if ((nameField & 0x80000000) != 0)
obj.NameOffset = nameField & ~0x80000000U;
else
obj.IntegerID = data.ReadUInt32LittleEndian(ref offset);
obj.IntegerID = nameField;
uint offsetField = data.ReadUInt32LittleEndian(ref offset);
if ((offsetField & 0x80000000) != 0)
@@ -1587,11 +1583,10 @@ namespace SabreTools.Serialization.Readers
// Perform top-level pass of data
for (int i = 0; i < totalEntryCount; i++)
{
bool nameEntry = i < obj.NumberOfNameEntries;
obj.Entries[i] = ParseResourceDirectoryEntry(tableData, ref offset, nameEntry);
obj.Entries[i] = ParseResourceDirectoryEntry(tableData, ref offset);
// Read the name from the offset, if needed
if (nameEntry && obj.Entries[i].NameOffset > 0 && obj.Entries[i].NameOffset < tableData.Length)
if (obj.Entries[i].NameOffset > 0 && obj.Entries[i].NameOffset < tableData.Length)
{
int nameOffset = (int)obj.Entries[i].NameOffset;
obj.Entries[i].Name = ParseResourceDirectoryString(tableData, ref nameOffset);