diff --git a/BurnOutSharp/ProtectionType/ElectronicArts.cs b/BurnOutSharp/ProtectionType/ElectronicArts.cs index bfccec44..2280172d 100644 --- a/BurnOutSharp/ProtectionType/ElectronicArts.cs +++ b/BurnOutSharp/ProtectionType/ElectronicArts.cs @@ -1,10 +1,15 @@ -namespace BurnOutSharp.ProtectionType +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; + +namespace BurnOutSharp.ProtectionType { public class ElectronicArts { // TODO: Verify this doesn't over-match // TODO: Do more research into the Cucko protection: - // - Reference to `eastl` or `EASTL` is standard for EA products and does not indicate Cucko by itself + // - Reference to `EASTL` and `EAStl` 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 public static string CheckContents(string file, byte[] fileContent, bool includePosition = false) { @@ -38,11 +43,32 @@ if (fileContent.Contains(check, out position)) return "EA DRM Protection" + (includePosition ? $" (Index {position})" : string.Empty); - // E + (char)0x00 + A + (char)0x00 + + (char)0x00 + D + (char)0x00 + R + (char)0x00 + M + (char)0x00 + + (char)0x00 + H + (char)0x00 + e + (char)0x00 + l + (char)0x00 + p + (char)0x00 + e + (char)0x00 + r - check = new byte[] { 0x45, 0x00, 0x41, 0x00, 0x20, 0x00, 0x44, 0x00, 0x52, 0x00, 0x4D, 0x00, 0x20, 0x00, 0x48, 0x00, 0x65, 0x00, 0x6C, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72 }; + // E + (char)0x00 + A + (char)0x00 + + (char)0x00 + D + (char)0x00 + R + (char)0x00 + M + (char)0x00 + + (char)0x00 + H + (char)0x00 + e + (char)0x00 + l + (char)0x00 + p + (char)0x00 + e + (char)0x00 + r + (char)0x00 + check = new byte[] { 0x45, 0x00, 0x41, 0x00, 0x20, 0x00, 0x44, 0x00, 0x52, 0x00, 0x4D, 0x00, 0x20, 0x00, 0x48, 0x00, 0x65, 0x00, 0x6C, 0x00, 0x70, 0x00, 0x65, 0x00, 0x72, 0x00 }; if (fileContent.Contains(check, out position)) return "EA DRM Protection" + (includePosition ? $" (Index {position})" : string.Empty); + // O + (char)0x00 + r + (char)0x00 + i + (char)0x00 + g + (char)0x00 + i + (char)0x00 + n + (char)0x00 + S + (char)0x00 + e + (char)0x00 + t + (char)0x00 + u + (char)0x00 + p + (char)0x00 + . + (char)0x00 + e + (char)0x00 + x + (char)0x00 + e + (char)0x00 + check = new byte[] { 0x4F, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6E, 0x00, 0x53, 0x00, 0x65, 0x00, 0x74, 0x00, 0x75, 0x00, 0x70, 0x00, 0x2E, 0x00, 0x65, 0x00, 0x78, 0x00, 0x65, 0x00 }; + if (fileContent.Contains(check, out position)) + return "Origin" + (includePosition ? $" (Index {position})" : string.Empty); + + return null; + } + + public static string CheckPath(string path, IEnumerable files, bool isDirectory) + { + if (isDirectory) + { + if (files.Any(f => Path.GetFileName(f).Equals("OriginSetup.exe", StringComparison.OrdinalIgnoreCase))) + return "Origin"; + } + else + { + if (Path.GetFileName(path).Equals("OriginSetup.exe", StringComparison.OrdinalIgnoreCase)) + return "Origin"; + } + return null; } } diff --git a/BurnOutSharp/ProtectionType/Origin.cs b/BurnOutSharp/ProtectionType/Origin.cs deleted file mode 100644 index 74454e24..00000000 --- a/BurnOutSharp/ProtectionType/Origin.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; - -namespace BurnOutSharp.ProtectionType -{ - public class Origin - { - public static string CheckPath(string path, IEnumerable files, bool isDirectory) - { - if (isDirectory) - { - if (files.Any(f => Path.GetFileName(f).Equals("OriginSetup.exe", StringComparison.OrdinalIgnoreCase))) - return "Origin"; - } - else - { - if (Path.GetFileName(path).Equals("OriginSetup.exe", StringComparison.OrdinalIgnoreCase)) - return "Origin"; - } - - return null; - } - } -} diff --git a/BurnOutSharp/Scanner.cs b/BurnOutSharp/Scanner.cs index 48e7412c..5c728901 100644 --- a/BurnOutSharp/Scanner.cs +++ b/BurnOutSharp/Scanner.cs @@ -253,6 +253,11 @@ namespace BurnOutSharp if (!string.IsNullOrWhiteSpace(protection)) protections.Add(protection); + // EA Protections + protection = ElectronicArts.CheckPath(path, files, isDirectory); + if (!string.IsNullOrWhiteSpace(protection)) + protections.Add(protection); + // FreeLock protection = FreeLock.CheckPath(path, files, isDirectory); if (!string.IsNullOrWhiteSpace(protection)) @@ -298,11 +303,6 @@ namespace BurnOutSharp if (!string.IsNullOrWhiteSpace(protection)) protections.Add(protection); - // Origin - protection = Origin.CheckPath(path, files, isDirectory); - if (!string.IsNullOrWhiteSpace(protection)) - protections.Add(protection); - // Protect DVD-Video protection = ProtectDVDVideo.CheckPath(path, files, isDirectory); if (!string.IsNullOrWhiteSpace(protection))