Another round of cleanup and normalization

mnadareski · mnadareski · commit 6a5afd8d2c67 · 2025-09-20T19:18:08.000-04:00
diff --git a/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs b/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs
@@ -12,8 +12,9 @@ public class AutoPlayMediaStudio : IExecutableCheck<PortableExecutable>
         /// <inheritdoc/>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
-            // Known to detect versions 5.0.0.3 - 8.1.0.0
             string? name = exe.ProductName;
+
+            // Known to detect versions 5.0.0.3 - 8.1.0.0
             if (name.OptionalStartsWith("AutoPlay Media Studio", StringComparison.OrdinalIgnoreCase))
                 return $"AutoPlay Media Studio {GetVersion(exe)}";
 
diff --git a/BinaryObjectScanner/Packer/GPInstall.cs b/BinaryObjectScanner/Packer/GPInstall.cs
@@ -11,8 +11,9 @@ public class GPInstall : IExecutableCheck<PortableExecutable>
         /// <inheritdoc/>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
-            // <see href="https://www.virustotal.com/gui/file/0e0a93cba8163cef9c979cbb49a6f15604956b9441aba6fb9e9f0c6897cc73ed/details"/>
             string? name = exe.FileDescription;
+
+            // <see href="https://www.virustotal.com/gui/file/0e0a93cba8163cef9c979cbb49a6f15604956b9441aba6fb9e9f0c6897cc73ed/details"/>
             if (name.OptionalContains("GP-Install"))
                 return "GP-Install";
 
diff --git a/BinaryObjectScanner/Packer/GenteeInstaller.cs b/BinaryObjectScanner/Packer/GenteeInstaller.cs
@@ -10,6 +10,13 @@ public class GenteeInstaller : IExecutableCheck<PortableExecutable>
         /// <inheritdoc/>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
+            string? name = exe.AssemblyName;
+
+            // <see href="https://www.virustotal.com/gui/file/40e222d35fe8bdd94360462e2f2b870ec7e2c184873e2a481109408db790bfe8/details"/>
+            // This was found in a "Create Install 2003"-made installer
+            if (name.OptionalEquals("Gentee.Installer.Install"))
+                return "Gentee Installer";
+
             // Get the .data/DATA section strings, if they exist
             var strs = exe.GetFirstSectionStrings(".data") ?? exe.GetFirstSectionStrings("DATA");
             if (strs != null)
@@ -21,12 +28,6 @@ public class GenteeInstaller : IExecutableCheck<PortableExecutable>
                     return "Gentee Installer";
             }
 
-            // <see href="https://www.virustotal.com/gui/file/40e222d35fe8bdd94360462e2f2b870ec7e2c184873e2a481109408db790bfe8/details"/>
-            // This was found in a "Create Install 2003"-made installer
-            string? name = exe.AssemblyName;
-            if (name.OptionalEquals("Gentee.Installer.Install"))
-                return "Gentee Installer";
-
             return null;
         }
     }
diff --git a/BinaryObjectScanner/Packer/GkWareSFX.cs b/BinaryObjectScanner/Packer/GkWareSFX.cs
@@ -11,13 +11,15 @@ public class GkWareSFX : IExecutableCheck<PortableExecutable>
         /// <inheritdoc/>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
-            // <see href="https://www.virustotal.com/gui/file/867726b7afc1b2343651497bbbe35618f781bb82491a2a768922117c44a897d3/details"/>
             string? name = exe.FileDescription;
+
+            // <see href="https://www.virustotal.com/gui/file/867726b7afc1b2343651497bbbe35618f781bb82491a2a768922117c44a897d3/details"/>
             if (name.OptionalContains("GkWare Self extractor"))
                 return "GkWare SFX";
 
-            // <see href="https://www.virustotal.com/gui/file/867726b7afc1b2343651497bbbe35618f781bb82491a2a768922117c44a897d3/details"/>
             name = exe.ProductName;
+
+            // <see href="https://www.virustotal.com/gui/file/867726b7afc1b2343651497bbbe35618f781bb82491a2a768922117c44a897d3/details"/>
             if (name.OptionalContains("GkWare Self extractor"))
                 return "GkWare SFX";
 
diff --git a/BinaryObjectScanner/Packer/InstallAnywhere.cs b/BinaryObjectScanner/Packer/InstallAnywhere.cs
@@ -12,10 +12,12 @@ public class InstallAnywhere : IExecutableCheck<PortableExecutable>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
             string? name = exe.FileDescription;
