Organize StarForce, get rid of all Model calls

Author: mnadareski

BinaryObjectScanner/Packer/Crunch.cs

@@ -12,7 +12,7 @@ public class Crunch : IExecutableCheck<PortableExecutable>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
             // Get the last section strings, if they exist
-            var sections = exe.Model.SectionTable ?? [];
+            var sections = exe.SectionTable ?? [];
             var strs = exe.GetSectionStrings(sections.Length - 1);
             if (strs != null)
             {

BinaryObjectScanner/Packer/HyperTechCrackProof.cs

@@ -16,7 +16,7 @@ public class HyperTechCrackProof : IExecutableCheck<PortableExecutable>
         {
             // This check may be overly limiting, as it excludes the sample provided to DiE (https://github.com/horsicq/Detect-It-Easy/issues/102).
             // TODO: Find further samples and invesitgate if the "peC" section is only present on specific versions.
-            bool importTableMatch = Array.Exists(exe.Model.ImportTable?.ImportDirectoryTable ?? [],
+            bool importTableMatch = Array.Exists(exe.ImportTable?.ImportDirectoryTable ?? [],
                 idte => idte?.Name == "KeRnEl32.dLl");
 
             if (exe.ContainsSection("peC", exact: true) && importTableMatch)

BinaryObjectScanner/Packer/InnoSetup.cs

@@ -14,7 +14,7 @@ public class InnoSetup : IExecutableCheck<NewExecutable>, IExecutableCheck<Porta
         public string? CheckExecutable(string file, NewExecutable exe, bool includeDebug)
         {
             // Check for "Inno" in the reserved words
-            var reserved2 = exe.Model.Stub?.Header?.Reserved2;
+            var reserved2 = exe.Stub?.Header?.Reserved2;
             if (reserved2 != null && reserved2.Length > 5)
             {
                 if (reserved2[4] == 0x6E49 && reserved2[5] == 0x6F6E)

BinaryObjectScanner/Packer/PECompact.cs

@@ -11,7 +11,7 @@ public class PECompact : IExecutableCheck<PortableExecutable>
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
             // 0x4F434550 is "PECO"
-            if (exe.Model.COFFFileHeader?.PointerToSymbolTable == 0x4F434550)
+            if (exe.COFFFileHeader?.PointerToSymbolTable == 0x4F434550)
                 return "PE Compact v1.x";
 
             // TODO: Get more granular version detection. PiD is somehow able to detect version ranges based

BinaryObjectScanner/Packer/WinZipSFX.cs

@@ -63,7 +63,7 @@ public class ByteShield : IExecutableCheck<PortableExecutable>, IPathCheck
                 return $"ByteShield Activation Client {exe.GetInternalVersion()}";
 
             // Found in "ByteShield.dll" in Redump entry 6236
-            name = exe.Model.ExportTable?.ExportDirectoryTable?.Name;
+            name = exe.ExportTable?.ExportDirectoryTable?.Name;
             if (name.OptionalEquals("ByteShield Client"))
                 return "ByteShield Component Module";
 

BinaryObjectScanner/Protection/ByteShield.cs

@@ -120,14 +120,14 @@ public class CDDVDCops : IExecutableCheck<NewExecutable>, IExecutableCheck<Porta
                 return match;
 
             // Get the resident and non-resident name table strings
-            var nrntStrs = Array.ConvertAll(exe.Model.NonResidentNameTable ?? [],
+            var nrntStrs = Array.ConvertAll(exe.NonResidentNameTable ?? [],
                 nrnte => nrnte?.NameString == null ? string.Empty : Encoding.ASCII.GetString(nrnte.NameString));
 
             // Check the imported-name table
             // Found in "h3blade.exe" in Redump entry 85077.
-            if (exe.Model.ImportedNameTable != null)
+            if (exe.ImportedNameTable != null)
             {
-                foreach (var inte in exe.Model.ImportedNameTable.Values)
+                foreach (var inte in exe.ImportedNameTable.Values)
                 {
                     if (inte.NameString.IsNullOrEmpty())
                         continue;

BinaryObjectScanner/Protection/CDDVDCops.cs

@@ -28,19 +28,19 @@ public class CDGuard : IExecutableCheck<PortableExecutable>, IPathCheck
             // TODO: Investigate the numerous ".guard" sections present in "Randevu.exe" in Redump entry 97142.
 
             // Get the export directory table
-            if (exe.Model.ExportTable?.ExportDirectoryTable != null)
+            if (exe.ExportTable?.ExportDirectoryTable != null)
             {
                 // Found in "cdguard.dll" in Redump entry 97142 and IA item "pahgeby-he3hakomkou".
-                bool match = exe.Model.ExportTable.ExportDirectoryTable.Name.OptionalEquals("cdguard.dll", StringComparison.OrdinalIgnoreCase);
+                bool match = exe.ExportTable.ExportDirectoryTable.Name.OptionalEquals("cdguard.dll", StringComparison.OrdinalIgnoreCase);
                 if (match)
                     return "CD-Guard Copy Protection System";
             }
 
             // Get the import directory table
-            if (exe.Model.ImportTable?.ImportDirectoryTable != null)
+            if (exe.ImportTable?.ImportDirectoryTable != null)
             {
                 // Found in "Randevu.exe" in Redump entry 97142.
-                bool match = Array.Exists(exe.Model.ImportTable.ImportDirectoryTable, idte => idte?.Name != null && idte.Name.Equals("cdguard.dll", StringComparison.OrdinalIgnoreCase));
+                bool match = Array.Exists(exe.ImportTable.ImportDirectoryTable, idte => idte?.Name != null && idte.Name.Equals("cdguard.dll", StringComparison.OrdinalIgnoreCase));
                 if (match)
                     return "CD-Guard Copy Protection System";
             }

BinaryObjectScanner/Protection/CDGuard.cs

@@ -10,9 +10,9 @@ public class CDSHiELDSE : IExecutableCheck<PortableExecutable>
         {
             // TODO: Indicates Hypertech Crack Proof as well?
             //// Get the import directory table
-            //if (exe.Model.ImportTable?.ImportDirectoryTable != null)
+            //if (exe.ImportTable?.ImportDirectoryTable != null)
             //{
-            //    bool match = exe.Model.ImportTable.ImportDirectoryTable.Any(idte => idte.Name == "KeRnEl32.dLl");
+            //    bool match = exe.ImportTable.ImportDirectoryTable.Any(idte => idte.Name == "KeRnEl32.dLl");
             //    if (match)
             //        return "CDSHiELD SE";
             //}

BinaryObjectScanner/Protection/CDSHiELDSE.cs

@@ -18,10 +18,10 @@ public class CenegaProtectDVD : IExecutableCheck<PortableExecutable>, IPathCheck
         public string? CheckExecutable(string file, PortableExecutable exe, bool includeDebug)
         {
             // Get the export directory table
-            if (exe.Model.ExportTable?.ExportDirectoryTable != null)
+            if (exe.ExportTable?.ExportDirectoryTable != null)
             {
                 // Found in "cenega.dll" in IA item "speed-pack".
-                bool match = exe.Model.ExportTable.ExportDirectoryTable.Name.OptionalEquals("ProtectDVD.dll", StringComparison.OrdinalIgnoreCase);
+                bool match = exe.ExportTable.ExportDirectoryTable.Name.OptionalEquals("ProtectDVD.dll", StringComparison.OrdinalIgnoreCase);
                 if (match)
                     return "Cenega ProtectDVD";
             }