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

Clean up a significant number of TODOs

Browse Source
This commit is contained in:
Matt Nadareski
2021-09-11 00:32:48 -07:00
parent 73dd669c20
commit f2b9e3a31b
9 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BurnOutSharp/ExecutableType/Microsoft/Entries/ResourceDirectoryTableEntry.cs
View File

@@ -127,8 +127,6 @@ namespace BurnOutSharp.ExecutableType.Microsoft.Entries
int dataEntryAddress = (int)(rdte.DataEntryOffset + sectionStart);
if (dataEntryAddress > 0 && dataEntryAddress < content.Length)
rdte.DataEntry = ResourceDataEntry.Deserialize(content, ref dataEntryAddress, sections);
//Console.WriteLine($"At {dataEntryAddress}: {rdte.DataEntry.DataAsUTF8String}");
}
else
{

2
BurnOutSharp/PackerType/Armadillo.cs
View File

@@ -17,7 +17,7 @@ namespace BurnOutSharp.PackerType
if (sections == null)
return null;
// Get the .nicode section, if it exists -- TODO: Confirm this check with a real disc
// Get the .nicode section, if it exists
var nicodeSection = sections.FirstOrDefault(s => Encoding.ASCII.GetString(s.Name).StartsWith(".nicode"));
if (nicodeSection != null)
return "Armadillo";

5
BurnOutSharp/PackerType/CExe.cs
View File

@@ -37,6 +37,11 @@ namespace BurnOutSharp.PackerType
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug, PortableExecutable pex, NewExecutable nex)
{
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;
if (sections == null)
return null;
var contentMatchSets = GetContentMatchSets();
if (contentMatchSets != null && contentMatchSets.Any())
return MatchUtil.GetFirstMatch(file, fileContent, contentMatchSets, includeDebug);

9
BurnOutSharp/PackerType/PECompact.cs
View File

@@ -15,11 +15,10 @@ namespace BurnOutSharp.PackerType
var sections = pex?.SectionTable;
if (sections == null)
return null;
// TODO: Do something with this information -
// PE Compact 1 uses the symbol table pointer in the file header to store the value 1329808720 / 50 45 43 4F / PECO
// Console.WriteLine($"{file} symbol table pointer: {pex.ImageFileHeader.PointerToSymbolTable}");
// Console.WriteLine($"{file} ptr as string: {Encoding.ASCII.GetString(BitConverter.GetBytes(pex.ImageFileHeader.PointerToSymbolTable))}");
// 0x4F434550 is "PECO"
if (pex.ImageFileHeader.PointerToSymbolTable == 0x4F434550)
return "PE Compact v1.x";
// TODO: Get more granular version detection. PiD is somehow able to detect version ranges based
// on the data in the file. This may be related to information in other fields

2
BurnOutSharp/ProtectionType/CenegaProtectDVD.cs
View File

@@ -14,7 +14,7 @@ namespace BurnOutSharp.ProtectionType
if (sections == null)
return null;
// Get the .cenega section, if it exists -- TODO: Confirm this check with a real disc
// Get the .cenega section, if it exists
var cenegaSection = sections.FirstOrDefault(s => Encoding.ASCII.GetString(s.Name).StartsWith(".cenega"));
if (cenegaSection != null)
return "Cenega ProtectDVD";

3
BurnOutSharp/ProtectionType/ElectronicArts.cs
View File

@@ -14,6 +14,9 @@ namespace BurnOutSharp.ProtectionType
// TODO: Do more research into the Cucko protection:
// - Reference to `EASTL` and `EAStdC` are standard for EA products and does not indicate Cucko by itself
// - There's little information outside of PiD detection that actually knows about Cucko
// - Look into `ccinstall`, `Services/EACOM`, `TSLHost`, `SIGS/UploadThread/exchangeAuthToken`,
// `blazeURL`, `psapi.dll`, `DasmX86Dll.dll`, `NVCPL.dll`, `iphlpapi.dll`, `dbghelp.dll`,
// `WS2_32.dll`,
/// <inheritdoc/>
private List<ContentMatchSet> GetContentMatchSets()
{

34
BurnOutSharp/ProtectionType/Intenium.cs
View File

@@ -1,8 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BurnOutSharp.ExecutableType.Microsoft;
using BurnOutSharp.Matching;
using BurnOutSharp.ExecutableType.Microsoft;
using BurnOutSharp.Tools;
namespace BurnOutSharp.ProtectionType
{
@@ -32,30 +29,9 @@ namespace BurnOutSharp.ProtectionType
if (sections == null)
return null;
// TODO: This isn't working for some reason. Look into it a bit more
// var resource = Utilities.FindResourceInSection(pex.ResourceSection, dataContains: "Trial\0P");
// if (resource != null)
// return "INTENIUM Trial & Buy Protection";
// TODO: Find this inside of the .rsrc section using the executable header
// Get the .rsrc section, if it exists
var rsrcSection = sections.FirstOrDefault(s => Encoding.ASCII.GetString(s.Name).StartsWith(".rsrc"));
if (rsrcSection != null)
{
int sectionAddr = (int)rsrcSection.PointerToRawData;
int sectionEnd = sectionAddr + (int)rsrcSection.VirtualSize;
var matchers = new List<ContentMatchSet>
{
// Trial + (char)0x00 + P
new ContentMatchSet(
new ContentMatch(new byte?[] { 0x54, 0x72, 0x69, 0x61, 0x6C, 0x00, 0x50 }, start: sectionAddr, end: sectionEnd),
"INTENIUM Trial & Buy Protection"),
};
string match = MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
if (!string.IsNullOrWhiteSpace(match))
return match;
}
var fileNameResource = Utilities.FindResourceInSection(pex.ResourceSection, dataContains: $"NO NESTED PRMS SUPPORTED");
if (fileNameResource != null)
return "ITENIUM Trial & Buy Protection";
return null;
}

1
BurnOutSharp/ProtectionType/SafeDisc.cs
View File

@@ -158,7 +158,6 @@ namespace BurnOutSharp.ProtectionType
return MatchUtil.GetFirstMatch(path, pathMatchers, any: true);
}
// TODO: Try to find a file that this actually triggers for
public static string Get320to4xVersion(string file, byte[] fileContent, List<int> positions) => "3.20-4.xx (version removed)";
public static string GetVersion(string file, byte[] fileContent, List<int> positions)

16
BurnOutSharp/Tools/Utilities.cs
View File

@@ -372,13 +372,14 @@ namespace BurnOutSharp.Tools
/// <param name="rs">ResourceSection from the executable</param>
/// <param name="dataStart">String to use if checking for data starting with a string</param>
/// <param name="dataContains">String to use if checking for data contains a string</param>
/// <param name="dataEnd">String to use if checking for data ending with a string</param>
/// <returns>Full encoded resource data, null on error</returns>
public static ResourceDataEntry FindResourceInSection(ResourceSection rs, string dataStart = null, string dataContains = null)
public static ResourceDataEntry FindResourceInSection(ResourceSection rs, string dataStart = null, string dataContains = null, string dataEnd = null)
{
if (rs == null)
return null;
return FindResourceInTable(rs.ResourceDirectoryTable, dataStart, dataContains);
return FindResourceInTable(rs.ResourceDirectoryTable, dataStart, dataContains, dataEnd);
}
/// <summary>
@@ -387,8 +388,9 @@ namespace BurnOutSharp.Tools
/// <param name="rdt">ResourceDirectoryTable representing a layer</param>
/// <param name="dataStart">String to use if checking for data starting with a string</param>
/// <param name="dataContains">String to use if checking for data contains a string</param>
/// <param name="dataEnd">String to use if checking for data ending with a string</param>
/// <returns>Full encoded resource data, null on error</returns>
private static ResourceDataEntry FindResourceInTable(ResourceDirectoryTable rdt, string dataStart, string dataContains)
private static ResourceDataEntry FindResourceInTable(ResourceDirectoryTable rdt, string dataStart, string dataContains, string dataEnd)
{
if (rdt == null)
return null;
@@ -401,10 +403,12 @@ namespace BurnOutSharp.Tools
return rdte.DataEntry;
else if (dataContains != null && rdte.DataEntry.DataAsUTF8String.Contains(dataContains))
return rdte.DataEntry;
else if (dataEnd != null && rdte.DataEntry.DataAsUTF8String.EndsWith(dataStart))
return rdte.DataEntry;
}
else
{
var manifest = FindResourceInTable(rdte.Subdirectory, dataStart, dataContains);
var manifest = FindResourceInTable(rdte.Subdirectory, dataStart, dataContains, dataEnd);
if (manifest != null)
return manifest;
}
@@ -418,10 +422,12 @@ namespace BurnOutSharp.Tools
return rdte.DataEntry;
else if (dataContains != null && rdte.DataEntry.DataAsUTF8String.Contains(dataContains))
return rdte.DataEntry;
else if (dataEnd != null && rdte.DataEntry.DataAsUTF8String.EndsWith(dataStart))
return rdte.DataEntry;
}
else
{
var manifest = FindResourceInTable(rdte.Subdirectory, dataStart, dataContains);
var manifest = FindResourceInTable(rdte.Subdirectory, dataStart, dataContains, dataEnd);
if (manifest != null)
return manifest;
}