diff --git a/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj b/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj index 52fe1dcc..328bc575 100644 --- a/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj +++ b/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj @@ -17,7 +17,7 @@ all - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/BinaryObjectScanner.Test/FileType/AACSMediaKeyBlockTests.cs b/BinaryObjectScanner.Test/FileType/AACSMediaKeyBlockTests.cs index 9b72ae31..71c31640 100644 --- a/BinaryObjectScanner.Test/FileType/AACSMediaKeyBlockTests.cs +++ b/BinaryObjectScanner.Test/FileType/AACSMediaKeyBlockTests.cs @@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType public class AACSMediaKeyBlockTests { private static readonly SabreTools.Serialization.Wrappers.AACSMediaKeyBlock wrapper - = new(new SabreTools.Models.AACS.MediaKeyBlock(), new MemoryStream(new byte[1024])); + = new(new SabreTools.Data.Models.AACS.MediaKeyBlock(), new MemoryStream(new byte[1024])); [Fact] public void DetectFile_EmptyString_Null() diff --git a/BinaryObjectScanner.Test/FileType/BDPlusSVMTests.cs b/BinaryObjectScanner.Test/FileType/BDPlusSVMTests.cs index c9033ed8..3db323d1 100644 --- a/BinaryObjectScanner.Test/FileType/BDPlusSVMTests.cs +++ b/BinaryObjectScanner.Test/FileType/BDPlusSVMTests.cs @@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType public class BDPlusSVMTests { private static readonly SabreTools.Serialization.Wrappers.BDPlusSVM wrapper - = new(new SabreTools.Models.BDPlus.SVM(), new MemoryStream(new byte[1024])); + = new(new SabreTools.Data.Models.BDPlus.SVM(), new MemoryStream(new byte[1024])); [Fact] public void DetectFile_EmptyString_Null() diff --git a/BinaryObjectScanner.Test/FileType/LDSCRYPTTests.cs b/BinaryObjectScanner.Test/FileType/LDSCRYPTTests.cs index 7fe753b9..d7731a06 100644 --- a/BinaryObjectScanner.Test/FileType/LDSCRYPTTests.cs +++ b/BinaryObjectScanner.Test/FileType/LDSCRYPTTests.cs @@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType public class LDSCRYPTTests { private static readonly SabreTools.Serialization.Wrappers.LDSCRYPT wrapper - = new(new SabreTools.Models.LDSCRYPT.EncryptedFile(), new MemoryStream(new byte[1024])); + = new(new SabreTools.Data.Models.LDSCRYPT.EncryptedFile(), new MemoryStream(new byte[1024])); [Fact] public void DetectFile_EmptyString_Null() diff --git a/BinaryObjectScanner.Test/FileType/LinearExecutableTests.cs b/BinaryObjectScanner.Test/FileType/LinearExecutableTests.cs index a4878709..397c48f1 100644 --- a/BinaryObjectScanner.Test/FileType/LinearExecutableTests.cs +++ b/BinaryObjectScanner.Test/FileType/LinearExecutableTests.cs @@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType public class LinearExecutableTests { private static readonly SabreTools.Serialization.Wrappers.LinearExecutable wrapper - = new(new SabreTools.Models.LinearExecutable.Executable(), new MemoryStream(new byte[1024])); + = new(new SabreTools.Data.Models.LinearExecutable.Executable(), new MemoryStream(new byte[1024])); [Fact] public void DetectFile_EmptyString_Null() diff --git a/BinaryObjectScanner.Test/FileType/MSDOSTests.cs b/BinaryObjectScanner.Test/FileType/MSDOSTests.cs index 5bd22c3d..47759ee3 100644 --- a/BinaryObjectScanner.Test/FileType/MSDOSTests.cs +++ b/BinaryObjectScanner.Test/FileType/MSDOSTests.cs @@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType public class MSDOSTests { private static readonly SabreTools.Serialization.Wrappers.MSDOS wrapper - = new(new SabreTools.Models.MSDOS.Executable(), new MemoryStream(new byte[1024])); + = new(new SabreTools.Data.Models.MSDOS.Executable(), new MemoryStream(new byte[1024])); [Fact] public void DetectFile_EmptyString_Null() diff --git a/BinaryObjectScanner.Test/FileType/NewExecutableTests.cs b/BinaryObjectScanner.Test/FileType/NewExecutableTests.cs index cf7bf20d..f828905b 100644 --- a/BinaryObjectScanner.Test/FileType/NewExecutableTests.cs +++ b/BinaryObjectScanner.Test/FileType/NewExecutableTests.cs @@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType public class NewExecutableTests { private static readonly SabreTools.Serialization.Wrappers.NewExecutable wrapper - = new(new SabreTools.Models.NewExecutable.Executable(), new MemoryStream(new byte[1024])); + = new(new SabreTools.Data.Models.NewExecutable.Executable(), new MemoryStream(new byte[1024])); [Fact] public void DetectFile_EmptyString_Null() diff --git a/BinaryObjectScanner.Test/FileType/PLJTests.cs b/BinaryObjectScanner.Test/FileType/PLJTests.cs index e633d071..278d7462 100644 --- a/BinaryObjectScanner.Test/FileType/PLJTests.cs +++ b/BinaryObjectScanner.Test/FileType/PLJTests.cs @@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType public class PLJTests { private static readonly SabreTools.Serialization.Wrappers.PlayJAudioFile wrapper - = new(new SabreTools.Models.PlayJ.AudioFile(), new MemoryStream(new byte[1024])); + = new(new SabreTools.Data.Models.PlayJ.AudioFile(), new MemoryStream(new byte[1024])); [Fact] public void DetectFile_EmptyString_Null() diff --git a/BinaryObjectScanner.Test/FileType/PortableExecutableTests.cs b/BinaryObjectScanner.Test/FileType/PortableExecutableTests.cs index 9cda387c..063580dd 100644 --- a/BinaryObjectScanner.Test/FileType/PortableExecutableTests.cs +++ b/BinaryObjectScanner.Test/FileType/PortableExecutableTests.cs @@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType public class PortableExecutableTests { private static readonly SabreTools.Serialization.Wrappers.PortableExecutable wrapper - = new(new SabreTools.Models.PortableExecutable.Executable(), new MemoryStream(new byte[1024])); + = new(new SabreTools.Data.Models.PortableExecutable.Executable(), new MemoryStream(new byte[1024])); [Fact] public void DetectFile_EmptyString_Null() diff --git a/BinaryObjectScanner.Test/FileType/RealArcadeInstallerTests.cs b/BinaryObjectScanner.Test/FileType/RealArcadeInstallerTests.cs index a7313108..a9d0e74b 100644 --- a/BinaryObjectScanner.Test/FileType/RealArcadeInstallerTests.cs +++ b/BinaryObjectScanner.Test/FileType/RealArcadeInstallerTests.cs @@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType public class RealArcadeInstallerTests { private static readonly SabreTools.Serialization.Wrappers.RealArcadeInstaller wrapper - = new(new SabreTools.Models.RealArcade.RgsFile(), new MemoryStream(new byte[1024])); + = new(new SabreTools.Data.Models.RealArcade.RgsFile(), new MemoryStream(new byte[1024])); [Fact] public void DetectFile_EmptyString_Null() diff --git a/BinaryObjectScanner.Test/FileType/RealArcadeMezzanineTests.cs b/BinaryObjectScanner.Test/FileType/RealArcadeMezzanineTests.cs index e4e40518..f0c2c03e 100644 --- a/BinaryObjectScanner.Test/FileType/RealArcadeMezzanineTests.cs +++ b/BinaryObjectScanner.Test/FileType/RealArcadeMezzanineTests.cs @@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType public class RealArcadeMezzanineTests { private static readonly SabreTools.Serialization.Wrappers.RealArcadeMezzanine wrapper - = new(new SabreTools.Models.RealArcade.Mezzanine(), new MemoryStream(new byte[1024])); + = new(new SabreTools.Data.Models.RealArcade.Mezzanine(), new MemoryStream(new byte[1024])); [Fact] public void DetectFile_EmptyString_Null() diff --git a/BinaryObjectScanner.Test/FileType/SFFSTests.cs b/BinaryObjectScanner.Test/FileType/SFFSTests.cs index c0f147ab..28dbe175 100644 --- a/BinaryObjectScanner.Test/FileType/SFFSTests.cs +++ b/BinaryObjectScanner.Test/FileType/SFFSTests.cs @@ -7,7 +7,7 @@ namespace BinaryObjectScanner.Test.FileType public class SFFSTests { private static readonly SabreTools.Serialization.Wrappers.SFFS wrapper - = new(new SabreTools.Models.StarForce.FileSystem(), new MemoryStream(new byte[1024])); + = new(new SabreTools.Data.Models.StarForce.FileSystem(), new MemoryStream(new byte[1024])); [Fact] public void DetectFile_EmptyString_Null() diff --git a/BinaryObjectScanner.Test/GameEngine/RenderWareTests.cs b/BinaryObjectScanner.Test/GameEngine/RenderWareTests.cs index b7fedf89..2345610f 100644 --- a/BinaryObjectScanner.Test/GameEngine/RenderWareTests.cs +++ b/BinaryObjectScanner.Test/GameEngine/RenderWareTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.GameEngine public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/ASPackTests.cs b/BinaryObjectScanner.Test/Packer/ASPackTests.cs index 7b339e82..7a6a1abd 100644 --- a/BinaryObjectScanner.Test/Packer/ASPackTests.cs +++ b/BinaryObjectScanner.Test/Packer/ASPackTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/AdvancedInstallerTests.cs b/BinaryObjectScanner.Test/Packer/AdvancedInstallerTests.cs index 6c2b9252..0b2e24c7 100644 --- a/BinaryObjectScanner.Test/Packer/AdvancedInstallerTests.cs +++ b/BinaryObjectScanner.Test/Packer/AdvancedInstallerTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/AutoPlayMediaStudioTests.cs b/BinaryObjectScanner.Test/Packer/AutoPlayMediaStudioTests.cs index 7250dd85..8ac6aa6b 100644 --- a/BinaryObjectScanner.Test/Packer/AutoPlayMediaStudioTests.cs +++ b/BinaryObjectScanner.Test/Packer/AutoPlayMediaStudioTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/CExeTests.cs b/BinaryObjectScanner.Test/Packer/CExeTests.cs index ba0e1cdf..5e1356e1 100644 --- a/BinaryObjectScanner.Test/Packer/CExeTests.cs +++ b/BinaryObjectScanner.Test/Packer/CExeTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/CrunchTests.cs b/BinaryObjectScanner.Test/Packer/CrunchTests.cs index f2bfa477..6a6bc119 100644 --- a/BinaryObjectScanner.Test/Packer/CrunchTests.cs +++ b/BinaryObjectScanner.Test/Packer/CrunchTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/DotFuscatorTests.cs b/BinaryObjectScanner.Test/Packer/DotFuscatorTests.cs index 429a6863..61e6545c 100644 --- a/BinaryObjectScanner.Test/Packer/DotFuscatorTests.cs +++ b/BinaryObjectScanner.Test/Packer/DotFuscatorTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/DotNetReactorTests.cs b/BinaryObjectScanner.Test/Packer/DotNetReactorTests.cs index b5cc72c7..c024240e 100644 --- a/BinaryObjectScanner.Test/Packer/DotNetReactorTests.cs +++ b/BinaryObjectScanner.Test/Packer/DotNetReactorTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/EXEStealthTests.cs b/BinaryObjectScanner.Test/Packer/EXEStealthTests.cs index 4fb6a238..133356d0 100644 --- a/BinaryObjectScanner.Test/Packer/EXEStealthTests.cs +++ b/BinaryObjectScanner.Test/Packer/EXEStealthTests.cs @@ -21,7 +21,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/EmbeddedFileTests.cs b/BinaryObjectScanner.Test/Packer/EmbeddedFileTests.cs index 871821be..ed6af1aa 100644 --- a/BinaryObjectScanner.Test/Packer/EmbeddedFileTests.cs +++ b/BinaryObjectScanner.Test/Packer/EmbeddedFileTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/GenteeInstallerTests.cs b/BinaryObjectScanner.Test/Packer/GenteeInstallerTests.cs index 61fd2824..0dcd8f63 100644 --- a/BinaryObjectScanner.Test/Packer/GenteeInstallerTests.cs +++ b/BinaryObjectScanner.Test/Packer/GenteeInstallerTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/HyperTechCrackProofTests.cs b/BinaryObjectScanner.Test/Packer/HyperTechCrackProofTests.cs index f18c9a56..32e753bd 100644 --- a/BinaryObjectScanner.Test/Packer/HyperTechCrackProofTests.cs +++ b/BinaryObjectScanner.Test/Packer/HyperTechCrackProofTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/InnoSetupTests.cs b/BinaryObjectScanner.Test/Packer/InnoSetupTests.cs index 7412a492..3cc4adbc 100644 --- a/BinaryObjectScanner.Test/Packer/InnoSetupTests.cs +++ b/BinaryObjectScanner.Test/Packer/InnoSetupTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckNewExecutableTest() { string file = "filename"; - SabreTools.Models.NewExecutable.Executable model = new(); + SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); @@ -23,7 +23,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/InstallAnywhereTests.cs b/BinaryObjectScanner.Test/Packer/InstallAnywhereTests.cs index f9b35152..349e12ca 100644 --- a/BinaryObjectScanner.Test/Packer/InstallAnywhereTests.cs +++ b/BinaryObjectScanner.Test/Packer/InstallAnywhereTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/InstallerVISETests.cs b/BinaryObjectScanner.Test/Packer/InstallerVISETests.cs index 1bd4e52e..7c554556 100644 --- a/BinaryObjectScanner.Test/Packer/InstallerVISETests.cs +++ b/BinaryObjectScanner.Test/Packer/InstallerVISETests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/IntelInstallationFrameworkTests.cs b/BinaryObjectScanner.Test/Packer/IntelInstallationFrameworkTests.cs index 946fdb03..c0fe3697 100644 --- a/BinaryObjectScanner.Test/Packer/IntelInstallationFrameworkTests.cs +++ b/BinaryObjectScanner.Test/Packer/IntelInstallationFrameworkTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/MicrosoftCABSFXTests.cs b/BinaryObjectScanner.Test/Packer/MicrosoftCABSFXTests.cs index b11dce4d..2adde56e 100644 --- a/BinaryObjectScanner.Test/Packer/MicrosoftCABSFXTests.cs +++ b/BinaryObjectScanner.Test/Packer/MicrosoftCABSFXTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/NSISTests.cs b/BinaryObjectScanner.Test/Packer/NSISTests.cs index c4a2bccc..2706c383 100644 --- a/BinaryObjectScanner.Test/Packer/NSISTests.cs +++ b/BinaryObjectScanner.Test/Packer/NSISTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/NeoLiteTests.cs b/BinaryObjectScanner.Test/Packer/NeoLiteTests.cs index b9f62981..307e94e5 100644 --- a/BinaryObjectScanner.Test/Packer/NeoLiteTests.cs +++ b/BinaryObjectScanner.Test/Packer/NeoLiteTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/PECompactTests.cs b/BinaryObjectScanner.Test/Packer/PECompactTests.cs index 1f6f49a9..dfb7bb75 100644 --- a/BinaryObjectScanner.Test/Packer/PECompactTests.cs +++ b/BinaryObjectScanner.Test/Packer/PECompactTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/PEtiteTests.cs b/BinaryObjectScanner.Test/Packer/PEtiteTests.cs index 5065e76f..6cb61a5f 100644 --- a/BinaryObjectScanner.Test/Packer/PEtiteTests.cs +++ b/BinaryObjectScanner.Test/Packer/PEtiteTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/SetupFactoryTests.cs b/BinaryObjectScanner.Test/Packer/SetupFactoryTests.cs index f3f9af52..4793eb8b 100644 --- a/BinaryObjectScanner.Test/Packer/SetupFactoryTests.cs +++ b/BinaryObjectScanner.Test/Packer/SetupFactoryTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/SevenZipSFXTests.cs b/BinaryObjectScanner.Test/Packer/SevenZipSFXTests.cs index b11c49d1..b32c44d3 100644 --- a/BinaryObjectScanner.Test/Packer/SevenZipSFXTests.cs +++ b/BinaryObjectScanner.Test/Packer/SevenZipSFXTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/ShrinkerTests.cs b/BinaryObjectScanner.Test/Packer/ShrinkerTests.cs index 03d8770a..6da06f49 100644 --- a/BinaryObjectScanner.Test/Packer/ShrinkerTests.cs +++ b/BinaryObjectScanner.Test/Packer/ShrinkerTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/UPXTests.cs b/BinaryObjectScanner.Test/Packer/UPXTests.cs index 58836ca2..aa3b16ed 100644 --- a/BinaryObjectScanner.Test/Packer/UPXTests.cs +++ b/BinaryObjectScanner.Test/Packer/UPXTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/WinRARSFXTests.cs b/BinaryObjectScanner.Test/Packer/WinRARSFXTests.cs index e0cbaa36..bb33265e 100644 --- a/BinaryObjectScanner.Test/Packer/WinRARSFXTests.cs +++ b/BinaryObjectScanner.Test/Packer/WinRARSFXTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/WinZipSFXTests.cs b/BinaryObjectScanner.Test/Packer/WinZipSFXTests.cs index 84cbf5c5..d585dc12 100644 --- a/BinaryObjectScanner.Test/Packer/WinZipSFXTests.cs +++ b/BinaryObjectScanner.Test/Packer/WinZipSFXTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckNewExecutableTest() { string file = "filename"; - SabreTools.Models.NewExecutable.Executable model = new(); + SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); @@ -23,7 +23,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Packer/WiseInstallerTests.cs b/BinaryObjectScanner.Test/Packer/WiseInstallerTests.cs index 268bb9f6..75048d99 100644 --- a/BinaryObjectScanner.Test/Packer/WiseInstallerTests.cs +++ b/BinaryObjectScanner.Test/Packer/WiseInstallerTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckNewExecutableTest() { string file = "filename"; - SabreTools.Models.NewExecutable.Executable model = new(); + SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); @@ -23,7 +23,7 @@ namespace BinaryObjectScanner.Test.Packer public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/ActiveMARKTests.cs b/BinaryObjectScanner.Test/Protection/ActiveMARKTests.cs index 1cf2fa68..92e0764b 100644 --- a/BinaryObjectScanner.Test/Protection/ActiveMARKTests.cs +++ b/BinaryObjectScanner.Test/Protection/ActiveMARKTests.cs @@ -21,7 +21,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/AegiSoftTests.cs b/BinaryObjectScanner.Test/Protection/AegiSoftTests.cs index faf35b4f..7f1423c4 100644 --- a/BinaryObjectScanner.Test/Protection/AegiSoftTests.cs +++ b/BinaryObjectScanner.Test/Protection/AegiSoftTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/AlphaROMTests.cs b/BinaryObjectScanner.Test/Protection/AlphaROMTests.cs index 3cd578b2..09ebe17f 100644 --- a/BinaryObjectScanner.Test/Protection/AlphaROMTests.cs +++ b/BinaryObjectScanner.Test/Protection/AlphaROMTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/ArmadilloTests.cs b/BinaryObjectScanner.Test/Protection/ArmadilloTests.cs index db197d4c..10eb7a23 100644 --- a/BinaryObjectScanner.Test/Protection/ArmadilloTests.cs +++ b/BinaryObjectScanner.Test/Protection/ArmadilloTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/ByteShieldTests.cs b/BinaryObjectScanner.Test/Protection/ByteShieldTests.cs index 378c27be..da41f76a 100644 --- a/BinaryObjectScanner.Test/Protection/ByteShieldTests.cs +++ b/BinaryObjectScanner.Test/Protection/ByteShieldTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CDCheckTests.cs b/BinaryObjectScanner.Test/Protection/CDCheckTests.cs index f055b50f..2b3c4e4e 100644 --- a/BinaryObjectScanner.Test/Protection/CDCheckTests.cs +++ b/BinaryObjectScanner.Test/Protection/CDCheckTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CDDVDCopsTests.cs b/BinaryObjectScanner.Test/Protection/CDDVDCopsTests.cs index dee491ae..4a6726db 100644 --- a/BinaryObjectScanner.Test/Protection/CDDVDCopsTests.cs +++ b/BinaryObjectScanner.Test/Protection/CDDVDCopsTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckNewExecutableTest() { string file = "filename"; - SabreTools.Models.NewExecutable.Executable model = new(); + SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); @@ -24,7 +24,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CDGuardTests.cs b/BinaryObjectScanner.Test/Protection/CDGuardTests.cs index f0c06e9f..faa1f0e6 100644 --- a/BinaryObjectScanner.Test/Protection/CDGuardTests.cs +++ b/BinaryObjectScanner.Test/Protection/CDGuardTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CDKeyTests.cs b/BinaryObjectScanner.Test/Protection/CDKeyTests.cs index b976906d..de964722 100644 --- a/BinaryObjectScanner.Test/Protection/CDKeyTests.cs +++ b/BinaryObjectScanner.Test/Protection/CDKeyTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CDLockTests.cs b/BinaryObjectScanner.Test/Protection/CDLockTests.cs index c916d2b0..697ad869 100644 --- a/BinaryObjectScanner.Test/Protection/CDLockTests.cs +++ b/BinaryObjectScanner.Test/Protection/CDLockTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CDSHiELDSETests.cs b/BinaryObjectScanner.Test/Protection/CDSHiELDSETests.cs index 34616464..f8130013 100644 --- a/BinaryObjectScanner.Test/Protection/CDSHiELDSETests.cs +++ b/BinaryObjectScanner.Test/Protection/CDSHiELDSETests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CenegaProtectDVDTests.cs b/BinaryObjectScanner.Test/Protection/CenegaProtectDVDTests.cs index f86f67d1..06d2752b 100644 --- a/BinaryObjectScanner.Test/Protection/CenegaProtectDVDTests.cs +++ b/BinaryObjectScanner.Test/Protection/CenegaProtectDVDTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/ChannelwareTests.cs b/BinaryObjectScanner.Test/Protection/ChannelwareTests.cs index 61ea70e5..d70c47c6 100644 --- a/BinaryObjectScanner.Test/Protection/ChannelwareTests.cs +++ b/BinaryObjectScanner.Test/Protection/ChannelwareTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/ChosenBytesCodeLockTests.cs b/BinaryObjectScanner.Test/Protection/ChosenBytesCodeLockTests.cs index fcedd928..2a7a37be 100644 --- a/BinaryObjectScanner.Test/Protection/ChosenBytesCodeLockTests.cs +++ b/BinaryObjectScanner.Test/Protection/ChosenBytesCodeLockTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CopyKillerTests.cs b/BinaryObjectScanner.Test/Protection/CopyKillerTests.cs index 325911b2..58a81c0b 100644 --- a/BinaryObjectScanner.Test/Protection/CopyKillerTests.cs +++ b/BinaryObjectScanner.Test/Protection/CopyKillerTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CopyLokTests.cs b/BinaryObjectScanner.Test/Protection/CopyLokTests.cs index e0d63787..1fd1cd9b 100644 --- a/BinaryObjectScanner.Test/Protection/CopyLokTests.cs +++ b/BinaryObjectScanner.Test/Protection/CopyLokTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CopyXTests.cs b/BinaryObjectScanner.Test/Protection/CopyXTests.cs index 22b625fb..68dbb70d 100644 --- a/BinaryObjectScanner.Test/Protection/CopyXTests.cs +++ b/BinaryObjectScanner.Test/Protection/CopyXTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CrypKeyTests.cs b/BinaryObjectScanner.Test/Protection/CrypKeyTests.cs index d96bec0c..07c9f934 100644 --- a/BinaryObjectScanner.Test/Protection/CrypKeyTests.cs +++ b/BinaryObjectScanner.Test/Protection/CrypKeyTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/CuckoTests.cs b/BinaryObjectScanner.Test/Protection/CuckoTests.cs index 2d8c9058..df074785 100644 --- a/BinaryObjectScanner.Test/Protection/CuckoTests.cs +++ b/BinaryObjectScanner.Test/Protection/CuckoTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/DenuvoTests.cs b/BinaryObjectScanner.Test/Protection/DenuvoTests.cs index 4e58a4bc..664b83b4 100644 --- a/BinaryObjectScanner.Test/Protection/DenuvoTests.cs +++ b/BinaryObjectScanner.Test/Protection/DenuvoTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/DigiGuardTests.cs b/BinaryObjectScanner.Test/Protection/DigiGuardTests.cs index 22e29e7e..e2ddd0fe 100644 --- a/BinaryObjectScanner.Test/Protection/DigiGuardTests.cs +++ b/BinaryObjectScanner.Test/Protection/DigiGuardTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/DiscGuardTests.cs b/BinaryObjectScanner.Test/Protection/DiscGuardTests.cs index e26b8207..ba2f5f43 100644 --- a/BinaryObjectScanner.Test/Protection/DiscGuardTests.cs +++ b/BinaryObjectScanner.Test/Protection/DiscGuardTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/EAAntiCheatTests.cs b/BinaryObjectScanner.Test/Protection/EAAntiCheatTests.cs index 662b1c34..b9bd0456 100644 --- a/BinaryObjectScanner.Test/Protection/EAAntiCheatTests.cs +++ b/BinaryObjectScanner.Test/Protection/EAAntiCheatTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/EasyAntiCheatTests.cs b/BinaryObjectScanner.Test/Protection/EasyAntiCheatTests.cs index bce9159f..65f4f941 100644 --- a/BinaryObjectScanner.Test/Protection/EasyAntiCheatTests.cs +++ b/BinaryObjectScanner.Test/Protection/EasyAntiCheatTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/ElectronicArtsTests.cs b/BinaryObjectScanner.Test/Protection/ElectronicArtsTests.cs index 31d77266..3789b785 100644 --- a/BinaryObjectScanner.Test/Protection/ElectronicArtsTests.cs +++ b/BinaryObjectScanner.Test/Protection/ElectronicArtsTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/Engine32Tests.cs b/BinaryObjectScanner.Test/Protection/Engine32Tests.cs index 7587830b..1198ed90 100644 --- a/BinaryObjectScanner.Test/Protection/Engine32Tests.cs +++ b/BinaryObjectScanner.Test/Protection/Engine32Tests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/GFWLTests.cs b/BinaryObjectScanner.Test/Protection/GFWLTests.cs index 59449ec7..0490a392 100644 --- a/BinaryObjectScanner.Test/Protection/GFWLTests.cs +++ b/BinaryObjectScanner.Test/Protection/GFWLTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/GefestTests.cs b/BinaryObjectScanner.Test/Protection/GefestTests.cs index 6e6d2e2f..b46251cf 100644 --- a/BinaryObjectScanner.Test/Protection/GefestTests.cs +++ b/BinaryObjectScanner.Test/Protection/GefestTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/HexalockAutoLockTests.cs b/BinaryObjectScanner.Test/Protection/HexalockAutoLockTests.cs index 3b182916..8eb5516c 100644 --- a/BinaryObjectScanner.Test/Protection/HexalockAutoLockTests.cs +++ b/BinaryObjectScanner.Test/Protection/HexalockAutoLockTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/ImpulseReactorTests.cs b/BinaryObjectScanner.Test/Protection/ImpulseReactorTests.cs index fb324f48..1d8da4cc 100644 --- a/BinaryObjectScanner.Test/Protection/ImpulseReactorTests.cs +++ b/BinaryObjectScanner.Test/Protection/ImpulseReactorTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/InteniumTests.cs b/BinaryObjectScanner.Test/Protection/InteniumTests.cs index 922af43d..a2e0a8a6 100644 --- a/BinaryObjectScanner.Test/Protection/InteniumTests.cs +++ b/BinaryObjectScanner.Test/Protection/InteniumTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/InterLokTests.cs b/BinaryObjectScanner.Test/Protection/InterLokTests.cs index 007b45f7..4c7946d0 100644 --- a/BinaryObjectScanner.Test/Protection/InterLokTests.cs +++ b/BinaryObjectScanner.Test/Protection/InterLokTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/JoWoodTests.cs b/BinaryObjectScanner.Test/Protection/JoWoodTests.cs index 4cd21f43..bccf7aa9 100644 --- a/BinaryObjectScanner.Test/Protection/JoWoodTests.cs +++ b/BinaryObjectScanner.Test/Protection/JoWoodTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/KalypsoLauncherTests.cs b/BinaryObjectScanner.Test/Protection/KalypsoLauncherTests.cs index abb77147..437f1b3e 100644 --- a/BinaryObjectScanner.Test/Protection/KalypsoLauncherTests.cs +++ b/BinaryObjectScanner.Test/Protection/KalypsoLauncherTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/LabelGateTests.cs b/BinaryObjectScanner.Test/Protection/LabelGateTests.cs index b8b50e56..ff160aa9 100644 --- a/BinaryObjectScanner.Test/Protection/LabelGateTests.cs +++ b/BinaryObjectScanner.Test/Protection/LabelGateTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/LaserLokTests.cs b/BinaryObjectScanner.Test/Protection/LaserLokTests.cs index ccc26b63..2f83e0fe 100644 --- a/BinaryObjectScanner.Test/Protection/LaserLokTests.cs +++ b/BinaryObjectScanner.Test/Protection/LaserLokTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/MGIRegistrationTests.cs b/BinaryObjectScanner.Test/Protection/MGIRegistrationTests.cs index 7ed1f008..650c337d 100644 --- a/BinaryObjectScanner.Test/Protection/MGIRegistrationTests.cs +++ b/BinaryObjectScanner.Test/Protection/MGIRegistrationTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/MacrovisionTests.cs b/BinaryObjectScanner.Test/Protection/MacrovisionTests.cs index 07edd420..81f18d6d 100644 --- a/BinaryObjectScanner.Test/Protection/MacrovisionTests.cs +++ b/BinaryObjectScanner.Test/Protection/MacrovisionTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckNewExecutableTest() { string file = "filename"; - SabreTools.Models.NewExecutable.Executable model = new(); + SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); @@ -24,7 +24,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/MediaCloQTests.cs b/BinaryObjectScanner.Test/Protection/MediaCloQTests.cs index 1fdd9df7..d4e18f06 100644 --- a/BinaryObjectScanner.Test/Protection/MediaCloQTests.cs +++ b/BinaryObjectScanner.Test/Protection/MediaCloQTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/MediaMaxTests.cs b/BinaryObjectScanner.Test/Protection/MediaMaxTests.cs index 9bb90f32..bb4767e5 100644 --- a/BinaryObjectScanner.Test/Protection/MediaMaxTests.cs +++ b/BinaryObjectScanner.Test/Protection/MediaMaxTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/NEACProtectTests.cs b/BinaryObjectScanner.Test/Protection/NEACProtectTests.cs index 50f6c63c..f9d99c3b 100644 --- a/BinaryObjectScanner.Test/Protection/NEACProtectTests.cs +++ b/BinaryObjectScanner.Test/Protection/NEACProtectTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/NProtectTests.cs b/BinaryObjectScanner.Test/Protection/NProtectTests.cs index 722becec..1dacfbd0 100644 --- a/BinaryObjectScanner.Test/Protection/NProtectTests.cs +++ b/BinaryObjectScanner.Test/Protection/NProtectTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/OnlineRegistrationTests.cs b/BinaryObjectScanner.Test/Protection/OnlineRegistrationTests.cs index fe70495b..f7f4759b 100644 --- a/BinaryObjectScanner.Test/Protection/OnlineRegistrationTests.cs +++ b/BinaryObjectScanner.Test/Protection/OnlineRegistrationTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/OpenMGTests.cs b/BinaryObjectScanner.Test/Protection/OpenMGTests.cs index bd1e3804..a61e930d 100644 --- a/BinaryObjectScanner.Test/Protection/OpenMGTests.cs +++ b/BinaryObjectScanner.Test/Protection/OpenMGTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/OriginTests.cs b/BinaryObjectScanner.Test/Protection/OriginTests.cs index 2754e97f..4d96e6ba 100644 --- a/BinaryObjectScanner.Test/Protection/OriginTests.cs +++ b/BinaryObjectScanner.Test/Protection/OriginTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/PlayJTests.cs b/BinaryObjectScanner.Test/Protection/PlayJTests.cs index 712358a8..e0d0a237 100644 --- a/BinaryObjectScanner.Test/Protection/PlayJTests.cs +++ b/BinaryObjectScanner.Test/Protection/PlayJTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/ProtectDiscTests.cs b/BinaryObjectScanner.Test/Protection/ProtectDiscTests.cs index 3cd75556..acc140eb 100644 --- a/BinaryObjectScanner.Test/Protection/ProtectDiscTests.cs +++ b/BinaryObjectScanner.Test/Protection/ProtectDiscTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/RainbowSentinelTests.cs b/BinaryObjectScanner.Test/Protection/RainbowSentinelTests.cs index c27b6f4a..04c74fff 100644 --- a/BinaryObjectScanner.Test/Protection/RainbowSentinelTests.cs +++ b/BinaryObjectScanner.Test/Protection/RainbowSentinelTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckNewExecutableTest() { string file = "filename"; - SabreTools.Models.NewExecutable.Executable model = new(); + SabreTools.Data.Models.NewExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.NewExecutable exe = new(model, source); @@ -24,7 +24,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/RealArcadeTests.cs b/BinaryObjectScanner.Test/Protection/RealArcadeTests.cs index b2810113..266f500d 100644 --- a/BinaryObjectScanner.Test/Protection/RealArcadeTests.cs +++ b/BinaryObjectScanner.Test/Protection/RealArcadeTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/RoxxeTests.cs b/BinaryObjectScanner.Test/Protection/RoxxeTests.cs index eb88e092..1b743759 100644 --- a/BinaryObjectScanner.Test/Protection/RoxxeTests.cs +++ b/BinaryObjectScanner.Test/Protection/RoxxeTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/SVKProtectorTests.cs b/BinaryObjectScanner.Test/Protection/SVKProtectorTests.cs index f5247ef4..32200bd9 100644 --- a/BinaryObjectScanner.Test/Protection/SVKProtectorTests.cs +++ b/BinaryObjectScanner.Test/Protection/SVKProtectorTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/SecuROMTests.cs b/BinaryObjectScanner.Test/Protection/SecuROMTests.cs index f81716e7..f2e3c716 100644 --- a/BinaryObjectScanner.Test/Protection/SecuROMTests.cs +++ b/BinaryObjectScanner.Test/Protection/SecuROMTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/SmartETests.cs b/BinaryObjectScanner.Test/Protection/SmartETests.cs index 29b02378..0c22986b 100644 --- a/BinaryObjectScanner.Test/Protection/SmartETests.cs +++ b/BinaryObjectScanner.Test/Protection/SmartETests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/SoftLockTests.cs b/BinaryObjectScanner.Test/Protection/SoftLockTests.cs index 06717341..d16384ad 100644 --- a/BinaryObjectScanner.Test/Protection/SoftLockTests.cs +++ b/BinaryObjectScanner.Test/Protection/SoftLockTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/SolidShieldTests.cs b/BinaryObjectScanner.Test/Protection/SolidShieldTests.cs index acdc2d02..a8131a47 100644 --- a/BinaryObjectScanner.Test/Protection/SolidShieldTests.cs +++ b/BinaryObjectScanner.Test/Protection/SolidShieldTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/StarForceTests.cs b/BinaryObjectScanner.Test/Protection/StarForceTests.cs index 8f3ce1df..3f0afa4d 100644 --- a/BinaryObjectScanner.Test/Protection/StarForceTests.cs +++ b/BinaryObjectScanner.Test/Protection/StarForceTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/SteamTests.cs b/BinaryObjectScanner.Test/Protection/SteamTests.cs index 006c4874..8b13c361 100644 --- a/BinaryObjectScanner.Test/Protection/SteamTests.cs +++ b/BinaryObjectScanner.Test/Protection/SteamTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/SysiphusTests.cs b/BinaryObjectScanner.Test/Protection/SysiphusTests.cs index 27a66c7c..b84debbd 100644 --- a/BinaryObjectScanner.Test/Protection/SysiphusTests.cs +++ b/BinaryObjectScanner.Test/Protection/SysiphusTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/TAGESTests.cs b/BinaryObjectScanner.Test/Protection/TAGESTests.cs index 29ff771c..b5866503 100644 --- a/BinaryObjectScanner.Test/Protection/TAGESTests.cs +++ b/BinaryObjectScanner.Test/Protection/TAGESTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/ThemidaTests.cs b/BinaryObjectScanner.Test/Protection/ThemidaTests.cs index 32b7d1cc..26e28a64 100644 --- a/BinaryObjectScanner.Test/Protection/ThemidaTests.cs +++ b/BinaryObjectScanner.Test/Protection/ThemidaTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/ThreePLockTests.cs b/BinaryObjectScanner.Test/Protection/ThreePLockTests.cs index ed275c91..e3198bac 100644 --- a/BinaryObjectScanner.Test/Protection/ThreePLockTests.cs +++ b/BinaryObjectScanner.Test/Protection/ThreePLockTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/ThreeTwoOneStudiosTests.cs b/BinaryObjectScanner.Test/Protection/ThreeTwoOneStudiosTests.cs index 88043914..0d9545c2 100644 --- a/BinaryObjectScanner.Test/Protection/ThreeTwoOneStudiosTests.cs +++ b/BinaryObjectScanner.Test/Protection/ThreeTwoOneStudiosTests.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/UplayTests.cs b/BinaryObjectScanner.Test/Protection/UplayTests.cs index e2fadb77..2fb8b704 100644 --- a/BinaryObjectScanner.Test/Protection/UplayTests.cs +++ b/BinaryObjectScanner.Test/Protection/UplayTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/WMDSTests.cs b/BinaryObjectScanner.Test/Protection/WMDSTests.cs index 6fb04aff..0ab257c0 100644 --- a/BinaryObjectScanner.Test/Protection/WMDSTests.cs +++ b/BinaryObjectScanner.Test/Protection/WMDSTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/WTMCDProtectTests.cs b/BinaryObjectScanner.Test/Protection/WTMCDProtectTests.cs index d9a2fe1b..50ebcd63 100644 --- a/BinaryObjectScanner.Test/Protection/WTMCDProtectTests.cs +++ b/BinaryObjectScanner.Test/Protection/WTMCDProtectTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner.Test/Protection/XCPTests.cs b/BinaryObjectScanner.Test/Protection/XCPTests.cs index 2d223960..3b50579c 100644 --- a/BinaryObjectScanner.Test/Protection/XCPTests.cs +++ b/BinaryObjectScanner.Test/Protection/XCPTests.cs @@ -11,7 +11,7 @@ namespace BinaryObjectScanner.Test.Protection public void CheckPortableExecutableTest() { string file = "filename"; - SabreTools.Models.PortableExecutable.Executable model = new(); + SabreTools.Data.Models.PortableExecutable.Executable model = new(); Stream source = new MemoryStream(new byte[1024]); SabreTools.Serialization.Wrappers.PortableExecutable exe = new(model, source); diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj index f371c37b..6c13700a 100644 --- a/BinaryObjectScanner/BinaryObjectScanner.csproj +++ b/BinaryObjectScanner/BinaryObjectScanner.csproj @@ -56,8 +56,7 @@ - - + diff --git a/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs b/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs index f6599e74..00b2ac6e 100644 --- a/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs +++ b/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs @@ -1,6 +1,4 @@ -using System; using System.IO; -using SabreTools.Models.AACS; namespace BinaryObjectScanner.FileType { @@ -14,12 +12,6 @@ namespace BinaryObjectScanner.FileType /// public override string? Detect(Stream stream, string file, bool includeDebug) - { - var record = Array.Find(_wrapper.Records, r => r.RecordType == RecordType.TypeAndVersion); - if (record is TypeAndVersionRecord tavr) - return $"AACS {tavr.VersionNumber}"; - - return "AACS (Unknown Version)"; - } + => $"AACS {_wrapper.Version ?? "(Unknown Version)"}"; } } diff --git a/BinaryObjectScanner/FileType/DetectableBaseT.cs b/BinaryObjectScanner/FileType/DetectableBaseT.cs index bda622ca..366aa728 100644 --- a/BinaryObjectScanner/FileType/DetectableBaseT.cs +++ b/BinaryObjectScanner/FileType/DetectableBaseT.cs @@ -1,5 +1,5 @@ using BinaryObjectScanner.Interfaces; -using SabreTools.Serialization.Interfaces; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.FileType { diff --git a/BinaryObjectScanner/Interfaces/IDetectableT.cs b/BinaryObjectScanner/Interfaces/IDetectableT.cs index ec22f6d4..bbdcf90b 100644 --- a/BinaryObjectScanner/Interfaces/IDetectableT.cs +++ b/BinaryObjectScanner/Interfaces/IDetectableT.cs @@ -1,4 +1,4 @@ -using SabreTools.Serialization.Interfaces; +using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Interfaces { diff --git a/BinaryObjectScanner/Packer/EmbeddedFile.cs b/BinaryObjectScanner/Packer/EmbeddedFile.cs index 2bcac1cd..8d892772 100644 --- a/BinaryObjectScanner/Packer/EmbeddedFile.cs +++ b/BinaryObjectScanner/Packer/EmbeddedFile.cs @@ -30,43 +30,47 @@ namespace BinaryObjectScanner.Packer int temp = overlayOffset; byte[] overlaySample = overlayData.ReadBytes(ref temp, 0x10); - if (overlaySample.StartsWith([0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C])) + if (overlaySample.StartsWith(SabreTools.Data.Models.SevenZip.Constants.SignatureBytes)) { embeddedTypes.Add("Embedded 7-Zip Archive"); } + else if (overlaySample.StartsWith(SabreTools.Data.Models.BZip2.Constants.SignatureBytes)) + { + embeddedTypes.Add("Embedded BZip2 Archive"); + } else if (overlaySample.StartsWith([0x1F, 0x8B])) { embeddedTypes.Add("Embedded GZip Archive"); } - else if (overlaySample.StartsWith(SabreTools.Models.MicrosoftCabinet.Constants.SignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.MicrosoftCabinet.Constants.SignatureBytes)) { embeddedTypes.Add("Embedded MS-CAB Archive"); } - else if (overlaySample.StartsWith([0x42, 0x5A, 0x68])) + else if (overlaySample.StartsWith(SabreTools.Data.Models.CFB.Constants.SignatureBytes)) { - embeddedTypes.Add("Embedded BZip2 Archive"); + embeddedTypes.Add("Embedded MSI Installer"); } - else if (overlaySample.StartsWith(SabreTools.Models.PKZIP.Constants.LocalFileHeaderSignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.LocalFileHeaderSignatureBytes)) { embeddedTypes.Add("Embedded PKZIP Archive"); } - else if (overlaySample.StartsWith(SabreTools.Models.PKZIP.Constants.EndOfCentralDirectoryRecordSignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.EndOfCentralDirectoryRecordSignatureBytes)) { embeddedTypes.Add("Embedded PKZIP Archive"); } - else if (overlaySample.StartsWith(SabreTools.Models.PKZIP.Constants.EndOfCentralDirectoryRecord64SignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.EndOfCentralDirectoryRecord64SignatureBytes)) { embeddedTypes.Add("Embedded PKZIP Archive"); } - else if (overlaySample.StartsWith(SabreTools.Models.PKZIP.Constants.DataDescriptorSignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.DataDescriptorSignatureBytes)) { embeddedTypes.Add("Embedded PKZIP Archive"); } - else if (overlaySample.StartsWith([0x52, 0x61, 0x72, 0x21, 0x1A, 0x07, 0x00])) + else if (overlaySample.StartsWith(SabreTools.Data.Models.RAR.Constants.OldSignatureBytes)) { embeddedTypes.Add("Embedded RAR Archive"); } - else if (overlaySample.StartsWith([0x52, 0x61, 0x72, 0x21, 0x1A, 0x07, 0x01, 0x00])) + else if (overlaySample.StartsWith(SabreTools.Data.Models.RAR.Constants.NewSignatureBytes)) { embeddedTypes.Add("Embedded RAR Archive"); } @@ -74,11 +78,11 @@ namespace BinaryObjectScanner.Packer { embeddedTypes.Add("Embedded UHARC Archive"); } - else if (overlaySample.StartsWith([0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00])) + else if (overlaySample.StartsWith(SabreTools.Data.Models.XZ.Constants.SignatureBytes)) { embeddedTypes.Add("Embedded XZ Archive"); } - else if (overlaySample.StartsWith(SabreTools.Models.MSDOS.Constants.SignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.MSDOS.Constants.SignatureBytes)) { embeddedTypes.Add("Embedded Executable"); } @@ -124,31 +128,33 @@ namespace BinaryObjectScanner.Packer int temp = resourceOffset; byte[] resourceSample = ba.ReadBytes(ref temp, 0x10); - if (resourceSample.StartsWith([0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C])) + if (resourceSample.StartsWith(SabreTools.Data.Models.SevenZip.Constants.SignatureBytes)) embeddedTypes.Add("Embedded 7-Zip Archive"); - else if (resourceSample.StartsWith([0x42, 0x5A, 0x68])) + else if (resourceSample.StartsWith(SabreTools.Data.Models.BZip2.Constants.SignatureBytes)) embeddedTypes.Add("Embedded BZip2 Archive"); else if (resourceSample.StartsWith([0x1F, 0x8B])) embeddedTypes.Add("Embedded GZip Archive"); - else if (resourceSample.StartsWith(SabreTools.Models.MicrosoftCabinet.Constants.SignatureBytes)) + else if (resourceSample.StartsWith(SabreTools.Data.Models.MicrosoftCabinet.Constants.SignatureBytes)) embeddedTypes.Add("Embedded MS-CAB Archive"); - else if (resourceSample.StartsWith(SabreTools.Models.PKZIP.Constants.LocalFileHeaderSignatureBytes)) + else if (resourceSample.StartsWith(SabreTools.Data.Models.CFB.Constants.SignatureBytes)) + embeddedTypes.Add("Embedded MSI Installer"); + else if (resourceSample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.LocalFileHeaderSignatureBytes)) embeddedTypes.Add("Embedded PKZIP Archive"); - else if (resourceSample.StartsWith(SabreTools.Models.PKZIP.Constants.EndOfCentralDirectoryRecordSignatureBytes)) + else if (resourceSample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.EndOfCentralDirectoryRecordSignatureBytes)) embeddedTypes.Add("Embedded PKZIP Archive"); - else if (resourceSample.StartsWith(SabreTools.Models.PKZIP.Constants.EndOfCentralDirectoryRecord64SignatureBytes)) + else if (resourceSample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.EndOfCentralDirectoryRecord64SignatureBytes)) embeddedTypes.Add("Embedded PKZIP Archive"); - else if (resourceSample.StartsWith(SabreTools.Models.PKZIP.Constants.DataDescriptorSignatureBytes)) + else if (resourceSample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.DataDescriptorSignatureBytes)) embeddedTypes.Add("Embedded PKZIP Archive"); - else if (resourceSample.StartsWith([0x52, 0x61, 0x72, 0x21, 0x1A, 0x07, 0x00])) + else if (resourceSample.StartsWith(SabreTools.Data.Models.RAR.Constants.OldSignatureBytes)) embeddedTypes.Add("Embedded RAR Archive"); - else if (resourceSample.StartsWith([0x52, 0x61, 0x72, 0x21, 0x1A, 0x07, 0x01, 0x00])) + else if (resourceSample.StartsWith(SabreTools.Data.Models.RAR.Constants.NewSignatureBytes)) embeddedTypes.Add("Embedded RAR Archive"); else if (resourceSample.StartsWith([0x55, 0x48, 0x41, 0x06])) embeddedTypes.Add("Embedded UHARC Archive"); - else if (resourceSample.StartsWith([0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00])) + else if (resourceSample.StartsWith(SabreTools.Data.Models.XZ.Constants.SignatureBytes)) embeddedTypes.Add("Embedded XZ Archive"); - else if (resourceSample.StartsWith(SabreTools.Models.MSDOS.Constants.SignatureBytes)) + else if (resourceSample.StartsWith(SabreTools.Data.Models.MSDOS.Constants.SignatureBytes)) embeddedTypes.Add("Embedded Executable"); } } @@ -167,11 +173,11 @@ namespace BinaryObjectScanner.Packer int temp = overlayOffset; byte[] overlaySample = overlayData.ReadBytes(ref temp, 0x10); - if (overlaySample.StartsWith([0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C])) + if (overlaySample.StartsWith(SabreTools.Data.Models.SevenZip.Constants.SignatureBytes)) { embeddedTypes.Add("Embedded 7-Zip Archive"); } - else if (overlaySample.StartsWith([0x42, 0x5A, 0x68])) + else if (overlaySample.StartsWith(SabreTools.Data.Models.BZip2.Constants.SignatureBytes)) { embeddedTypes.Add("Embedded BZip2 Archive"); } @@ -179,31 +185,35 @@ namespace BinaryObjectScanner.Packer { embeddedTypes.Add("Embedded GZip Archive"); } - else if (overlaySample.StartsWith(SabreTools.Models.MicrosoftCabinet.Constants.SignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.MicrosoftCabinet.Constants.SignatureBytes)) { embeddedTypes.Add("Embedded MS-CAB Archive"); } - else if (overlaySample.StartsWith(SabreTools.Models.PKZIP.Constants.LocalFileHeaderSignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.CFB.Constants.SignatureBytes)) + { + embeddedTypes.Add("Embedded MSI Installer"); + } + else if (overlaySample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.LocalFileHeaderSignatureBytes)) { embeddedTypes.Add("Embedded PKZIP Archive"); } - else if (overlaySample.StartsWith(SabreTools.Models.PKZIP.Constants.EndOfCentralDirectoryRecordSignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.EndOfCentralDirectoryRecordSignatureBytes)) { embeddedTypes.Add("Embedded PKZIP Archive"); } - else if (overlaySample.StartsWith(SabreTools.Models.PKZIP.Constants.EndOfCentralDirectoryRecord64SignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.EndOfCentralDirectoryRecord64SignatureBytes)) { embeddedTypes.Add("Embedded PKZIP Archive"); } - else if (overlaySample.StartsWith(SabreTools.Models.PKZIP.Constants.DataDescriptorSignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.PKZIP.Constants.DataDescriptorSignatureBytes)) { embeddedTypes.Add("Embedded PKZIP Archive"); } - else if (overlaySample.StartsWith([0x52, 0x61, 0x72, 0x21, 0x1A, 0x07, 0x00])) + else if (overlaySample.StartsWith(SabreTools.Data.Models.RAR.Constants.OldSignatureBytes)) { embeddedTypes.Add("Embedded RAR Archive"); } - else if (overlaySample.StartsWith([0x52, 0x61, 0x72, 0x21, 0x1A, 0x07, 0x01, 0x00])) + else if (overlaySample.StartsWith(SabreTools.Data.Models.RAR.Constants.NewSignatureBytes)) { embeddedTypes.Add("Embedded RAR Archive"); } @@ -215,11 +225,11 @@ namespace BinaryObjectScanner.Packer { embeddedTypes.Add("Embedded XZ Archive"); } - else if (overlaySample.StartsWith(SabreTools.Models.MSDOS.Constants.SignatureBytes)) + else if (overlaySample.StartsWith(SabreTools.Data.Models.MSDOS.Constants.SignatureBytes)) { embeddedTypes.Add("Embedded Executable"); } - else if (overlaySample.StartsWith([0x3B, 0x21, 0x40, 0x49, 0x6E, 0x73, 0x74, 0x61, 0x6C, 0x6C])) + else if (overlaySample.StartsWith(SabreTools.Data.Models.XZ.Constants.SignatureBytes)) { // 7-zip SFX script -- ";!@Install" to ";!@InstallEnd@!" overlayOffset = exe.OverlayData.FirstPosition([0x3B, 0x21, 0x40, 0x49, 0x6E, 0x73, 0x74, 0x61, 0x6C, 0x6C, 0x45, 0x6E, 0x64, 0x40, 0x21]); diff --git a/BinaryObjectScanner/Packer/WinZipSFX.cs b/BinaryObjectScanner/Packer/WinZipSFX.cs index 7bdbc03a..936fd9e0 100644 --- a/BinaryObjectScanner/Packer/WinZipSFX.cs +++ b/BinaryObjectScanner/Packer/WinZipSFX.cs @@ -71,10 +71,10 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x0086 && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.ProtectedModeOnly - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.ProtectedModeOnly + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x4000 @@ -92,7 +92,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -107,10 +107,10 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x0086 && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.ProtectedModeOnly - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.ProtectedModeOnly + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x4000 @@ -128,7 +128,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -143,10 +143,10 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x0080 && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.ProtectedModeOnly - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.ProtectedModeOnly + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x4000 @@ -164,7 +164,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -179,9 +179,9 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x00CD && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x4000 @@ -199,7 +199,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -218,10 +218,10 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x0086 && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.ProtectedModeOnly - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.ProtectedModeOnly + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x4000 @@ -239,7 +239,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -254,9 +254,9 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x00BE && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x4000 @@ -274,7 +274,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -289,10 +289,10 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x0080 && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.ProtectedModeOnly - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.ProtectedModeOnly + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x4000 @@ -310,7 +310,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -325,9 +325,9 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x00BE && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x4000 @@ -345,7 +345,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -364,10 +364,10 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x0086 && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.ProtectedModeOnly - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.ProtectedModeOnly + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x3A00 @@ -385,7 +385,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -400,9 +400,9 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x00BE && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x3A00 @@ -420,7 +420,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -435,10 +435,10 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x0080 && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.ProtectedModeOnly - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.ProtectedModeOnly + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x3A00 @@ -456,7 +456,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -471,9 +471,9 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x00BE && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x3A00 @@ -491,7 +491,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -510,10 +510,10 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x0086 && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.ProtectedModeOnly - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.ProtectedModeOnly + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x4000 @@ -531,7 +531,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -546,9 +546,9 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x00BE && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x2000 && exe.Header?.InitialStackAlloc == 0x3C00 @@ -566,7 +566,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 @@ -581,9 +581,9 @@ namespace BinaryObjectScanner.Packer && exe.Header?.EntryTableOffset == 0x00C6 && exe.Header?.EntryTableSize == 0x0002 && exe.Header?.CrcChecksum == 0x00000000 - && exe.Header?.FlagWord == (SabreTools.Models.NewExecutable.HeaderFlag.MULTIPLEDATA - | SabreTools.Models.NewExecutable.HeaderFlag.FullScreen - | SabreTools.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) + && exe.Header?.FlagWord == (SabreTools.Data.Models.NewExecutable.HeaderFlag.MULTIPLEDATA + | SabreTools.Data.Models.NewExecutable.HeaderFlag.FullScreen + | SabreTools.Data.Models.NewExecutable.HeaderFlag.WindowsPMCompatible) && exe.Header?.AutomaticDataSegmentNumber == 0x0003 && exe.Header?.InitialHeapAlloc == 0x43DC && exe.Header?.InitialStackAlloc == 0x2708 @@ -601,7 +601,7 @@ namespace BinaryObjectScanner.Packer && exe.Header?.MovableEntriesCount == 0x0000 && exe.Header?.SegmentAlignmentShiftCount == 0x0001 && exe.Header?.ResourceEntriesCount == 0x0000 - && exe.Header?.TargetOperatingSystem == SabreTools.Models.NewExecutable.OperatingSystem.WINDOWS + && exe.Header?.TargetOperatingSystem == SabreTools.Data.Models.NewExecutable.OperatingSystem.WINDOWS && exe.Header?.AdditionalFlags == 0x00 && exe.Header?.ReturnThunkOffset == 0x0000 && exe.Header?.ReturnThunkOffset == 0x0000 diff --git a/BinaryObjectScanner/Protection/Denuvo.cs b/BinaryObjectScanner/Protection/Denuvo.cs index fd905582..486a517c 100644 --- a/BinaryObjectScanner/Protection/Denuvo.cs +++ b/BinaryObjectScanner/Protection/Denuvo.cs @@ -5,7 +5,7 @@ using SabreTools.IO; using SabreTools.IO.Extensions; using SabreTools.IO.Matching; using SabreTools.Serialization.Wrappers; -using OHMN = SabreTools.Models.COFF.OptionalHeaderMagicNumber; +using OHMN = SabreTools.Data.Models.COFF.OptionalHeaderMagicNumber; namespace BinaryObjectScanner.Protection { diff --git a/ProtectionScan/ProtectionScan.csproj b/ProtectionScan/ProtectionScan.csproj index f1de579a..1eeb53a3 100644 --- a/ProtectionScan/ProtectionScan.csproj +++ b/ProtectionScan/ProtectionScan.csproj @@ -40,7 +40,7 @@ - + \ No newline at end of file