SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-16 22:05:26 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Minor formatting quibbles

Browse Source
This commit is contained in:
Matt Nadareski
2024-11-20 20:01:28 -05:00
parent 4df6a4e79d
commit cb91cdff1d
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1061,8 +1061,9 @@ namespace SabreTools.Serialization.Deserializers
if (kvp.Value == null)
continue;
var vaddrs = Array.ConvertAll(kvp.Value,
ilte => ilte == null ? 0 : (int)ilte.HintNameTableRVA.ConvertVirtualAddress(sections));
var vaddrs = Array.ConvertAll(kvp.Value, ilte => ilte == null
? 0
: (int)ilte.HintNameTableRVA.ConvertVirtualAddress(sections));
addresses.AddRange(vaddrs);
}
#else
@@ -1084,8 +1085,9 @@ namespace SabreTools.Serialization.Deserializers
if (kvp.Value == null)
continue;
var vaddrs = Array.ConvertAll(kvp.Value,
iate => iate == null ? 0 : (int)iate.HintNameTableRVA.ConvertVirtualAddress(sections));
var vaddrs = Array.ConvertAll(kvp.Value, iate => iate == null
? 0
: (int)iate.HintNameTableRVA.ConvertVirtualAddress(sections));
addresses.AddRange(vaddrs);
}
#else

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

@@ -859,18 +859,21 @@ namespace SabreTools.Serialization.Wrappers
if (st?.Children == null)
continue;
// Return the match if found
match = Array.Find(st.Children, sd => sd != null && key.Equals(sd.Key, StringComparison.OrdinalIgnoreCase));
if (match != null)
break;
return match.Value?.TrimEnd('\0');
}
return null;
#else
var match = stringTable
.SelectMany(st => st?.Children ?? [])
.FirstOrDefault(sd => sd != null && key.Equals(sd.Key, StringComparison.OrdinalIgnoreCase));
#endif
// Return either the match or null
return match?.Value?.TrimEnd('\0');
#endif
}
/// <summary>
@@ -1150,7 +1153,14 @@ namespace SabreTools.Serialization.Wrappers
if (resource is not Dictionary<int, string?> st || st == null)
continue;
foreach (var s in st.Values)
{
if (s == null || !s.Contains(entry))
continue;
stringTables.Add(st);
break;
}
}
return stringTables;