diff --git a/BurnOutSharp/ProtectionType/SolidShield.cs b/BurnOutSharp/ProtectionType/SolidShield.cs
index e80fe2c3..f381f658 100644
--- a/BurnOutSharp/ProtectionType/SolidShield.cs
+++ b/BurnOutSharp/ProtectionType/SolidShield.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using BurnOutSharp.ExecutableType.Microsoft.PE;
using BurnOutSharp.Interfaces;
@@ -16,6 +17,8 @@ namespace BurnOutSharp.ProtectionType
///
public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
{
+ // TODO: Investigate ".pseudo" section found in "tvdm.dll" in Redump entry 68166.
+
// Get the sections from the executable, if possible
var sections = pex?.SectionTable;
if (sections == null)
@@ -24,19 +27,31 @@ namespace BurnOutSharp.ProtectionType
string name = pex.FileDescription;
if (name?.StartsWith("DVM Library", StringComparison.OrdinalIgnoreCase) == true)
return $"SolidShield {Utilities.GetInternalVersion(pex)}";
+
else if (name?.StartsWith("Solidshield Activation Library", StringComparison.OrdinalIgnoreCase) == true)
return $"SolidShield Core.dll {Utilities.GetInternalVersion(pex)}";
+
else if (name?.StartsWith("Activation Manager", StringComparison.OrdinalIgnoreCase) == true)
return $"SolidShield Activation Manager Module {GetInternalVersion(pex)}";
- name = pex.ProductName;
+ // Found in "tvdm.dll" in Redump entry 68166.
+ else if (name?.StartsWith("Solidshield Library", StringComparison.OrdinalIgnoreCase) == true)
+ return $"SolidShield {GetInternalVersion(pex)}";
+
+ name = pex.ProductName;
if (name?.StartsWith("Solidshield Activation Library", StringComparison.OrdinalIgnoreCase) == true)
return $"SolidShield Core.dll {Utilities.GetInternalVersion(pex)}";
+
else if (name?.StartsWith("Solidshield Library", StringComparison.OrdinalIgnoreCase) == true)
return $"SolidShield Core.dll {Utilities.GetInternalVersion(pex)}";
+
else if (name?.StartsWith("Activation Manager", StringComparison.OrdinalIgnoreCase) == true)
return $"SolidShield Activation Manager Module {GetInternalVersion(pex)}";
+ // Found in "tvdm.dll" in Redump entry 68166.
+ else if (name?.StartsWith("Solidshield Library", StringComparison.OrdinalIgnoreCase) == true)
+ return $"SolidShield {GetInternalVersion(pex)}";
+
// Get the .init section, if it exists
var initSectionRaw = pex.ReadRawSection(".init", first: true);
if (initSectionRaw != null)
@@ -94,8 +109,13 @@ namespace BurnOutSharp.ProtectionType
{
var matchers = new List
{
- new PathMatchSet(new PathMatch("dvm.dll", useEndsWith: true), "SolidShield"),
- new PathMatchSet(new PathMatch("hc.dll", useEndsWith: true), "SolidShield"),
+ // Found in Redump entry 68166.
+ new PathMatchSet(new PathMatch($"{Path.DirectorySeparatorChar}tdvm.dll", useEndsWith: true), "SolidShield"),
+ new PathMatchSet(new PathMatch($"{Path.DirectorySeparatorChar}tdvm.vds", useEndsWith: true), "SolidShield"),
+ new PathMatchSet(new PathMatch("vfs20.dll", useEndsWith: true), "SolidShield"),
+
+ new PathMatchSet(new PathMatch($"{Path.DirectorySeparatorChar}dvm.dll", useEndsWith: true), "SolidShield"),
+ new PathMatchSet(new PathMatch($"{Path.DirectorySeparatorChar}hc.dll", useEndsWith: true), "SolidShield"),
new PathMatchSet(new PathMatch("solidshield-cd.dll", useEndsWith: true), "SolidShield"),
new PathMatchSet(new PathMatch("c11prot.dll", useEndsWith: true), "SolidShield"),
};
@@ -109,8 +129,8 @@ namespace BurnOutSharp.ProtectionType
{
var matchers = new List
{
- new PathMatchSet(new PathMatch("dvm.dll", useEndsWith: true), "SolidShield"),
- new PathMatchSet(new PathMatch("hc.dll", useEndsWith: true), "SolidShield"),
+ new PathMatchSet(new PathMatch($"{Path.DirectorySeparatorChar}dvm.dll", useEndsWith: true), "SolidShield"),
+ new PathMatchSet(new PathMatch($"{Path.DirectorySeparatorChar}hc.dll", useEndsWith: true), "SolidShield"),
new PathMatchSet(new PathMatch("solidshield-cd.dll", useEndsWith: true), "SolidShield"),
new PathMatchSet(new PathMatch("c11prot.dll", useEndsWith: true), "SolidShield"),
};
@@ -128,7 +148,7 @@ namespace BurnOutSharp.ProtectionType
return "v1";
else if (id1.SequenceEqual(new byte[] { 0x2E, 0x6F, 0x26 }) && id2.SequenceEqual(new byte[] { 0xDB, 0xC5, 0x20, 0x3A })) // new byte[] { 0xDB, 0xC5, 0x20, 0x3A, 0xB9 }
return "v2"; // TODO: Verify against other SolidShield 2 discs
-
+
return null;
}
@@ -148,10 +168,10 @@ namespace BurnOutSharp.ProtectionType
if (!char.IsNumber(version))
return null;
-
+
return $"{version}.{subVersion}.{subSubVersion}.{subSubSubVersion}";
}
-
+
public static string GetVersionPlusTages(string file, byte[] fileContent, List positions)
{
int position = positions[0];
@@ -188,13 +208,13 @@ namespace BurnOutSharp.ProtectionType
return null;
}
-
+
private static string GetInternalVersion(PortableExecutable pex)
{
string companyName = pex.CompanyName?.ToLowerInvariant();
if (!string.IsNullOrWhiteSpace(companyName) && (companyName.Contains("solidshield") || companyName.Contains("tages")))
return Utilities.GetInternalVersion(pex);
-
+
return null;
}
}