Bump version to 2.3.4

* Specify CDS-200 for more detections

* Fix the use of GetVersion

BurnOutSharp/BurnOutSharp.csproj

@@ -10,9 +10,9 @@
     <Copyright>Copyright (c)2005-2010 Gernot Knippen, Copyright (c)2018-2022 Matt Nadareski</Copyright>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <RepositoryUrl>https://github.com/mnadareski/BurnOutSharp</RepositoryUrl>
-    <Version>2.3.0</Version>
-    <AssemblyVersion>2.3.0</AssemblyVersion>
-    <FileVersion>2.3.0</FileVersion>
+    <Version>2.3.4</Version>
+    <AssemblyVersion>2.3.4</AssemblyVersion>
+    <FileVersion>2.3.4</FileVersion>
     <IncludeSource>true</IncludeSource>
     <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
@@ -22,8 +22,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenMcdf" Version="2.2.1.9" />
-    <PackageReference Include="SharpCompress" Version="0.32.1" />
+    <PackageReference Include="OpenMcdf" Version="2.2.1.12" />
+    <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
     <PackageReference Include="Teronis.MSBuild.Packaging.ProjectBuildInPackage" Version="1.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -57,9 +57,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Dtf\src\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" />
-    <ProjectReference Include="..\HLLibSharp\HLLibSharp\HLLibSharp.csproj" />
-    <ProjectReference Include="..\LibMSPackSharp\LibMSPackSharp\LibMSPackSharp.csproj" />
+    <ProjectReference Include="..\Dtf\src\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
+    <ProjectReference Include="..\Dtf\src\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
+    <ProjectReference Include="..\HLLibSharp\HLLibSharp\HLLibSharp.csproj">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
+    <ProjectReference Include="..\LibMSPackSharp\LibMSPackSharp\LibMSPackSharp.csproj">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
   </ItemGroup>
 
 </Project>

BurnOutSharp/FileType/MicrosoftCAB.cs

@@ -8,6 +8,7 @@ using System.Text;
 using BurnOutSharp.Interfaces;
 using BurnOutSharp.Tools;
 using ComponentAce.Compression.Libs.zlib;
+using WixToolset.Dtf.Compression;
 using WixToolset.Dtf.Compression.Cab;
 
 namespace BurnOutSharp.FileType

BurnOutSharp/FileType/PLJ.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Linq;
+using BurnOutSharp.Interfaces;
+using BurnOutSharp.Tools;
+
+namespace BurnOutSharp.FileType
+{
+    public class PLJ : IScannable
+    {
+        /// <inheritdoc/>
+        public bool ShouldScan(byte[] magic)
+        {
+            // https://www.iana.org/assignments/media-types/audio/vnd.everad.plj
+            if (magic.StartsWith(new byte?[] { 0xFF, 0x9D, 0x53, 0x4B }))
+                return true;
+
+            return false;
+        }
+
+        /// <inheritdoc/>
+        public ConcurrentDictionary<string, ConcurrentQueue<string>> Scan(Scanner scanner, string file)
+        {
+            if (!File.Exists(file))
+                return null;
+
+            using (var fs = File.OpenRead(file))
+            {
+                return Scan(scanner, fs, file);
+            }
+        }
+
+        /// <inheritdoc/>
+        public ConcurrentDictionary<string, ConcurrentQueue<string>> Scan(Scanner scanner, Stream stream, string file)
+        {
+            var protections = new ConcurrentDictionary<string, ConcurrentQueue<string>>();
+            try
+            {
+                byte[] magic = new byte[16];
+                stream.Read(magic, 0, 16);
+
+                if (ShouldScan(magic))
+                {
+                    Utilities.AppendToDictionary(protections, file, "PlayJ Audio File");
+                    return protections;
+                }
+            }
+            catch (Exception ex)
+            {
+                if (scanner.IncludeDebug) Console.WriteLine(ex);
+            }
+
+            return null;
+        }
+    }
+}

BurnOutSharp/Matching/ContentMatch.cs

@@ -88,7 +88,7 @@ namespace BurnOutSharp.Matching
                 return false;
 
             // If we're too close to the end of the stack, return false
-            if (Needle.Length >= stack.Length - index)
+            if (Needle.Length > stack.Length - index)
                 return false;
 
             for (int i = 0; i < Needle.Length; i++)

BurnOutSharp/ProtectionType/ActiveMARK.cs

@@ -22,7 +22,7 @@ namespace BurnOutSharp.ProtectionType
                         0x20, 0xC2, 0x16, 0x00, 0xA8, 0xC1, 0x16, 0x00,
                         0xB8, 0xC1, 0x16, 0x00, 0x86, 0xC8, 0x16, 0x00,
                         0x9A, 0xC1, 0x16, 0x00, 0x10, 0xC2, 0x16, 0x00
-                    }, "ActiveMARK 5"),
+                    }, "ActiveMARK 5 (Unconfirmed - Please report to us on Github)"),
                 };
 
                 return MatchUtil.GetFirstMatch(file, fileContent, contentMatchSets, includeDebug);