+
             if (name.OptionalStartsWith("InstallAnywhere Self Extractor", StringComparison.OrdinalIgnoreCase))
                 return $"InstallAnywhere {GetVersion(exe)}";
 
             name = exe.ProductName;
+
             if (name.OptionalStartsWith("InstallAnywhere", StringComparison.OrdinalIgnoreCase))
                 return $"InstallAnywhere {GetVersion(exe)}";
 
diff --git a/BinaryObjectScanner/Packer/IntelInstallationFramework.cs b/BinaryObjectScanner/Packer/IntelInstallationFramework.cs
@@ -11,13 +11,15 @@ public class IntelInstallationFramework : IExecutableCheck<PortableExecutable>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
             string? name = exe.FileDescription;
+
             if (name.OptionalEquals("Intel(R) Installation Framework", StringComparison.OrdinalIgnoreCase)
                 || name.OptionalEquals("Intel Installation Framework", StringComparison.OrdinalIgnoreCase))
             {
                 return $"Intel Installation Framework {exe.GetInternalVersion()}";
             }
 
             name = exe.ProductName;
+
             if (name.OptionalEquals("Intel(R) Installation Framework", StringComparison.OrdinalIgnoreCase)
                 || name.OptionalEquals("Intel Installation Framework", StringComparison.OrdinalIgnoreCase))
             {
diff --git a/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs b/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs
@@ -11,10 +11,12 @@ public class MicrosoftCABSFX : IExecutableCheck<PortableExecutable>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
             string? name = exe.InternalName;
+
             if (name.OptionalEquals("Wextract", StringComparison.OrdinalIgnoreCase))
                 return $"Microsoft CAB SFX {GetVersion(exe)}";
 
             name = exe.OriginalFilename;
+            
             if (name.OptionalEquals("WEXTRACT.EXE", StringComparison.OrdinalIgnoreCase))
                 return $"Microsoft CAB SFX {GetVersion(exe)}";
 
diff --git a/BinaryObjectScanner/Packer/NSIS.cs b/BinaryObjectScanner/Packer/NSIS.cs
@@ -10,6 +10,7 @@ public class NSIS : IExecutableCheck<PortableExecutable>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
             string? name = exe.AssemblyDescription;
+
             if (name.OptionalStartsWith("Nullsoft Install System"))
                 return $"NSIS {name!.Substring("Nullsoft Install System".Length).Trim()}";
 
diff --git a/BinaryObjectScanner/Packer/SetupFactory.cs b/BinaryObjectScanner/Packer/SetupFactory.cs
@@ -12,17 +12,20 @@ public class SetupFactory : IExecutableCheck<PortableExecutable>
         /// <inheritdoc/>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
-            // Known to detect versions 7.0.5.1 - 9.1.0.0
             string? name = exe.LegalCopyright;
+
+            // Known to detect versions 7.0.5.1 - 9.1.0.0
             if (name.OptionalStartsWith("Setup Engine", StringComparison.OrdinalIgnoreCase))
                 return $"Setup Factory {GetVersion(exe)}";
 
             name = exe.ProductName;
+
             if (name.OptionalStartsWith("Setup Factory", StringComparison.OrdinalIgnoreCase))
                 return $"Setup Factory {GetVersion(exe)}";
 
-            // Known to detect version 5.0.1 - 6.0.1.3
             name = exe.FileDescription;
+
+            // Known to detect version 5.0.1 - 6.0.1.3
             if (name.OptionalStartsWith("Setup Factory", StringComparison.OrdinalIgnoreCase))
                 return $"Setup Factory {GetVersion(exe)}";
 
diff --git a/BinaryObjectScanner/Packer/SevenZipSFX.cs b/BinaryObjectScanner/Packer/SevenZipSFX.cs
@@ -8,27 +8,27 @@ public class SevenZipSFX : IExecutableCheck<PortableExecutable>
         /// <inheritdoc/>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
-            // Get the assembly description, if possible
             string? name = exe.AssemblyDescription;
+
             if (name.OptionalStartsWith("7-Zip Self-extracting Archive"))
                 return $"7-Zip SFX {exe.AssemblyDescription!.Substring("7-Zip Self-extracting Archive ".Length)}";
 
-            // Get the file description, if it exists
             name = exe.FileDescription;
+
             if (name.OptionalEquals("7z SFX"))
                 return "7-Zip SFX";
             if (name.OptionalEquals("7z Self-Extract Setup"))
                 return "7-Zip SFX";
 
-            // Get the original filename, if it exists
             name = exe.OriginalFilename;
+
             if (name.OptionalEquals("7z.sfx.exe"))
                 return "7-Zip SFX";
             else if (name.OptionalEquals("7zS.sfx"))
                 return "7-Zip SFX";
 
-            // Get the internal name, if it exists
             name = exe.InternalName;
+            
             if (name.OptionalEquals("7z.sfx"))
                 return "7-Zip SFX";
             else if (name.OptionalEquals("7zS.sfx"))
diff --git a/BinaryObjectScanner/Packer/SmartInstallMaker.cs b/BinaryObjectScanner/Packer/SmartInstallMaker.cs
@@ -11,8 +11,9 @@ public class SmartInstallMaker : IExecutableCheck<PortableExecutable>
         /// <inheritdoc/>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
-            // <see href="https://www.virustotal.com/gui/file/43b5791a7d87830025efae0db8f1cc5a02b6001f4703b0189adf1412cdbe22ac/details"/>
             string? name = exe.AssemblyDescription;
+
+            // <see href="https://www.virustotal.com/gui/file/43b5791a7d87830025efae0db8f1cc5a02b6001f4703b0189adf1412cdbe22ac/details"/>
             if (name.OptionalContains("Smart Install Maker"))
                 return "Smart Install Maker";
 
diff --git a/BinaryObjectScanner/Packer/SpoonInstaller.cs b/BinaryObjectScanner/Packer/SpoonInstaller.cs
@@ -11,14 +11,16 @@ public class SpoonInstaller : IExecutableCheck<PortableExecutable>
         /// <inheritdoc/>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
-            // <see href="https://www.virustotal.com/gui/file/ad876d9aa59a2c51af776ce7c095af69f41f2947c6a46cfe87a724ecf8745084/details"/>
             string? name = exe.AssemblyDescription;
+
+            // <see href="https://www.virustotal.com/gui/file/ad876d9aa59a2c51af776ce7c095af69f41f2947c6a46cfe87a724ecf8745084/details"/>
             if (name.OptionalEquals("Spoon Installer"))
                 return "Spoon Installer";
 
+            name = exe.AssemblyName;
+
             // <see href="https://www.virustotal.com/gui/file/40e222d35fe8bdd94360462e2f2b870ec7e2c184873e2a481109408db790bfe8/details"/>
             // This was found in a "Create Install 2003"-made installer
-            name = exe.AssemblyName;
             if (name.OptionalEquals("Illustrate.Spoon.Installer"))
                 return "Spoon Installer";
 
diff --git a/BinaryObjectScanner/Packer/WinRARSFX.cs b/BinaryObjectScanner/Packer/WinRARSFX.cs
@@ -9,6 +9,7 @@ public class WinRARSFX : IExecutableCheck<PortableExecutable>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
             string? name = exe.AssemblyDescription;
+
             if (name.OptionalContains("WinRAR archiver"))
                 return "WinRAR SFX";
 

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,15 @@ public class IntelInstallationFramework : IExecutableCheck<PortableExecutable>`
`11`	`11`	`public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)`
`12`	`12`	`{`
`13`	`13`	`string? name = exe.FileDescription;`
	`14`	`+`
`14`	`15`	`if (name.OptionalEquals("Intel(R) Installation Framework", StringComparison.OrdinalIgnoreCase)`
`15`	`16`	`\|\| name.OptionalEquals("Intel Installation Framework", StringComparison.OrdinalIgnoreCase))`
`16`	`17`	`{`
`17`	`18`	`return $"Intel Installation Framework {exe.GetInternalVersion()}";`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`name = exe.ProductName;`
	`22`	`+`
`21`	`23`	`if (name.OptionalEquals("Intel(R) Installation Framework", StringComparison.OrdinalIgnoreCase)`
`22`	`24`	`\|\| name.OptionalEquals("Intel Installation Framework", StringComparison.OrdinalIgnoreCase))`
`23`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ public class NSIS : IExecutableCheck<PortableExecutable>`
`10`	`10`	`public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)`
`11`	`11`	`{`
`12`	`12`	`string? name = exe.AssemblyDescription;`
	`13`	`+`
`13`	`14`	`if (name.OptionalStartsWith("Nullsoft Install System"))`
`14`	`15`	`return $"NSIS {name!.Substring("Nullsoft Install System".Length).Trim()}";`
`15`	`16`