Better cabinet handling, update version

BurnOutSharp/BurnOutSharp.csproj

@@ -44,8 +44,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="UnshieldSharp, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UnshieldSharp.1.4.2.1\lib\net461\UnshieldSharp.dll</HintPath>
+    <Reference Include="UnshieldSharp, Version=1.4.2.2, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UnshieldSharp.1.4.2.2\lib\net461\UnshieldSharp.dll</HintPath>
     </Reference>
     <Reference Include="zlib.net, Version=1.0.3.0, Culture=neutral, PublicKeyToken=47d7877cb3620160">
       <HintPath>..\packages\zlib.net.1.0.4.0\lib\zlib.net.dll</HintPath>

BurnOutSharp/BurnOutSharp.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>BurnOutSharp</id>
-    <version>1.03.7</version>
+    <version>1.03.7.1</version>
     <title>BurnOutSharp</title>
     <authors>Matt Nadareski, Gernot Knippen</authors>
     <owners>Matt Nadareski, Gernot Knippen</owners>
@@ -15,7 +15,7 @@
     <dependencies>
       <dependency id="LessIO" version="0.5.0" />
       <dependency id="libmspack4n" version="0.8.0" />
-      <dependency id="UnshieldSharp" version="1.4.2.1" />
+      <dependency id="UnshieldSharp" version="1.4.2.2" />
     </dependencies>
   </metadata>
   <files>

BurnOutSharp/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.03.7")]
-[assembly: AssemblyFileVersion("1.03.7.0")]
+[assembly: AssemblyVersion("1.03.7.1")]
+[assembly: AssemblyFileVersion("1.03.7.1")]

BurnOutSharp/ProtectionFind.cs

@@ -99,6 +99,10 @@ namespace BurnOutSharp
                 if (ProtectDVDVideo(path, files))
                     protections[path] = "Protect DVD-Video";
 
+                // PSX Anti-modchip
+                if (PSXAntiModchip(path, files))
+                    protections[path] = "PlayStation Anti-modchip";
+
                 // Zzxzz
                 if (Directory.Exists(Path.Combine(path, "Zzxzz")))
                     protections[path] = "Zzxzz";
@@ -458,6 +462,7 @@ namespace BurnOutSharp
             {
                 try
                 {
+                    List<string> protections = new List<string>();
                     string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
                     Directory.CreateDirectory(tempPath);
 
@@ -475,16 +480,17 @@ namespace BurnOutSharp
                             catch { }
 
                             if (!String.IsNullOrEmpty(protection))
-                            {
-                                try
-                                {
-                                    Directory.Delete(tempPath, true);
-                                }
-                                catch { }
-                                return protection;
-                            }
+                                protections.Add(protection);
                         }
                     }
+
+                    try
+                    {
+                        Directory.Delete(tempPath, true);
+                    }
+                    catch { }
+
+                    return string.Join(", ", protections);
                 }
                 catch { }
             }
@@ -494,6 +500,7 @@ namespace BurnOutSharp
             {
                 try
                 {
+                    List<string> protections = new List<string>();
                     string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
                     Directory.CreateDirectory(tempPath);
 
@@ -506,15 +513,16 @@ namespace BurnOutSharp
                         File.Delete(tempfile);
 
                         if (!String.IsNullOrEmpty(protection))
-                        {
-                            try
-                            {
-                                Directory.Delete(tempPath, true);
-                            }
-                            catch { }
-                            return protection;
-                        }
+                            protections.Add(protection);
                     }
+
+                    try
+                    {
+                        Directory.Delete(tempPath, true);
+                    }
+                    catch { }
+
+                    return string.Join(", ", protections);
                 }
                 catch { }
             }
@@ -691,6 +699,31 @@ namespace BurnOutSharp
             return false;
         }
 
+        private static bool PSXAntiModchip(string path, string[] files)
+        {
+            if (files.Where(s => s.ToLower().EndsWith(".cnf")).Count() > 0)
+            {
+                foreach (string file in files)
+                {
+                    try
+                    {
+                        // Load the current file and check for specialty strings first
+                        StreamReader sr = new StreamReader(file, Encoding.Default);
+                        string FileContent = sr.ReadToEnd();
+                        sr.Close();
+
+                        if (FileContent.Contains("     SOFTWARE TERMINATED\nCONSOLE MAY HAVE BEEN MODIFIED\n     CALL 1-888-780-7690")
+                            || FileContent.Contains("強制終了しました。\n本体が改造されている\nおそれがあります。"))
+                            return true;
+
+                    }
+                    catch { }
+                }
+            }
+
+            return false;
+        }
+
         #endregion
 
         #region Version detections
@@ -1157,9 +1190,6 @@ namespace BurnOutSharp
             // Origin
             mapping.Add("OriginSetup.exe", "Origin");
 
-            // PSX LibCrypt - TODO: That's... not accurate
-            mapping.Add(".cnf", "PSX LibCrypt");
-
             // SafeCast
             mapping.Add("cdac11ba.exe", "SafeCast");
 

BurnOutSharp/packages.config

@@ -2,6 +2,6 @@
 <packages>
   <package id="LessIO" version="0.5.0" targetFramework="net461" />
   <package id="libmspack4n" version="0.8.0" targetFramework="net461" />
-  <package id="UnshieldSharp" version="1.4.2.1" targetFramework="net461" />
+  <package id="UnshieldSharp" version="1.4.2.2" targetFramework="net461" />
   <package id="zlib.net" version="1.0.4.0" targetFramework="net461" />
 </packages>

README.md

@@ -45,7 +45,7 @@ Below is a list of the protections that can be detected using this code:
 - Origin (partial)
 - ProtectDisc
 - Protect DVD-Video
-- PSX LibCrypt (partial)
+- PlayStation Anti-modchip (En/Jp, not "Red Hand")
 - Ring PROTECH
 - SafeCast
 - SafeDisc (all versions)