@@ -44,6 +44,7 @@ namespace BurnOutSharp.ProtectionType
             {
                 var matchers = new List<ContentMatchSet>
                 {
+                    // Checks sourced from https://raw.githubusercontent.com/wolfram77web/app-peid/master/userdb.txt
                     new ContentMatchSet(new byte?[]
                     {
                         0x79, 0x11, 0x7F, 0xAB, 0x9A, 0x4A, 0x83, 0xB5,

BurnOutSharp/ProtectionType/AlphaDVD.cs

@@ -20,7 +20,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("PlayDVD.exe", useEndsWith: true), "Alpha-DVD"),
+                new PathMatchSet(new PathMatch("PlayDVD.exe", useEndsWith: true), "Alpha-DVD (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -31,7 +31,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("PlayDVD.exe", useEndsWith: true), "Alpha-DVD"),
+                new PathMatchSet(new PathMatch("PlayDVD.exe", useEndsWith: true), "Alpha-DVD (Unconfirmed - Please report to us on Github"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/ProtectionType/AlphaROM.cs

@@ -22,10 +22,11 @@ namespace BurnOutSharp.ProtectionType
     /// https://archive.org/details/little-busters-regular-edition-iso-only-2007
     /// Games that may have Alpha-ROM:
     /// http://cpdb.kemuri-net.com/ (Protection database that includes many different protections, including Alpha-ROM).
+    /// https://w.atwiki.jp/tirasinoura/pages/3.html (List of games with Alpha-ROM, and explains some version differences).
     /// https://vndb.org/r?f=fwSiglusEngine- (VNs made with an engine known to use Alpha-ROM).
     /// https://vndb.org/r?f=fwRealLive- (VNs made with an engine known to use Alpha-ROM).
     /// References and further information:
-    /// http://hhg.sakura.ne.jp/cd-dvd/dust/alpha/1_twin_sector.htm
+    /// http://hhg.sakura.ne.jp/cd-dvd/dust/alpha/alpha_index.htm
     /// https://www.weblio.jp/content/Alpha-ROM
     /// https://ameblo.jp/michael-j-fox/entry-10046574609.html
     /// http://s2000.yokinihakarae.com/sub03-10-2(DVD).html
@@ -59,11 +60,11 @@ namespace BurnOutSharp.ProtectionType
                 var matchers = new List<ContentMatchSet>
                 {
                     // \SETTEC
+                    // Found in IA item "little-busters-regular-edition-iso-only-2007"
                     new ContentMatchSet(new byte?[] { 0x5C, 0x53, 0x45, 0x54, 0x54, 0x45, 0x43 }, "Alpha-ROM"),
 
-                    // On Redump entry 84122, this string is found within an executable, but outside the bounds of any section. Thus, it currently remains undetected.
-                    // Worth noting is that all the section names, aside from .text, seem to be purposefully expunged.
                     // SETTEC0000
+                    // Found in IA item "little-busters-regular-edition-iso-only-2007"
                     new ContentMatchSet(new byte?[] { 0x53, 0x45, 0x54, 0x54, 0x45, 0x43, 0x30, 0x30, 0x30, 0x30 }, "Alpha-ROM"),
                 };
 
@@ -116,6 +117,21 @@ namespace BurnOutSharp.ProtectionType
                     return match;
             }
 
+            // Get the overlay data, if it exists
+            if (pex.OverlayRaw != null)
+            {
+                var matchers = new List<ContentMatchSet>
+                {
+                    // Found in Redump entry 84122.
+                    // SETTEC0000
+                    new ContentMatchSet(new byte?[] { 0x53, 0x45, 0x54, 0x54, 0x45, 0x43, 0x30, 0x30, 0x30, 0x30 }, "Alpha-ROM"),
+                };
+
+                string match = MatchUtil.GetFirstMatch(file, pex.OverlayRaw, matchers, includeDebug);
+                if (!string.IsNullOrWhiteSpace(match))
+                    return match;
+            }
+
             return null;
         }
     }

BurnOutSharp/ProtectionType/ByteShield.cs

@@ -12,8 +12,8 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("Byteshield.dll", useEndsWith: true), "ByteShield"),
-                new PathMatchSet(new PathMatch(".bbz", useEndsWith: true), "ByteShield"),
+                new PathMatchSet(new PathMatch("Byteshield.dll", useEndsWith: true), "ByteShield (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch(".bbz", useEndsWith: true), "ByteShield (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -24,8 +24,8 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("Byteshield.dll", useEndsWith: true), "ByteShield"),
-                new PathMatchSet(new PathMatch(".bbz", useEndsWith: true), "ByteShield"),
+                new PathMatchSet(new PathMatch("Byteshield.dll", useEndsWith: true), "ByteShield (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch(".bbz", useEndsWith: true), "ByteShield (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/ProtectionType/CDDVDCops.cs

@@ -25,14 +25,14 @@ namespace BurnOutSharp.ProtectionType
                     {
                         0x43, 0x44, 0x2D, 0x43, 0x6F, 0x70, 0x73, 0x2C,
                         0x20, 0x20, 0x76, 0x65, 0x72, 0x2E, 0x20
-                    }, GetVersion, "CD-Cops"),
+                    }, GetVersion, "CD-Cops (Unconfirmed - Please report to us on Github)"),
 
                     // // DVD-Cops,  ver. 
                     new ContentMatchSet(new byte?[]
                     {
                         0x44, 0x56, 0x44, 0x2D, 0x43, 0x6F, 0x70, 0x73,
                         0x2C, 0x20, 0x20, 0x76, 0x65, 0x72, 0x2E, 0x20
-                    }, GetVersion, "DVD-Cops"),
+                    }, GetVersion, "DVD-Cops (Unconfirmed - Please report to us on Github)"),
                 };
 
                 return MatchUtil.GetFirstMatch(file, fileContent, contentMatchSets, includeDebug);
@@ -66,7 +66,7 @@ namespace BurnOutSharp.ProtectionType
                 {
                     0x43, 0x44, 0x2D, 0x43, 0x6F, 0x70, 0x73, 0x2C,
                     0x20, 0x20, 0x76, 0x65, 0x72, 0x2E, 0x20
-                }, GetVersion, "CD-Cops"),
+                }, GetVersion, "CD-Cops (Unconfirmed - Please report to us on Github)"),
             };
             
             return MatchUtil.GetFirstMatch(file, data, neMatchSets, includeDebug);
@@ -81,6 +81,7 @@ namespace BurnOutSharp.ProtectionType
                 return null;
 
             // Get the .grand section, if it exists -- TODO: Confirm is this is in DVD-Cops as well
+            // Found in "AGENTHUG.QZ_" in Redump entry 84517
             bool grandSection = pex.ContainsSection(".grand", exact: true);
             if (grandSection)
                 return "CD-Cops";
