From fee980e0483fdeaf71dc88409d4d46d756d2c524 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 28 Oct 2020 16:33:20 -0700
Subject: [PATCH] CD Check has a valid case again

---
 BurnOutSharp/FileType/Executable.cs    |  8 ++++----
 BurnOutSharp/ProtectionType/CDCheck.cs | 20 ++++++++++++++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/BurnOutSharp/FileType/Executable.cs b/BurnOutSharp/FileType/Executable.cs
index 9d84024f..20c8dcd7 100644
--- a/BurnOutSharp/FileType/Executable.cs
+++ b/BurnOutSharp/FileType/Executable.cs
@@ -98,10 +98,10 @@ namespace BurnOutSharp.FileType
             if (!string.IsNullOrWhiteSpace(protection))
                 protections.Add(protection);
 
-            // CD Check - Disabled because of too many false positives
-            //protection = CDCheck.CheckContents(fileContent, includePosition);
-            //if (!string.IsNullOrWhiteSpace(protection))
-            //    protections.Add(protection);
+            // CD Check
+            protection = CDCheck.CheckContents(fileContent, includePosition);
+            if (!string.IsNullOrWhiteSpace(protection))
+                protections.Add(protection);
 
             // Cenega ProtectDVD
             protection = CengaProtectDVD.CheckContents(fileContent, includePosition);
diff --git a/BurnOutSharp/ProtectionType/CDCheck.cs b/BurnOutSharp/ProtectionType/CDCheck.cs
index 3ccae6bb..4ba83c01 100644
--- a/BurnOutSharp/ProtectionType/CDCheck.cs
+++ b/BurnOutSharp/ProtectionType/CDCheck.cs
@@ -4,12 +4,28 @@
     {
         public static string CheckContents(byte[] fileContent, bool includePosition = false)
         {
-            // "GetDriveType"
+            // MGS CDCheck
+            byte[] check = new byte[] { 0x4D, 0x47, 0x53, 0x20, 0x43, 0x44, 0x43, 0x68, 0x65, 0x63, 0x6B };
+            if (fileContent.Contains(check, out int position))
+                return "Microsoft Game Studios CD Check" + (includePosition ? $" (Index {position})" : string.Empty);
+            
+            // CDCheck
+            check = new byte[] { 0x43, 0x44, 0x43, 0x68, 0x65, 0x63, 0x6B };
+            if (fileContent.Contains(check, out position))
+                return "Microsoft Game Studios CD Check" + (includePosition ? $" (Index {position})" : string.Empty);
+
+            return null;
+        }
+
+        // These content checks are too broad to be useful
+        private static string CheckContentsBroad(byte[] fileContent, bool includePosition = false)
+        {
+            // GetDriveType
             byte[] check = new byte[] { 0x47, 0x65, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65 };
             if (fileContent.Contains(check, out int position))
                 return "CD Check" + (includePosition ? $" (Index {position})" : string.Empty);
 
-            // "GetVolumeInformation"
+            // GetVolumeInformation
             check = new byte[] { 0x47, 0x65, 0x74, 0x56, 0x6F, 0x6C, 0x75, 0x6D, 0x65, 0x49, 0x6E, 0x66, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x69, 0x6F, 0x6E };
             if (fileContent.Contains(check, out position))
                 return "CD Check" + (includePosition ? $" (Index {position})" : string.Empty);