From 5f9f21ae1425e437a60b2ff13d449782b715e73d Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Sat, 20 Sep 2025 17:48:51 -0400
Subject: [PATCH] Replace things that are marked for replacement

---
 BinaryObjectScanner/Packer/GenteeInstaller.cs | 24 ++++---------------
 BinaryObjectScanner/Packer/SpoonInstaller.cs  | 23 ++++--------------
 2 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/BinaryObjectScanner/Packer/GenteeInstaller.cs b/BinaryObjectScanner/Packer/GenteeInstaller.cs
index c3072c32..4578b8e4 100644
--- a/BinaryObjectScanner/Packer/GenteeInstaller.cs
+++ b/BinaryObjectScanner/Packer/GenteeInstaller.cs
@@ -1,6 +1,4 @@
-using System;
 using BinaryObjectScanner.Interfaces;
-using SabreTools.Models.PortableExecutable.ResourceEntries;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Packer
@@ -23,23 +21,11 @@ namespace BinaryObjectScanner.Packer
                     return "Gentee Installer";
             }
 
-            // Get the resource data
-            // TODO: This should be replaced by a helper method on the wrapper
-            var resourceData = exe.ResourceData;
-            if (resourceData != null)
-            {
-                var resourceValue = Array.Find([.. resourceData.Values], rd => rd is AssemblyManifest);
-                if (resourceValue != null && resourceValue is AssemblyManifest manifest)
-                {
-                    var identities = manifest?.AssemblyIdentities ?? [];
-                    var nameIdentity = Array.Find(identities, ai => !string.IsNullOrEmpty(ai?.Name));
-
-                    // <see href="https://www.virustotal.com/gui/file/40e222d35fe8bdd94360462e2f2b870ec7e2c184873e2a481109408db790bfe8/details"/>
-                    // This was found in a "Create Install 2003"-made installer
-                    if (nameIdentity?.Name == "Gentee.Installer.Install")
-                        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 == "Gentee.Installer.Install")
+                return "Gentee Installer";
 
             return null;
         }
diff --git a/BinaryObjectScanner/Packer/SpoonInstaller.cs b/BinaryObjectScanner/Packer/SpoonInstaller.cs
index b3bb4f59..d1896f97 100644
--- a/BinaryObjectScanner/Packer/SpoonInstaller.cs
+++ b/BinaryObjectScanner/Packer/SpoonInstaller.cs
@@ -1,6 +1,4 @@
-using System;
 using BinaryObjectScanner.Interfaces;
-using SabreTools.Models.PortableExecutable.ResourceEntries;
 using SabreTools.Serialization.Wrappers;
 
 namespace BinaryObjectScanner.Packer
@@ -18,22 +16,11 @@ namespace BinaryObjectScanner.Packer
             if (name.OptionalEquals("Spoon Installer"))
                 return "Spoon Installer";
 
-            // Get the resource data
-            // TODO: This should be replaced by a helper method on the wrapper
-            var resourceData = exe.ResourceData;
-            if (resourceData != null)
-            {
-                var resourceValue = Array.Find([.. resourceData.Values], rd => rd is AssemblyManifest);
-                if (resourceValue != null && resourceValue is AssemblyManifest manifest)
-                {
-                    var identities = manifest?.AssemblyIdentities ?? [];
-                    var nameIdentity = Array.Find(identities, ai => !string.IsNullOrEmpty(ai?.Name));
-
-                    // <see href="https://www.virustotal.com/gui/file/ad876d9aa59a2c51af776ce7c095af69f41f2947c6a46cfe87a724ecf8745084/details"/>
-                    if (nameIdentity?.Name == "Illustrate.Spoon.Installer")
-                        return "Spoon Installer";
-                }
-            }
+            // <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 == "Illustrate.Spoon.Installer")
+                return "Spoon Installer";
 
             return null;
         }