@@ -94,11 +95,13 @@ namespace BurnOutSharp.ProtectionType
             // TODO: Original had "CDCOPS.DLL" required and all the rest in a combined OR
             var matchers = new List<PathMatchSet>
             {
+                // Found in Redump entry 84517
                 new PathMatchSet(new PathMatch("CDCOPS.DLL", useEndsWith: true), "CD-Cops"),
-                new PathMatchSet(new PathMatch(".GZ_", useEndsWith: true), "CD-Cops"),
                 new PathMatchSet(new PathMatch(".W_X", useEndsWith: true), "CD-Cops"),
-                new PathMatchSet(new PathMatch(".Qz", useEndsWith: true), "CD-Cops"),
                 new PathMatchSet(new PathMatch(".QZ_", useEndsWith: true), "CD-Cops"),
+
+                new PathMatchSet(new PathMatch(".GZ_", useEndsWith: true), "CD-Cops (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch(".Qz", useEndsWith: true), "CD-Cops (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -109,11 +112,13 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
+                // Found in Redump entry 84517
                 new PathMatchSet(new PathMatch("CDCOPS.DLL", useEndsWith: true), "CD-Cops"),
-                new PathMatchSet(new PathMatch(".GZ_", useEndsWith: true), "CD-Cops"),
                 new PathMatchSet(new PathMatch(".W_X", useEndsWith: true), "CD-Cops"),
-                new PathMatchSet(new PathMatch(".Qz", useEndsWith: true), "CD-Cops"),
                 new PathMatchSet(new PathMatch(".QZ_", useEndsWith: true), "CD-Cops"),
+
+                new PathMatchSet(new PathMatch(".GZ_", useEndsWith: true), "CD-Cops (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch(".Qz", useEndsWith: true), "CD-Cops (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/ProtectionType/CDLock.cs

@@ -6,6 +6,24 @@ using BurnOutSharp.Matching;
 
 namespace BurnOutSharp.ProtectionType
 {
+    /// <summary>
+    /// CD-Lock (https://www.cdmediaworld.com/hardware/cdrom/cd_protections_dummy_files.shtml) is a copy protection most commonly used in Europe and active from 1998-2001 that seems to have a resemblance to Bitpool in a few ways.
+    /// It makes use of padded dummy files with an AFP extension, with there being 4 such files on a disc.
+    /// These files typically have a filename consistening of seemingly random 4 characters with an AFP extension, though there are known exceptions.
+    /// These exceptions have "afp" files with the names "Gang1.afp", "Gang2.afp", "Gang3.afp", and "Gang4.afp" (Redump entries 37788 and 43221).
+    /// There also always seems to be a "CONFIG.AFP" file present, which in most cases contains a marker relating to the other AFP files present on the disc.
+    /// At least one game breaks this mould, having a "CONFIG.AFP" file present but is filled with 0x20 bytes instead of the expected data (Redump entries 37788 and 43221).
+    /// Games protected with CD-Lock also appear to consistently have 3 additional tracks relating to the protection appended. These are 2 audio tracks, followed by a data track.
+    /// Unlike Bitpool, it seems that these additional tracks are appended whether or not there are intentional audio tracks present on the disc as well. Compare Redump entries 37788 and 66321.
+    /// It appears that this latter data track points to the data of the first data track, giving the appearance to some software that the disc contains 2 equally sized data tracks.
+    /// It seems to me that this is intended to confuse dumping software, possibly attempting to lead it to believe that the disc has a larger capacity than it physically could have.
+    /// https://inxs8.tripod.com/illegal_toc.htm seems to confirm that the software of the time especially seems to have had issues with this, though none of the technical information on the page seems to be particularly correct.
+    /// Based off of Redump entries 31615 and 37700, it seems that there are cases where the main data track on two separate discs is identical, but the protection tracks differ. The reason for this is unknown.
+    /// There are a few discs where one of the protection audio tracks is quite large, sometimes even larger than the main data track. The reason for this is also unknown (Redump entries 43221 and 66749).
+    /// https://www.softpedia.com/get/Security/Encrypting/CD-Lock.shtml seems to be an unrelated program that protects CDs via encryption.
+    /// Possible false positives include Redump entries 51241, 51373, 54397, 76437.
+    /// Confirmed to be present on Redump entries 24287, 31615, 34448, 35967, 36627, 37700, 37788, 43221, 55788, and 66749.
+    /// </summary>
     public class CDLock : IPathCheck, IPortableExecutableCheck
     {
         /// <inheritdoc/>
@@ -21,6 +39,8 @@ namespace BurnOutSharp.ProtectionType
             {
                 var matchers = new List<ContentMatchSet>
                 {
+                    // Found in game executables protected with CD-Lock (Redump entries 24287 and 31615).
+                    // TODO: Check for possible false postives (Redump entry 97942).
                     // 2 + (char)0xF2 + (char)0x02 + (char)0x82 + (char)0xC3 + (char)0xBC + (char)0x0B + $ + (char)0x99 + (char)0xAD + 'C + (char)0xE4 + (char)0x9D + st + (char)0x99 + (char)0xFA + 2$ + (char)0x9D + )4 + (char)0xFF + t
                     new ContentMatchSet(new byte?[]
                     {
@@ -44,7 +64,12 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch(".AFP", useEndsWith: true), "CD-Lock"),
+                // TODO: Determine if there's any consistency in the naming of the additional AFP files.
+
+                // Found in every confirmed sample of CD-Lock, generally (but not always) appears to include markers relating to the additional AFP files present (Redump entries 24287 and 31615). 
+                new PathMatchSet(new PathMatch("CONFIG.AFP", useEndsWith: true), "CD-Lock"),
+
+                // There is also a "$$$$$$$$.$$$" file present on some discs, but it isn't known if this is directly related to CD-Lock (Redump entries 37788 and 43221).
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -55,7 +80,12 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch(".AFP", useEndsWith: true), "CD-Lock"),
+                // TODO: Determine if there's any consistency in the naming of the additional AFP files.
+
+                // Found in every confirmed sample of CD-Lock, generally (but not always) appears to include markers relating to the additional AFP files present (Redump entries 24287 and 31615).
+                new PathMatchSet(new PathMatch("CONFIG.AFP", useEndsWith: true), "CD-Lock"),
+
+                // There is also a "$$$$$$$$.$$$" file present on some discs, but it isn't known if this is directly related to CD-Lock (Redump entries 37788 and 43221).
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/ProtectionType/CDProtector.cs

@@ -13,10 +13,10 @@ namespace BurnOutSharp.ProtectionType
             // TODO: Verify if these are OR or AND
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("_cdp16.dat", useEndsWith: true), "CD-Protector"),
-                new PathMatchSet(new PathMatch("_cdp16.dll", useEndsWith: true), "CD-Protector"),
-                new PathMatchSet(new PathMatch("_cdp32.dat", useEndsWith: true), "CD-Protector"),
-                new PathMatchSet(new PathMatch("_cdp32.dll", useEndsWith: true), "CD-Protector"),
+                new PathMatchSet(new PathMatch("_cdp16.dat", useEndsWith: true), "CD-Protector (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("_cdp16.dll", useEndsWith: true), "CD-Protector (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("_cdp32.dat", useEndsWith: true), "CD-Protector (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("_cdp32.dll", useEndsWith: true), "CD-Protector (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -27,10 +27,10 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("_cdp16.dat", useEndsWith: true), "CD-Protector"),
-                new PathMatchSet(new PathMatch("_cdp16.dll", useEndsWith: true), "CD-Protector"),
-                new PathMatchSet(new PathMatch("_cdp32.dat", useEndsWith: true), "CD-Protector"),
-                new PathMatchSet(new PathMatch("_cdp32.dll", useEndsWith: true), "CD-Protector"),
+                new PathMatchSet(new PathMatch("_cdp16.dat", useEndsWith: true), "CD-Protector (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("_cdp16.dll", useEndsWith: true), "CD-Protector (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("_cdp32.dat", useEndsWith: true), "CD-Protector (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("_cdp32.dll", useEndsWith: true), "CD-Protector (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/ProtectionType/CDX.cs

@@ -13,9 +13,9 @@ namespace BurnOutSharp.ProtectionType
             // TODO: Verify if these are OR or AND
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("CHKCDX16.DLL", useEndsWith: true), "CD-X"),
-                new PathMatchSet(new PathMatch("CHKCDX32.DLL", useEndsWith: true), "CD-X"),
-                new PathMatchSet(new PathMatch("CHKCDXNT.DLL", useEndsWith: true), "CD-X"),
+                new PathMatchSet(new PathMatch("CHKCDX16.DLL", useEndsWith: true), "CD-X (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("CHKCDX32.DLL", useEndsWith: true), "CD-X (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("CHKCDXNT.DLL", useEndsWith: true), "CD-X (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -26,9 +26,9 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("CHKCDX16.DLL", useEndsWith: true), "CD-X"),
-                new PathMatchSet(new PathMatch("CHKCDX32.DLL", useEndsWith: true), "CD-X"),
-                new PathMatchSet(new PathMatch("CHKCDXNT.DLL", useEndsWith: true), "CD-X"),
+                new PathMatchSet(new PathMatch("CHKCDX16.DLL", useEndsWith: true), "CD-X (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("CHKCDX32.DLL", useEndsWith: true), "CD-X (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("CHKCDXNT.DLL", useEndsWith: true), "CD-X (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/ProtectionType/CactusDataShield.cs

@@ -10,6 +10,23 @@ using BurnOutSharp.Matching;
 
 namespace BurnOutSharp.ProtectionType
 {
+    /// <summary>
+    /// CactusDataShield was a copy protection originally developed by Midbar Technologies, which was then purchased by Macrovision in 2002 (https://variety.com/2002/digital/news/macrovision-acquires-midbar-cuts-ttr-link-1117875824/).
+    /// CDS-100 appears to function by attempting to prevent dumping/ripping the discs protected with it.
+    /// CDS-200+ uses a dedicated audio player to play the music "legitimately".
+    /// Patent relating to CDS-100: https://patents.google.com/patent/US6425098B1/
+    /// Known CDS versions:
+    /// CDS-100 ("The Loveparade Compilation 2001" by various artists (Barcode 74321 86986 2) (Likely Discogs Release Code [r155963]) and "World Of Our Own" (Limited Edition) by Westlife (Barcode 7 43218 98572 0) (Discogs Release Code [r1357706])).
+    /// CDS-200 (PlayJ) (("Volumia!" by Puur (Barcode 7 43218 63282 2) (Discogs Release Code [r795427])) (Confirmed to be CDS-200 from https://www.cdrinfo.com/d7/content/cactus-data-shield-200?page=2).
+    /// CDS200.0.4 - 3.0 build 16a (Redump entry 95036)
+    /// CDS200.0.4 - 3.0 build 16c ("TMF Hitzone 20" by various artists (Barcode 7 31458 37062 8)).
+    /// CDS200.0.4 - 4.1 build 2a ("Ich Habe Einen Traum" by Uwe Busse (Barcode 9 002723 251203)).
+    /// CDS200.0.4 - 4.1 build 2e ("Hallucinations" by David Usher (Barcode 7 24359 30322 2)).
+    /// CDS-300
+    /// Further information:
+    /// https://www.cdrinfo.com/d7/content/cactus-data-shield-200
+    /// https://www.cdmediaworld.com/hardware/cdrom/cd_protections_cactus_data_shield.shtml
+    /// </summary>
     public class CactusDataShield : IContentCheck, IPathCheck, IPortableExecutableCheck
     {
         /// <inheritdoc/>
@@ -60,6 +77,23 @@ namespace BurnOutSharp.ProtectionType
                     return match;
             }
 
+            // Get the .rsrc section, if it exists
+            var rsrcSectionRaw = pex.ReadRawSection(".rsrc", first: false);
+            if (rsrcSectionRaw != null)
+            {
+                var matchers = new List<ContentMatchSet>
+                {
+                    // CactusPJ
+                    // Found in "Volumia!" by Puur (Barcode 7 43218 63282 2) (Discogs Release Code [r795427]).
+                    // Modified version of the PlayJ Music Player specificaly for CDS, as indicated by the About page present when running the executable.
+                    new ContentMatchSet(new byte?[] { 0x43, 0x61, 0x63, 0x74, 0x75, 0x73, 0x50, 0x4A }, "PlayJ Music Player (Cactus Data Shield 200)"),
+                };
+
+                string match = MatchUtil.GetFirstMatch(file, rsrcSectionRaw, matchers, includeDebug);
+                if (!string.IsNullOrWhiteSpace(match))
+                    return match;
+            }
+			
             return null;
         }
 
@@ -69,9 +103,18 @@ namespace BurnOutSharp.ProtectionType
             // TODO: Verify if these are OR or AND
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("CACTUSPJ.exe", useEndsWith: true), GetVersion, "Cactus Data Shield"),
+                // Found in "Volumia!" by Puur (Barcode 7 43218 63282 2) (Discogs Release Code [r795427]).
+                // Modified version of the PlayJ Music Player specificaly for CDS, as indicated by the About page present when running the executable.
+                // The file "DATA16.BML" is also present on this disc but the name is too generic to check for.
+                new PathMatchSet(new PathMatch("CACTUSPJ.exe", useEndsWith: true), "PlayJ Music Player (Cactus Data Shield 200)"),
+
+                // Found in "Volumia!" by Puur (Barcode 7 43218 63282 2) (Discogs Release Code [r795427]). 
+                // In "Volumina! - Puur" (7 43218 63282 2), this file is composed of multiple PLJ files combined together.
+                // In later versions, this file is a padded dummy file. ("Ich Habe Einen Traum" by Uwe Busse (Barcode 9 002723 251203)).
+                new PathMatchSet(new PathMatch("YUCCA.CDS", useEndsWith: true), "Cactus Data Shield 200"),
+
+                // TODO: Find samples of the following: 
                 new PathMatchSet(new PathMatch("CDSPlayer.app", useEndsWith: true), GetVersion, "Cactus Data Shield"),
-                new PathMatchSet(new PathMatch("PJSTREAM.DLL", useEndsWith: true), GetVersion, "Cactus Data Shield"),
                 new PathMatchSet(new PathMatch("wmmp.exe", useEndsWith: true), GetVersion, "Cactus Data Shield"),
 
                 // Present on CDS-300, as well as SafeDisc. This is likely due to both protections being created by Macrovision.
@@ -86,9 +129,18 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("CACTUSPJ.exe", useEndsWith: true), "Cactus Data Shield 200"),
+                // Found in "Volumia!" by Puur (Barcode 7 43218 63282 2) (Discogs Release Code [r795427]).
+                // Modified version of the PlayJ Music Player specificaly for CDS, as indicated by the About page present when running the executable.
+                // The file "DATA16.BML" is also present on this disc but the name is too generic to check for.
+                new PathMatchSet(new PathMatch("CACTUSPJ.exe", useEndsWith: true), "PlayJ Music Player (Cactus Data Shield 200)"),
+
+                // Found in "Volumia!" by Puur (Barcode 7 43218 63282 2) (Discogs Release Code [r795427]), 
+                // In "Volumia! - Puur", this file is composed of multiple PLJ files combined together.
+                // In later versions, this file is a padded dummy file. ("Ich Habe Einen Traum" by Uwe Busse (Barcode 9 002723 251203)).
+                new PathMatchSet(new PathMatch("YUCCA.CDS", useEndsWith: true), "Cactus Data Shield 200"),
+
+                // TODO: Find samples of the following: 
                 new PathMatchSet(new PathMatch("CDSPlayer.app", useEndsWith: true), "Cactus Data Shield 200"),
-                new PathMatchSet(new PathMatch("PJSTREAM.DLL", useEndsWith: true), "Cactus Data Shield 200"),
                 new PathMatchSet(new PathMatch("wmmp.exe", useEndsWith: true), "Cactus Data Shield 200"),
 
                 // Present on CDS-300, as well as SafeDisc. This is likely due to both protections being created by Macrovision.

BurnOutSharp/ProtectionType/CodeLock.cs

@@ -22,7 +22,7 @@ namespace BurnOutSharp.ProtectionType
                      {
                          0x43, 0x4F, 0x44, 0x45, 0x2D, 0x4C, 0x4F, 0x43,
                          0x4B, 0x2E, 0x4F, 0x43, 0x58
-                     }, "CodeLock / CodeLok / CopyLok"),
+                     }, "CodeLock / CodeLok / CopyLok (Unconfirmed - Please report to us on Github)"),
                  };
 
                 return MatchUtil.GetFirstMatch(file, fileContent, contentMatchSets, includeDebug);
@@ -38,8 +38,9 @@ namespace BurnOutSharp.ProtectionType
             var sections = pex?.SectionTable;
             if (sections == null)
                 return null;
-            
+
             // If there are more than 2 icd-prefixed sections, then we have a match
+            // Found in Redump entry 31557.
             int icdSectionCount = pex.GetSectionNames().Count(s => s.StartsWith("icd"));
             if (icdSectionCount >= 2)
                 return "CodeLock / CodeLok / CopyLok";

BurnOutSharp/ProtectionType/DVDCrypt.cs

@@ -12,7 +12,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("DvdCrypt.pdb", useEndsWith: true), "DVD Crypt"),
+                new PathMatchSet(new PathMatch("DvdCrypt.pdb", useEndsWith: true), "DVD Crypt (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -23,7 +23,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("DvdCrypt.pdb", useEndsWith: true), "DVD Crypt"),
+                new PathMatchSet(new PathMatch("DvdCrypt.pdb", useEndsWith: true), "DVD Crypt (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/ProtectionType/DVDMoviePROTECT.cs

@@ -23,7 +23,7 @@ namespace BurnOutSharp.ProtectionType
                     FileInfo ifofile = new FileInfo(Path.Combine(bupfile.DirectoryName, bupfile.Name.Substring(0, bupfile.Name.Length - bupfile.Extension.Length) + ".ifo"));
                     if (bupfile.Length != ifofile.Length)
                     {
-                        protections.Enqueue("DVD-Movie-PROTECT");
+                        protections.Enqueue("DVD-Movie-PROTECT (Unconfirmed - Please report to us on Github)");
                         break;
                     }
                 }

BurnOutSharp/ProtectionType/Doc.loc.cs

@@ -0,0 +1,18 @@
+namespace BurnOutSharp.ProtectionType
+{
+    public class DocLoc
+    {
+        // TODO: Implement - https://web.archive.org/web/20060107074801/http://www.docdata.com/
+        // Doc.Loc appears to be a form of audio CD copy protection, used/created by the company DocData. It seems to work by preventing the tracks being read in PC optical drives using a non-standard second session.
+        // List of known information and resources:
+        // https://www.co-bw.com/DMS_how_to_rip_copy_protected_cds.htm
+        // http://forum.redump.org/topic/40001/interesting-list-of-cd-audio-copy-protections/
+        // https://hydrogenaud.io/index.php/topic,7198.75.html
+        // http://cdr.xenoclast.org/issues/cd/bad/
+        // https://myce.wiki/other/Plextor-PX-W4012S-SCSI-32/10/
+        // https://www.discogs.com/release/790336-Various-Yorin-FM-Hitzone-21
+        // https://www.discogs.com/release/188439-Helium-Vola-Helium-Vola
+        // https://web.archive.org/web/20210420093858/https://club.myce.com/t/wolfsheim-casting-shadows-new-doc-loc-version/60377
+        // https://forums.afterdawn.com/threads/emi-copy-control.266790/
+    }
+}

BurnOutSharp/ProtectionType/FreeLock.cs

@@ -12,7 +12,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("FREELOCK.IMG", useEndsWith: true), "FreeLock"),
+                new PathMatchSet(new PathMatch("FREELOCK.IMG", useEndsWith: true), "FreeLock (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -23,7 +23,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("FREELOCK.IMG", useEndsWith: true), "FreeLock"),
+                new PathMatchSet(new PathMatch("FREELOCK.IMG", useEndsWith: true), "FreeLock (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/ProtectionType/IndyVCD.cs

@@ -5,6 +5,10 @@ using BurnOutSharp.Matching;
 
 namespace BurnOutSharp.ProtectionType
 {
+    // http://www.vsubhash.in/ubuntu-gnome-diary.html#play_copy_protected_vcds_indygenius_indyvcd
+    // https://forum.videohelp.com/threads/241664-How-to-copy-this-vcd
+    // https://forum.videohelp.com/threads/315331-VCD-cannot-play-in-PC-but-can-play-in-DVD-player
+    // https://answers.microsoft.com/en-us/windows/forum/all/call-to-dii-register-server-failed/16cb344e-979a-4fb6-a8cd-1c9bc4dd14dd
     public class IndyVCD : IPathCheck
     {
         /// <inheritdoc/>
@@ -13,8 +17,8 @@ namespace BurnOutSharp.ProtectionType
             // TODO: Verify if these are OR or AND
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("INDYVCD.AX", useEndsWith: true), "IndyVCD"),
-                new PathMatchSet(new PathMatch("INDYMP3.idt", useEndsWith: true), "IndyVCD"),
+                new PathMatchSet(new PathMatch("INDYVCD.AX", useEndsWith: true), "IndyVCD (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("INDYMP3.idt", useEndsWith: true), "IndyVCD (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -25,8 +29,8 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("INDYVCD.AX", useEndsWith: true), "IndyVCD"),
-                new PathMatchSet(new PathMatch("INDYMP3.idt", useEndsWith: true), "IndyVCD"),
+                new PathMatchSet(new PathMatch("INDYVCD.AX", useEndsWith: true), "IndyVCD (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("INDYMP3.idt", useEndsWith: true), "IndyVCD (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/ProtectionType/KeyLock.cs

@@ -19,7 +19,7 @@ namespace BurnOutSharp.ProtectionType
                     {
                         0x4B, 0x45, 0x59, 0x2D, 0x4C, 0x4F, 0x43, 0x4B,
                         0x20, 0x43, 0x4F, 0x4D, 0x4D, 0x41, 0x4E, 0x44
-                    }, "Key-Lock (Dongle)"),
+                    }, "Key-Lock (Dongle) (Unconfirmed - Please report to us on Github)"),
                 };
 
                 return MatchUtil.GetFirstMatch(file, fileContent, contentMatchSets, includeDebug);

BurnOutSharp/ProtectionType/PlayJ.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using BurnOutSharp.ExecutableType.Microsoft.PE;
+using BurnOutSharp.Interfaces;
+using BurnOutSharp.Matching;
+
+namespace BurnOutSharp.ProtectionType
+{
+    /// <summary>
+    /// PlayJ (https://web.archive.org/web/20000815053956/http://www.playj.com/) by EverAd was a form of DRM protected audio that was intended to be distributed freely, but that showed advertisements to the listener.
+    /// This format didn't live for very long, having started in the February of 2000 (https://web.archive.org/web/20000301013405/http://www.playj.com/digital_music.htm) and ending with the parent company shutting down in 2001 (https://www.thestreet.com/technology/everad-closes-down-after-having-raised-345m-in-past-two-years-1505964).
+    /// The file format itself appears to be an encrypted MP3 (https://www.wired.com/2000/03/ads-take-aim-at-online-music/).
+    /// The IANA assignment for the PlayJ format: https://www.iana.org/assignments/media-types/audio/vnd.everad.plj
+    /// The official player has been archived and can still be used to listen to the music (https://web.archive.org/web/20010417025347/http://dlp.playj.com:80/playj/PlayJIns266.exe).
+    /// The music files themselves do not contain advertisements, which is instead handled on the side of the music players and plugins capable of playing the format.
+    /// According to the ReadMe.txt found in https://web.archive.org/web/20010417025347/http://dlp.playj.com:80/playj/PlayJIns266.exe, there's 2 distinct versions of the format. The differences between versions are currently unknown.
+    /// There are a few sources of PlayJ music archived online, these being a few examples:
+    /// https://web.archive.org/web/*/http://dlp.playj.com/*/
+    /// https://web.archive.org/web/*/http://brightnet.music.tucows.com/*/
+    /// Also noted in the ReadMe.txt present in https://web.archive.org/web/20010417025347/http://dlp.playj.com:80/playj/PlayJIns266.exe as hosting PlayJ music:
+    /// http://www.listen.com
+    /// http://www.launch.com
+    /// Further information and resources:
+    /// https://www.entrepreneur.com/business-news/sales-marketing-playing-around/33284
+    /// https://www.adweek.com/brand-marketing/j-records-and-everad-ink-pact-47882/
+    /// https://adage.com/article/news/everad-s-playj-partners-clive-davis-j-records/11043
+    /// https://www.nytimes.com/2000/07/07/technology/search-for-digital-music-revenue-takes-new-direction.html
+    /// </summary>
+    public class PlayJ : IPathCheck, IPortableExecutableCheck
+    {
+        public string CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
+        {
+            // Get the sections from the executable, if possible
+            var sections = pex?.SectionTable;
+            if (sections == null)
+                return null;
+
+            // Found in "PlayJ.exe" (https://web.archive.org/web/20010417025347/http://dlp.playj.com:80/playj/PlayJIns266.exe) and "CACTUSPJ.exe" ("Volumia!" by Puur (Barcode 7 43218 63282 2) (Discogs Release Code [r795427])).
+            string name = pex.FileDescription;
+            if (!string.IsNullOrWhiteSpace(name) && name.StartsWith("PlayJ Music Player", StringComparison.OrdinalIgnoreCase))
+                return $"PlayJ Music Player";
+            // Found in "PJSTREAM.DLL" ("Volumia!" by Puur (Barcode 7 43218 63282 2) (Discogs Release Code [r795427])).
+            name = pex.FileDescription;
+            if (!string.IsNullOrWhiteSpace(name) && name.StartsWith("EVAUX32 Module", StringComparison.OrdinalIgnoreCase))
+                return $"PlayJ Music Player Component";
+            // Found in "PlayJ.exe" (https://web.archive.org/web/20010417025347/http://dlp.playj.com:80/playj/PlayJIns266.exe) and "CACTUSPJ.exe" ("Volumia!" by Puur (Barcode 7 43218 63282 2) (Discogs Release Code [r795427])).
+            name = pex.ProductName;
+            if (!string.IsNullOrWhiteSpace(name) && name.StartsWith("PlayJ", StringComparison.OrdinalIgnoreCase))
+                return $"PlayJ";
+
+            return null;
+        }
+
+        /// <inheritdoc/>
+        public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)
+        {
+            var matchers = new List<PathMatchSet>
+            {
+                // Found in https://web.archive.org/web/20010417025347/http://dlp.playj.com:80/playj/PlayJIns266.exe.
+                // The files "Data8.bml" and "Data16.bml" are also present in the installation directory, but it is currently unknown if they are specific to this DRM or not.
+                new PathMatchSet(new PathMatch("PlayJ.exe", useEndsWith: true), "PlayJ Music Player"),
+                new PathMatchSet(new PathMatch("PLJFilter.ax", useEndsWith: true), "PlayJ Windows Media Player Plug-in"),
+
+                // Found in "Volumia!" by Puur (Barcode 7 43218 63282 2) (Discogs Release Code [r795427]).
+                new PathMatchSet(new PathMatch("PJSTREAM.DLL", useEndsWith: true), "PlayJ Music Player Component"),
+            };
+
+            return MatchUtil.GetAllMatches(files, matchers, any: false);
+        }
+
+        /// <inheritdoc/>
+        public string CheckFilePath(string path)
+        {
+            var matchers = new List<PathMatchSet>
+            {
+                // Found in https://web.archive.org/web/20010417025347/http://dlp.playj.com:80/playj/PlayJIns266.exe.
+                // The files "Data8.bml" and "Data16.bml" are also present in the installation directory, but it is currently unknown if they are specific to this DRM or not.
+                new PathMatchSet(new PathMatch("PlayJ.exe", useEndsWith: true), "PlayJ Music Player"),
+                new PathMatchSet(new PathMatch("PLJFilter.ax", useEndsWith: true), "PlayJ Windows Media Player Plug-in"),
+
+                // Found in "Volumia!" by Puur (Barcode 7 43218 63282 2) (Discogs Release Code [r795427]).
+                new PathMatchSet(new PathMatch("PJSTREAM.DLL", useEndsWith: true), "PlayJ Music Player Component"),
+            };
+
+            return MatchUtil.GetFirstMatch(path, matchers, any: true);
+        }
+    }
+}

BurnOutSharp/ProtectionType/ProtectDVDVideo.cs

@@ -22,7 +22,7 @@ namespace BurnOutSharp.ProtectionType
                     FileInfo ifofile = new FileInfo(ifofiles[i]);
                     if (ifofile.Length == 0)
                     {
-                        protections.Enqueue("Protect DVD-Video");
+                        protections.Enqueue("Protect DVD-Video (Unconfirmed - Please report to us on Github)");
                         break;
                     }
                 }

BurnOutSharp/ProtectionType/RingPROTECH.cs

@@ -6,6 +6,7 @@ using BurnOutSharp.Matching;
 namespace BurnOutSharp.ProtectionType
 {
     // Renamed to ProRing at some point
+    // TODO: Investigate Redump entry 82475, which PiD detects as having "Optgraph Copy-X / Ring-Protech".
     public class RingPROTECH : IContentCheck, IPathCheck
     {
         /// <inheritdoc/>
@@ -21,7 +22,7 @@ namespace BurnOutSharp.ProtectionType
                     {
                         0x00, 0x41, 0x6C, 0x6C, 0x6F, 0x63, 0x61, 0x74,
                         0x6F, 0x72, 0x00, 0x00, 0x00, 0x00
-                    }, "Ring PROTECH / ProRing [Check disc for physical ring]"),
+                    }, "Ring PROTECH / ProRing [Check disc for physical ring] (Unconfirmed - Please report to us on Github)"),
                 };
 
                 return MatchUtil.GetFirstMatch(file, fileContent, contentMatchSets, includeDebug);
@@ -37,6 +38,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
+                // Found in Redump entry 94161
                 new PathMatchSet(new PathMatch("protect.pro", useEndsWith: true), "Ring PROTECH / ProRing [Check disc for physical ring]"),
             };
 
@@ -48,6 +50,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
+                // Found in Redump entry 94161
                 new PathMatchSet(new PathMatch("protect.pro", useEndsWith: true), "Ring PROTECH / ProRing [Check disc for physical ring]"),
             };
 

BurnOutSharp/ProtectionType/SafeDisc.cs

@@ -119,6 +119,17 @@ namespace BurnOutSharp.ProtectionType
                     new PathMatch(".256", useEndsWith: true),
                 }, "SafeDisc 1.06.000+"),
 
+                // The file "mcp.dll" is known to only be used in a specific version range for SafeDisc, but is currently only used in a grouped file name check with other SafeDisc files to prevent false positives.
+                // Found in Redump entries 28810, 30555, 55078, and 62935.
+                new PathMatchSet(new List<PathMatch>
+                {
+                    new PathMatch("00000001.TMP", useEndsWith: true),
+                    new PathMatch("drvmgt.dll", useEndsWith: true),
+                    new PathMatch("mcp.dll", useEndsWith: true),
+                    new PathMatch("secdrv.sys", useEndsWith: true),
+
+                }, "SafeDisc 1.45.011-1.50.020"),
+
                 // TODO: Research "splash16.bmp" and "splash256.bmp".
 
                 // Found to be present in every version of SafeDisc, possibly every single release.

BurnOutSharp/ProtectionType/SoftLock.cs

@@ -13,8 +13,8 @@ namespace BurnOutSharp.ProtectionType
             // TODO: Verify if these are OR or AND
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("SOFTLOCKI.dat", useEndsWith: true), "SoftLock"),
-                new PathMatchSet(new PathMatch("SOFTLOCKC.dat", useEndsWith: true), "SoftLock"),
+                new PathMatchSet(new PathMatch("SOFTLOCKI.dat", useEndsWith: true), "SoftLock (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("SOFTLOCKC.dat", useEndsWith: true), "SoftLock (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -25,8 +25,8 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("SOFTLOCKI.dat", useEndsWith: true), "SoftLock"),
-                new PathMatchSet(new PathMatch("SOFTLOCKC.dat", useEndsWith: true), "SoftLock"),
+                new PathMatchSet(new PathMatch("SOFTLOCKI.dat", useEndsWith: true), "SoftLock (Unconfirmed - Please report to us on Github)"),
+                new PathMatchSet(new PathMatch("SOFTLOCKC.dat", useEndsWith: true), "SoftLock (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/ProtectionType/TZCopyProtector.cs

@@ -12,7 +12,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("_742893.016", useEndsWith: true), "TZCopyProtector"),
+                new PathMatchSet(new PathMatch("_742893.016", useEndsWith: true), "TZCopyProtector (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -23,7 +23,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("_742893.016", useEndsWith: true), "TZCopyProtector"),
+                new PathMatchSet(new PathMatch("_742893.016", useEndsWith: true), "TZCopyProtector (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/ProtectionType/Winlock.cs

@@ -12,7 +12,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("WinLock.PSX", useEndsWith: true), "Winlock"),
+                new PathMatchSet(new PathMatch("WinLock.PSX", useEndsWith: true), "Winlock (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -23,7 +23,7 @@ namespace BurnOutSharp.ProtectionType
         {
             var matchers = new List<PathMatchSet>
             {
-                new PathMatchSet(new PathMatch("WinLock.PSX", useEndsWith: true), "Winlock"),
+                new PathMatchSet(new PathMatch("WinLock.PSX", useEndsWith: true), "Winlock (Unconfirmed - Please report to us on Github)"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BurnOutSharp/Scanner.cs

@@ -264,7 +264,7 @@ namespace BurnOutSharp
                 if (IncludeDebug) Console.WriteLine(ex);
 
                 var protections = new ConcurrentDictionary<string, ConcurrentQueue<string>>();
-                Utilities.AppendToDictionary(protections, file, "[Exception opening file, please try again]");
+                Utilities.AppendToDictionary(protections, file, IncludeDebug ? ex.ToString() : "[Exception opening file, please try again]");
                 Utilities.ClearEmptyKeys(protections);
                 return protections;
             }
@@ -314,6 +314,13 @@ namespace BurnOutSharp
                     Utilities.AppendToDictionary(protections, subProtections);
                 }
 
+                // PLJ
+                if (new PLJ().ShouldScan(magic))
+                {
+                    var subProtections = new PLJ().Scan(this, stream, fileName);
+                    Utilities.AppendToDictionary(protections, subProtections);
+                }
+
                 // Text-based files
                 if (new Textfile().ShouldScan(magic, extension))
                 {
@@ -447,7 +454,7 @@ namespace BurnOutSharp
             {
                 if (IncludeDebug) Console.WriteLine(ex);
 
-                Utilities.AppendToDictionary(protections, fileName, "[Exception opening file, please try again]");
+                Utilities.AppendToDictionary(protections, fileName, IncludeDebug ? ex.ToString() : "[Exception opening file, please try again]");
             }
 
             // Clear out any empty keys

README.md

@@ -30,13 +30,13 @@ Below is a list of protections detected by BurnOutSharp. The two columns explain
 | ActiveMARK | True | False | Version 5 unconfirmed²; version finding incomplete |
 | AegiSoft License Manager | True | True | |
 | Alpha-DVD | False | True | Unconfirmed¹ |
-| Alpha-ROM | True | False | Unconfirmed¹ |
+| Alpha-ROM | True | False | |
 | BD+ | False | True | |
 | Bitpool | False | True | |
 | ByteShield | False | True | Unconfirmed¹ |
 | Cactus Data Shield | True | True | |
 | CD-Cops / DVD-Cops | True | True | Partially unconfirmed² |
-| CD-Lock | True | True | Unconfirmed¹ |
+| CD-Lock | True | True | |
 | CD-Protector | False | True | Unconfirmed¹ |
 | CD-X | False | True | Unconfirmed¹ |
 | CDSHiELD SE | True | False | |
@@ -70,12 +70,13 @@ Below is a list of protections detected by BurnOutSharp. The two columns explain
 | OpenMG | True | True | |
 | Origin | True | True | |
 | phenoProtect | False | False | Text file check only |
+| PlayJ | True | True | |
 | ProtectDISC / VOB ProtectCD/DVD | True | False | |
 | Protect DVD-Video | False | True | Unconfirmed¹ |
 | PlayStation Anti-modchip | True | False | En/Jp, not "Red Hand"; PSX executables only |
-| Ring PROTECH / ProRing | True | True | Unconfirmed¹ |
+| Ring PROTECH / ProRing | True | True | Partially unconfirmed² |
 | SafeDisc / SafeCast | True | True | Can't distinguish between some versions of SafeDisc and SafeCast |
-| SafeLock | False | True | Unconfirmed¹ |
+| SafeLock | False | True | |
 | SecuROM | True | True | v8.x and White Label detected partially² |
 | SmartE | True | True | |
 | SoftLock | False | True | Unconfirmed¹ |
@@ -109,6 +110,7 @@ Below is a list of protections that have been identified but have not yet been i
 - CrypKey
 - DBB
 - DiscAudit
+- Doc.loc
 - FADE
 - MusicGuard
 - Roxxe
@@ -177,4 +179,4 @@ Contributions to the project are welcome. Please follow the current coding style
 
 ## Special Thanks
 
-I want to give a special thanks to [SilasLaspada](https://github.com/SilasLaspada) who has gone above and beyond helping both fix existing checks as well as add new ones.
+I want to give a special thanks to [TheRogueArchivist](https://github.com/TheRogueArchivist) who has gone above and beyond helping both fix existing checks as well as add new ones.