Bump version

Fixes folder extraction for 7z, RAR, and WinRAR SFX. Applied same fix to tar, but more is needed for it to work properly.

.github/workflows/build_test.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         project: [Test]
-        runtime: [win-x86, win-x64, linux-x64, osx-x64] #[win-x86, win-x64, win-arm64, linux-x64, linux-arm64, osx-x64]
+        runtime: [win-x86, win-x64, win-arm64, linux-x64, linux-arm64, osx-x64]
         framework: [net8.0] #[net20, net35, net40, net452, net472, net48, netcoreapp3.1, net5.0, net6.0, net7.0, net8.0]
         conf: [Release, Debug]
 

BinaryObjectScanner/BinaryObjectScanner.csproj

@@ -10,8 +10,10 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
-    <!-- <TreatWarningsAsErrors>true</TreatWarningsAsErrors> --> <!-- Can't be enabled because of external code -->
-    <Version>3.1.4</Version>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Version>3.1.14</Version>
+    <!-- Mostly added due to external libraries -->
+    <WarningsNotAsErrors>CS0162;CS0612;CS8600;CS8601;CS8602;CS8603;CS8604;CS8605;CS8618;CS8625;CS8634;CS8765;IL3000;NU5100</WarningsNotAsErrors>
   
     <!-- Package Properties -->
     <Authors>Matt Nadareski</Authors>
@@ -51,7 +53,7 @@
   </PropertyGroup>
 
   <!-- These are needed for dealing with native Windows DLLs -->
