Bump version

* Add Roxxe detection

* Fix Roxxe PR review comments

BinaryObjectScanner/BinaryObjectScanner.csproj

@@ -11,7 +11,7 @@
     <Nullable>enable</Nullable>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <!-- <TreatWarningsAsErrors>true</TreatWarningsAsErrors> --> <!-- Can't be enabled because of external code -->
-    <Version>3.1.3</Version>
+    <Version>3.1.4</Version>
   
     <!-- Package Properties -->
     <Authors>Matt Nadareski</Authors>
@@ -81,14 +81,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SabreTools.Compression" Version="0.4.0" />
+    <PackageReference Include="SabreTools.Compression" Version="0.4.1" />
     <PackageReference Include="SabreTools.Hashing" Version="1.2.0" />
-    <PackageReference Include="SabreTools.IO" Version="1.3.2" />
+    <PackageReference Include="SabreTools.IO" Version="1.3.3" />
     <PackageReference Include="SabreTools.Matching" Version="1.3.1" />
-    <PackageReference Include="SabreTools.Models" Version="1.4.0" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.4.1" />
-    <PackageReference Include="UnshieldSharp" Version="1.7.3" />
-    <PackageReference Include="WiseUnpacker" 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" />
   </ItemGroup>
 
 </Project>

BinaryObjectScanner/Protection/Roxxe.cs

@@ -0,0 +1,83 @@
+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>
+    /// Roxxe was a Czech DRM. It appears to have been a simple disc check that also relied on unusual disc manufacturing and dummy files to attempt to prevent copying.
+    /// 
+    /// DRML: https://github.com/TheRogueArchivist/DRML/blob/main/entries/Roxxe/Roxxe.md
+    /// </summary>
+    public class Roxxe : 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 code/CODE section strings, if they exist
+            var strs = pex.GetFirstSectionStrings("code") ?? pex.GetFirstSectionStrings("CODE");
+            if (strs != null)
+            {
+                // Found in "Owar.exe" in IA item "game4u-22-cd".
+                if (strs.Any(s => s.Contains("TRCHANGER.INI")))
+                    return "Roxxe";
+            }
+
+            // Get the .rsrc section strings, if they exist
+            // TODO: Check for these strings specifically within the application-defined resource that they're found in, not just the generic resource section.
+            strs = pex.GetFirstSectionStrings(".rsrc");
+            if (strs != null)
+            {
+                // Found in "Owar.exe" in IA items "game4u-22-cd" and "original-war".
+                // These checks are less reliable, as they are still found in a version of the game that appears to have patched out Roxxe (the version present in IA item "original-war").
+                if (strs.Any(s => s.Contains("PRRT01")))
+                    return "Roxxe (Possibly remnants)";
+                
+                if (strs.Any(s => s.Contains("CommonPRRT")))
+                    return "Roxxe (Possibly remnants)";
+
+                if (strs.Any(s => s.Contains("roxe")))
+                    return "Roxxe (Possibly remnants)";
+            }
+
+            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>
+            {
+                // Files such as "TRCHANGER.INI" may be present, but haven't been found yet.
+            };
+
+            return MatchUtil.GetAllMatches(files, matchers, any: true);
+        }
+
+        /// <inheritdoc/>
+        public string? CheckFilePath(string path)
+        {
+            var matchers = new List<PathMatchSet>
+            {
+                // Files such as "TRCHANGER.INI" may be present, but haven't been found yet.
+            };
+
+            return MatchUtil.GetFirstMatch(path, matchers, any: true);
+        }
+    }
+}

README.md

@@ -1,4 +1,4 @@
-# BinaryObjectScanner
+# 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)
@@ -94,6 +94,7 @@ Below is a list of protections detected by BinaryObjectScanner. The two columns
 | Rainbow Sentinel | True | True | |
 | Ring PROTECH / ProRing | True | True | Partially unconfirmed² |
 | RipGuard | True | True | Partially unconfirmed² |
+| Roxxe | True | False | |
 | SafeDisc / SafeCast | True | True | Can't distinguish between some versions of SafeDisc and SafeCast |
 | SafeLock | False | True | |
 | SecuROM | True | True | v8.x and White Label detected partially² |

Test/Test.csproj

@@ -27,13 +27,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SabreTools.Compression" Version="0.4.0" />
-    <PackageReference Include="SabreTools.IO" Version="1.3.2" />
+    <PackageReference Include="SabreTools.Compression" Version="0.4.1" />
+    <PackageReference Include="SabreTools.IO" Version="1.3.3" />
     <PackageReference Include="SabreTools.Matching" Version="1.3.1" />
-    <PackageReference Include="SabreTools.Models" Version="1.4.0" />
-    <PackageReference Include="SabreTools.Printing" Version="1.3.3" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.4.1" />
-    <PackageReference Include="UnshieldSharp" Version="1.7.3" />
+    <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" />
   </ItemGroup>
 
 </Project>