-  <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`))">
+  <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND $(RuntimeIdentifier.StartsWith(`win-x86`))">
     <Content Include="*.dll">
       <Pack>true</Pack>
       <PackagePath>contentFiles;content</PackagePath>
@@ -73,7 +75,7 @@
     <PackageReference Include="OpenMcdf" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))">
-    <PackageReference Include="SharpCompress" Version="0.36.0" />
+    <PackageReference Include="SharpCompress" Version="0.38.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith(`net4`)) AND !$(TargetFramework.StartsWith(`net40`))">
@@ -81,14 +83,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SabreTools.Compression" Version="0.4.1" />
+    <PackageReference Include="SabreTools.Compression" Version="0.5.1" />
     <PackageReference Include="SabreTools.Hashing" Version="1.2.0" />
-    <PackageReference Include="SabreTools.IO" Version="1.3.3" />
+    <PackageReference Include="SabreTools.IO" Version="1.4.11" />
     <PackageReference Include="SabreTools.Matching" Version="1.3.1" />
-    <PackageReference Include="SabreTools.Models" Version="1.4.1" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.4.3" />
-    <PackageReference Include="UnshieldSharp" Version="1.7.4" />
-    <PackageReference Include="WiseUnpacker" Version="1.3.2" />
+    <PackageReference Include="SabreTools.Models" Version="1.4.8" />
+    <PackageReference Include="SabreTools.Serialization" Version="1.6.7" />
+    <PackageReference Include="UnshieldSharp" Version="1.8.3" />
+    <PackageReference Include="WiseUnpacker" Version="1.4.2" />
   </ItemGroup>
 
 </Project>

BinaryObjectScanner/Factory.cs

@@ -1,5 +1,5 @@
 using BinaryObjectScanner.Interfaces;
-using BinaryObjectScanner.Utilities;
+using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner
 {
@@ -8,20 +8,22 @@ namespace BinaryObjectScanner
         /// <summary>
         /// Create an instance of a detectable based on file type
         /// </summary>
-        public static IDetectable? CreateDetectable(SupportedFileType fileType)
+        public static IDetectable? CreateDetectable(WrapperType fileType)
         {
             switch (fileType)
             {
-                case SupportedFileType.AACSMediaKeyBlock: return new FileType.AACSMediaKeyBlock();
-                case SupportedFileType.BDPlusSVM: return new FileType.BDPlusSVM();
-                //case SupportedFileType.CIA: return new FileType.CIA();
-                case SupportedFileType.Executable: return new FileType.Executable();
-                case SupportedFileType.LDSCRYPT: return new FileType.LDSCRYPT();
-                //case SupportedFileType.N3DS: return new FileType.N3DS();
-                //case SupportedFileType.Nitro: return new FileType.Nitro();
-                case SupportedFileType.PLJ: return new FileType.PLJ();
-                case SupportedFileType.SFFS: return new FileType.SFFS();
-                case SupportedFileType.Textfile: return new FileType.Textfile();
+                case WrapperType.AACSMediaKeyBlock: return new FileType.AACSMediaKeyBlock();
+                case WrapperType.BDPlusSVM: return new FileType.BDPlusSVM();
+                //case WrapperType.CIA: return new FileType.CIA();
+                case WrapperType.Executable: return new FileType.Executable();
+                case WrapperType.LDSCRYPT: return new FileType.LDSCRYPT();
+                //case WrapperType.N3DS: return new FileType.N3DS();
+                //case WrapperType.Nitro: return new FileType.Nitro();
+                case WrapperType.PlayJAudioFile: return new FileType.PLJ();
+                case WrapperType.RealArcadeInstaller: return new FileType.RealArcadeInstaller();
+                case WrapperType.RealArcadeMezzanine: return new FileType.RealArcadeMezzanine();
+                case WrapperType.SFFS: return new FileType.SFFS();
+                case WrapperType.Textfile: return new FileType.Textfile();
                 default: return null;
             }
         }
@@ -29,40 +31,40 @@ namespace BinaryObjectScanner
         /// <summary>
         /// Create an instance of an extractable based on file type
         /// </summary>
-        public static IExtractable? CreateExtractable(SupportedFileType fileType)
+        public static IExtractable? CreateExtractable(WrapperType fileType)
         {
             switch (fileType)
             {
-                case SupportedFileType.BFPK: return new FileType.BFPK();
-                case SupportedFileType.BSP: return new FileType.BSP();
-                case SupportedFileType.BZip2: return new FileType.BZip2();
-                case SupportedFileType.CFB: return new FileType.CFB();
-                //case SupportedFileType.CIA: return new FileType.CIA();
-                case SupportedFileType.GCF: return new FileType.GCF();
-                case SupportedFileType.GZIP: return new FileType.GZIP();
-                case SupportedFileType.InstallShieldArchiveV3: return new FileType.InstallShieldArchiveV3();
-                case SupportedFileType.InstallShieldCAB: return new FileType.InstallShieldCAB();
-                case SupportedFileType.MicrosoftCAB: return new FileType.MicrosoftCAB();
-                case SupportedFileType.MicrosoftLZ: return new FileType.MicrosoftLZ();
-                case SupportedFileType.MPQ: return new FileType.MPQ();
-                //case SupportedFileType.N3DS: return new FileType.N3DS();
-                //case SupportedFileType.NCF: return new FileType.NCF();
-                //case SupportedFileType.Nitro: return new FileType.Nitro();
-                case SupportedFileType.PAK: return new FileType.PAK();
-                case SupportedFileType.PFF: return new FileType.PFF();
-                case SupportedFileType.PKZIP: return new FileType.PKZIP();
-                //case SupportedFileType.PLJ: return new FileType.PLJ();
-                //case SupportedFileType.Quantum: return new FileType.Quantum();
-                case SupportedFileType.RAR: return new FileType.RAR();
-                case SupportedFileType.SevenZip: return new FileType.SevenZip();
-                case SupportedFileType.SFFS: return new FileType.SFFS();
-                case SupportedFileType.SGA: return new FileType.SGA();
-                case SupportedFileType.TapeArchive: return new FileType.TapeArchive();
-                case SupportedFileType.VBSP: return new FileType.VBSP();
-                case SupportedFileType.VPK: return new FileType.VPK();
-                case SupportedFileType.WAD: return new FileType.WAD();
-                case SupportedFileType.XZ: return new FileType.XZ();
-                case SupportedFileType.XZP: return new FileType.XZP();
+                case WrapperType.BFPK: return new FileType.BFPK();
+                case WrapperType.BSP: return new FileType.BSP();
+                case WrapperType.BZip2: return new FileType.BZip2();
+                case WrapperType.CFB: return new FileType.CFB();
+                //case WrapperType.CIA: return new FileType.CIA();
+                case WrapperType.GCF: return new FileType.GCF();
+                case WrapperType.GZIP: return new FileType.GZIP();
+                case WrapperType.InstallShieldArchiveV3: return new FileType.InstallShieldArchiveV3();
+                case WrapperType.InstallShieldCAB: return new FileType.InstallShieldCAB();
+                case WrapperType.MicrosoftCAB: return new FileType.MicrosoftCAB();
+                case WrapperType.MicrosoftLZ: return new FileType.MicrosoftLZ();
+                case WrapperType.MoPaQ: return new FileType.MPQ();
+                //case WrapperType.N3DS: return new FileType.N3DS();
+                //case WrapperType.NCF: return new FileType.NCF();
+                //case WrapperType.Nitro: return new FileType.Nitro();
+                case WrapperType.PAK: return new FileType.PAK();
+                case WrapperType.PFF: return new FileType.PFF();
+                case WrapperType.PKZIP: return new FileType.PKZIP();
+                //case WrapperType.PlayJAudioFile: return new FileType.PLJ();
+                //case WrapperType.Quantum: return new FileType.Quantum();
+                case WrapperType.RAR: return new FileType.RAR();
+                case WrapperType.SevenZip: return new FileType.SevenZip();
+                case WrapperType.SFFS: return new FileType.SFFS();
+                case WrapperType.SGA: return new FileType.SGA();
+                case WrapperType.TapeArchive: return new FileType.TapeArchive();
+                case WrapperType.VBSP: return new FileType.VBSP();
+                case WrapperType.VPK: return new FileType.VPK();
+                case WrapperType.WAD: return new FileType.WAD();
+                case WrapperType.XZ: return new FileType.XZ();
+                case WrapperType.XZP: return new FileType.XZP();
                 default: return null;
             }
         }

BinaryObjectScanner/FileType/Executable.cs

@@ -7,7 +7,9 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+#if NET40_OR_GREATER || NETCOREAPP
 using System.Threading.Tasks;
+#endif
 using BinaryObjectScanner.Interfaces;
 using BinaryObjectScanner.Utilities;
 using SabreTools.Serialization.Wrappers;

BinaryObjectScanner/FileType/GZIP.cs

@@ -42,10 +42,14 @@ namespace BinaryObjectScanner.FileType
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
                             string tempFile = Path.Combine(tempPath, entry.Key);
                             entry.WriteToFile(tempFile);
                         }

BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs

@@ -1,8 +1,6 @@
 using System;
 using System.IO;
-using System.Linq;
 using BinaryObjectScanner.Interfaces;
-using UnshieldSharp.Archive;
 
 namespace BinaryObjectScanner.FileType
 {
@@ -31,16 +29,16 @@ namespace BinaryObjectScanner.FileType
                 Directory.CreateDirectory(tempPath);
 
                 UnshieldSharp.Archive.InstallShieldArchiveV3 archive = new UnshieldSharp.Archive.InstallShieldArchiveV3(file);
-                foreach (CompressedFile cfile in archive.Files.Select(kvp => kvp.Value))
+                foreach (var cfile in archive.Files)
                 {
                     try
                     {
-                        string tempFile = Path.Combine(tempPath, cfile.FullPath!);
+                        string tempFile = Path.Combine(tempPath, cfile.Key);
                         var directoryName = Path.GetDirectoryName(tempFile);
                         if (directoryName != null && !Directory.Exists(directoryName))
                             Directory.CreateDirectory(directoryName);
 
-                        (byte[]? fileContents, string? error) = archive.Extract(cfile.FullPath!);
+                        (byte[]? fileContents, string? error) = archive.Extract(cfile.Key);
                         if (fileContents == null || !string.IsNullOrEmpty(error))
                             continue;
 

BinaryObjectScanner/FileType/InstallShieldCAB.cs

@@ -59,21 +59,21 @@ namespace BinaryObjectScanner.FileType
                 Directory.CreateDirectory(tempPath);
 
                 var cabfile = InstallShieldCabinet.Open(file);
-                if (cabfile == null)
+                if (cabfile?.HeaderList == null)
                     return null;
 
-                for (int i = 0; i < cabfile.FileCount; i++)
+                for (int i = 0; i < cabfile.HeaderList.FileCount; i++)
                 {
                     try
                     {
                         // Check if the file is valid first
-                        if (!cabfile.FileIsValid(i))
+                        if (!cabfile.HeaderList.FileIsValid(i))
                             continue;
 
                         string tempFile;
                         try
                         {
-                            string? filename = cabfile.FileName(i);
+                            string? filename = cabfile.HeaderList.GetFileName(i);
                             tempFile = Path.Combine(tempPath, filename ?? string.Empty);
                         }
                         catch

BinaryObjectScanner/FileType/PKZIP.cs

@@ -42,10 +42,18 @@ namespace BinaryObjectScanner.FileType
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
+                            // If the entry is partial due to an incomplete multi-part archive, skip it
+                            if (!entry.IsComplete)
+                                continue;
+
                             string tempFile = Path.Combine(tempPath, entry.Key);
                             var directoryName = Path.GetDirectoryName(tempFile);
                             if (directoryName != null && !Directory.Exists(directoryName))

BinaryObjectScanner/FileType/RAR.cs

@@ -42,11 +42,22 @@ namespace BinaryObjectScanner.FileType
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
+                            // If we have a partial entry due to an incomplete multi-part archive, skip it
+                            if (!entry.IsComplete)
+                                continue;
+
                             string tempFile = Path.Combine(tempPath, entry.Key);
+                            var directoryName = Path.GetDirectoryName(tempFile);
+                            if (directoryName != null && !Directory.Exists(directoryName))
+                                Directory.CreateDirectory(directoryName);
                             entry.WriteToFile(tempFile);
                         }
                         catch (Exception ex)

BinaryObjectScanner/FileType/RealArcadeInstaller.cs

@@ -0,0 +1,48 @@
+using System;
+using System.IO;
+using BinaryObjectScanner.Interfaces;
+using SabreTools.Matching;
+
+namespace BinaryObjectScanner.FileType
+{
+    /// <summary>
+    /// RealArcade Installer. Known to use the ".rgs" file extension.
+    /// 
+    /// TODO: Add further parsing, game ID and name should be possible to parse.
+    /// </summary>
+    public class RealArcadeInstaller : IDetectable
+    {
+        /// <inheritdoc/>
+        public string? Detect(string file, bool includeDebug)
+        {
+            if (!File.Exists(file))
+                return null;
+
+            using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+            {
+                return Detect(fs, file, includeDebug);
+            }
+        }
+
+        /// <inheritdoc/>
+        public string? Detect(Stream stream, string file, bool includeDebug)
+        {
+            try
+            {
+                byte[] magic = new byte[16];
+                stream.Read(magic, 0, 16);
+
+                // RASGI2.0
+                // Found in the ".rgs" files in IA item "Nova_RealArcadeCD_USA".
+                if (magic.StartsWith(new byte?[] { 0x52, 0x41, 0x53, 0x47, 0x49, 0x32, 0x2E, 0x30 }))
+                    return "RealArcade Installer";
+            }
+            catch (Exception ex)
+            {
+                if (includeDebug) Console.WriteLine(ex);
+            }
+
+            return null;
+        }
+    }
+}

BinaryObjectScanner/FileType/RealArcadeMezzanine.cs

@@ -0,0 +1,48 @@
+using System;
+using System.IO;
+using BinaryObjectScanner.Interfaces;
+using SabreTools.Matching;
+
+namespace BinaryObjectScanner.FileType
+{
+    /// <summary>
+    /// RealArcade Mezzanine files, which contain metadata. Known to use the ".mez" file extension.
+    /// 
+    /// TODO: Add further parsing, game ID should be possible to parse.
+    /// </summary>
+    public class RealArcadeMezzanine : IDetectable
+    {
+        /// <inheritdoc/>
+        public string? Detect(string file, bool includeDebug)
+        {
+            if (!File.Exists(file))
+                return null;
+
+            using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+            {
+                return Detect(fs, file, includeDebug);
+            }
+        }
+
+        /// <inheritdoc/>
+        public string? Detect(Stream stream, string file, bool includeDebug)
+        {
+            try
+            {
+                byte[] magic = new byte[16];
+                stream.Read(magic, 0, 16);
+
+                // XZip2.0
+                // Found in the ".mez" files in IA item "Nova_RealArcadeCD_USA".
+                if (magic.StartsWith(new byte?[] { 0x58, 0x5A, 0x69, 0x70, 0x32, 0x2E, 0x30 }))
+                    return "RealArcade Mezzanine";
+            }
+            catch (Exception ex)
+            {
+                if (includeDebug) Console.WriteLine(ex);
+            }
+
+            return null;
+        }
+    }
+}

BinaryObjectScanner/FileType/SevenZip.cs

@@ -26,6 +26,9 @@ namespace BinaryObjectScanner.FileType
         /// <inheritdoc/>
         public string? Extract(Stream? stream, string file, bool includeDebug)
         {
+            if (stream == null)
+                return null;
+
 #if NET462_OR_GREATER || NETCOREAPP
             try
             {
@@ -39,11 +42,22 @@ namespace BinaryObjectScanner.FileType
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
+                            // If we have a partial entry due to an incomplete multi-part archive, skip it
+                            if (!entry.IsComplete)
+                                continue;
+
                             string tempFile = Path.Combine(tempPath, entry.Key);
+                            var directoryName = Path.GetDirectoryName(tempFile);
+                            if (directoryName != null && !Directory.Exists(directoryName))
+                                Directory.CreateDirectory(directoryName);
                             entry.WriteToFile(tempFile);
                         }
                         catch (Exception ex)

BinaryObjectScanner/FileType/TapeArchive.cs

@@ -42,11 +42,23 @@ namespace BinaryObjectScanner.FileType
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
+                            // If we have a partial entry due to an incomplete multi-part archive, skip it
+                            if (!entry.IsComplete)
+                                continue;
+
+                            // TODO: Fix bug with extracting folders from tar.
                             string tempFile = Path.Combine(tempPath, entry.Key);
+                            var directoryName = Path.GetDirectoryName(tempFile);
+                            if (directoryName != null && !Directory.Exists(directoryName))
+                                Directory.CreateDirectory(directoryName);
                             entry.WriteToFile(tempFile);
                         }
                         catch (Exception ex)

BinaryObjectScanner/FileType/Textfile.cs

@@ -54,6 +54,14 @@ namespace BinaryObjectScanner.FileType
                 else if (fileContent.Contains("Please enter a valid registration number"))
                     protections.Add("CD-Key / Serial");
 
+                // Channelware
+                // Found in "README.TXT" in Redump entry 116358.
+                if (fileContent.Contains("This application is a Channelware-activated product."))
+                    protections.Add("Channelware");
+                // Found in "Swr.dat" in the "TOYSTORY" installation folder from Redump entry 12354.
+                if (fileContent.Contains("cwsw.com/authts"))
+                    protections.Add("Channelware");
+
                 // CopyKiller
                 // Found in "autorun.dat" in CopyKiller versions 3.62 and 3.64.
                 if (fileContent.Contains("CopyKiller CD-Protection V3.6x"))
@@ -100,13 +108,24 @@ namespace BinaryObjectScanner.FileType
                     protections.Add("MediaMax CD-3");
 
                 // phenoProtect
+                // Found in Redump entry 84082.
                 if (fileContent.Contains("phenoProtect"))
                     protections.Add("phenoProtect");
+                // Additional check to minimize overmatching.
+                if (fileContent.Contains("InstallSHIELD Software Coporation"))
+                    // Found in Redump entry 102493.
+                    if (fileContent.Contains("COPYPROTECTION_FAILEDR"))
+                        protections.Add("phenoProtect");
 
                 // Rainbow Sentinel
                 // Found in "SENTW95.HLP" and "SENTINEL.HLP" in BA entry "Autodesk AutoCAD LT 98 (1998) (CD) [English] [Dutch]".
                 if (fileContent.Contains("Rainbow Sentinel Driver Help"))
                     protections.Add("Rainbow Sentinel");
+                // Found in "\disc4\cad\sdcc_200.zip\DISK1\_USER1.HDR\Language_Independent_Intel_32_Files\SNTNLUSB.INF" in "CICA 32 For Windows CD-ROM (Walnut Creek) (October 1999) (Disc 4).iso" in IA item "CICA_32_For_Windows_CD-ROM_Walnut_Creek_October_1999".
+                if (fileContent.Contains("SNTNLUSB.SvcDesc=\"Rainbow Security Device\""))
+                    protections.Add("Rainbow Sentinel USB Driver");
+                if (fileContent.Contains("SntUsb95.SvcDesc=\"Rainbow Security Device\""))
+                    protections.Add("Rainbow Sentinel USB Driver");
 
                 // Found in "OEMSETUP.INF" in BA entry "Autodesk AutoCAD LT 98 (1998) (CD) [English] [Dutch]".
                 if (fileContent.Contains("Sentinel Driver Disk"))

BinaryObjectScanner/FileType/VPK.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
-using SabreTools.IO;
+using SabreTools.IO.Extensions;
 
 namespace BinaryObjectScanner.FileType
 {

BinaryObjectScanner/Packer/EmbeddedExecutable.cs

@@ -33,6 +33,10 @@ namespace BinaryObjectScanner.Packer
         {
             try
             {
+                // If there are no resources
+                if (pex.ResourceData == null)
+                    return null;
+
                 // Get the resources that have an executable signature
                 var resources = pex.ResourceData
                     .Where(kvp => kvp.Value != null && kvp.Value is byte[])
@@ -57,11 +61,8 @@ namespace BinaryObjectScanner.Packer
                         tempFile = Path.Combine(tempPath, tempFile);
 
                         // Write the resource data to a temp file
-                        using (var tempStream = File.Open(tempFile, FileMode.Create, FileAccess.Write, FileShare.ReadWrite))
-                        {
-                            if (tempStream != null)
-                                tempStream.Write(data, 0, data.Length);
-                        }
+                        using var tempStream = File.Open(tempFile, FileMode.Create, FileAccess.Write, FileShare.ReadWrite);
+                        tempStream?.Write(data, 0, data.Length);
                     }
                     catch (Exception ex)
                     {

BinaryObjectScanner/Packer/SevenZipSFX.cs

@@ -1,10 +1,16 @@
+using System;
+using System.IO;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using SabreTools.Serialization.Wrappers;
+#if NET462_OR_GREATER || NETCOREAPP
+using SharpCompress.Archives;
+using SharpCompress.Archives.SevenZip;
+using SharpCompress.Readers;
+#endif
 
 namespace BinaryObjectScanner.Packer
 {
-    // TODO: Add extraction
     public class SevenZipSFX : IExtractablePortableExecutable, IPortableExecutableCheck
     {
         /// <inheritdoc/>
@@ -47,7 +53,57 @@ namespace BinaryObjectScanner.Packer
         /// <inheritdoc/>
         public string? Extract(string file, PortableExecutable pex, bool includeDebug)
         {
+            if (!File.Exists(file))
+                return null;
+
+#if NET462_OR_GREATER || NETCOREAPP
+            try
+            {
+                // Create a temp output directory
+                string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+                Directory.CreateDirectory(tempPath);
+
+                using (SevenZipArchive sevenZipFile = SevenZipArchive.Open(file, new ReaderOptions() { LookForHeader = true }))
+                {
+                    foreach (var entry in sevenZipFile.Entries)
+                    {
+                        try
+                        {
+                            // If the entry is a directory
+                            if (entry.IsDirectory)
+                                continue;
+
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
+                            // If we have a partial entry due to an incomplete multi-part archive, skip it
+                            if (!entry.IsComplete)
+                                continue;
+
+                            string tempFile = Path.Combine(tempPath, entry.Key);
+                            var directoryName = Path.GetDirectoryName(tempFile);
+                            if (directoryName != null && !Directory.Exists(directoryName))
+                                Directory.CreateDirectory(directoryName);
+                            entry.WriteToFile(tempFile);
+                        }
+                        catch (Exception ex)
+                        {
+                            if (includeDebug) Console.WriteLine(ex);
+                        }
+                    }
+                }
+
+                return tempPath;
+            }
+            catch (Exception ex)
+            {
+                if (includeDebug) Console.WriteLine(ex);
+                return null;
+            }
+#else
             return null;
+#endif
         }
     }
 }

BinaryObjectScanner/Packer/WinRARSFX.cs

@@ -39,23 +39,34 @@ namespace BinaryObjectScanner.Packer
             try
             {
                 // Should be using stream instead of file, but stream fails to extract anything. My guess is that the executable portion of the archive is causing stream to fail, but not file.
-                using (RarArchive zipFile = RarArchive.Open(file, new ReaderOptions() { LookForHeader = true }))
+                using (RarArchive rarFile = RarArchive.Open(file, new ReaderOptions() { LookForHeader = true }))
                 {
-                    if (!zipFile.IsComplete)
+                    if (!rarFile.IsComplete)
                         return null;
 
                     string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
                     Directory.CreateDirectory(tempPath);
 
-                    foreach (var entry in zipFile.Entries)
+                    foreach (var entry in rarFile.Entries)
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
+                            // If we have a partial entry due to an incomplete multi-part archive, skip it
+                            if (!entry.IsComplete)
+                                continue;
+
                             string tempFile = Path.Combine(tempPath, entry.Key);
+                            var directoryName = Path.GetDirectoryName(tempFile);
+                            if (directoryName != null && !Directory.Exists(directoryName))
+                                Directory.CreateDirectory(directoryName);
                             entry.WriteToFile(tempFile);
                         }
                         catch (Exception ex)

BinaryObjectScanner/Packer/WinZipSFX.cs

@@ -20,10 +20,13 @@ namespace BinaryObjectScanner.Packer
             if (nex.Model.ResidentNameTable == null)
                 return null;
 
-            // Check for the WinZip name string
+            // Check for the WinZip name strings
             bool winZipNameFound = nex.Model.ResidentNameTable
                 .Select(rnte => rnte?.NameString == null ? string.Empty : Encoding.ASCII.GetString(rnte.NameString))
                 .Any(s => s.Contains("WZ-SE-01"));
+            winZipNameFound |= nex.Model.NonResidentNameTable?
+                .Select(nrnte => nrnte?.NameString == null ? string.Empty : Encoding.ASCII.GetString(nrnte.NameString))
+                .Any(s => s.Contains("WinZip(R) Self-Extractor")) ?? false;
 
             // If we didn't find it
             if (!winZipNameFound)
@@ -73,29 +76,37 @@ namespace BinaryObjectScanner.Packer
         /// <summary>
         /// Handle common extraction between executable types
         /// </summary>
-        private static string? Extract(string file, bool includeDebug)
+        public static string? Extract(string file, bool includeDebug)
         {
 #if NET462_OR_GREATER || NETCOREAPP
             try
             {
-                // Should be using stream instead of file, but stream fails to extract anything. My guess is that the executable portion of the archive is causing stream to fail, but not file.
+                // Create a temp output directory
+                string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+                Directory.CreateDirectory(tempPath);
+
                 using (ZipArchive zipFile = ZipArchive.Open(file))
                 {
-                    if (!zipFile.IsComplete)
-                        return null;
-
-                    string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-                    Directory.CreateDirectory(tempPath);
-
                     foreach (var entry in zipFile.Entries)
                     {
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
+                            // If we have a partial entry due to an incomplete multi-part archive, skip it
+                            if (!entry.IsComplete)
+                                continue;
+
                             string tempFile = Path.Combine(tempPath, entry.Key);
+                            var directoryName = Path.GetDirectoryName(tempFile);
+                            if (directoryName != null && !Directory.Exists(directoryName))
+                                Directory.CreateDirectory(directoryName);
                             entry.WriteToFile(tempFile);
                         }
                         catch (Exception ex)
@@ -103,9 +114,9 @@ namespace BinaryObjectScanner.Packer
                             if (includeDebug) Console.WriteLine(ex);
                         }
                     }
-
-                    return tempPath;
                 }
+
+                return tempPath;
             }
             catch (Exception ex)
             {

BinaryObjectScanner/Packer/WiseInstaller.cs

@@ -3,10 +3,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
-using SabreTools.IO;
+using SabreTools.IO.Extensions;
 using SabreTools.Matching;
 using SabreTools.Serialization.Wrappers;
-using Wise = WiseUnpacker.WiseUnpacker;
+using WiseUnpacker;
+using WiseUnpacker.EWISE;
 
 namespace BinaryObjectScanner.Packer
 {
@@ -81,8 +82,7 @@ namespace BinaryObjectScanner.Packer
             try
             {
                 // TODO: Try to find where the file data lives and how to get it
-                var unpacker = new Wise();
-                if (!unpacker.ExtractTo(file, tempPath))
+                if (!Extractor.ExtractTo(file, tempPath))
                 {
                     try
                     {
@@ -151,14 +151,14 @@ namespace BinaryObjectScanner.Packer
                 // Ensure that we have an archive end
                 if (format.ArchiveEnd > 0)
                 {
-                    overlayOffset = dataStart + format.ArchiveEnd;
+                    overlayOffset = (int)(dataStart + format.ArchiveEnd);
                     int archiveEndLoaded = overlayData.ReadInt32(ref overlayOffset);
                     if (archiveEndLoaded != 0)
                         format.ArchiveEnd = archiveEndLoaded;
                 }
 
                 // Skip to the start of the archive
-                overlayOffset = dataStart + format.ArchiveStart;
+                overlayOffset = (int)(dataStart + format.ArchiveStart);
 
                 // Skip over the initialization text, if we expect it
                 if (format.InitText)
@@ -190,8 +190,7 @@ namespace BinaryObjectScanner.Packer
                 // If we have DEFLATE -- TODO: Port implementation here or use DeflateStream
                 else
                 {
-                    Wise unpacker = new Wise();
-                    if (!unpacker.ExtractTo(file, tempPath))
+                    if (!Extractor.ExtractTo(file, tempPath))
                     {
                         try
                         {
@@ -316,47 +315,5 @@ namespace BinaryObjectScanner.Packer
 
             return null;
         }
-
-        /// <summary>
-        /// Class representing the properties of each recognized Wise installer format
-        /// </summary>
-        /// TODO: Requires all fields to be writable in package before replacement
-        private class FormatProperty
-        {
-            /// <summary>
-            /// Offset to the executable data
-            /// </summary>
-            public int ExecutableOffset { get; set; }
-
-            /// <summary>
-            /// Indicates if this format includes a DLL at the start or not
-            /// </summary>
-            public bool Dll { get; set; }
-
-            /// <summary>
-            /// Offset within the data where the archive starts
-            /// </summary>
-            public int ArchiveStart { get; set; }
-
-            /// <summary>
-            /// Position in the archive head of the archive end
-            /// </summary>
-            public int ArchiveEnd { get; set; }
-
-            /// <summary>
-            /// Format includes initialization text
-            /// </summary>
-            public bool InitText { get; set; }
-
-            /// <summary>
-            /// Position of the filename within the data
-            /// </summary>
-            public int FilenamePosition { get; set; }
-
-            /// <summary>
-            /// Format does not include a CRC
-            /// </summary>
-            public bool NoCrc { get; set; }
-        }
     }
 }

BinaryObjectScanner/Progress.cs

@@ -23,7 +23,7 @@ namespace System
     public class Progress<T> : IProgress<T> where T : EventArgs
     {
         /// <summary>The synchronization context captured upon construction.  This will never be null.</summary>
-        private readonly SynchronizationContext _synchronizationContext;
+        private readonly SynchronizationContext? _synchronizationContext;
         /// <summary>The handler specified to the constructor.  This may be null.</summary>
         private readonly Action<T>? _handler;
         /// <summary>A cached delegate used to post invocation to the synchronization context.</summary>
@@ -73,7 +73,7 @@ namespace System
             {
                 // Post the processing to the sync context.
                 // (If T is a value type, it will get boxed here.)
-                _synchronizationContext.Post(_invokeHandlers, value);
+                _synchronizationContext?.Post(_invokeHandlers, value);
             }
         }
 

BinaryObjectScanner/Protection/AlphaROM.cs

@@ -71,6 +71,12 @@ namespace BinaryObjectScanner.Protection
             {
                 if (strs.Any(s => s.Contains("This Game is Japan Only")))
                     return "Alpha-ROM";
+                // Found in "Filechk.exe" in Redump entry 115358.
+                if (strs.Any(s => s.Contains("AlphaCheck.exe")))
+                    return "Alpha-ROM";
+                // Found in "Uninstall.exe" in Redump entry 115358.
+                if (strs.Any(s => s.Contains("AlphaCheck.dat")))
+                    return "Alpha-ROM";
             }
 
             // Get the overlay data, if it exists

BinaryObjectScanner/Protection/Channelware.cs

@@ -0,0 +1,121 @@
+#if NET40_OR_GREATER || NETCOREAPP
+using System.Collections.Concurrent;
+#endif
+using System.Collections.Generic;
+using System.IO;
+using BinaryObjectScanner.Interfaces;
+using SabreTools.Matching;
+using SabreTools.Serialization.Wrappers;
+
+namespace BinaryObjectScanner.Protection
+{
+    /// <summary>
+    /// Channelware was an online activation DRM.
+    /// 
+    /// Official websites:
+    /// 
+    /// https://web.archive.org/web/19980212121046/http://www.channelware.com/index.html
+    /// https://web.archive.org/web/20021002225705/http://cwsw.com/Home/default.asp
+    /// https://web.archive.org/web/20040101180929/http://www.netactive.com/Home/
+    /// 
+    /// TODO:
+    /// Add version detection. Redump entry 116358 is version 1.x and Redump entry 12354 is 2.x, but the file versions are inconsistent. 
+    /// Investigate "NetActive Reach", which is is either a newer version of this DRM, or a new DRM created by the same company. (https://web.archive.org/web/20040101162921/http://www.netactive.com/Products/)
+    /// </summary>
+    public class Channelware : IPathCheck, IPortableExecutableCheck
+    {
+        /// <inheritdoc/>
+        public string? CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
+        {
+            // Get the sections from the executable, if possible
+            var sections = pex.Model.SectionTable;
+            if (sections == null)
+                return null;
+
+            // Found in "AbeWincw.dll" in Redump entry 116358 and in "TOYSGMcw.dll" in the "TOYSTORY" installation folder from Redump entry 12354.
+            var name = pex.ProductName;
+            if (name?.Equals("ChannelWare Utilities") == true)
+                return "Channelware";
+
+            // Found in "cwbrowse.exe" in the "Channelware" folder installed from Redump entry 12354.
+            if (name?.Equals("Channelware Browser Launcher") == true)
+                return "Channelware";
+
+            // Found in "cwuninst.exe" in the "Channelware" folder installed from Redump entry 12354.
+            if (name?.Equals("Channelware Launcher Uninstall Application") == true)
+                return "Channelware";
+
+            // Found in "cwbrowse.exe" in the "Channelware\CWBrowse" folder installed from Redump entry 116358.
+            if (name?.Equals("Channelware Authorization Server Browser Launcher") == true)
+                return "Channelware";
+
+            name = pex.FileDescription;
+            // Found in "cwuninst.exe" in the "Channelware" folder installed from Redump entry 12354.
+            if (name?.Equals("Channelware Launcher Uninstall") == true)
+                return "Channelware";
+
+            name = pex.LegalTrademarks;
+            // Found in "CWAuto.dll" and "Upgrader.exe" in the "TOYSTORY" installation folder from Redump entry 12354.
+            if (name?.Equals("Channelware") == true)
+                return "Channelware";
+
+            return null;
+        }
+
+        /// <inheritdoc/>
+#if NET20 || NET35
+        public Queue<string> CheckDirectoryPath(string path, IEnumerable<string>? files)
+#else
+        public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string>? files)
+#endif
+        {
+            var matchers = new List<PathMatchSet>
+            {
+                // Found in Redump entries 12354 and 116358.
+                new(new FilePathMatch("cwlaunch.hlp"), "Channelware"),
+
+                // Found in the "Channelware\CWBrowse" folder installed from Redump entry 116358, and in the "Channelware" folder installed from Redump entry 12354.
+                new(new FilePathMatch("cwbrowse.exe"), "Channelware"),
+
+                // Found in the "Channelware" folder installed from Redump entry 12354.
+                new(new FilePathMatch("cwuninst.exe"), "Channelware"),
+                new(new FilePathMatch("chanwr.ini"), "Channelware"),
+                new(new FilePathMatch("CWAuto.dll"), "Channelware"),
+
+                // Found in Redump entry 116358.
+                new(Path.Combine("CWare", "install.exe"), "Channelware"),
+
+                // Found in Redump entry 12354.
+                new(Path.Combine("cware", "Install.exe"), "Channelware"),
+            };
+
+            return MatchUtil.GetAllMatches(files, matchers, any: true);
+        }
+
+        /// <inheritdoc/>
+        public string? CheckFilePath(string path)
+        {
+            var matchers = new List<PathMatchSet>
+            {
+                // Found in Redump entries 12354 and 116358.
+                new(new FilePathMatch("cwlaunch.hlp"), "Channelware"),
+
+                // Found in the "Channelware\CWBrowse" folder installed from Redump entry 116358, and in the "Channelware" folder installed from Redump entry 12354.
+                new(new FilePathMatch("cwbrowse.exe"), "Channelware"),
+
+                // Found in the "Channelware" folder installed from Redump entry 12354.
+                new(new FilePathMatch("cwuninst.exe"), "Channelware"),
+                new(new FilePathMatch("chanwr.ini"), "Channelware"),
+                new(new FilePathMatch("CWAuto.dll"), "Channelware"),
+
+                // Found in Redump entry 116358.
+                new(Path.Combine("CWare", "install.exe"), "Channelware"),
+
+                // Found in Redump entry 12354.
+                new(Path.Combine("cware", "Install.exe"), "Channelware"),
+            };
+
+            return MatchUtil.GetFirstMatch(path, matchers, any: true);
+        }
+    }
+}

BinaryObjectScanner/Protection/EAAntiCheat.cs

@@ -0,0 +1,88 @@
+#if NET40_OR_GREATER || NETCOREAPP
+using System.Collections.Concurrent;
+#endif
+using System.Collections.Generic;
+using BinaryObjectScanner.Interfaces;
+using SabreTools.Matching;
+using SabreTools.Serialization.Wrappers;
+
+namespace BinaryObjectScanner.Protection
+{
+    /// <summary>
+    /// EA Anti Cheat is a kernel-level anti-cheat developed and used by EA. (https://www.ea.com/security/news/eaac-deep-dive).
+    /// List of games that contain EA Anti Cheat on Steam: https://steamdb.info/tech/AntiCheat/EA_AntiCheat/
+    /// 
+    /// An EasyAntiCheat installer is present in the file "EAAntiCheat.Installer.Tool.exe" found in "Plants vs. Zombies: Battle for Neighborville" (Steam Depot 1262241, Manifest 8124759833120741594).
+    /// This could indicate that EasyAntiCheat is directly integrated into EA Anti Cheat.
+    /// 
+    /// The internal name appears to be "skyfall", as this is the Internal Name set to several EA Anti Cheat files, and the string "C:\dev\gitlab-runner\builds\r5uPUG7E\0\anticheat\skyfall\Build\Retail\EAAntiCheat.Installer.pdb" is present in "EAAntiCheat.Installer.Tool.exe".
+    /// </summary>
+    public class EAAntiCheat : IPathCheck, IPortableExecutableCheck
+    {
+        // TODO: Add support for detecting older versions, especially versions made before Easy Anti-Cheat was purchased by Epic Games.
+        /// <inheritdoc/>
+        public string? CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
+        {
+            // Get the sections from the executable, if possible
+            var sections = pex.Model.SectionTable;
+            if (sections == null)
+                return null;
+
+            var name = pex.FileDescription;
+            // Found in "EAAntiCheat.GameServiceLauncher.exe" and "EAAntiCheat.Installer.exe" in "Plants vs. Zombies: Battle for Neighborville" (Steam Depot 1262241, Manifest 8124759833120741594).
+            if (!string.IsNullOrEmpty(name) && name!.Contains("EA Anticheat"))
+                return "EA Anti Cheat";
+
+            name = pex.ProductName;
+            // Found in "EAAntiCheat.GameServiceLauncher.exe" and "EAAntiCheat.Installer.exe" in "Plants vs. Zombies: Battle for Neighborville" (Steam Depot 1262241, Manifest 8124759833120741594).
+            if (!string.IsNullOrEmpty(name) && name!.Contains("EA Anticheat"))
+                return "EA Anti Cheat";
+
+            name = pex.InternalName;
+            // Found in "EAAntiCheat.GameServiceLauncher.exe" and "EAAntiCheat.Installer.exe" in "Plants vs. Zombies: Battle for Neighborville" (Steam Depot 1262241, Manifest 8124759833120741594).
+            if (!string.IsNullOrEmpty(name) && name!.Equals("skyfall"))
+                return "EA Anti Cheat";
+
+            // TODO: Add check for "EA SPEAR AntiCheat Engineering" in ASN.1 certificate data. Found in files "EAAntiCheat.GameServiceLauncher.dll", "EAAntiCheat.GameServiceLauncher.exe", "EAAntiCheat.Installer.exe", and "preloader_l.dll".
+            return null;
+        }
+
+        /// <inheritdoc/>
+#if NET20 || NET35
+        public Queue<string> CheckDirectoryPath(string path, IEnumerable<string>? files)
+#else
+        public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string>? files)
+#endif
+        {
+            var matchers = new List<PathMatchSet>
+            {
+                // Found in "Plants vs. Zombies: Battle for Neighborville" (Steam Depot 1262241, Manifest 8124759833120741594).
+                new(new FilePathMatch("EAAntiCheat.cfg"), "EA Anti Cheat"),
+                new(new FilePathMatch("EAAntiCheat.GameServiceLauncher.dll"), "EA Anti Cheat"),
+                new(new FilePathMatch("EAAntiCheat.GameServiceLauncher.exe"), "EA Anti Cheat"),
+                new(new FilePathMatch("EAAntiCheat.splash.png"), "EA Anti Cheat"),
+                new(new FilePathMatch("EAAntiCheat.Installer.exe"), "EA Anti Cheat"),
+                new(new FilePathMatch("EAAntiCheat.Installer.Tool.exe"), "EA Anti Cheat"),
+            };
+
+            return MatchUtil.GetAllMatches(files, matchers, any: true);
+        }
+
+        /// <inheritdoc/>
+        public string? CheckFilePath(string path)
+        {
+            var matchers = new List<PathMatchSet>
+            {
+                // Found in "Plants vs. Zombies: Battle for Neighborville" (Steam Depot 1262241, Manifest 8124759833120741594).
+                new(new FilePathMatch("EAAntiCheat.cfg"), "EA Anti Cheat"),
+                new(new FilePathMatch("EAAntiCheat.GameServiceLauncher.dll"), "EA Anti Cheat"),
+                new(new FilePathMatch("EAAntiCheat.GameServiceLauncher.exe"), "EA Anti Cheat"),
+                new(new FilePathMatch("EAAntiCheat.splash.png"), "EA Anti Cheat"),
+                new(new FilePathMatch("EAAntiCheat.Installer.exe"), "EA Anti Cheat"),
+                new(new FilePathMatch("EAAntiCheat.Installer.Tool.exe"), "EA Anti Cheat"),
+            };
+
+            return MatchUtil.GetFirstMatch(path, matchers, any: true);
+        }
+    }
+}

BinaryObjectScanner/Protection/LabelGate.cs

@@ -63,20 +63,20 @@ namespace BinaryObjectScanner.Protection
                 new(new List<PathMatch>
                 {
 #if NET20 || NET35
-                    new(Path.Combine(Path.Combine("BIN", "WIN32"), "MQ2SETUP.EXE").Replace("\\", "/"), useEndsWith: true),
-                    new(Path.Combine(Path.Combine("BIN", "WIN32"), "MQSTART.EXE").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine(Path.Combine("BIN", "WIN32"), "MQ2SETUP.EXE")),
+                    new(Path.Combine(Path.Combine("BIN", "WIN32"), "MQSTART.EXE")),
 #else
-                    new(Path.Combine("BIN", "WIN32", "MQ2SETUP.EXE").Replace("\\", "/"), useEndsWith: true),
-                    new(Path.Combine("BIN", "WIN32", "MQSTART.EXE").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("BIN", "WIN32", "MQ2SETUP.EXE")),
+                    new(Path.Combine("BIN", "WIN32", "MQSTART.EXE")),
 #endif
                 }, "LabelGate CD2 Media Player"),
 
                 // All of these are also found present on all known LabelGate CD2 releases, though an additional file "RESERVED.DAT" is found in the same directory in at least one release (Product ID SVWC-7185)
                 new(new List<PathMatch>
                 {
-                    new(Path.Combine("MQDISC", "LICENSE.TXT").Replace("\\", "/"), useEndsWith: true),
-                    new(Path.Combine("MQDISC", "MQDISC.INI").Replace("\\", "/"), useEndsWith: true),
-                    new(Path.Combine("MQDISC", "START.INI").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("MQDISC", "LICENSE.TXT")),
+                    new(Path.Combine("MQDISC", "MQDISC.INI")),
+                    new(Path.Combine("MQDISC", "START.INI")),
                 }, "LabelGate CD2"),
             };
 

BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs

@@ -72,6 +72,10 @@ namespace BinaryObjectScanner.Protection
                     return "SafeDisc Lite";
                 if (strs.Any(s => s.Contains("LTDLL_Unwrap")))
                     return "SafeDisc Lite";
+
+                // Present in "Setup.exe" from the earlier "safedisc.exe" driver update provided by Macrovision.
+                if (strs.Any(s => s.Contains("Failed to get the DRVMGT.DLL Setup API address")))
+                    return "Macrovision SecDrv Update Installer";
             }
 
             var name = pex.FileDescription;
@@ -79,14 +83,23 @@ namespace BinaryObjectScanner.Protection
             if (name?.Equals("SafeDisc SRV Tool APP", StringComparison.OrdinalIgnoreCase) == true)
                 return $"SafeDisc SRV Tool APP {GetSafeDiscDiagExecutableVersion(pex)}";
 
+            // Present in "Setup.exe" from the later "safedisc.exe" driver update provided by Macrovision.
+            if (name?.Equals("Macrovision SecDrv Update", StringComparison.OrdinalIgnoreCase) == true)
+                return "Macrovision SecDrv Update Installer";
+
             // Present on all "CLOKSPL.DLL" versions before SafeDisc 1.06.000. Found on Redump entries 61731 and 66004. 
             name = pex.ProductName;
             if (name?.Equals("SafeDisc CDROM Protection System", StringComparison.OrdinalIgnoreCase) == true)
                 return "SafeDisc 1.00.025-1.01.044";
+
             // Present in "Diag.exe" files from SafeDisc 4.50.000+.
             else if (name?.Equals("SafeDisc SRV Tool APP", StringComparison.OrdinalIgnoreCase) == true)
                 return $"SafeDisc SRV Tool APP {GetSafeDiscDiagExecutableVersion(pex)}";
 
+            // Present in "Setup.exe" from the later "safedisc.exe" driver update provided by Macrovision.
+            if (name?.Equals("Macrovision SecDrv Update", StringComparison.OrdinalIgnoreCase) == true)
+                return "Macrovision SecDrv Update Installer";
+
             // Present on all "CLOKSPL.EXE" versions before SafeDisc 1.06.000. Found on Redump entries 61731 and 66004. 
             // Only found so far on SafeDisc 1.00.025-1.01.044, but the report is currently left generic due to the generic nature of the check.
             name = pex.FileDescription;
@@ -95,8 +108,12 @@ namespace BinaryObjectScanner.Protection
 
             // Found in Redump entries 20729 and 65569.
             // Get the debug data
-            if (pex.FindCodeViewDebugTableByPath("SafeDisc").Any() || pex.FindCodeViewDebugTableByPath("Safedisk").Any())
-                return "SafeDisc";
+            try
+            {
+                if (pex.FindCodeViewDebugTableByPath("SafeDisc").Any() || pex.FindCodeViewDebugTableByPath("Safedisk").Any())
+                    return "SafeDisc";
+            }
+            catch { }
 
             // TODO: Investigate various section names:
             // "STLPORT_" - Found in Redump entry 11638.

BinaryObjectScanner/Protection/Macrovision.SafeWrap.cs

@@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Protection
     /// It's used (to an unknown extent) within SafeCast and SafeDisc (https://web.archive.org/web/20030829044647/http://www.macrovision.com:80/solutions/software/SafeWrap_FAQ_July2003.pdf Section #3).
     /// It can be used separately from any other Macrovision product, such as (supposedly) for RioPort (https://www.cdrinfo.com/d7/content/macrovision-invests-next-generation-security-and-transport-technologies-internet-delivery).
     /// No direct SafeWrap only sample has currently been found, nor is it exactly clear what parts of SafeCast/SafeDisc are SafeWrap.
-    /// It's claimed that SafeWrap uses one DLL and one .SYS "security driver" (https://www.cdrinfo.com/d7/content/macrovision-invests-next-generation-security-and-transport-technologies-internet-delivery Section #30).
+    /// It's claimed that SafeWrap uses one DLL and one .SYS "security driver" (https://web.archive.org/web/20030829044647/http://www.macrovision.com:80/solutions/software/SafeWrap_FAQ_July2003.pdf Section #30).
     /// This would appear to be referring to the "drvmgt.dll" and "secdrv.sys" files, the latter of which is officially referred to as the "Macrovision SECURITY Driver" in some SafeDisc versions.
     /// This may not be fully accurate, as not all of these files are known to always be used with SafeCast, though this does need further investigation.
     /// The .stxt* sections found in various Macrovision products may indicate SafeWrap, as they started being used around the time that SafeWrap was made public.
@@ -18,13 +18,17 @@ namespace BinaryObjectScanner.Protection
     /// 
     /// Further information and resources:
     /// Macrovision press release that mentions SafeWrap: https://www.sec.gov/Archives/edgar/data/1027443/000100547701501658/ex99-1.txt
+    /// Macrionvision "Tamper-proof" blurb advertising SafeWrap: https://web.archive.org/web/20030412093353/http://www.macrovision.com/solutions/software/tamper.php3
     /// SafeAudio news that mentions SafeWrap: https://www.cdmediaworld.com/hardware/cdrom/news/0201/safeaudio_3.shtml
+    /// The titles for a few audio DRM FAQ's include the text "SafeWrap™ Frequently Asked Questions" in the page title, but this may be a copy-paste error: 
+    /// https://web.archive.org/web/20030324080804/http://www.macrovision.com:80/solutions/audio/images/SafeAudio_FAQ_Public_5-02.pdf + https://web.archive.org/web/20030403050432/http://www.macrovision.com:80/solutions/audio/Audio_protection_FAQ_Public_March2003.pdf
     /// Eclipse SafeAudio news that mentions SafeWrap: http://www.eclipsedata.com/PDFs/21.pdf
     /// Report to congress that mentions SafeWrap: https://www.uspto.gov/sites/default/files/web/offices/dcom/olia/teachreport.pdf
     /// Patent that mentions possibly using SafeWrap: https://patents.google.com/patent/US7493289B2/en
     /// MacroSafe presentation that mentions current customer of SafeWrap/SafeCast/SafeDisc: https://slideplayer.com/slide/6840826/
     /// List of DRM companies and products: https://www1.villanova.edu/villanova/generalcounsel/copyright/digitized/companies.html
     /// Forum post that briefly mentions SafeWrap: https://www.ttlg.com/forums/showthread.php?t=70035
+    /// Forum post (with no replies) that asks for information about SafeWrap: https://forum.powerbasic.com/forum/user-to-user-discussions/powerbasic-for-windows/9167-macrovision-anti-code-tampering-tool
     /// Document that mentions SafeWrap as third-party security tool: https://www.cs.clemson.edu/course/cpsc420/material/Papers/Guide_AppSecurity.pdf
     /// Japanese PDF that mentions SafeWrap: https://ipsj.ixsq.nii.ac.jp/ej/index.php?action=pages_view_main&active_action=repository_action_common_download&item_id=64743&item_no=1&attribute_id=1&file_no=1&page_id=13&block_id=8
     /// Korean PDF that mentions SafeWrap: http://contents.kocw.or.kr/contents4/document/lec/2012/KonKuk_glocal/Nohyounghee1/9.pdf

BinaryObjectScanner/Protection/Macrovision.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using BinaryObjectScanner.Utilities;
-using SabreTools.IO;
+using SabreTools.IO.Extensions;
 using SabreTools.Matching;
 using SabreTools.Serialization.Wrappers;
 
@@ -275,6 +275,8 @@ namespace BinaryObjectScanner.Protection
             if (!string.IsNullOrEmpty(safeDisc))
                 resultsList.Add(safeDisc!);
 
+            // Clean the result list
+            resultsList = CleanResultList(resultsList);
             if (resultsList != null && resultsList.Count > 0)
                 return string.Join(", ", [.. resultsList]);
 
@@ -551,16 +553,26 @@ namespace BinaryObjectScanner.Protection
                 // Version 1.04.000/1.4.0.0 can be found in "cdac01aa.dll" and "cdac01ba.dll" from IA item "ejay_nestle_trial", but needs further research.
                 // Found in Redump entry 83145.
                 "2.11.010"
+
+                    // Found in IA item microsoft-software-jukebox-for-toshiba-1.0.
                     or "2.11.020"
+
+                    // Source not documented.
                     or "2.11.060"
                     or "2.16.050"
+
+                    // Found in Redump entry 90157 / IA item microsoft-software-jukebox-usa-hp-oem.
+                    or "2.41.000"
+
+                    // Source not documented.
                     or "2.60.030"
                     or "2.67.010" => "SafeCast",
 
                 // SafeCast (Unconfirmed)
                 // Found in Adobe Photoshop according to http://www.reversing.be/article.php?story=2006102413541932
-                "2.41.000"
-                    or "2.42.000"
+                "2.42.000"
+
+                    // Source not documented.
                     or "2.50.030"
                     or "2.51.000" => "SafeCast (Unconfirmed - Please report to us on GitHub)",
 
@@ -571,6 +583,8 @@ namespace BinaryObjectScanner.Protection
                 // SafeDisc (Confirmed)
                 // Found in Redump entry 66005.
                 "1.00.025"
+
+                    // Source not documented.
                     or "1.00.026"
                     or "1.00.030"
                     or "1.00.032"
@@ -638,12 +652,25 @@ namespace BinaryObjectScanner.Protection
             };
         }
 
-        private List<string>? CleanResultList(List<string>? resultsList)
+        private static List<string>? CleanResultList(List<string>? resultsList)
         {
             // If we have an invalid result list
             if (resultsList == null || resultsList.Count == 0)
                 return resultsList;
 
+            // Remove duplicates
+            if (resultsList.Contains("Macrovision Protected Application"))
+            {
+                if (resultsList.Contains("Macrovision Protected Application [Version Expunged]"))
+                    resultsList = resultsList.Where(r => r != "Macrovision Protected Application").ToList();
+                else if (resultsList.Contains("Macrovision Protected Application (Entry point not present in the stxt371 section. Executable is either unprotected or nonfunctional)"))
+                    resultsList = resultsList.Where(r => r != "Macrovision Protected Application").ToList();
+                else if (resultsList.Contains("Macrovision Protected Application (Generic detection - Report to us on GitHub)"))
+                    resultsList = resultsList.Where(r => r != "Macrovision Protected Application").ToList();
+                else if (resultsList.Contains("Macrovision Protected Application (Report this to us on GitHub)"))
+                    resultsList = resultsList.Where(r => r != "Macrovision Protected Application").ToList();
+            }
+
             // Get distinct and order
             return [.. resultsList.Distinct().OrderBy(s => s)];
         }

BinaryObjectScanner/Protection/OpenMG.cs

@@ -79,10 +79,10 @@ namespace BinaryObjectScanner.Protection
                 // TODO: Investigate the consistency of "\OMGEXTRA\INDX0000.XML" and "\OMGEXTRA\INDX0001.XML", they seem to only appear when bonus content is present ("Touch" by Amerie).
                 new(new List<PathMatch>
                 {
-                    new(Path.Combine("OMGAUDIO", "00AUDTOC.DAT").Replace("\\", "/"), useEndsWith: true),
-                    new(Path.Combine("OMGAUDIO", "01AUDSTR.DAT").Replace("\\", "/"), useEndsWith: true),
-                    new(Path.Combine("OMGAUDIO", "05SRPCDS.DAT").Replace("\\", "/"), useEndsWith: true),
-                    new(Path.Combine("OMGEXTRA", "OMGSVC.DAT").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("OMGAUDIO", "00AUDTOC.DAT")),
+                    new(Path.Combine("OMGAUDIO", "01AUDSTR.DAT")),
+                    new(Path.Combine("OMGAUDIO", "05SRPCDS.DAT")),
+                    new(Path.Combine("OMGEXTRA", "OMGSVC.DAT")),
                 }, "OpenMG"),
 
                 // Always found together on OpenMG releases ("Touch" by Amerie, Redump entry 95010, and product ID SVWC-7185).

BinaryObjectScanner/Protection/Phenoprotect.cs

@@ -4,6 +4,8 @@
     {
         // Currently implemented as a text file check, more checks are likely possible but currently unknown.
         // Current checks based off Redump entry 84082 are found in the InstallShield setup.inx file, but the game also checks if the original disc is present in the drive after installation as well, so it seems unlikely for the InstallShield check to be relevant at that stage.
+        // A later version of it can be found in Redump entry 102493, which is found in the InstallShield setup.ins file, and also has a disc check when the game is run. On top of this, there is also a serial number check present. It is currently unknown how to uniquely detect either of them.
+        // The disc checks may be completely generic and undetectable, as these checks seem to be more lax than the installer checks. 
         // <see href="https://github.com/TheRogueArchivist/DRML/blob/main/entries/phenoProtect/phenoProtect.md"/>
     }
 }

BinaryObjectScanner/Protection/RainbowSentinel.cs

@@ -21,10 +21,11 @@ namespace BinaryObjectScanner.Protection
     /// TODO: Investigate "sntnlusb.sys" (https://www.rainbow.com.my/document/endusertroubleshooting.pdf).
     /// 
     /// Versions: 
-    /// Rainbow Sentinel PD-5.1: IA items "pcwkcd-1296" and "CHIPTRMart97".
+    /// Rainbow Sentinel PD-5.1: IA items "pcwkcd-1296, "CHIPTRMart97", and "bugcd199801".
     /// Rainbow Sentinel PD-5.1e (Beta): IA item "CHIPTRMart97".
+    /// Rainbow Sentinel PD-5.37: File "CICA 32 For Windows CD-ROM (Walnut Creek) (October 1999) (Disc 4).iso" in IA item "CICA_32_For_Windows_CD-ROM_Walnut_Creek_October_1999".
     /// Rainbow Sentinel PD-5.39: IA item "chip-cds-2001-08".
-    /// Rainbow Sentinel PD-15: IA items "ASMEsMechanicalEngineeringToolkit1997December" and "aplicaciones-windows".
+    /// Rainbow Sentinel PD-15: IA items "ASMEsMechanicalEngineeringToolkit1997December", "aplicaciones-windows", and "ASMEsMechanicalEngineeringToolkit1997December".
     /// Rainbow Sentinel PD-17: IA item "czchip199707cd".
     /// Rainbow Sentinel PD-30: BA entry "Autodesk AutoCAD LT 98 (1998) (CD) [English] [Dutch]" and IA item "auto-cad-r14-cdrom".
     /// Rainbow Sentinel PD-31: BA entry "Autodesk AutoCAD LT 98 (1998) (CD) [English] [Dutch]" and IA item "auto-cad-r14-cdrom".
@@ -172,6 +173,11 @@ namespace BinaryObjectScanner.Protection
             if (name?.Equals("NetSentinel Server for WIN 32", StringComparison.OrdinalIgnoreCase) == true)
                 return "Rainbow NetSentinel Server for Win32";
 
+            // Found in "\disc4\cad\sdcc_200.zip\DISK1\_USER1.HDR\Language_Independent_Intel_32_Files\SNTNLUSB.SYS" in "CICA 32 For Windows CD-ROM (Walnut Creek) (October 1999) (Disc 4).iso" in IA item "CICA_32_For_Windows_CD-ROM_Walnut_Creek_October_1999".
+            // TODO: Check if the version included with this is useful.
+            if (name?.Equals("Rainbow Technologies Sentinel Device Driver", StringComparison.OrdinalIgnoreCase) == true)
+                return "Rainbow Sentinel Driver";
+
             name = pex.ProductName;
 
             // Found in multiple files in BA entry "Autodesk AutoCAD LT 98 (1998) (CD) [English] [Dutch]", including "RNBOVTMP.DLL", "SENTTEMP.DLL", and "SNTI386.DLL".
@@ -194,6 +200,11 @@ namespace BinaryObjectScanner.Protection
             if (name?.Equals("Sentinel System Driver", StringComparison.OrdinalIgnoreCase) == true)
                 return $"Rainbow Sentinel {pex.ProductVersion}";
 
+            // Found in "\disc4\cad\sdcc_200.zip\DISK1\_USER1.HDR\Language_Independent_Intel_32_Files\SNTNLUSB.SYS" in "CICA 32 For Windows CD-ROM (Walnut Creek) (October 1999) (Disc 4).iso" in IA item "CICA_32_For_Windows_CD-ROM_Walnut_Creek_October_1999".
+            // TODO: Check if the version included with this is useful.
+            if (name?.Equals("Rainbow Technologies USB Security Device Driver", StringComparison.OrdinalIgnoreCase) == true)
+                return "Rainbow Sentinel Driver";
+
             // Get the .data/DATA section strings, if they exist
             var strs = pex.GetFirstSectionStrings(".data") ?? pex.GetFirstSectionStrings("DATA");
             if (strs != null)
@@ -330,6 +341,15 @@ namespace BinaryObjectScanner.Protection
                  new(new FilePathMatch("NSRVOM.EXE"), "Rainbow NetSentinel Server for OS/2"),
                  new(new FilePathMatch("NSRVGX.EXE"), "Rainbow NetSentinel Server for Win32"),
 
+                 // Found in "\disc4\cad\sdcc_200.zip\DISK1\_USER1.HDR\Language_Independent_Intel_32_Files" in "CICA 32 For Windows CD-ROM (Walnut Creek) (October 1999) (Disc 4).iso" in IA item "CICA_32_For_Windows_CD-ROM_Walnut_Creek_October_1999".
+                 // TODO: Add text file checks for these IFX files.
+                 new(new FilePathMatch("SNTNLUSB.IFX"), "Rainbow Sentinel USB Driver"),
+                 new(new FilePathMatch("SNTNLUSB.INF"), "Rainbow Sentinel USB Driver"),
+                 new(new FilePathMatch("SNTNLUSB.SYS"), "Rainbow Sentinel USB Driver"),
+                 new(new FilePathMatch("SNTUSB95.IFX"), "Rainbow Sentinel USB Driver"),
+                 new(new FilePathMatch("SNTUSB95.INF"), "Rainbow Sentinel USB Driver"),
+                 new(new FilePathMatch("SNTUSB95.SYS"), "Rainbow Sentinel USB Driver"),
+
                  // Found in IA item "czchip199707cd".
                  new(new List<PathMatch>
                  {
@@ -422,6 +442,15 @@ namespace BinaryObjectScanner.Protection
                  new(new FilePathMatch("SNTMIPS.DLL"), "Rainbow Sentinel Windows NT MIPS Platform Driver"),
                  new(new FilePathMatch("SNTPPC.DLL"), "Rainbow Sentinel Windows NT PowerPC Platform Driver"),
 
+                 // Found in "\disc4\cad\sdcc_200.zip\DISK1\_USER1.HDR\Language_Independent_Intel_32_Files" in "CICA 32 For Windows CD-ROM (Walnut Creek) (October 1999) (Disc 4).iso" in IA item "CICA_32_For_Windows_CD-ROM_Walnut_Creek_October_1999".
+                 // TODO: Add text file checks for these IFX files.
+                 new(new FilePathMatch("SNTNLUSB.IFX"), "Rainbow Sentinel USB Driver"),
+                 new(new FilePathMatch("SNTNLUSB.INF"), "Rainbow Sentinel USB Driver"),
+                 new(new FilePathMatch("SNTNLUSB.SYS"), "Rainbow Sentinel USB Driver"),
+                 new(new FilePathMatch("SNTUSB95.IFX"), "Rainbow Sentinel USB Driver"),
+                 new(new FilePathMatch("SNTUSB95.INF"), "Rainbow Sentinel USB Driver"),
+                 new(new FilePathMatch("SNTUSB95.SYS"), "Rainbow Sentinel USB Driver"),
+
                  // Found in IA item "chip-cds-2001-08".
                  // File names for Rainbow Sentinel files sometimes found in ".cab" files.
                  new(new FilePathMatch("F194_rnbovdd.dll.B391C188_6953_11D4_82CB_00D0B72E1DB9"), "Rainbow Sentinel"),

BinaryObjectScanner/Protection/RealArcade.cs

@@ -0,0 +1,75 @@
+using System;
+#if NET40_OR_GREATER || NETCOREAPP
+using System.Collections.Concurrent;
+#endif
+using System.Collections.Generic;
+using System.Linq;
+using BinaryObjectScanner.Interfaces;
+using SabreTools.Matching;
+using SabreTools.Serialization.Wrappers;
+
+namespace BinaryObjectScanner.Protection
+{
+    /// <summary>
+    /// RealArcade was a game platform that allowed users to play timed demos of games, and then prompted them to purchase the game in order to play the game without a limit.
+    /// Although the servers are long dead, there is a community project actively being developed to allow users to properly download and play these games.
+    /// Links:
+    /// https://github.com/lightbulbatelier/RealArcade-DGA
+    /// https://archive.org/details/realrcade-games-preservation-project
+    /// </summary>
+    public class RealArcade : IPathCheck, IPortableExecutableCheck
+    {
+        /// <inheritdoc/>
+        public string? CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug)
+        {
+            // Get the sections from the executable, if possible
+            var sections = pex.Model.SectionTable;
+            if (sections == null)
+                return null;
+
+            // Get the .data section strings, if they exist
+            var strs = pex.GetFirstSectionStrings(".data");
+            if (strs != null)
+            {
+                // Found in "rebound.exe" in the installation directory for "Rebound" in IA item "Nova_RealArcadeCD_USA".
+                if (strs.Any(s => s.Contains("RngInterstitialDLL")))
+                    return "RealArcade";
+            }
+
+            // Found in "RngInterstitial.dll" in the RealArcade installation directory in IA item "Nova_RealArcadeCD_USA".
+            var name = pex.FileDescription;
+            if (name?.Contains("RngInterstitial") == true)
+                return "RealArcade";
+
+            return null;
+        }
+
+        /// <inheritdoc/>
+#if NET20 || NET35
+        public Queue<string> CheckDirectoryPath(string path, IEnumerable<string>? files)
+#else
+        public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string>? files)
+#endif
+        {
+            var matchers = new List<PathMatchSet>
+            {
+                // ".rgs" and ".mez" files are also associated with RealArcade.
+                new(new FilePathMatch("RngInterstitial.dll"), "RealArcade"),
+            };
+
+            return MatchUtil.GetAllMatches(files, matchers, any: true);
+        }
+
+        /// <inheritdoc/>
+        public string? CheckFilePath(string path)
+        {
+            var matchers = new List<PathMatchSet>
+            {
+                // ".rgs" and ".mez" files are also associated with RealArcade.
+                new(new FilePathMatch("RngInterstitial.dll"), "RealArcade"),
+            };
+
+            return MatchUtil.GetFirstMatch(path, matchers, any: true);
+        }
+    }
+}

BinaryObjectScanner/Protection/Roxxe.cs

@@ -47,10 +47,19 @@ namespace BinaryObjectScanner.Protection
                 if (strs.Any(s => s.Contains("CommonPRRT")))
                     return "Roxxe (Possibly remnants)";
 
-                if (strs.Any(s => s.Contains("roxe")))
-                    return "Roxxe (Possibly remnants)";
+                // Currently overmatches, will likely be a viable check when better Delphi executable parsing is available.
+                // if (strs.Any(s => s.Contains("roxe")))
+                //     return "Roxxe (Possibly remnants)";
             }
 
+            // If any dialog boxes match
+            // Found in "Data6.OWP" in IA item "game4u-22-cd".
+            if (pex.FindDialogBoxByItemTitle("SharpTiny Version 1.0").Any())
+                return "Roxxe";
+            // Found in "Data8.OWP" in IA item "game4u-22-cd".
+            else if (pex.FindDialogBoxByItemTitle("T32xWin Version 1.0").Any())
+                return "Roxxe";
+
             return null;
         }
 

BinaryObjectScanner/Protection/SecuROM.cs

@@ -26,6 +26,14 @@ namespace BinaryObjectScanner.Protection
             if (name?.Contains("SecuROM PA") == true)
                 return $"SecuROM Product Activation v{pex.GetInternalVersion()}";
 
+            name = pex.InternalName;
+            if (name?.Equals("paul.dll") == true)
+                return $"SecuROM Product Activation v{pex.GetInternalVersion()}";
+            else if (name?.Equals("paul_dll_activate_and_play.dll") == true)
+                return $"SecuROM Product Activation v{pex.GetInternalVersion()}";
+            else if (name?.Equals("paul_dll_preview_and_review.dll") == true)
+                return $"SecuROM Product Activation v{pex.GetInternalVersion()}";
+
             name = pex.OriginalFilename;
             if (name?.Equals("paul_dll_activate_and_play.dll") == true)
                 return $"SecuROM Product Activation v{pex.GetInternalVersion()}";
@@ -205,7 +213,7 @@ namespace BinaryObjectScanner.Protection
             byte[] subSubVersion = new byte[2];
             subSubVersion[0] = (byte)(fileContent[index] ^ 42);
             index++;
-            subSubVersion[0] = (byte)(fileContent[index] ^ 8);
+            subSubVersion[1] = (byte)(fileContent[index] ^ 8);
             index += 2;
 
             byte[] subSubSubVersion = new byte[4];
@@ -226,31 +234,40 @@ namespace BinaryObjectScanner.Protection
         // These live in the MS-DOS stub, for some reason
         private static string GetV7Version(PortableExecutable pex)
         {
-            int index = 172; // 64 bytes for DOS stub, 236 bytes in total
+            try
+            {
+                int index = 172; // 64 bytes for DOS stub, 236 bytes in total
 #if NETFRAMEWORK
-            byte[] bytes = new byte[4];
-            Array.Copy(pex.StubExecutableData, index, bytes, 0, 4);
+                byte[] bytes = new byte[4];
+                Array.Copy(pex.StubExecutableData, index, bytes, 0, 4);
 #else
-            byte[] bytes = new ReadOnlySpan<byte>(pex.StubExecutableData, index, 4).ToArray();
+                byte[] bytes = new ReadOnlySpan<byte>(pex.StubExecutableData, index, 4).ToArray();
 #endif
 
-            //SecuROM 7 new and 8
-            if (bytes[3] == 0x5C) // if (bytes[0] == 0xED && bytes[3] == 0x5C {
-            {
-                return $"{bytes[0] ^ 0xEA}.{bytes[1] ^ 0x2C:00}.{bytes[2] ^ 0x8:0000}";
+                //SecuROM 7 new and 8
+                if (bytes[3] == 0x5C) // if (bytes[0] == 0xED && bytes[3] == 0x5C {
+                {
+                    return $"{bytes[0] ^ 0xEA}.{bytes[1] ^ 0x2C:00}.{bytes[2] ^ 0x8:0000}";
+                }
+
+                // SecuROM 7 old
+                else
+                {
+                    index = 58; // 64 bytes for DOS stub, 122 bytes in total
+#if NETFRAMEWORK
+                    bytes = new byte[2];
+                    Array.Copy(pex.StubExecutableData, index, bytes, 0, 2);
+#else
+                    bytes = new ReadOnlySpan<byte>(pex.StubExecutableData, index, 2).ToArray();
+#endif
+                    return $"7.{bytes[0] ^ 0x10:00}.{bytes[1] ^ 0x10:0000}"; //return "7.01-7.10"
+                }
             }
-
-            // SecuROM 7 old
-            else
+            catch (ArgumentException)
             {
-                index = 58; // 64 bytes for DOS stub, 122 bytes in total
-#if NETFRAMEWORK
-                bytes = new byte[2];
-                Array.Copy(pex.StubExecutableData, index, bytes, 0, 2);
-#else
-                bytes = new ReadOnlySpan<byte>(pex.StubExecutableData, index, 2).ToArray();
-#endif
-                return $"7.{bytes[0] ^ 0x10:00}.{bytes[1] ^ 0x10:0000}"; //return "7.01-7.10"
+                // If SecuROM is stripped, the MS-DOS stub might be shorter.
+                // We then know that SecuROM -was- there, but we don't know what exact version.
+                return "7 remnants";
             }
         }
 

BinaryObjectScanner/Protection/StarForce.cs

@@ -27,7 +27,35 @@ namespace BinaryObjectScanner.Protection
             if (sections == null)
                 return null;
 
-            var name = pex.LegalCopyright;
+            // TODO: Find what fvinfo field actually maps to this
+            var name = pex.FileDescription;
+
+            // There are some File Description checks that are currently too generic to use.
+            // "Host Library" - Found in "protect.dll" in Redump entry 81756.
+            // "User Interface Application" - Found in "protect.exe" in Redump entry 81756.
+            // "Helper Application" - Found in "protect.x64" and "protect.x86" in Redump entry 81756.
+
+            // Found in "sfdrvrem.exe" in Redump entry 102677.
+            if (name?.Contains("FrontLine Drivers Removal Tool") == true)
+                return $"StarForce FrontLine Driver Removal Tool";
+
+            // Found in "protect.exe" in Redump entry 94805.
+            if (name?.Contains("FrontLine Protection GUI Application") == true)
+                return $"StarForce {pex.GetInternalVersion()}";
+
+            // Found in "protect.dll" in Redump entry 94805.
+            if (name?.Contains("FrontLine Protection Library") == true)
+                return $"StarForce {pex.GetInternalVersion()}";
+
+            // Found in "protect.x64" and "protect.x86" in Redump entry 94805.
+            if (name?.Contains("FrontLine Helper") == true)
+                return $"StarForce {pex.GetInternalVersion()}";
+
+            // TODO: Find a sample of this check.
+            if (name?.Contains("Protected Module") == true)
+                return $"StarForce 5";
+
+            name = pex.LegalCopyright;
             if (name?.StartsWith("(c) Protection Technology") == true) // (c) Protection Technology (StarForce)?
                 return $"StarForce {pex.GetInternalVersion()}";
             else if (name?.Contains("Protection Technology") == true) // Protection Technology (StarForce)?
@@ -61,30 +89,6 @@ namespace BinaryObjectScanner.Protection
                     return $"StarForce {pex.GetInternalVersion()}";
             }
 
-            // TODO: Find what fvinfo field actually maps to this
-            name = pex.FileDescription;
-
-            // There are some File Description checks that are currently too generic to use.
-            // "Host Library" - Found in "protect.dll" in Redump entry 81756.
-            // "User Interface Application" - Found in "protect.exe" in Redump entry 81756.
-            // "Helper Application" - Found in "protect.x64" and "protect.x86" in Redump entry 81756.
-
-            // Found in "protect.exe" in Redump entry 94805.
-            if (name?.Contains("FrontLine Protection GUI Application") == true)
-                return $"StarForce {pex.GetInternalVersion()}";
-
-            // Found in "protect.dll" in Redump entry 94805.
-            if (name?.Contains("FrontLine Protection Library") == true)
-                return $"StarForce {pex.GetInternalVersion()}";
-
-            // Found in "protect.x64" and "protect.x86" in Redump entry 94805.
-            if (name?.Contains("FrontLine Helper") == true)
-                return $"StarForce {pex.GetInternalVersion()}";
-
-            // TODO: Find a sample of this check.
-            if (name?.Contains("Protected Module") == true)
-                return $"StarForce 5";
-
             // TODO: Check to see if there are any missing checks
             // https://github.com/horsicq/Detect-It-Easy/blob/master/db/PE/StarForce.2.sg
 

BinaryObjectScanner/Protection/Steam.cs

@@ -55,7 +55,8 @@ namespace BinaryObjectScanner.Protection
                 new(new List<PathMatch>
                 {
                     // TODO: Identify based on "Steam(TM)" being present in "Description" but not in "File Description".
-                    new FilePathMatch("steam.exe"),
+                    // Overmatches on some files, such as IA item "ASMEsMechanicalEngineeringToolkit1997December".
+                    // new FilePathMatch("steam.exe"),
 
                     new FilePathMatch("steam.ini"),
                     

BinaryObjectScanner/Protection/Tages.cs

@@ -76,10 +76,10 @@ namespace BinaryObjectScanner.ProtectionType
                 new(new List<PathMatch>
                 {
                     // d37f70489207014d7d0fbaa43b081a93e8030498
-                    new(Path.Combine("Sys", "Devx.sys").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("Sys", "Devx.sys")),
 
                     // a0acbc2f8e321e4f30c913c095e28af444058249
-                    new(Path.Combine("Sys", "VtPr.sys").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("Sys", "VtPr.sys")),
 
                     // SHA-1 is variable, file size is 81,920 bytes
                     new FilePathMatch("Wave.aif"),
@@ -99,16 +99,16 @@ namespace BinaryObjectScanner.ProtectionType
                 new(new List<PathMatch>
                 {
                     // f82339d797be6da92f5d9dadeae9025385159057
-                    new(Path.Combine("9x", "Tamlx.alf").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("9x", "Tamlx.alf")),
 
                     // 933c004d3043863f019f5ffaf63402a30e65026c
-                    new(Path.Combine("9x", "Tamlx.apt").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("9x", "Tamlx.apt")),
 
                     // d45745fa6b0d23fe0ee12e330ab85d5bf4e0e776
-                    new(Path.Combine("NT", "enodpl.sys").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("NT", "enodpl.sys")),
 
                     // f111eba05ca6e9061c557547420847d7fdee657d
-                    new(Path.Combine("NT", "litdpl.sys").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("NT", "litdpl.sys")),
                 }, "TAGES"),
 
                 // Currently only known to exist in "XIII" and "Beyond Good & Evil" (Redump entries 8774-8776, 45940-45941, 18690-18693, and presumably 21320, 21321, 21323, and 36124).
@@ -127,16 +127,16 @@ namespace BinaryObjectScanner.ProtectionType
                 new(new List<PathMatch>
                 {
                     // 40826e95f3ad8031b6debe15aca052c701288e04
-                    new(Path.Combine("9x", "hwpsgt.vxd").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("9x", "hwpsgt.vxd")),
 
                     // f82339d797be6da92f5d9dadeae9025385159057
-                    new(Path.Combine("9x", "lemsgt.vxd").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("9x", "lemsgt.vxd")),
 
                     // 43f407ecdc0d87a3713126b757ccaad07ade285f
-                    new(Path.Combine("NT", "hwpsgt.sys").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("NT", "hwpsgt.sys")),
 
                     // 548dd6359abbcc8c84ce346d078664eeedc716f7
-                    new(Path.Combine("NT", "lemsgt.sys").Replace("\\", "/"), useEndsWith: true),
+                    new(Path.Combine("NT", "lemsgt.sys")),
                 }, "TAGES"),
 
                 // The following files are supposed to only be found inside the driver setup executables, and are present in at least version 5.2.0.1 (Redump entry 15976).

BinaryObjectScanner/Protection/TivolaRingProtection.cs

@@ -22,7 +22,7 @@ namespace BinaryObjectScanner.Protection
         {
             var matchers = new List<PathMatchSet>
             {
-                new(Path.Combine("ZDAT", "webmast.dxx").Replace("\\", "/"), "Tivola Ring Protection [Check disc for physical ring]"),
+                new(Path.Combine("ZDAT", "webmast.dxx"), "Tivola Ring Protection [Check disc for physical ring]"),
             };
 
             return MatchUtil.GetAllMatches(files, matchers, any: true);
@@ -33,7 +33,7 @@ namespace BinaryObjectScanner.Protection
         {
             var matchers = new List<PathMatchSet>
             {
-                new(Path.Combine("ZDAT", "webmast.dxx").Replace("\\", "/"), "Tivola Ring Protection [Check disc for physical ring]"),
+                new(Path.Combine("ZDAT", "webmast.dxx"), "Tivola Ring Protection [Check disc for physical ring]"),
             };
 
             return MatchUtil.GetFirstMatch(path, matchers, any: true);

BinaryObjectScanner/Protection/Zzxzz.cs

@@ -21,9 +21,9 @@ namespace BinaryObjectScanner.Protection
             var matchers = new List<PathMatchSet>
             {
 #if NET20 || NET35
-                new(Path.Combine(Path.Combine(path, "Zzxzz"), "Zzz.aze").Replace("\\", "/"), "Zzxzz"),
+                new(Path.Combine(Path.Combine(path, "Zzxzz"), "Zzz.aze"), "Zzxzz"),
 #else
-                new(Path.Combine(path, "Zzxzz", "Zzz.aze").Replace("\\", "/"), "Zzxzz"),
+                new(Path.Combine(path, "Zzxzz", "Zzz.aze"), "Zzxzz"),
 #endif
                 new($"Zzxzz/", "Zzxzz"),
             };

BinaryObjectScanner/Protection/nProtect.cs

@@ -13,6 +13,8 @@ namespace BinaryObjectScanner.Protection
     /// 
     /// nProtect GameGuard (https://nprotect.com/kr/b2b/prod_gg.html) is anti-cheat software used in a fair amount of online games.
     /// Partial list of games that use GameGuard: https://en.wikipedia.org/wiki/NProtect_GameGuard.
+    /// Known versions of GameGuard:
+    /// "2024.2.27.1" - Found in GameGuard.des in "Soulworker" (Steam Depot 1377581, Manifest 5092481117079359342).
     /// 
     /// nProtect KeyCrypt is an anti-keylogging product that seemingly has other DRM functions as well, such as shutting down processes it deems unnecessary (https://en.wikipedia.org/wiki/INCA_Internet#nProtect_Netizen,_nProtect_Personal,_nProtect_Keycrypt)
     /// TODO: Verify the exact functions of KeyCrypt.
@@ -42,7 +44,7 @@ namespace BinaryObjectScanner.Protection
 
             var name = pex.FileDescription;
 
-            // Found in "GameGuard.des" in Redump entry 90526 and 99598.
+            // Found in "GameGuard.des" in Redump entry 90526 and 99598, and "Soulworker" (Steam Depot 1377581, Manifest 5092481117079359342).
             if (name?.Contains("nProtect GameGuard Launcher") == true)
                 return $"nProtect GameGuard ({pex.GetInternalVersion()})";
 

BinaryObjectScanner/Scanner.cs

@@ -5,11 +5,17 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+#if NET462_OR_GREATER || NETCOREAPP
 using System.Text;
+#endif
+#if NET40_OR_GREATER || NETCOREAPP
 using System.Threading.Tasks;
+#endif
 using BinaryObjectScanner.FileType;
 using BinaryObjectScanner.Interfaces;
 using BinaryObjectScanner.Utilities;
+using SabreTools.IO.Extensions;
+using SabreTools.Serialization.Interfaces;
 using SabreTools.Serialization.Wrappers;
 using static BinaryObjectScanner.Utilities.Dictionary;
 
@@ -92,7 +98,7 @@ namespace BinaryObjectScanner
         public ConcurrentDictionary<string, ConcurrentQueue<string>>? GetProtections(string path)
 #endif
         {
-            return GetProtections(new List<string> { path });
+            return GetProtections([path]);
         }
 
         /// <summary>
@@ -131,11 +137,7 @@ namespace BinaryObjectScanner
                 if (Directory.Exists(path))
                 {
                     // Enumerate all files at first for easier access
-#if NET20 || NET35
-                    var files = Directory.GetFiles(path, "*", SearchOption.AllDirectories).ToList();
-#else
-                    var files = Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories).ToList();
-#endif
+                    var files = IOExtensions.SafeEnumerateFiles(path, "*", SearchOption.AllDirectories).ToList();
 
                     // Scan for path-detectable protections
                     if (ScanPaths)
@@ -328,12 +330,8 @@ namespace BinaryObjectScanner
                 }
 
                 // Get the file type either from magic number or extension
-                SupportedFileType fileType = FileTypes.GetFileType(magic);
-                if (fileType == SupportedFileType.UNKNOWN)
-                    fileType = FileTypes.GetFileType(extension);
-
-                // If we still got unknown, just return null
-                if (fileType == SupportedFileType.UNKNOWN)
+                WrapperType fileType = WrapperFactory.GetFileType(magic, extension);
+                if (fileType == WrapperType.UNKNOWN)
                     return null;
 
                 #region Non-Archive File Types
@@ -428,9 +426,18 @@ namespace BinaryObjectScanner
 #endif
         {
             // Try to create a wrapper for the proper executable type
-            var wrapper = WrapperFactory.CreateExecutableWrapper(stream);
-            if (wrapper == null)
+            IWrapper? wrapper;
+            try
+            {
+                wrapper = WrapperFactory.CreateExecutableWrapper(stream);
+                if (wrapper == null)
+                    return null;
+            }
+            catch (Exception ex)
+            {
+                if (IncludeDebug) Console.WriteLine(ex);
                 return null;
+            }
 
             // Create the output dictionary
 #if NET20 || NET35

BinaryObjectScanner/Utilities/Enums.cs

@@ -1,193 +0,0 @@
-namespace BinaryObjectScanner.Utilities
-{
-    /// <summary>
-    /// Subset of file types that are supported by the library
-    /// </summary>
-    public enum SupportedFileType
-    {
-        /// <summary>
-        /// Unknown or unsupported
-        /// </summary>
-        UNKNOWN,
-
-        /// <summary>
-        /// AACS media key block
-        /// </summary>
-        AACSMediaKeyBlock,
-
-        /// <summary>
-        /// BD+ SVM
-        /// </summary>
-        BDPlusSVM,
-
-        /// <summary>
-        /// BFPK custom archive
-        /// </summary>
-        BFPK,
-
-        /// <summary>
-        /// Half-Life Level
-        /// </summary>
-        BSP,
-
-        /// <summary>
-        /// bzip2 archive
-        /// </summary>
-        BZip2,
-
-        /// <summary>
-        /// Compound File Binary
-        /// </summary>
-        CFB,
-
-        /// <summary>
-        /// CTR Importable Archive
-        /// </summary>
-        CIA,
-
-        /// <summary>
-        /// Executable or library
-        /// </summary>
-        Executable,
-
-        /// <summary>
-        /// Half-Life Game Cache File
-        /// </summary>
-        GCF,
-
-        /// <summary>
-        /// gzip archive
-        /// </summary>
-        GZIP,
-
-        /// <summary>
-        /// Key-value pair INI file
-        /// </summary>
-        IniFile,
-
-        /// <summary>
-        /// InstallShield archive v3
-        /// </summary>
-        InstallShieldArchiveV3,
-
-        /// <summary>
-        /// InstallShield cabinet file
-        /// </summary>
-        InstallShieldCAB,
-
-        /// <summary>
-        /// Link Data Security encrypted file
-        /// </summary>
-        LDSCRYPT,
-
-        /// <summary>
-        /// Microsoft cabinet file
-        /// </summary>
-        MicrosoftCAB,
-
-        /// <summary>
-        /// Microsoft LZ-compressed file
-        /// </summary>
-        MicrosoftLZ,
-
-        /// <summary>
-        /// MPQ game data archive
-        /// </summary>
-        MPQ,
-
-        /// <summary>
-        /// Nintendo 3DS cart image
-        /// </summary>
-        N3DS,
-
-        /// <summary>
-        /// Half-Life No Cache File
-        /// </summary>
-        NCF,
-
-        /// <summary>
-        /// Nintendo DS/DSi cart image
-        /// </summary>
-        Nitro,
-
-        /// <summary>
-        /// Half-Life Package File
-        /// </summary>
-        PAK,
-
-        /// <summary>
-        /// NovaLogic Game Archive Format
-        /// </summary>
-        PFF,
-
-        /// <summary>
-        /// PKWARE ZIP archive and derivatives
-        /// </summary>
-        PKZIP,
-
-        /// <summary>
-        /// PlayJ audio file
-        /// </summary>
-        PLJ,
-
-        /// <summary>
-        /// Quantum archive
-        /// </summary>
-        Quantum,
-
-        /// <summary>
-        /// RAR archive
-        /// </summary>
-        RAR,
-
-        /// <summary>
-        /// 7-zip archive
-        /// </summary>
-        SevenZip,
-
-        /// <summary>
-        /// StarForce FileSystem file
-        /// </summary>
-        SFFS,
-
-        /// <summary>
-        /// SGA
-        /// </summary>
-        SGA,
-
-        /// <summary>
-        /// Tape archive
-        /// </summary>
-        TapeArchive,
-
-        /// <summary>
-        /// Various generic textfile formats
-        /// </summary>
-        Textfile,
-
-        /// <summary>
-        /// Half-Life 2 Level
-        /// </summary>
-        VBSP,
-
-        /// <summary>
-        /// Valve Package File
-        /// </summary>
-        VPK,
-
-        /// <summary>
-        /// Half-Life Texture Package File
-        /// </summary>
-        WAD,
-
-        /// <summary>
-        /// xz archive
-        /// </summary>
-        XZ,
-
-        /// <summary>
-        /// Xbox Package File
-        /// </summary>
-        XZP,
-    }
-}

BinaryObjectScanner/Utilities/FileTypes.cs

@@ -1,798 +0,0 @@
-using System;
-using SabreTools.Matching;
-
-namespace BinaryObjectScanner.Utilities
-{
-    public static class FileTypes
-    {
-        /// <summary>
-        /// Get the supported file type for a magic string
-        /// </summary>
-        /// <remarks>Recommend sending in 16 bytes to check</remarks>
-        public static SupportedFileType GetFileType(byte[] magic)
-        {
-            // If we have an invalid magic byte array
-            if (magic == null || magic.Length == 0)
-                return SupportedFileType.UNKNOWN;
-
-            // TODO: For all modelled types, use the constants instead of hardcoded values here
-            #region AACSMediaKeyBlock
-
-            // Block starting with verify media key record
-            if (magic.StartsWith(new byte?[] { 0x81, 0x00, 0x00, 0x14 }))
-                return SupportedFileType.AACSMediaKeyBlock;
-
-            // Block starting with type and version record
-            if (magic.StartsWith(new byte?[] { 0x10, 0x00, 0x00, 0x0C }))
-                return SupportedFileType.AACSMediaKeyBlock;
-
-            #endregion
-
-            #region BDPlusSVM
-
-            if (magic.StartsWith(new byte?[] { 0x42, 0x44, 0x53, 0x56, 0x4D, 0x5F, 0x43, 0x43 }))
-                return SupportedFileType.BDPlusSVM;
-
-            #endregion
-
-            #region BFPK
-
-            if (magic.StartsWith(new byte?[] { 0x42, 0x46, 0x50, 0x4b }))
-                return SupportedFileType.BFPK;
-
-            #endregion
-
-            #region BSP
-
-            if (magic.StartsWith(new byte?[] { 0x1e, 0x00, 0x00, 0x00 }))
-                return SupportedFileType.BSP;
-
-            #endregion
-
-            #region BZip2
-
-            if (magic.StartsWith(new byte?[] { 0x42, 0x52, 0x68 }))
-                return SupportedFileType.BZip2;
-
-            #endregion
-
-            #region CFB
-
-            if (magic.StartsWith(new byte?[] { 0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1 }))
-                return SupportedFileType.CFB;
-
-            #endregion
-
-            #region CIA
-
-            // No magic checks for CIA
-
-            #endregion
-
-            #region Executable
-
-            // DOS MZ executable file format (and descendants)
-            if (magic.StartsWith(new byte?[] { 0x4d, 0x5a }))
-                return SupportedFileType.Executable;
-
-            /*
-            // None of the following are supported in scans yet
-
-            // Executable and Linkable Format
-            if (magic.StartsWith(new byte?[] { 0x7f, 0x45, 0x4c, 0x46 }))
-                return FileTypes.Executable;
-
-            // Mach-O binary (32-bit)
-            if (magic.StartsWith(new byte?[] { 0xfe, 0xed, 0xfa, 0xce }))
-                return FileTypes.Executable;
-
-            // Mach-O binary (32-bit, reverse byte ordering scheme)
-            if (magic.StartsWith(new byte?[] { 0xce, 0xfa, 0xed, 0xfe }))
-                return FileTypes.Executable;
-
-            // Mach-O binary (64-bit)
-            if (magic.StartsWith(new byte?[] { 0xfe, 0xed, 0xfa, 0xcf }))
-                return FileTypes.Executable;
-
-            // Mach-O binary (64-bit, reverse byte ordering scheme)
-            if (magic.StartsWith(new byte?[] { 0xcf, 0xfa, 0xed, 0xfe }))
-                return FileTypes.Executable;
-
-            // Prefrred Executable File Format
-            if (magic.StartsWith(new byte?[] { 0x4a, 0x6f, 0x79, 0x21, 0x70, 0x65, 0x66, 0x66 }))
-                return FileTypes.Executable;
-            */
-
-            #endregion
-
-            #region GCF
-
-            if (magic.StartsWith(new byte?[] { 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 }))
-                return SupportedFileType.GCF;
-
-            #endregion
-
-            #region GZIP
-
-            if (magic.StartsWith(new byte?[] { 0x1f, 0x8b }))
-                return SupportedFileType.GZIP;
-
-            #endregion
-
-            #region IniFile
-
-            // No magic checks for IniFile
-
-            #endregion
-
-            #region InstallShieldArchiveV3
-
-            if (magic.StartsWith(new byte?[] { 0x13, 0x5D, 0x65, 0x8C }))
-                return SupportedFileType.InstallShieldArchiveV3;
-
-            #endregion
-
-            #region InstallShieldCAB
-
-            if (magic.StartsWith(new byte?[] { 0x49, 0x53, 0x63 }))
-                return SupportedFileType.InstallShieldCAB;
-
-            #endregion
-
-            #region LDSCRYPT
-
-            if (magic.StartsWith(new byte?[] { 0x4C, 0x44, 0x53, 0x43, 0x52, 0x59, 0x50, 0x54 }))
-                return SupportedFileType.LDSCRYPT;
-
-            #endregion
-
-            #region MicrosoftCAB
-
-            if (magic.StartsWith(new byte?[] { 0x4d, 0x53, 0x43, 0x46 }))
-                return SupportedFileType.MicrosoftCAB;
-
-            #endregion
-
-            #region MicrosoftLZ
-
-            if (magic.StartsWith(new byte?[] { 0x53, 0x5a, 0x44, 0x44, 0x88, 0xf0, 0x27, 0x33 }))
-                return SupportedFileType.MicrosoftLZ;
-
-            #endregion
-
-            #region MPQ
-
-            if (magic.StartsWith(new byte?[] { 0x4d, 0x50, 0x51, 0x1a }))
-                return SupportedFileType.MPQ;
-
-            if (magic.StartsWith(new byte?[] { 0x4d, 0x50, 0x51, 0x1b }))
-                return SupportedFileType.MPQ;
-
-            #endregion
-
-            #region N3DS
-
-            // No magic checks for N3DS
-
-            #endregion
-
-            #region NCF
-
-            if (magic.StartsWith(new byte?[] { 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 }))
-                return SupportedFileType.NCF;
-
-            #endregion
-
-            #region Nitro
-
-            // No magic checks for Nitro
-
-            #endregion
-
-            #region PAK
-
-            if (magic.StartsWith(new byte?[] { 0x50, 0x41, 0x43, 0x4B }))
-                return SupportedFileType.PAK;
-
-            #endregion
-
-            #region PFF
-
-            // Version 2
-            if (magic.StartsWith(new byte?[] { 0x14, 0x00, 0x00, 0x00, 0x50, 0x46, 0x46, 0x32 }))
-                return SupportedFileType.PFF;
-
-            // Version 3
-            if (magic.StartsWith(new byte?[] { 0x14, 0x00, 0x00, 0x00, 0x50, 0x46, 0x46, 0x33 }))
-                return SupportedFileType.PFF;
-
-            // Version 4
-            if (magic.StartsWith(new byte?[] { 0x14, 0x00, 0x00, 0x00, 0x50, 0x46, 0x46, 0x34 }))
-                return SupportedFileType.PFF;
-
-            #endregion
-
-            #region PKZIP
-
-            // PKZIP (Unknown)
-            if (magic.StartsWith(new byte?[] { 0x50, 0x4b, 0x00, 0x00 }))
-                return SupportedFileType.PKZIP;
-
-            // PKZIP
-            if (magic.StartsWith(new byte?[] { 0x50, 0x4b, 0x03, 0x04 }))
-                return SupportedFileType.PKZIP;
-
-            // PKZIP (Empty Archive)
-            if (magic.StartsWith(new byte?[] { 0x50, 0x4b, 0x05, 0x06 }))
-                return SupportedFileType.PKZIP;
-
-            // PKZIP (Spanned Archive)
-            if (magic.StartsWith(new byte?[] { 0x50, 0x4b, 0x07, 0x08 }))
-                return SupportedFileType.PKZIP;
-
-            #endregion
-
-            #region PLJ
-
-            // https://www.iana.org/assignments/media-types/audio/vnd.everad.plj
-            if (magic.StartsWith(new byte?[] { 0xFF, 0x9D, 0x53, 0x4B }))
-                return SupportedFileType.PLJ;
-
-            #endregion
-
-            #region Quantum
-
-            if (magic.StartsWith(new byte?[] { 0x44, 0x53 }))
-                return SupportedFileType.Quantum;
-
-            #endregion
-
-            #region RAR
-
-            // RAR archive version 1.50 onwards
-            if (magic.StartsWith(new byte?[] { 0x52, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00 }))
-                return SupportedFileType.RAR;
-
-            // RAR archive version 5.0 onwards
-            if (magic.StartsWith(new byte?[] { 0x52, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x01, 0x00 }))
-                return SupportedFileType.RAR;
-
-            #endregion
-
-            #region SevenZip
-
-            if (magic.StartsWith(new byte?[] { 0x37, 0x7a, 0xbc, 0xaf, 0x27, 0x1c }))
-                return SupportedFileType.SevenZip;
-
-            #endregion
-
-            #region SFFS
-
-            // Found in Redump entry 81756, confirmed to be "StarForce Filesystem" by PiD.
-            if (magic.StartsWith(new byte?[] { 0x53, 0x46, 0x46, 0x53 }))
-                return SupportedFileType.SFFS;
-
-            #endregion 
-
-            #region SGA
-
-            if (magic.StartsWith(new byte?[] { 0x5F, 0x41, 0x52, 0x43, 0x48, 0x49, 0x56, 0x45 }))
-                return SupportedFileType.SGA;
-
-            #endregion
-
-            #region TapeArchive
-
-            if (magic.StartsWith(new byte?[] { 0x75, 0x73, 0x74, 0x61, 0x72, 0x00, 0x30, 0x30 }))
-                return SupportedFileType.TapeArchive;
-
-            if (magic.StartsWith(new byte?[] { 0x75, 0x73, 0x74, 0x61, 0x72, 0x20, 0x20, 0x00 }))
-                return SupportedFileType.TapeArchive;
-
-            #endregion
-
-            #region Textfile
-
-            // Not all textfiles can be determined through magic number
-
-            // HTML
-            if (magic.StartsWith(new byte?[] { 0x3c, 0x68, 0x74, 0x6d, 0x6c }))
-                return SupportedFileType.Textfile;
-
-            // HTML and XML
-            if (magic.StartsWith(new byte?[] { 0x3c, 0x21, 0x44, 0x4f, 0x43, 0x54, 0x59, 0x50, 0x45 }))
-                return SupportedFileType.Textfile;
-
-            // InstallShield Compiled Rules
-            if (magic.StartsWith(new byte?[] { 0x61, 0x4C, 0x75, 0x5A }))
-                return SupportedFileType.Textfile;
-
-            // Microsoft Office File (old)
-            if (magic.StartsWith(new byte?[] { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1 }))
-                return SupportedFileType.Textfile;
-
-            // Rich Text File
-            if (magic.StartsWith(new byte?[] { 0x7b, 0x5c, 0x72, 0x74, 0x66, 0x31 }))
-                return SupportedFileType.Textfile;
-
-            // Windows Help File
-            if (magic.StartsWith(new byte?[] { 0x3F, 0x5F, 0x03, 0x00 }))
-                return SupportedFileType.Textfile;
-
-            // XML 
-            // "<?xml"
-            if (magic.StartsWith(new byte?[] { 0x3C, 0x3F, 0x78, 0x6D, 0x6C }))
-                return SupportedFileType.Textfile;
-
-            #endregion
-
-            #region VBSP
-
-            if (magic.StartsWith(new byte?[] { 0x56, 0x42, 0x53, 0x50 }))
-                return SupportedFileType.VBSP;
-
-            #endregion
-
-            #region VPK
-
-            if (magic.StartsWith(new byte?[] { 0x34, 0x12, 0xaa, 0x55 }))
-                return SupportedFileType.VPK;
-
-            #endregion
-
-            #region WAD
-
-            if (magic.StartsWith(new byte?[] { 0x57, 0x41, 0x44, 0x33 }))
-                return SupportedFileType.WAD;
-
-            #endregion
-
-            #region XZ
-
-            if (magic.StartsWith(new byte?[] { 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00 }))
-                return SupportedFileType.XZ;
-
-            #endregion
-
-            #region XZP
-
-            if (magic.StartsWith(new byte?[] { 0x70, 0x69, 0x5A, 0x78 }))
-                return SupportedFileType.XZP;
-
-            #endregion
-
-            // We couldn't find a supported match
-            return SupportedFileType.UNKNOWN;
-        }
-
-        /// <summary>
-        /// Get the supported file type for an extension
-        /// </summary>
-        /// <remarks>This is less accurate than a magic string match</remarks>
-        public static SupportedFileType GetFileType(string extension)
-        {
-            // If we have an invalid extension
-            if (string.IsNullOrEmpty(extension))
-                return SupportedFileType.UNKNOWN;
-
-            // Normalize the extension
-            extension = extension.TrimStart('.').Trim();
-
-            #region AACSMediaKeyBlock
-
-            // Shares an extension with INF setup information so it can't be used accurately
-            // Blu-ray
-            // if (extension.Equals("inf", StringComparison.OrdinalIgnoreCase))
-            //     return SupportedFileType.AACSMediaKeyBlock;
-
-            // HD-DVD
-            if (extension.Equals("aacs", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.AACSMediaKeyBlock;
-
-            #endregion
-
-            #region BDPlusSVM
-
-            if (extension.Equals("svm", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.BDPlusSVM;
-
-            #endregion
-
-            #region BFPK
-
-            // No extensions registered for BFPK
-
-            #endregion
-
-            #region BSP
-
-            // Shares an extension with VBSP so it can't be used accurately
-            // if (extension.Equals("bsp", StringComparison.OrdinalIgnoreCase))
-            //     return SupportedFileType.BSP;
-
-            #endregion
-
-            #region BZip2
-
-            if (extension.Equals("bz2", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.BZip2;
-
-            #endregion
-
-            #region CFB
-
-            // Installer package
-            if (extension.Equals("msi", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.CFB;
-
-            // Merge module
-            else if (extension.Equals("msm", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.CFB;
-
-            // Patch Package
-            else if (extension.Equals("msp", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.CFB;
-
-            // Transform
-            else if (extension.Equals("mst", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.CFB;
-
-            // Patch Creation Properties
-            else if (extension.Equals("pcp", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.CFB;
-
-            #endregion
-
-            #region CIA
-
-            if (extension.Equals("cia", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.CIA;
-
-            #endregion
-
-            #region Executable
-
-            // DOS MZ executable file format (and descendants)
-            if (extension.Equals("exe", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Executable;
-
-            // DOS MZ library file format (and descendants)
-            if (extension.Equals("dll", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Executable;
-
-            #endregion
-
-            #region GCF
-
-            if (extension.Equals("gcf", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.GCF;
-
-            #endregion
-
-            #region GZIP
-
-            if (extension.Equals("gz", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.GZIP;
-
-            #endregion
-
-            #region IniFile
-
-            if (extension.Equals("ini", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.IniFile;
-
-            #endregion
-
-            #region InstallShieldArchiveV3
-
-            if (extension.Equals("z", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.InstallShieldArchiveV3;
-
-            #endregion
-
-            #region InstallShieldCAB
-
-            // No extensions registered for InstallShieldCAB
-            // Both InstallShieldCAB and MicrosoftCAB share the same extension
-
-            #endregion
-
-            #region MicrosoftCAB
-
-            // No extensions registered for InstallShieldCAB
-            // Both InstallShieldCAB and MicrosoftCAB share the same extension
-
-            #endregion
-
-            #region MPQ
-
-            if (extension.Equals("mpq", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.MPQ;
-
-            #endregion
-
-            #region N3DS
-
-            // 3DS cart image
-            if (extension.Equals("3ds", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.N3DS;
-
-            // CIA package -- Not currently supported
-            // else if (extension.Equals("cia", StringComparison.OrdinalIgnoreCase))
-            //     return SupportedFileType.N3DS;
-
-            #endregion
-
-            #region NCF
-
-            if (extension.Equals("ncf", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.NCF;
-
-            #endregion
-
-            #region Nitro
-
-            // DS cart image
-            if (extension.Equals("nds", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Nitro;
-
-            // DS development cart image
-            else if (extension.Equals("srl", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Nitro;
-
-            // DSi cart image
-            else if (extension.Equals("dsi", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Nitro;
-
-            // iQue DS cart image
-            else if (extension.Equals("ids", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Nitro;
-
-            #endregion
-
-            #region PAK
-
-            // No extensions registered for PAK
-            // Both PAK and Quantum share one extension
-            // if (extension.Equals("pak", StringComparison.OrdinalIgnoreCase))
-            //     return SupportedFileType.PAK;
-
-            #endregion
-
-            #region PFF
-
-            if (extension.Equals("pff", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PFF;
-
-            #endregion
-
-            #region PKZIP
-
-            // PKZIP
-            if (extension.Equals("zip", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // Android package
-            if (extension.Equals("apk", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // Java archive
-            if (extension.Equals("jar", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // Google Earth saved working session file
-            if (extension.Equals("kmz", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // KWord document
-            if (extension.Equals("kwd", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // Microsoft Office Open XML Format (OOXML) Document
-            if (extension.Equals("docx", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // Microsoft Office Open XML Format (OOXML) Presentation
-            if (extension.Equals("pptx", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // Microsoft Office Open XML Format (OOXML) Spreadsheet
-            if (extension.Equals("xlsx", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // OpenDocument text document
-            if (extension.Equals("odt", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // OpenDocument presentation
-            if (extension.Equals("odp", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // OpenDocument text document template
-            if (extension.Equals("ott", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // Microsoft Open XML paper specification file
-            if (extension.Equals("oxps", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // OpenOffice spreadsheet
-            if (extension.Equals("sxc", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // OpenOffice drawing
-            if (extension.Equals("sxd", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // OpenOffice presentation
-            if (extension.Equals("sxi", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // OpenOffice word processing
-            if (extension.Equals("sxw", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // StarOffice spreadsheet
-            if (extension.Equals("sxc", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // Windows Media compressed skin file
-            if (extension.Equals("wmz", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // Mozilla Browser Archive
-            if (extension.Equals("xpi", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // XML paper specification file
-            if (extension.Equals("xps", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            // eXact Packager Models
-            if (extension.Equals("xpt", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PKZIP;
-
-            #endregion
-
-            #region PLJ
-
-            // https://www.iana.org/assignments/media-types/audio/vnd.everad.plj
-            if (extension.Equals("plj", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.PLJ;
-
-            #endregion
-
-            #region Quantum
-
-            if (extension.Equals("q", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Quantum;
-
-            // Both PAK and Quantum share one extension
-            // if (extension.Equals("pak", StringComparison.OrdinalIgnoreCase))
-            //     return SupportedFileType.Quantum;
-
-            #endregion
-
-            #region RAR
-
-            if (extension.Equals("rar", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.RAR;
-
-            #endregion
-
-            #region SevenZip
-
-            if (extension.Equals("7z", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.SevenZip;
-
-            #endregion
-
-            #region SGA
-
-            if (extension.Equals("sga", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.SGA;
-
-            #endregion
-
-            #region TapeArchive
-
-            if (extension.Equals("tar", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.SevenZip;
-
-            #endregion
-
-            #region Textfile
-
-            // "Description in Zip"
-            if (extension.Equals("diz", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-
-            // Generic textfile (no header)
-            if (extension.Equals("txt", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-
-            // HTML
-            if (extension.Equals("htm", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-            if (extension.Equals("html", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-
-            // InstallShield Script
-            if (extension.Equals("ins", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-
-            // Microsoft Office File (old)
-            if (extension.Equals("doc", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-
-            // Property list
-            if (extension.Equals("plist", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-
-            // Rich Text File
-            if (extension.Equals("rtf", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-
-            // Setup information
-            if (extension.Equals("inf", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-
-            // Windows Help File
-            if (extension.Equals("hlp", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-
-            // WZC
-            if (extension.Equals("wzc", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-
-            // XML
-            if (extension.Equals("xml", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.Textfile;
-
-            
-
-            #endregion
-
-            #region VBSP
-
-            // Shares an extension with BSP so it can't be used accurately
-            // if (extension.Equals("bsp", StringComparison.OrdinalIgnoreCase))
-            //     return SupportedFileType.VBSP;
-
-            #endregion
-
-            #region VPK
-
-            // Common extension so this cannot be used accurately
-            // if (extension.Equals("vpk", StringComparison.OrdinalIgnoreCase))
-            //     return SupportedFileType.VPK;
-
-            #endregion
-
-            #region WAD
-
-            // Common extension so this cannot be used accurately
-            // if (extension.Equals("wad", StringComparison.OrdinalIgnoreCase))
-            //     return SupportedFileType.WAD;
-
-            #endregion
-
-            #region XZ
-
-            if (extension.Equals("xz", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.XZ;
-
-            #endregion
-
-            #region XZP
-
-            if (extension.Equals("xzp", StringComparison.OrdinalIgnoreCase))
-                return SupportedFileType.XZP;
-
-            #endregion
-
-            // We couldn't find a supported match
-            return SupportedFileType.UNKNOWN;
-        }
-    }
-}

BinaryObjectScanner/Utilities/WrapperFactory.cs

@@ -1,114 +0,0 @@
-using System.IO;
-using SabreTools.IO;
-using SabreTools.Matching;
-using SabreTools.Serialization.Interfaces;
-using SabreTools.Serialization.Wrappers;
-
-namespace BinaryObjectScanner.Utilities
-{
-    public static class WrapperFactory
-    {
-        /// <summary>
-        /// Create an instance of a wrapper based on file type
-        /// </summary>
-        public static IWrapper? CreateWrapper(SupportedFileType fileType, Stream? data)
-        {
-            switch (fileType)
-            {
-                case SupportedFileType.AACSMediaKeyBlock: return AACSMediaKeyBlock.Create(data);
-                case SupportedFileType.BDPlusSVM: return BDPlusSVM.Create(data);
-                case SupportedFileType.BFPK: return BFPK.Create(data);
-                case SupportedFileType.BSP: return BSP.Create(data);
-                //case SupportedFileType.BZip2: return BZip2.Create(data);
-                case SupportedFileType.CFB: return CFB.Create(data);
-                case SupportedFileType.CIA: return CIA.Create(data);
-                case SupportedFileType.Executable: return CreateExecutableWrapper(data);
-                case SupportedFileType.GCF: return GCF.Create(data);
-                //case SupportedFileType.GZIP: return GZIP.Create(data);
-                //case SupportedFileType.IniFile: return IniFile.Create(data);
-                //case SupportedFileType.InstallShieldArchiveV3: return InstallShieldArchiveV3.Create(data);
-                case SupportedFileType.InstallShieldCAB: return InstallShieldCabinet.Create(data);
-                //case SupportedFileType.LDSCRYPT: return LDSCRYPT.Create(data);
-                case SupportedFileType.MicrosoftCAB: return MicrosoftCabinet.Create(data);
-                //case SupportedFileType.MicrosoftLZ: return MicrosoftLZ.Create(data);
-                //case SupportedFileType.MPQ: return MoPaQ.Create(data);
-                case SupportedFileType.N3DS: return N3DS.Create(data);
-                case SupportedFileType.NCF: return NCF.Create(data);
-                case SupportedFileType.Nitro: return Nitro.Create(data);
-                case SupportedFileType.PAK: return PAK.Create(data);
-                case SupportedFileType.PFF: return PFF.Create(data);
-                //case SupportedFileType.PKZIP: return PKZIP.Create(data);
-                case SupportedFileType.PLJ: return PlayJAudioFile.Create(data);
-                case SupportedFileType.Quantum: return Quantum.Create(data);
-                //case SupportedFileType.RAR: return RAR.Create(data);
-                //case SupportedFileType.SevenZip: return SevenZip.Create(data);
-                //case SupportedFileType.SFFS: return SFFS.Create(data);
-                case SupportedFileType.SGA: return SGA.Create(data);
-                //case SupportedFileType.TapeArchive: return TapeArchive.Create(data);
-                //case SupportedFileType.Textfile: return Textfile.Create(data);
-                case SupportedFileType.VBSP: return VBSP.Create(data);
-                case SupportedFileType.VPK: return VPK.Create(data);
-                case SupportedFileType.WAD: return WAD.Create(data);
-                //case SupportedFileType.XZ: return XZ.Create(data);
-                case SupportedFileType.XZP: return XZP.Create(data);
-                default: return null;
-            }
-        }
-
-        /// <summary>
-        /// Create an instance of a wrapper based on the executable type
-        /// </summary>
-        /// <param name="stream">Stream data to parse</param>
-        /// <returns>IWrapper representing the executable, null on error</returns>
-        public static IWrapper? CreateExecutableWrapper(Stream? stream)
-        {
-            // If we have no stream
-            if (stream == null)
-                return null;
-
-            // Try to get an MS-DOS wrapper first
-            IWrapper? wrapper = MSDOS.Create(stream);
-            if (wrapper == null || !(wrapper is MSDOS msdos))
-                return null;
-
-            // Check for a valid new executable address
-            if (msdos.Model.Header?.NewExeHeaderAddr == null || msdos.Model.Header.NewExeHeaderAddr >= stream.Length)
-                return wrapper;
-
-            // Try to read the executable info
-            stream.Seek(msdos.Model.Header.NewExeHeaderAddr, SeekOrigin.Begin);
-            var magic = stream.ReadBytes(4);
-
-            // If we didn't get valid data at the offset
-            if (magic == null)
-            {
-                return wrapper;
-            }
-
-            // New Executable
-            else if (magic.StartsWith(SabreTools.Models.NewExecutable.Constants.SignatureBytes))
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-                return NewExecutable.Create(stream);
-            }
-
-            // Linear Executable
-            else if (magic.StartsWith(SabreTools.Models.LinearExecutable.Constants.LESignatureBytes)
-                || magic.StartsWith(SabreTools.Models.LinearExecutable.Constants.LXSignatureBytes))
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-                return LinearExecutable.Create(stream);
-            }
-
-            // Portable Executable
-            else if (magic.StartsWith(SabreTools.Models.PortableExecutable.Constants.SignatureBytes))
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-                return PortableExecutable.Create(stream);
-            }
-
-            // Everything else fails
-            return null;
-        }
-    }
-}

README.md

@@ -1,7 +1,7 @@
 # Binary Object Scanner
 
 [![Build status](https://ci.appveyor.com/api/projects/status/gmdft5bk1h8a1c31?svg=true)](https://ci.appveyor.com/project/mnadareski/BinaryObjectScanner)
-[![Build Test](https://github.com/SabreTools/BinaryObjectScanner/actions/workflows/build_test.yml/badge.svg)](https://github.com/SabreTools/BinaryObjectScanner/actions/workflows/build_test.yml)
+[![Test Build](https://github.com/SabreTools/BinaryObjectScanner/actions/workflows/build_test.yml/badge.svg)](https://github.com/SabreTools/BinaryObjectScanner/actions/workflows/build_test.yml)
 [![Nuget Pack](https://github.com/SabreTools/BinaryObjectScanner/actions/workflows/build_nupkg.yml/badge.svg)](https://github.com/SabreTools/BinaryObjectScanner/actions/workflows/build_nupkg.yml)
 
 C# protection, packer, and archive scanning library. This currently compiles as a library so it can be used in any C# application. A reference application called `Test` is also included to demonstrate the abilities of the library. For an example of a program implementing the library, see [MPF](https://github.com/SabreTools/MPF).
@@ -9,16 +9,16 @@ C# protection, packer, and archive scanning library. This currently compiles as
 The following non-project libraries (or ports thereof) are used for file handling:
 
 - [LessIO](https://github.com/activescott/LessIO) - Used by libmspack4n for IO handling
-- [libmspack4n](https://github.com/activescott/libmspack4n) MS-CAB extraction [Unused in .NET Frawework 2.0/3.5/4.0 and non-Windows builds due to Windows-specific libraries]
-- [openmcdf](https://github.com/ironfede/openmcdf) - MSI extraction
+- [libmspack4n](https://github.com/activescott/libmspack4n) MS-CAB extraction [Unused in .NET Frawework 2.0/3.5/4.0, non-Windows, and non-x86 builds due to Windows-specific libraries]
+- [OpenMcdf](https://github.com/ironfede/openmcdf) - MSI extraction
 - [SharpCompress](https://github.com/adamhathcock/sharpcompress) - Common archive format extraction
-- [StormLibSharp](https://github.com/robpaveza/stormlibsharp) - MoPaQ extraction [Unused in .NET Frawework 2.0/3.5/4.0 and non-Windows builds due to Windows-specific libraries]
+- [StormLibSharp](https://github.com/robpaveza/stormlibsharp) - MoPaQ extraction [Unused in .NET Frawework 2.0/3.5/4.0, non-Windows, and non-x86  builds due to Windows-specific libraries]
 - [UnshieldSharp](https://github.com/mnadareski/UnshieldSharp) - InstallShield CAB extraction
 - [WiseUnpacker](https://github.com/mnadareski/WiseUnpacker) - Wise Installer extraction
 
 The following projects have influenced this library:
 
-- [BurnOut](http://burnout.sourceforge.net/) - Project that this library was initially based on. The only thing left from that original port is in the name of the library. This project is fully unaffiliated with the original BurnOut and its authors.
+- [BurnOut](http://burnout.sourceforge.net/) - Project that this library was initially based on. This project is fully unaffiliated with the original BurnOut and its authors.
 - [HLLibSharp](https://github.com/mnadareski/HLLibSharp) - Documentation around Valve package handling, including extraction.
 - [libbdplus](https://www.videolan.org/developers/libbdplus.html) - Documentation around the BD+ SVM files.
 - [libmspack](https://github.com/kyz/libmspack) - Documentation around the MS-CAB format and associated compression methods.
@@ -26,6 +26,27 @@ The following projects have influenced this library:
 
 Please visit our sibling project, [DRML](https://github.com/TheRogueArchivist/DRML), the DRM Library for a more in-depth look at some of the protections detected.
 
+## Releases
+
+For the most recent stable build, download the latest release here: [Releases Page](https://github.com/SabreTools/BinaryObjectScanner/releases)
+
+For the latest WIP build here: [Rolling Release](https://github.com/SabreTools/BinaryObjectScanner/releases/tag/rolling)
+
+## Compatibility Notes
+
+Binary Object Scanner strives to have both full compatibility for scanning across .NET versions as well as across OSes. Unfortunately, this is not always the case. Please see the below list for known compatibility issues.
+
+- **7-zip archive** - Extraction is only supported on .NET Framework 4.6.2 and higher due to `SharpCompress` support limitations
+- **bzip2 archive** - Extraction is only supported on .NET Framework 4.6.2 and higher due to `SharpCompress` support limitations
+- **gzip archive** - Extraction is only supported on .NET Framework 4.6.2 and higher due to `SharpCompress` support limitations
+- **MS-CAB** - Extraction is only supported in Windows x86 builds running .NET Framework 4.5.2 and higher due to native DLL requirements
+- **MSI** - Extraction is only supported on .NET Framework 4.0 and higher due to `OpenMcdf` support limitations
+- **MoPaQ** - Extraction is only supported in Windows x86 builds running .NET Framework 4.5.2 and higher due to native DLL requirements
+- **PKZIP and derived files (ZIP, etc.)** - Extraction is only supported on .NET Framework 4.6.2 and higher
+- **RAR archive** - Extraction is only supported on .NET Framework 4.6.2 and higher due to `SharpCompress` support limitations
+- **Tape archive** - Extraction is only supported on .NET Framework 4.6.2 and higher due to `SharpCompress` support limitations
+- **xz archive** - Extraction is only supported on .NET Framework 4.6.2 and higher due to `SharpCompress` support limitations
+
 ## Protections Detected
 
 Below is a list of protections detected by BinaryObjectScanner. The two columns explain what sort of checks are performed to determine how the protection is detected. Generally speaking, it's better to have a content check than a path check.
@@ -49,6 +70,7 @@ Below is a list of protections detected by BinaryObjectScanner. The two columns
 | CD-X | False | True | Unconfirmed¹ |
 | CDSHiELD SE | True | False | |
 | Cenga ProtectDVD | True | True | |
+| Channelware | True | True | Version finding and detection of later versions unimplemented |
 | ChosenBytes CodeLock | True | True | Partially unconfirmed² |
 | CopyKiller | True | True | |
 | CopyLok/CodeLok | True | False | |
@@ -60,6 +82,7 @@ Below is a list of protections detected by BinaryObjectScanner. The two columns
 | DiscGuard | True | True | Partially unconfirmed² |
 | DVD-Movie-PROTECT | False | True | Unconfirmed¹ |
 | DVD Crypt | False | True | Unconfirmed¹ |
+| EA Anti Cheat | True | True | |
 | EA Protections | True | False | Including EA CDKey and EA DRM. |
 | Easy Anti-Cheat | True | True | |
 | Engine32 | True | False | |
@@ -92,6 +115,7 @@ Below is a list of protections detected by BinaryObjectScanner. The two columns
 | Protect DVD-Video | False | True | Unconfirmed¹ |
 | PlayStation Anti-modchip | True | False | En/Jp, not "Red Hand"; PSX executables only |
 | Rainbow Sentinel | True | True | |
+| RealArcade | True | True | |
 | Ring PROTECH / ProRing | True | True | Partially unconfirmed² |
 | RipGuard | True | True | Partially unconfirmed² |
 | Roxxe | True | False | |
@@ -161,7 +185,7 @@ Below is a list of game engines detected by BinaryObjectScanner. The two columns
 
 | Protection Name | Content Check | Path Check | Notes |
 | --------------- | ------------- | ---------- | ----- |
-| RenderWare | Yes | No | No | |
+| RenderWare | Yes | No | |
 
 ## Container Formats
 
@@ -186,9 +210,9 @@ Below is a list of container formats that are supported in some way:
 | InstallShield CAB | Yes | Yes | Yes | Via `UnshieldSharp` |
 | Linear Executable | No | No | No | Skeleton only |
 | Link Data Security encrypted file | No | Yes | No | |
-| Microsoft cabinet file | Yes | Yes | Yes | |
+| Microsoft cabinet file | Yes | Yes | Yes* | Via `libmspack4n`, Windows x86 only, .NET Framework 4.5.2 and above |
 | Microsoft LZ-compressed files | No | Yes | Yes | |
-| MoPaQ game data archive (MPQ) | No | Yes | Yes | Via `StormLibSharp` |
+| MoPaQ game data archive (MPQ) | No | Yes | Yes* | Via `StormLibSharp`, Windows x86 only, .NET Framework 4.5.2 and above |
 | MS-DOS Executable | Yes | Yes | No | Incomplete |
 | New Exectuable | Yes | Yes | No | Incomplete |
 | Nintendo 3DS cart image | Yes | Yes | No | |

Test/Extractor.cs

@@ -1,12 +1,12 @@
 using System;
 using System.IO;
-using System.Linq;
+#if NET452_OR_GREATER || NETCOREAPP
 using System.Text;
-using BinaryObjectScanner.Utilities;
+#endif
 #if NET40_OR_GREATER || NETCOREAPP
 using OpenMcdf;
 #endif
-using SabreTools.IO;
+using SabreTools.IO.Extensions;
 using SabreTools.Serialization.Wrappers;
 #if NET462_OR_GREATER || NETCOREAPP
 using SharpCompress.Archives;
@@ -20,18 +20,46 @@ using SharpCompress.Compressors.BZip2;
 using SharpCompress.Compressors.Xz;
 #endif
 using UnshieldSharp.Archive;
-using UnshieldSharp.Cabinet;
 
 namespace Test
 {
-    internal static class Extractor
+    internal class Extractor
     {
+        #region Options
+
+        /// <inheritdoc cref="BinaryObjectScanner.Options.IncludeDebug"/>
+        public bool IncludeDebug => _options?.IncludeDebug ?? false;
+
+        /// <summary>
+        /// Options object for configuration
+        /// </summary>
+        private readonly BinaryObjectScanner.Options _options;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="includeDebug">Enable including debug information</param>
+        public Extractor(bool includeDebug)
+        {
+            this._options = new BinaryObjectScanner.Options
+            {
+                IncludeDebug = includeDebug,
+            };
+
+#if NET462_OR_GREATER || NETCOREAPP
+            // Register the codepages
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+#endif
+        }
+
         /// <summary>
         /// Wrapper to extract data for a single path
         /// </summary>
         /// <param name="path">File or directory path</param>
         /// <param name="outputDirectory">Output directory path</param>
-        public static void ExtractPath(string path, string outputDirectory)
+        public void ExtractPath(string path, string outputDirectory)
         {
             Console.WriteLine($"Checking possible path: {path}");
 
@@ -42,11 +70,7 @@ namespace Test
             }
             else if (Directory.Exists(path))
             {
-#if NET20 || NET35
-                foreach (string file in Directory.GetFiles(path, "*", SearchOption.AllDirectories))
-#else
-                foreach (string file in Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories))
-#endif
+                foreach (string file in IOExtensions.SafeEnumerateFiles(path, "*", SearchOption.AllDirectories))
                 {
                     ExtractFile(file, outputDirectory);
                 }
@@ -60,23 +84,36 @@ namespace Test
         /// <summary>
         /// Print information for a single file, if possible
         /// </summary>
-        private static void ExtractFile(string file, string outputDirectory)
+        private void ExtractFile(string file, string outputDirectory)
         {
             Console.WriteLine($"Attempting to extract all files from {file}");
             using Stream stream = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 
-            // Read the first 8 bytes
-            byte[]? magic = stream.ReadBytes(8);
-            stream.Seek(0, SeekOrigin.Begin);
+            // Get the extension for certain checks
+            string extension = Path.GetExtension(file).ToLower().TrimStart('.');
+
+            // Get the first 16 bytes for matching
+            byte[] magic = new byte[16];
+            try
+            {
+                stream.Read(magic, 0, 16);
+                stream.Seek(0, SeekOrigin.Begin);
+            }
+            catch (Exception ex)
+            {
+                if (IncludeDebug) Console.WriteLine(ex);
+
+                return;
+            }
 
             // Get the file type
-            SupportedFileType ft = FileTypes.GetFileType(magic ?? []);
+            WrapperType ft = WrapperFactory.GetFileType(magic, extension);
 
             // Executables technically can be "extracted", but let's ignore that
             // TODO: Support executables that include other stuff
 
             // 7-zip
-            if (ft == SupportedFileType.SevenZip)
+            if (ft == WrapperType.SevenZip)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting 7-zip contents");
@@ -95,10 +132,14 @@ namespace Test
                         // If an individual entry fails
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
                             string tempFile = Path.Combine(outputDirectory, entry.Key);
                             entry.WriteToFile(tempFile);
                         }
@@ -118,7 +159,7 @@ namespace Test
             }
 
             // BFPK archive
-            else if (ft == SupportedFileType.BFPK)
+            else if (ft == WrapperType.BFPK)
             {
                 // Build the BFPK information
                 Console.WriteLine("Extracting BFPK contents");
@@ -145,7 +186,7 @@ namespace Test
             }
 
             // BSP
-            else if (ft == SupportedFileType.BSP)
+            else if (ft == WrapperType.BSP)
             {
                 // Build the BSP information
                 Console.WriteLine("Extracting BSP contents");
@@ -173,7 +214,7 @@ namespace Test
             }
 
             // bzip2
-            else if (ft == SupportedFileType.BZip2)
+            else if (ft == WrapperType.BZip2)
             {
                 // Build the bzip2 information
                 Console.WriteLine("Extracting bzip2 contents");
@@ -201,7 +242,7 @@ namespace Test
             }
 
             // CFB
-            else if (ft == SupportedFileType.CFB)
+            else if (ft == WrapperType.CFB)
             {
                 // Build the installer information
                 Console.WriteLine("Extracting CFB contents");
@@ -251,7 +292,7 @@ namespace Test
             }
 
             // GCF
-            else if (ft == SupportedFileType.GCF)
+            else if (ft == WrapperType.GCF)
             {
                 // Build the GCF information
                 Console.WriteLine("Extracting GCF contents");
@@ -278,7 +319,7 @@ namespace Test
             }
 
             // gzip
-            else if (ft == SupportedFileType.GZIP)
+            else if (ft == WrapperType.GZIP)
             {
                 // Build the gzip information
                 Console.WriteLine("Extracting gzip contents");
@@ -294,10 +335,14 @@ namespace Test
                     // If an individual entry fails
                     try
                     {
-                        // If we have a directory, skip it
+                        // If the entry is a directory
                         if (entry.IsDirectory)
                             continue;
 
+                        // If the entry has an invalid key
+                        if (entry.Key == null)
+                            continue;
+
                         string tempFile = Path.Combine(outputDirectory, entry.Key);
                         entry.WriteToFile(tempFile);
                     }
@@ -312,7 +357,7 @@ namespace Test
             }
 
             // InstallShield Archive V3 (Z)
-            else if (ft == SupportedFileType.InstallShieldArchiveV3)
+            else if (ft == WrapperType.InstallShieldArchiveV3)
             {
                 // Build the InstallShield Archive V3 information
                 Console.WriteLine("Extracting InstallShield Archive V3 contents");
@@ -322,17 +367,17 @@ namespace Test
                 try
                 {
                     var archive = new InstallShieldArchiveV3(file);
-                    foreach (var cfile in archive.Files.Select(kvp => kvp.Value))
+                    foreach (var cfile in archive.Files)
                     {
                         // If an individual entry fails
                         try
                         {
-                            string tempFile = Path.Combine(outputDirectory, cfile.FullPath ?? string.Empty);
+                            string tempFile = Path.Combine(outputDirectory, cfile.Key);
                             string? directoryName = Path.GetDirectoryName(tempFile);
                             if (!string.IsNullOrEmpty(directoryName) && !Directory.Exists(directoryName))
                                 Directory.CreateDirectory(directoryName);
 
-                            (byte[]? fileContents, string? error) = archive.Extract(cfile.FullPath ?? string.Empty);
+                            (byte[]? fileContents, string? error) = archive.Extract(cfile.Key);
                             if (!string.IsNullOrEmpty(error))
                                 continue;
 
@@ -344,7 +389,7 @@ namespace Test
                         }
                         catch (Exception ex)
                         {
-                            Console.WriteLine($"Something went wrong extracting InstallShield Archive V3 entry {cfile.Name}: {ex}");
+                            Console.WriteLine($"Something went wrong extracting InstallShield Archive V3 entry {cfile.Value.Name}: {ex}");
                             Console.WriteLine();
                         }
                     }
@@ -357,7 +402,7 @@ namespace Test
             }
 
             // IS-CAB archive
-            else if (ft == SupportedFileType.InstallShieldCAB)
+            else if (ft == WrapperType.InstallShieldCAB)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting IS-CAB contents");
@@ -367,12 +412,19 @@ namespace Test
                 try
                 {
                     var cabfile = UnshieldSharp.Cabinet.InstallShieldCabinet.Open(file);
-                    for (int i = 0; i < (cabfile?.FileCount ?? 0); i++)
+                    if (cabfile?.HeaderList == null)
+                    {
+                        Console.WriteLine("Something went wrong parsing IS-CAB archive");
+                        Console.WriteLine();
+                        return;
+                    }
+
+                    for (int i = 0; i < cabfile!.HeaderList.FileCount; i++)
                     {
                         // If an individual entry fails
                         try
                         {
-                            string? filename = cabfile?.FileName(i);
+                            string? filename = cabfile.HeaderList.GetFileName(i);
                             string tempFile;
                             try
                             {
@@ -401,7 +453,7 @@ namespace Test
 
 #if ((NETFRAMEWORK && !NET20 && !NET35 && !NET40) || NETCOREAPP) && WIN
             // Microsoft Cabinet archive
-            else if (ft == SupportedFileType.MicrosoftCAB)
+            else if (ft == WrapperType.MicrosoftCAB)
             {
                 // Build the cabinet information
                 Console.WriteLine("Extracting MS-CAB contents");
@@ -445,7 +497,7 @@ namespace Test
 #endif
 
             // Microsoft LZ / LZ32
-            else if (ft == SupportedFileType.MicrosoftLZ)
+            else if (ft == WrapperType.MicrosoftLZ)
             {
                 // Build the Microsoft LZ / LZ32 information
                 Console.WriteLine("Extracting Microsoft LZ / LZ32 contents");
@@ -486,7 +538,7 @@ namespace Test
 
 #if ((NETFRAMEWORK && !NET20 && !NET35 && !NET40) || NETCOREAPP) && WIN
             // MoPaQ (MPQ) archive
-            else if (ft == SupportedFileType.MPQ)
+            else if (ft == WrapperType.MoPaQ)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting MoPaQ contents");
@@ -546,7 +598,7 @@ namespace Test
 #endif
 
             // PAK
-            else if (ft == SupportedFileType.PAK)
+            else if (ft == WrapperType.PAK)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting PAK contents");
@@ -573,7 +625,7 @@ namespace Test
             }
 
             // PFF
-            else if (ft == SupportedFileType.PFF)
+            else if (ft == WrapperType.PFF)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting PFF contents");
@@ -600,7 +652,7 @@ namespace Test
             }
 
             // PKZIP
-            else if (ft == SupportedFileType.PKZIP)
+            else if (ft == WrapperType.PKZIP)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting PKZIP contents");
@@ -619,10 +671,14 @@ namespace Test
                         // If an individual entry fails
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
                             string tempFile = Path.Combine(outputDirectory, entry.Key);
                             string? directoryName = Path.GetDirectoryName(tempFile);
                             if (directoryName != null)
@@ -645,7 +701,7 @@ namespace Test
             }
 
             // Quantum
-            else if (ft == SupportedFileType.Quantum)
+            else if (ft == WrapperType.Quantum)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting Quantum contents");
@@ -672,7 +728,7 @@ namespace Test
             }
 
             // RAR
-            else if (ft == SupportedFileType.RAR)
+            else if (ft == WrapperType.RAR)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting RAR contents");
@@ -691,10 +747,14 @@ namespace Test
                         // If an individual entry fails
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
                             string tempFile = Path.Combine(outputDirectory, entry.Key);
                             entry.WriteToFile(tempFile);
                         }
@@ -714,7 +774,7 @@ namespace Test
             }
 
             // SGA
-            else if (ft == SupportedFileType.SGA)
+            else if (ft == WrapperType.SGA)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting SGA contents");
@@ -741,7 +801,7 @@ namespace Test
             }
 
             // Tape Archive
-            else if (ft == SupportedFileType.RAR)
+            else if (ft == WrapperType.RAR)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting Tape Archive contents");
@@ -760,10 +820,14 @@ namespace Test
                         // If an individual entry fails
                         try
                         {
-                            // If we have a directory, skip it
+                            // If the entry is a directory
                             if (entry.IsDirectory)
                                 continue;
 
+                            // If the entry has an invalid key
+                            if (entry.Key == null)
+                                continue;
+
                             string tempFile = Path.Combine(outputDirectory, entry.Key);
                             entry.WriteToFile(tempFile);
                         }
@@ -783,7 +847,7 @@ namespace Test
             }
 
             // VBSP
-            else if (ft == SupportedFileType.VBSP)
+            else if (ft == WrapperType.VBSP)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting VBSP contents");
@@ -810,7 +874,7 @@ namespace Test
             }
 
             // VPK
-            else if (ft == SupportedFileType.VPK)
+            else if (ft == WrapperType.VPK)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting VPK contents");
@@ -837,7 +901,7 @@ namespace Test
             }
 
             // WAD
-            else if (ft == SupportedFileType.WAD)
+            else if (ft == WrapperType.WAD)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting WAD contents");
@@ -864,7 +928,7 @@ namespace Test
             }
 
             // xz
-            else if (ft == SupportedFileType.RAR)
+            else if (ft == WrapperType.RAR)
             {
                 // Build the xz information
                 Console.WriteLine("Extracting xz contents");
@@ -891,7 +955,7 @@ namespace Test
             }
 
             // XZP
-            else if (ft == SupportedFileType.XZP)
+            else if (ft == WrapperType.XZP)
             {
                 // Build the archive information
                 Console.WriteLine("Extracting XZP contents");

Test/Printer.cs

@@ -1,22 +1,50 @@
 using System;
 using System.IO;
+#if NET452_OR_GREATER || NETCOREAPP
 using System.Text;
-using BinaryObjectScanner.Utilities;
-using SabreTools.IO;
-using SabreTools.Serialization.Interfaces;
+#endif
+using SabreTools.IO.Extensions;
 using SabreTools.Serialization.Wrappers;
+using SPrinter = SabreTools.Serialization.Printer;
 
 namespace Test
 {
-    internal static class Printer
+    internal class Printer
     {
+        #region Options
+
+        /// <inheritdoc cref="BinaryObjectScanner.Options.IncludeDebug"/>
+        public bool IncludeDebug => _options?.IncludeDebug ?? false;
+
         /// <summary>
-        /// Wrapper to print information for a single path
+        /// Options object for configuration
         /// </summary>
-        /// <param name="path">File or directory path</param>
-        /// <param name="json">Enable JSON output, if supported</param>
-        /// <param name="debug">Enable debug output</param>
-        public static void PrintPathInfo(string path, bool json, bool debug)
+        private readonly BinaryObjectScanner.Options _options;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="includeDebug">Enable including debug information</param>
+        public Printer(bool includeDebug)
+        {
+            this._options = new BinaryObjectScanner.Options
+            {
+                IncludeDebug = includeDebug,
+            };
+
+#if NET462_OR_GREATER || NETCOREAPP
+            // Register the codepages
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+#endif
+        }/// <summary>
+         /// Wrapper to print information for a single path
+         /// </summary>
+         /// <param name="path">File or directory path</param>
+         /// <param name="json">Enable JSON output, if supported</param>
+         /// <param name="debug">Enable debug output</param>
+        public void PrintPathInfo(string path, bool json, bool debug)
         {
             Console.WriteLine($"Checking possible path: {path}");
 
@@ -27,11 +55,7 @@ namespace Test
             }
             else if (Directory.Exists(path))
             {
-#if NET20 || NET35
-                foreach (string file in Directory.GetFiles(path, "*", SearchOption.AllDirectories))
-#else
-                foreach (string file in Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories))
-#endif
+                foreach (string file in IOExtensions.SafeEnumerateFiles(path, "*", SearchOption.AllDirectories))
                 {
                     PrintFileInfo(file, json, debug);
                 }
@@ -45,43 +69,50 @@ namespace Test
         /// <summary>
         /// Print information for a single file, if possible
         /// </summary>
-        private static void PrintFileInfo(string file, bool json, bool debug)
+        private void PrintFileInfo(string file, bool json, bool debug)
         {
             Console.WriteLine($"Attempting to print info for {file}");
 
-            using Stream stream = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-
-            // Read the first 8 bytes
-            byte[]? magic = stream.ReadBytes(8);
-            stream.Seek(0, SeekOrigin.Begin);
-
-            // Get the file type
-            SupportedFileType ft = FileTypes.GetFileType(magic ?? []);
-            if (ft == SupportedFileType.UNKNOWN)
+            try
             {
-                string extension = Path.GetExtension(file).TrimStart('.');
-                ft = FileTypes.GetFileType(extension);
-            }
+                using Stream stream = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 
-            // Print out the file format
-            Console.WriteLine($"File format found: {ft}");
+                // Get the extension for certain checks
+                string extension = Path.GetExtension(file).ToLower().TrimStart('.');
 
-            // Setup the wrapper to print
-            var wrapper = WrapperFactory.CreateWrapper(ft, stream);
+                // Get the first 16 bytes for matching
+                byte[] magic = new byte[16];
+                try
+                {
+                    stream.Read(magic, 0, 16);
+                    stream.Seek(0, SeekOrigin.Begin);
+                }
+                catch (Exception ex)
+                {
+                    if (IncludeDebug) Console.WriteLine(ex);
 
-            // If we don't have a wrapper
-            if (wrapper == null)
-            {
-                Console.WriteLine($"Either {ft} is not supported or something went wrong during parsing!");
-                Console.WriteLine();
-                return;
-            }
+                    return;
+                }
 
-            // Print the wrapper name
-            Console.WriteLine($"{wrapper.Description()} wrapper created successfully!");
+                // Get the file type
+                WrapperType ft = WrapperFactory.GetFileType(magic, extension);
 
-            // Get the base info output name
-            string filenameBase = $"info-{DateTime.Now:yyyy-MM-dd_HHmmss.ffff}";
+                // Print out the file format
+                Console.WriteLine($"File format found: {ft}");
+
+                // Setup the wrapper to print
+                var wrapper = WrapperFactory.CreateWrapper(ft, stream);
+
+                // If we don't have a wrapper
+                if (wrapper == null)
+                {
+                    Console.WriteLine($"Either {ft} is not supported or something went wrong during parsing!");
+                    Console.WriteLine();
+                    return;
+                }
+
+                // Get the base info output name
+                string filenameBase = $"info-{DateTime.Now:yyyy-MM-dd_HHmmss.ffff}";
 
 #if NET6_0_OR_GREATER
                 // If we have the JSON flag
@@ -96,336 +127,25 @@ namespace Test
                     jsw.WriteLine(serializedData);
                 }
 #endif
-            // Create the output data
-            var builder = wrapper.PrettyPrint();
-            Console.WriteLine(builder);
 
-            // Write the output data
-            using var sw = new StreamWriter(File.OpenWrite($"{filenameBase}.txt"));
-            sw.WriteLine(builder.ToString());
-        }
+                // Create the output data
+                var builder = SPrinter.ExportStringBuilder(wrapper);
+                if (builder == null)
+                {
+                    Console.WriteLine("No item information could be generated");
+                    return;
+                }
 
-        #region Printing Implementations
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this IWrapper wrapper)
-        {
-            return wrapper switch
+                // Write the output data
+                Console.WriteLine(builder);
+                using var sw = new StreamWriter(File.OpenWrite($"{filenameBase}.txt"));
+                sw.WriteLine(builder.ToString());
+            }
+            catch (Exception ex)
             {
-                AACSMediaKeyBlock item => item.PrettyPrint(),
-                BDPlusSVM item => item.PrettyPrint(),
-                BFPK item => item.PrettyPrint(),
-                BSP item => item.PrettyPrint(),
-                CFB item => item.PrettyPrint(),
-                CIA item => item.PrettyPrint(),
-                GCF item => item.PrettyPrint(),
-                InstallShieldCabinet item => item.PrettyPrint(),
-                IRD item => item.PrettyPrint(),
-                LinearExecutable item => item.PrettyPrint(),
-                MicrosoftCabinet item => item.PrettyPrint(),
-                MSDOS item => item.PrettyPrint(),
-                N3DS item => item.PrettyPrint(),
-                NCF item => item.PrettyPrint(),
-                NewExecutable item => item.PrettyPrint(),
-                Nitro item => item.PrettyPrint(),
-                PAK item => item.PrettyPrint(),
-                PFF item => item.PrettyPrint(),
-                PlayJAudioFile item => item.PrettyPrint(),
-                PortableExecutable item => item.PrettyPrint(),
-                Quantum item => item.PrettyPrint(),
-                SGA item => item.PrettyPrint(),
-                VBSP item => item.PrettyPrint(),
-                VPK item => item.PrettyPrint(),
-                WAD item => item.PrettyPrint(),
-                XeMID item => item.PrettyPrint(),
-                XMID item => item.PrettyPrint(),
-                XZP item => item.PrettyPrint(),
-                _ => new StringBuilder(),
-            };
+                Console.WriteLine(debug ? ex : "[Exception opening file, please try again]");
+                Console.WriteLine();
+            }
         }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this AACSMediaKeyBlock item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.AACSMediaKeyBlock.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this BDPlusSVM item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.BDPlusSVM.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this BFPK item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.BFPK.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this BSP item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.BSP.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this CFB item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.CFB.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this CIA item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.CIA.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this GCF item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.GCF.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this InstallShieldCabinet item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.InstallShieldCabinet.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this IRD item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.IRD.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this LinearExecutable item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.LinearExecutable.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this MicrosoftCabinet item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.MicrosoftCabinet.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this MSDOS item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.MSDOS.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this N3DS item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.N3DS.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this NCF item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.NCF.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this NewExecutable item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.NewExecutable.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this Nitro item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.Nitro.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this PAK item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.PAK.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this PFF item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.PFF.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this PlayJAudioFile item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.PlayJAudioFile.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this PortableExecutable item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.PortableExecutable.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this Quantum item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.Quantum.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this SGA item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.SGA.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this VBSP item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.VBSP.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this VPK item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.VPK.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this WAD item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.WAD.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this XeMID item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.XeMID.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this XMID item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.XMID.Print(builder, item.Model);
-            return builder;
-        }
-
-        /// <summary>
-        /// Export the item information as pretty-printed text
-        /// </summary>
-        private static StringBuilder PrettyPrint(this XZP item)
-        {
-            var builder = new StringBuilder();
-            SabreTools.Printing.XZP.Print(builder, item.Model);
-            return builder;
-        }
-
-        #endregion
     }
 }

Test/Program.cs

@@ -28,6 +28,12 @@ namespace Test
                 return;
             }
 
+            // Create extractor for all paths
+            var extractor = new Extractor(options.Debug);
+
+            // Create printer for all paths
+            var printer = new Printer(options.Debug);
+
             // Create scanner for all paths
             var scanner = new Scanner(
                 options.ScanArchives,
@@ -43,14 +49,14 @@ namespace Test
             {
                 // Extraction
                 if (options.EnableExtraction)
-                    Extractor.ExtractPath(inputPath, options.OutputPath);
+                    extractor.ExtractPath(inputPath, options.OutputPath);
 
                 // Information printing
                 if (options.EnableInformation)
 #if NETFRAMEWORK
-                    Printer.PrintPathInfo(inputPath, false, options.Debug);
+                    printer.PrintPathInfo(inputPath, false, options.Debug);
 #else
-                    Printer.PrintPathInfo(inputPath, options.Json, options.Debug);
+                    printer.PrintPathInfo(inputPath, options.Json, options.Debug);
 #endif
 
                 // Scanning

Test/Protector.cs

@@ -7,7 +7,6 @@ using System.Collections.Concurrent;
 using System.IO;
 using System.Linq;
 using BinaryObjectScanner;
-using BinaryObjectScanner.Utilities;
 
 namespace Test
 {

Test/Test.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
@@ -11,6 +10,20 @@
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
+  
+  <!-- Support All Frameworks -->
+  <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net4`))">
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`))">
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+  </PropertyGroup>
 
   <!-- Set a build flag for Windows specifically -->
   <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
@@ -27,13 +40,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SabreTools.Compression" Version="0.4.1" />
-    <PackageReference Include="SabreTools.IO" Version="1.3.3" />
+    <PackageReference Include="SabreTools.Compression" Version="0.5.1" />
+    <PackageReference Include="SabreTools.IO" Version="1.4.11" />
     <PackageReference Include="SabreTools.Matching" Version="1.3.1" />
-    <PackageReference Include="SabreTools.Models" Version="1.4.1" />
-    <PackageReference Include="SabreTools.Printing" Version="1.3.4" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.4.3" />
-    <PackageReference Include="UnshieldSharp" Version="1.7.4" />
+    <PackageReference Include="SabreTools.Models" Version="1.4.8" />
+    <PackageReference Include="SabreTools.Serialization" Version="1.6.7" />
+    <PackageReference Include="UnshieldSharp" Version="1.8.3" />
   </ItemGroup>
 
 </Project>

publish-nix.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 
 # This batch file assumes the following:
 # - .NET 8.0 (or newer) SDK is installed and in PATH
@@ -12,9 +12,8 @@
 USE_ALL=false
 NO_BUILD=false
 NO_ARCHIVE=false
-while getopts "uba" OPTION
-do
-    case $OPTION in 
+while getopts "uba" OPTION; do
+    case $OPTION in
     u)
         USE_ALL=true
         ;;
@@ -35,29 +34,34 @@ done
 BUILD_FOLDER=$PWD
 
 # Set the current commit hash
-COMMIT=`git log --pretty=%H -1`
+COMMIT=$(git log --pretty=%H -1)
+
+# Output the selected options
+echo "Selected Options:"
+echo "  Use all frameworks (-u)               $USE_ALL"
+echo "  No build (-b)                         $NO_BUILD"
+echo "  No archive (-a)                       $NO_ARCHIVE"
+echo " "
 
 # Create the build matrix arrays
 FRAMEWORKS=("net8.0")
-RUNTIMES=("win-x86" "win-x64" "linux-x64" "osx-x64")
+RUNTIMES=("win-x86" "win-x64" "win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64")
 
 # Use expanded lists, if requested
-if [ $USE_ALL = true ]
-then
+if [ $USE_ALL = true ]; then
     FRAMEWORKS=("net20" "net35" "net40" "net452" "net462" "net472" "net48" "netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0")
-    RUNTIMES=("win-x86" "win-x64" "win-arm64" "linux-x64" "linux-arm64" "osx-x64")
 fi
 
 # Create the filter arrays
 SINGLE_FILE_CAPABLE=("net5.0" "net6.0" "net7.0" "net8.0")
+VALID_APPLE_FRAMEWORKS=("net6.0" "net7.0" "net8.0")
 VALID_CROSS_PLATFORM_FRAMEWORKS=("netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0")
-VALID_CROSS_PLATFORM_RUNTIMES=("win-arm64" "linux-x64" "linux-arm64" "osx-x64")
+VALID_CROSS_PLATFORM_RUNTIMES=("win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64")
 NON_DLL_FRAMEWORKS=("net20" "net35" "net40")
-NON_DLL_RUNTIMES=("win-x64" "win-arm64" "linux-x64" "linux-arm64" "osx-x64")
+NON_DLL_RUNTIMES=("win-x64" "win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64")
 
 # Only build if requested
-if [ $NO_BUILD = false ]
-then
+if [ $NO_BUILD = false ]; then
     # Restore Nuget packages for all builds
     echo "Restoring Nuget packages"
     dotnet restore
@@ -66,23 +70,39 @@ then
     dotnet pack BinaryObjectScanner/BinaryObjectScanner.csproj --output $BUILD_FOLDER
 
     # Build Test
-    for FRAMEWORK in "${FRAMEWORKS[@]}"
-    do
-        for RUNTIME in "${RUNTIMES[@]}"
-        do
+    for FRAMEWORK in "${FRAMEWORKS[@]}"; do
+        for RUNTIME in "${RUNTIMES[@]}"; do
+            # Output the current build
+            echo "===== Build Test - $FRAMEWORK, $RUNTIME ====="
+
             # If we have an invalid combination of framework and runtime
-            if [ ! $(echo ${VALID_CROSS_PLATFORM_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] && [ $(echo ${VALID_CROSS_PLATFORM_RUNTIMES[@]} | fgrep -w $RUNTIME) ]
-            then
-                continue
+            if [[ ! $(echo ${VALID_CROSS_PLATFORM_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ]]; then
+                if [[ $(echo ${VALID_CROSS_PLATFORM_RUNTIMES[@]} | fgrep -w $RUNTIME) ]]; then
+                    echo "Skipped due to invalid combination"
+                    continue
+                fi
+            fi
+
+            # If we have Apple silicon but an unsupported framework
+            if [[ ! $(echo ${VALID_APPLE_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ]]; then
+                if [ $RUNTIME = "osx-arm64" ]; then
+                    echo "Skipped due to no Apple Silicon support"
+                    continue
+                fi
             fi
 
             # Only .NET 5 and above can publish to a single file
-            if [[ $(echo ${SINGLE_FILE_CAPABLE[@]} | fgrep -w $FRAMEWORK) ]]
-            then
-                dotnet publish Test/Test.csproj -f $FRAMEWORK -r $RUNTIME -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
+            if [[ $(echo ${SINGLE_FILE_CAPABLE[@]} | fgrep -w $FRAMEWORK) ]]; then
+                # Only include Debug if building all
+                if [ $USE_ALL = true ]; then
+                    dotnet publish Test/Test.csproj -f $FRAMEWORK -r $RUNTIME -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
+                fi
                 dotnet publish Test/Test.csproj -f $FRAMEWORK -r $RUNTIME -c Release --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
             else
-                dotnet publish Test/Test.csproj -f $FRAMEWORK -r $RUNTIME -c Debug --self-contained true --version-suffix $COMMIT
+                # Only include Debug if building all
+                if [ $USE_ALL = true ]; then
+                    dotnet publish Test/Test.csproj -f $FRAMEWORK -r $RUNTIME -c Debug --self-contained true --version-suffix $COMMIT
+                fi
                 dotnet publish Test/Test.csproj -f $FRAMEWORK -r $RUNTIME -c Release --self-contained true --version-suffix $COMMIT -p:DebugType=None -p:DebugSymbols=false
             fi
         done
@@ -90,29 +110,44 @@ then
 fi
 
 # Only create archives if requested
-if [ $NO_ARCHIVE = false ]
-then
+if [ $NO_ARCHIVE = false ]; then
     # Create Test archives
-    for FRAMEWORK in "${FRAMEWORKS[@]}"
-    do
-        for RUNTIME in "${RUNTIMES[@]}"
-        do
+    for FRAMEWORK in "${FRAMEWORKS[@]}"; do
+        for RUNTIME in "${RUNTIMES[@]}"; do
+            # Output the current build
+            echo "===== Archive Test - $FRAMEWORK, $RUNTIME ====="
+
             # If we have an invalid combination of framework and runtime
-            if [ ! $(echo ${VALID_CROSS_PLATFORM_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] && [ $(echo ${VALID_CROSS_PLATFORM_RUNTIMES[@]} | fgrep -w $RUNTIME) ]
-            then
-                continue
+            if [[ ! $(echo ${VALID_CROSS_PLATFORM_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ]]; then
+                if [[ $(echo ${VALID_CROSS_PLATFORM_RUNTIMES[@]} | fgrep -w $RUNTIME) ]]; then
+                    echo "Skipped due to invalid combination"
+                    continue
+                fi
             fi
 
-            cd $BUILD_FOLDER/Test/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/
-            if [ $(echo ${NON_DLL_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] || [ $(echo ${NON_DLL_RUNTIMES[@]} | fgrep -w $RUNTIME) ]
-            then
-                zip -r $BUILD_FOLDER/BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip . -x 'CascLib.dll' -x 'mspack.dll' -x 'StormLib.dll'
-            else
-                zip -r $BUILD_FOLDER/BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip .
+            # If we have Apple silicon but an unsupported framework
+            if [[ ! $(echo ${VALID_APPLE_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ]]; then
+                if [ $RUNTIME = "osx-arm64" ]; then
+                    echo "Skipped due to no Apple Silicon support"
+                    continue
+                fi
+            fi
+
+            # Only include Debug if building all
+            if [ $USE_ALL = true ]; then
+                cd $BUILD_FOLDER/Test/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/
+                if [[ $(echo ${NON_DLL_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ]]; then
+                    zip -r $BUILD_FOLDER/BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip . -x 'CascLib.dll' -x 'mspack.dll' -x 'StormLib.dll'
+                elif [[ $(echo ${NON_DLL_RUNTIMES[@]} | fgrep -w $RUNTIME) ]]; then
+                    zip -r $BUILD_FOLDER/BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip . -x 'CascLib.dll' -x 'mspack.dll' -x 'StormLib.dll'
+                else
+                    zip -r $BUILD_FOLDER/BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip .
+                fi
             fi
             cd $BUILD_FOLDER/Test/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/
-            if [ $(echo ${NON_DLL_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] || [ $(echo ${NON_DLL_RUNTIMES[@]} | fgrep -w $RUNTIME) ]
-            then
+            if [[ $(echo ${NON_DLL_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ]]; then
+                zip -r $BUILD_FOLDER/BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_release.zip . -x 'CascLib.dll' -x 'mspack.dll' -x 'StormLib.dll'
+            elif [[ $(echo ${NON_DLL_RUNTIMES[@]} | fgrep -w $RUNTIME) ]]; then
                 zip -r $BUILD_FOLDER/BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_release.zip . -x 'CascLib.dll' -x 'mspack.dll' -x 'StormLib.dll'
             else
                 zip -r $BUILD_FOLDER/BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_release.zip .
@@ -122,4 +157,4 @@ then
 
     # Reset the directory
     cd $BUILD_FOLDER
-fi
+fi

publish-win.ps1

@@ -27,27 +27,32 @@ $BUILD_FOLDER = $PSScriptRoot
 # Set the current commit hash
 $COMMIT = git log --pretty=format:"%H" -1
 
+# Output the selected options
+Write-Host "Selected Options:"
+Write-Host "  Use all frameworks (-UseAll)          $USE_ALL"
+Write-Host "  No build (-NoBuild)                   $NO_BUILD"
+Write-Host "  No archive (-NoArchive)               $NO_ARCHIVE"
+Write-Host " "
+
 # Create the build matrix arrays
 $FRAMEWORKS = @('net8.0')
-$RUNTIMES = @('win-x86', 'win-x64', 'linux-x64', 'osx-x64')
+$RUNTIMES = @('win-x86', 'win-x64', 'win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64', 'osx-arm64')
 
 # Use expanded lists, if requested
-if ($USE_ALL.IsPresent)
-{
+if ($USE_ALL.IsPresent) {
     $FRAMEWORKS = @('net20', 'net35', 'net40', 'net452', 'net462', 'net472', 'net48', 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0')
-    $RUNTIMES = @('win-x86', 'win-x64', 'win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64')
 }
 
 # Create the filter arrays
 $SINGLE_FILE_CAPABLE = @('net5.0', 'net6.0', 'net7.0', 'net8.0')
+$VALID_APPLE_FRAMEWORKS = @('net6.0', 'net7.0', 'net8.0')
 $VALID_CROSS_PLATFORM_FRAMEWORKS = @('netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0')
-$VALID_CROSS_PLATFORM_RUNTIMES = @('win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64')
+$VALID_CROSS_PLATFORM_RUNTIMES = @('win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64', 'osx-arm64')
 $NON_DLL_FRAMEWORKS = @('net20', 'net35', 'net40')
-$NON_DLL_RUNTIMES = @('win-x64', 'win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64')
+$NON_DLL_RUNTIMES = @('win-x64', 'win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64', 'osx-arm64')
 
 # Only build if requested
-if (!$NO_BUILD.IsPresent)
-{
+if (!$NO_BUILD.IsPresent) {
     # Restore Nuget packages for all builds
     Write-Host "Restoring Nuget packages"
     dotnet restore
@@ -56,25 +61,36 @@ if (!$NO_BUILD.IsPresent)
     dotnet pack BinaryObjectScanner\BinaryObjectScanner.csproj --output $BUILD_FOLDER
 
     # Build Test
-    foreach ($FRAMEWORK in $FRAMEWORKS)
-    {
-        foreach ($RUNTIME in $RUNTIMES)
-        {
+    foreach ($FRAMEWORK in $FRAMEWORKS) {
+        foreach ($RUNTIME in $RUNTIMES) {
+            # Output the current build
+            Write-Host "===== Build Test - $FRAMEWORK, $RUNTIME ====="
+
             # If we have an invalid combination of framework and runtime
-            if ($VALID_CROSS_PLATFORM_FRAMEWORKS -notcontains $FRAMEWORK -and $VALID_CROSS_PLATFORM_RUNTIMES -contains $RUNTIME)
-            {
+            if ($VALID_CROSS_PLATFORM_FRAMEWORKS -notcontains $FRAMEWORK -and $VALID_CROSS_PLATFORM_RUNTIMES -contains $RUNTIME) {
+                Write-Host "Skipped due to invalid combination"
+                continue
+            }
+
+            # If we have Apple silicon but an unsupported framework
+            if ($VALID_APPLE_FRAMEWORKS -notcontains $FRAMEWORK -and $RUNTIME -eq 'osx-arm64') {
+                Write-Host "Skipped due to no Apple Silicon support"
                 continue
             }
 
             # Only .NET 5 and above can publish to a single file
-            if ($SINGLE_FILE_CAPABLE -contains $FRAMEWORK)
-            {
-                dotnet publish Test\Test.csproj -f $FRAMEWORK -r $RUNTIME -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
+            if ($SINGLE_FILE_CAPABLE -contains $FRAMEWORK) {
+                # Only include Debug if building all
+                if ($USE_ALL.IsPresent) {
+                    dotnet publish Test\Test.csproj -f $FRAMEWORK -r $RUNTIME -c Debug --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true
+                }
                 dotnet publish Test\Test.csproj -f $FRAMEWORK -r $RUNTIME -c Release --self-contained true --version-suffix $COMMIT -p:PublishSingleFile=true -p:DebugType=None -p:DebugSymbols=false
             }
-            else
-            {
-                dotnet publish Test\Test.csproj -f $FRAMEWORK -r $RUNTIME -c Debug --self-contained true --version-suffix $COMMIT
+            else {
+                # Only include Debug if building all
+                if ($USE_ALL.IsPresent) {
+                    dotnet publish Test\Test.csproj -f $FRAMEWORK -r $RUNTIME -c Debug --self-contained true --version-suffix $COMMIT
+                }
                 dotnet publish Test\Test.csproj -f $FRAMEWORK -r $RUNTIME -c Release --self-contained true --version-suffix $COMMIT -p:DebugType=None -p:DebugSymbols=false
             }
         }
@@ -82,35 +98,41 @@ if (!$NO_BUILD.IsPresent)
 }
 
 # Only create archives if requested
-if (!$NO_ARCHIVE.IsPresent)
-{
+if (!$NO_ARCHIVE.IsPresent) {
     # Create Test archives
-    foreach ($FRAMEWORK in $FRAMEWORKS)
-    {
-        foreach ($RUNTIME in $RUNTIMES)
-        {
+    foreach ($FRAMEWORK in $FRAMEWORKS) {
+        foreach ($RUNTIME in $RUNTIMES) {
+            # Output the current build
+            Write-Host "===== Archive Test - $FRAMEWORK, $RUNTIME ====="
+
             # If we have an invalid combination of framework and runtime
-            if ($VALID_CROSS_PLATFORM_FRAMEWORKS -notcontains $FRAMEWORK -and $VALID_CROSS_PLATFORM_RUNTIMES -contains $RUNTIME)
-            {
+            if ($VALID_CROSS_PLATFORM_FRAMEWORKS -notcontains $FRAMEWORK -and $VALID_CROSS_PLATFORM_RUNTIMES -contains $RUNTIME) {
+                Write-Host "Skipped due to invalid combination"
                 continue
             }
 
-            Set-Location -Path $BUILD_FOLDER\Test\bin\Debug\${FRAMEWORK}\${RUNTIME}\publish\
-            if ($NON_DLL_FRAMEWORKS -contains $FRAMEWORK -or $NON_DLL_RUNTIMES -contains $RUNTIME)
-            {
-                7z a -tzip -x'!CascLib.dll' -x'!mspack.dll' -x'!StormLib.dll' $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip *
+            # If we have Apple silicon but an unsupported framework
+            if ($VALID_APPLE_FRAMEWORKS -notcontains $FRAMEWORK -and $RUNTIME -eq 'osx-arm64') {
+                Write-Host "Skipped due to no Apple Silicon support"
+                continue
             }
-            else
-            {
-                7z a -tzip $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip *
+
+            # Only include Debug if building all
+            if ($USE_ALL.IsPresent) {
+                Set-Location -Path $BUILD_FOLDER\Test\bin\Debug\${FRAMEWORK}\${RUNTIME}\publish\
+                if ($NON_DLL_FRAMEWORKS -contains $FRAMEWORK -or $NON_DLL_RUNTIMES -contains $RUNTIME) {
+                    7z a -tzip -x'!CascLib.dll' -x'!mspack.dll' -x'!StormLib.dll' $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip *
+                }
+                else {
+                    7z a -tzip $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip *
+                }
             }
+        
             Set-Location -Path $BUILD_FOLDER\Test\bin\Release\${FRAMEWORK}\${RUNTIME}\publish\
-            if ($NON_DLL_FRAMEWORKS -contains $FRAMEWORK -or $NON_DLL_RUNTIMES -contains $RUNTIME)
-            {
+            if ($NON_DLL_FRAMEWORKS -contains $FRAMEWORK -or $NON_DLL_RUNTIMES -contains $RUNTIME) {
                 7z a -tzip -x'!CascLib.dll' -x'!mspack.dll' -x'!StormLib.dll' $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_release.zip *
             }
-            else
-            {
+            else {
                 7z a -tzip $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_release.zip *
             }
         }