From b84259900692708038c7ff80af017cdfc0cc89d2 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 3 Oct 2024 12:01:08 -0400 Subject: [PATCH] Update packages --- BinaryObjectScanner/BinaryObjectScanner.csproj | 18 +++++++++--------- .../FileType/InstallShieldArchiveV3.cs | 2 +- BinaryObjectScanner/FileType/MPQ.cs | 5 ++--- BinaryObjectScanner/FileType/MicrosoftCAB.cs | 6 ++---- BinaryObjectScanner/Packer/ASPack.cs | 1 + BinaryObjectScanner/Packer/CExe.cs | 1 + BinaryObjectScanner/Packer/EXEStealth.cs | 1 + BinaryObjectScanner/Packer/InnoSetup.cs | 1 + BinaryObjectScanner/Packer/NeoLite.cs | 3 +-- BinaryObjectScanner/Packer/WiseInstaller.cs | 1 + BinaryObjectScanner/Protection/ActiveMARK.cs | 1 + BinaryObjectScanner/Protection/AegiSoft.cs | 2 ++ BinaryObjectScanner/Protection/AlphaDVD.cs | 1 + BinaryObjectScanner/Protection/AlphaROM.cs | 3 +-- BinaryObjectScanner/Protection/Bitpool.cs | 1 + BinaryObjectScanner/Protection/ByteShield.cs | 1 + BinaryObjectScanner/Protection/CDDVDCops.cs | 3 ++- BinaryObjectScanner/Protection/CDGuard.cs | 1 + BinaryObjectScanner/Protection/CDLock.cs | 2 ++ BinaryObjectScanner/Protection/CDProtector.cs | 1 + BinaryObjectScanner/Protection/CDSHiELDSE.cs | 3 +-- BinaryObjectScanner/Protection/CDX.cs | 1 + .../Protection/CactusDataShield.cs | 1 + .../Protection/CenegaProtectDVD.cs | 1 + BinaryObjectScanner/Protection/Channelware.cs | 1 + .../Protection/ChosenBytesCodeLock.cs | 1 + BinaryObjectScanner/Protection/CopyKiller.cs | 1 + BinaryObjectScanner/Protection/CrypKey.cs | 1 + BinaryObjectScanner/Protection/Cucko.cs | 1 + BinaryObjectScanner/Protection/DVDCrypt.cs | 1 + BinaryObjectScanner/Protection/Denuvo.cs | 3 ++- BinaryObjectScanner/Protection/DigiGuard.cs | 2 +- .../Protection/DinamicMultimedia.cs | 1 + BinaryObjectScanner/Protection/DiscGuard.cs | 2 ++ BinaryObjectScanner/Protection/EAAntiCheat.cs | 1 + .../Protection/EasyAntiCheat.cs | 1 + .../Protection/ElectronicArts.cs | 1 - BinaryObjectScanner/Protection/Engine32.cs | 1 + BinaryObjectScanner/Protection/FreeLock.cs | 1 + BinaryObjectScanner/Protection/GFWL.cs | 3 ++- BinaryObjectScanner/Protection/Gefest.cs | 1 + BinaryObjectScanner/Protection/HexaLock.cs | 1 + .../Protection/ImpulseReactor.cs | 1 + BinaryObjectScanner/Protection/IndyVCD.cs | 1 + BinaryObjectScanner/Protection/JoWood.cs | 1 + .../Protection/KalypsoLauncher.cs | 2 +- BinaryObjectScanner/Protection/KeyLock.cs | 1 + BinaryObjectScanner/Protection/LabelGate.cs | 1 + BinaryObjectScanner/Protection/LaserLok.cs | 1 + .../Protection/Macrovision.CDilla.cs | 1 + .../Protection/Macrovision.CactusDataShield.cs | 1 + .../Protection/Macrovision.FLEXnet.cs | 2 +- .../Protection/Macrovision.RipGuard.cs | 1 + .../Protection/Macrovision.SafeCast.cs | 2 ++ .../Protection/Macrovision.SafeDisc.cs | 1 + BinaryObjectScanner/Protection/Macrovision.cs | 2 ++ BinaryObjectScanner/Protection/MediaCloQ.cs | 1 + BinaryObjectScanner/Protection/MediaMaxCD3.cs | 1 + BinaryObjectScanner/Protection/NEACProtect.cs | 1 + .../Protection/OnlineRegistration.cs | 2 +- BinaryObjectScanner/Protection/OpenMG.cs | 1 + BinaryObjectScanner/Protection/Origin.cs | 1 + .../Protection/PSXAntiModchip.cs | 1 + BinaryObjectScanner/Protection/PlayJ.cs | 1 + BinaryObjectScanner/Protection/ProtectDisc.cs | 1 + .../Protection/RainbowSentinel.cs | 2 ++ BinaryObjectScanner/Protection/RealArcade.cs | 4 ++-- BinaryObjectScanner/Protection/RingPROTECH.cs | 2 ++ BinaryObjectScanner/Protection/Roxxe.cs | 4 ++-- BinaryObjectScanner/Protection/SVKP.cs | 1 + BinaryObjectScanner/Protection/SafeLock.cs | 1 + BinaryObjectScanner/Protection/SecuROM.cs | 6 ++++-- BinaryObjectScanner/Protection/SmartE.cs | 1 + BinaryObjectScanner/Protection/SoftLock.cs | 1 + BinaryObjectScanner/Protection/SolidShield.cs | 4 +++- BinaryObjectScanner/Protection/StarForce.cs | 1 + BinaryObjectScanner/Protection/Steam.cs | 1 + .../Protection/TZCopyProtection.cs | 1 + BinaryObjectScanner/Protection/Tages.cs | 4 +++- .../Protection/TivolaRingProtection.cs | 1 + BinaryObjectScanner/Protection/Uplay.cs | 1 + BinaryObjectScanner/Protection/WMDS.cs | 1 + BinaryObjectScanner/Protection/WTMCDProtect.cs | 1 + BinaryObjectScanner/Protection/WinLock.cs | 1 + BinaryObjectScanner/Protection/Zzxzz.cs | 1 + BinaryObjectScanner/Protection/nProtect.cs | 1 + Test/Extractor.cs | 2 +- Test/Test.csproj | 14 +++++++------- 88 files changed, 122 insertions(+), 47 deletions(-) diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj index 71cbefdb..3a61bf73 100644 --- a/BinaryObjectScanner/BinaryObjectScanner.csproj +++ b/BinaryObjectScanner/BinaryObjectScanner.csproj @@ -1,4 +1,4 @@ - + @@ -82,14 +82,14 @@ - - - - - - - - + + + + + + + + diff --git a/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs b/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs index 82f0272e..cb50a24c 100644 --- a/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs +++ b/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs @@ -38,7 +38,7 @@ namespace BinaryObjectScanner.FileType if (directoryName != null && !Directory.Exists(directoryName)) Directory.CreateDirectory(directoryName); - (byte[]? fileContents, string? error) = archive.Extract(cfile.Key); + byte[]? fileContents = archive.Extract(cfile.Key, out string? error); if (fileContents == null || !string.IsNullOrEmpty(error)) continue; diff --git a/BinaryObjectScanner/FileType/MPQ.cs b/BinaryObjectScanner/FileType/MPQ.cs index d0a7b6fb..33b135b8 100644 --- a/BinaryObjectScanner/FileType/MPQ.cs +++ b/BinaryObjectScanner/FileType/MPQ.cs @@ -1,7 +1,6 @@ -using System; -using System.IO; +using System.IO; using BinaryObjectScanner.Interfaces; -#if ((NETFRAMEWORK && !NET20 && !NET35 && !NET40) || NETCOREAPP) && WIN +#if (NET452_OR_GREATER || NETCOREAPP) && WIN using StormLibSharp; #endif diff --git a/BinaryObjectScanner/FileType/MicrosoftCAB.cs b/BinaryObjectScanner/FileType/MicrosoftCAB.cs index e3629531..711bd421 100644 --- a/BinaryObjectScanner/FileType/MicrosoftCAB.cs +++ b/BinaryObjectScanner/FileType/MicrosoftCAB.cs @@ -1,8 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; +using System.IO; using BinaryObjectScanner.Interfaces; -#if ((NETFRAMEWORK && !NET20 && !NET35 && !NET40) || NETCOREAPP) && WIN +#if (NET452_OR_GREATER || NETCOREAPP) && WIN using LibMSPackN; #endif diff --git a/BinaryObjectScanner/Packer/ASPack.cs b/BinaryObjectScanner/Packer/ASPack.cs index 85b699f1..f2baa0dc 100644 --- a/BinaryObjectScanner/Packer/ASPack.cs +++ b/BinaryObjectScanner/Packer/ASPack.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer diff --git a/BinaryObjectScanner/Packer/CExe.cs b/BinaryObjectScanner/Packer/CExe.cs index 8a00a6c1..1c5ec795 100644 --- a/BinaryObjectScanner/Packer/CExe.cs +++ b/BinaryObjectScanner/Packer/CExe.cs @@ -5,6 +5,7 @@ using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Compression.zlib; using SabreTools.Matching; +using SabreTools.Matching.Content; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer diff --git a/BinaryObjectScanner/Packer/EXEStealth.cs b/BinaryObjectScanner/Packer/EXEStealth.cs index dfa0c583..e27959ab 100644 --- a/BinaryObjectScanner/Packer/EXEStealth.cs +++ b/BinaryObjectScanner/Packer/EXEStealth.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer diff --git a/BinaryObjectScanner/Packer/InnoSetup.cs b/BinaryObjectScanner/Packer/InnoSetup.cs index a2b791a0..e41584bf 100644 --- a/BinaryObjectScanner/Packer/InnoSetup.cs +++ b/BinaryObjectScanner/Packer/InnoSetup.cs @@ -2,6 +2,7 @@ using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer diff --git a/BinaryObjectScanner/Packer/NeoLite.cs b/BinaryObjectScanner/Packer/NeoLite.cs index c550754e..baa85a79 100644 --- a/BinaryObjectScanner/Packer/NeoLite.cs +++ b/BinaryObjectScanner/Packer/NeoLite.cs @@ -1,5 +1,4 @@ -using System.IO; -using BinaryObjectScanner.Interfaces; +using BinaryObjectScanner.Interfaces; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Packer diff --git a/BinaryObjectScanner/Packer/WiseInstaller.cs b/BinaryObjectScanner/Packer/WiseInstaller.cs index a735f759..fe4ea292 100644 --- a/BinaryObjectScanner/Packer/WiseInstaller.cs +++ b/BinaryObjectScanner/Packer/WiseInstaller.cs @@ -5,6 +5,7 @@ using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.IO.Extensions; using SabreTools.Matching; +using SabreTools.Matching.Content; using SabreTools.Serialization.Wrappers; using WiseUnpacker; using WiseUnpacker.EWISE; diff --git a/BinaryObjectScanner/Protection/ActiveMARK.cs b/BinaryObjectScanner/Protection/ActiveMARK.cs index 2c118f66..a646a4d2 100644 --- a/BinaryObjectScanner/Protection/ActiveMARK.cs +++ b/BinaryObjectScanner/Protection/ActiveMARK.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Text; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/AegiSoft.cs b/BinaryObjectScanner/Protection/AegiSoft.cs index 4d059b2a..bc0731d0 100644 --- a/BinaryObjectScanner/Protection/AegiSoft.cs +++ b/BinaryObjectScanner/Protection/AegiSoft.cs @@ -5,6 +5,8 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/AlphaDVD.cs b/BinaryObjectScanner/Protection/AlphaDVD.cs index e60f9736..a120c8a8 100644 --- a/BinaryObjectScanner/Protection/AlphaDVD.cs +++ b/BinaryObjectScanner/Protection/AlphaDVD.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/AlphaROM.cs b/BinaryObjectScanner/Protection/AlphaROM.cs index fd965cda..e5f4f674 100644 --- a/BinaryObjectScanner/Protection/AlphaROM.cs +++ b/BinaryObjectScanner/Protection/AlphaROM.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Linq; +using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Serialization.Wrappers; diff --git a/BinaryObjectScanner/Protection/Bitpool.cs b/BinaryObjectScanner/Protection/Bitpool.cs index 08875ae0..c6260d4c 100644 --- a/BinaryObjectScanner/Protection/Bitpool.cs +++ b/BinaryObjectScanner/Protection/Bitpool.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/ByteShield.cs b/BinaryObjectScanner/Protection/ByteShield.cs index 16c5f204..42f2d4c4 100644 --- a/BinaryObjectScanner/Protection/ByteShield.cs +++ b/BinaryObjectScanner/Protection/ByteShield.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/CDDVDCops.cs b/BinaryObjectScanner/Protection/CDDVDCops.cs index eba149c6..4aac0d15 100644 --- a/BinaryObjectScanner/Protection/CDDVDCops.cs +++ b/BinaryObjectScanner/Protection/CDDVDCops.cs @@ -7,7 +7,8 @@ using System.Linq; using System.Text; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; -using SabreTools.Models.PortableExecutable; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/CDGuard.cs b/BinaryObjectScanner/Protection/CDGuard.cs index 4b2be046..6a8b03a0 100644 --- a/BinaryObjectScanner/Protection/CDGuard.cs +++ b/BinaryObjectScanner/Protection/CDGuard.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/CDLock.cs b/BinaryObjectScanner/Protection/CDLock.cs index 9aeb3964..db121d9c 100644 --- a/BinaryObjectScanner/Protection/CDLock.cs +++ b/BinaryObjectScanner/Protection/CDLock.cs @@ -4,6 +4,8 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/CDProtector.cs b/BinaryObjectScanner/Protection/CDProtector.cs index 0d3f71e5..9ab8136a 100644 --- a/BinaryObjectScanner/Protection/CDProtector.cs +++ b/BinaryObjectScanner/Protection/CDProtector.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CDSHiELDSE.cs b/BinaryObjectScanner/Protection/CDSHiELDSE.cs index 0b493d10..05644e16 100644 --- a/BinaryObjectScanner/Protection/CDSHiELDSE.cs +++ b/BinaryObjectScanner/Protection/CDSHiELDSE.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Linq; +using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Serialization.Wrappers; diff --git a/BinaryObjectScanner/Protection/CDX.cs b/BinaryObjectScanner/Protection/CDX.cs index a2392d2f..eb25caec 100644 --- a/BinaryObjectScanner/Protection/CDX.cs +++ b/BinaryObjectScanner/Protection/CDX.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CactusDataShield.cs b/BinaryObjectScanner/Protection/CactusDataShield.cs index 11f28d7f..ec2bfb77 100644 --- a/BinaryObjectScanner/Protection/CactusDataShield.cs +++ b/BinaryObjectScanner/Protection/CactusDataShield.cs @@ -2,6 +2,7 @@ using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/CenegaProtectDVD.cs b/BinaryObjectScanner/Protection/CenegaProtectDVD.cs index b22b8e40..dd5a3e75 100644 --- a/BinaryObjectScanner/Protection/CenegaProtectDVD.cs +++ b/BinaryObjectScanner/Protection/CenegaProtectDVD.cs @@ -5,6 +5,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Channelware.cs b/BinaryObjectScanner/Protection/Channelware.cs index 506d976d..fe03cd3c 100644 --- a/BinaryObjectScanner/Protection/Channelware.cs +++ b/BinaryObjectScanner/Protection/Channelware.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/ChosenBytesCodeLock.cs b/BinaryObjectScanner/Protection/ChosenBytesCodeLock.cs index e0e37cec..257874c8 100644 --- a/BinaryObjectScanner/Protection/ChosenBytesCodeLock.cs +++ b/BinaryObjectScanner/Protection/ChosenBytesCodeLock.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/CopyKiller.cs b/BinaryObjectScanner/Protection/CopyKiller.cs index 47069317..02e8fea8 100644 --- a/BinaryObjectScanner/Protection/CopyKiller.cs +++ b/BinaryObjectScanner/Protection/CopyKiller.cs @@ -5,6 +5,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/CrypKey.cs b/BinaryObjectScanner/Protection/CrypKey.cs index 7a0ab324..10a0ae08 100644 --- a/BinaryObjectScanner/Protection/CrypKey.cs +++ b/BinaryObjectScanner/Protection/CrypKey.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Cucko.cs b/BinaryObjectScanner/Protection/Cucko.cs index d29309d1..cb9656b7 100644 --- a/BinaryObjectScanner/Protection/Cucko.cs +++ b/BinaryObjectScanner/Protection/Cucko.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/DVDCrypt.cs b/BinaryObjectScanner/Protection/DVDCrypt.cs index 1a7320d0..620232e4 100644 --- a/BinaryObjectScanner/Protection/DVDCrypt.cs +++ b/BinaryObjectScanner/Protection/DVDCrypt.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Denuvo.cs b/BinaryObjectScanner/Protection/Denuvo.cs index 2c29334e..03c701d6 100644 --- a/BinaryObjectScanner/Protection/Denuvo.cs +++ b/BinaryObjectScanner/Protection/Denuvo.cs @@ -5,6 +5,8 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection @@ -28,7 +30,6 @@ namespace BinaryObjectScanner.Protection public class Denuvo : IPathCheck, IPortableExecutableCheck { - // TODO: Investigate possible filename checks for Denuvo Anti-Tamper. // https://www.pcgamingwiki.com/wiki/Denuvo#Redeem.exe diff --git a/BinaryObjectScanner/Protection/DigiGuard.cs b/BinaryObjectScanner/Protection/DigiGuard.cs index fa8194ca..54131d9b 100644 --- a/BinaryObjectScanner/Protection/DigiGuard.cs +++ b/BinaryObjectScanner/Protection/DigiGuard.cs @@ -2,9 +2,9 @@ using System.Collections.Concurrent; #endif using System.Collections.Generic; -using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/DinamicMultimedia.cs b/BinaryObjectScanner/Protection/DinamicMultimedia.cs index 2631701c..d58b60e9 100644 --- a/BinaryObjectScanner/Protection/DinamicMultimedia.cs +++ b/BinaryObjectScanner/Protection/DinamicMultimedia.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/DiscGuard.cs b/BinaryObjectScanner/Protection/DiscGuard.cs index 1d89431c..cff8f2ea 100644 --- a/BinaryObjectScanner/Protection/DiscGuard.cs +++ b/BinaryObjectScanner/Protection/DiscGuard.cs @@ -7,6 +7,8 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/EAAntiCheat.cs b/BinaryObjectScanner/Protection/EAAntiCheat.cs index d6e4dbd1..a35a8dc1 100644 --- a/BinaryObjectScanner/Protection/EAAntiCheat.cs +++ b/BinaryObjectScanner/Protection/EAAntiCheat.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/EasyAntiCheat.cs b/BinaryObjectScanner/Protection/EasyAntiCheat.cs index d7cee163..6d98dd43 100644 --- a/BinaryObjectScanner/Protection/EasyAntiCheat.cs +++ b/BinaryObjectScanner/Protection/EasyAntiCheat.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/ElectronicArts.cs b/BinaryObjectScanner/Protection/ElectronicArts.cs index 4ffaed02..ede6e217 100644 --- a/BinaryObjectScanner/Protection/ElectronicArts.cs +++ b/BinaryObjectScanner/Protection/ElectronicArts.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Serialization.Wrappers; diff --git a/BinaryObjectScanner/Protection/Engine32.cs b/BinaryObjectScanner/Protection/Engine32.cs index 5c026ba3..927b3d26 100644 --- a/BinaryObjectScanner/Protection/Engine32.cs +++ b/BinaryObjectScanner/Protection/Engine32.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/FreeLock.cs b/BinaryObjectScanner/Protection/FreeLock.cs index 6f09aae1..b112b913 100644 --- a/BinaryObjectScanner/Protection/FreeLock.cs +++ b/BinaryObjectScanner/Protection/FreeLock.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/GFWL.cs b/BinaryObjectScanner/Protection/GFWL.cs index 0b236b6d..604fa0d1 100644 --- a/BinaryObjectScanner/Protection/GFWL.cs +++ b/BinaryObjectScanner/Protection/GFWL.cs @@ -6,9 +6,10 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; -namespace BinaryObjectScanner.ProtectionType +namespace BinaryObjectScanner.Protection { public class GFWL : IPathCheck, IPortableExecutableCheck { diff --git a/BinaryObjectScanner/Protection/Gefest.cs b/BinaryObjectScanner/Protection/Gefest.cs index a87ec7fb..ef11d61a 100644 --- a/BinaryObjectScanner/Protection/Gefest.cs +++ b/BinaryObjectScanner/Protection/Gefest.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/HexaLock.cs b/BinaryObjectScanner/Protection/HexaLock.cs index 45ee7563..343ea40b 100644 --- a/BinaryObjectScanner/Protection/HexaLock.cs +++ b/BinaryObjectScanner/Protection/HexaLock.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/ImpulseReactor.cs b/BinaryObjectScanner/Protection/ImpulseReactor.cs index a0632bed..82fbdd1a 100644 --- a/BinaryObjectScanner/Protection/ImpulseReactor.cs +++ b/BinaryObjectScanner/Protection/ImpulseReactor.cs @@ -6,6 +6,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/IndyVCD.cs b/BinaryObjectScanner/Protection/IndyVCD.cs index fc14f3cf..70f80688 100644 --- a/BinaryObjectScanner/Protection/IndyVCD.cs +++ b/BinaryObjectScanner/Protection/IndyVCD.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/JoWood.cs b/BinaryObjectScanner/Protection/JoWood.cs index 3ef2c0f1..ab4e27c0 100644 --- a/BinaryObjectScanner/Protection/JoWood.cs +++ b/BinaryObjectScanner/Protection/JoWood.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/KalypsoLauncher.cs b/BinaryObjectScanner/Protection/KalypsoLauncher.cs index f9db47cf..e8d2cdc8 100644 --- a/BinaryObjectScanner/Protection/KalypsoLauncher.cs +++ b/BinaryObjectScanner/Protection/KalypsoLauncher.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection @@ -23,7 +24,6 @@ namespace BinaryObjectScanner.Protection /// public class KalypsoLauncher : IPathCheck, IPortableExecutableCheck { - /// public string? CheckPortableExecutable(string file, PortableExecutable pex, bool includeDebug) { diff --git a/BinaryObjectScanner/Protection/KeyLock.cs b/BinaryObjectScanner/Protection/KeyLock.cs index 2a05e1fb..1b8ec257 100644 --- a/BinaryObjectScanner/Protection/KeyLock.cs +++ b/BinaryObjectScanner/Protection/KeyLock.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/LabelGate.cs b/BinaryObjectScanner/Protection/LabelGate.cs index 67673dc8..f7b43ffc 100644 --- a/BinaryObjectScanner/Protection/LabelGate.cs +++ b/BinaryObjectScanner/Protection/LabelGate.cs @@ -7,6 +7,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/LaserLok.cs b/BinaryObjectScanner/Protection/LaserLok.cs index 4df629b3..d2f482b4 100644 --- a/BinaryObjectScanner/Protection/LaserLok.cs +++ b/BinaryObjectScanner/Protection/LaserLok.cs @@ -7,6 +7,7 @@ using System.IO; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.CDilla.cs b/BinaryObjectScanner/Protection/Macrovision.CDilla.cs index ed3b154b..2545e938 100644 --- a/BinaryObjectScanner/Protection/Macrovision.CDilla.cs +++ b/BinaryObjectScanner/Protection/Macrovision.CDilla.cs @@ -5,6 +5,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.CactusDataShield.cs b/BinaryObjectScanner/Protection/Macrovision.CactusDataShield.cs index 948bbf68..85b2f91f 100644 --- a/BinaryObjectScanner/Protection/Macrovision.CactusDataShield.cs +++ b/BinaryObjectScanner/Protection/Macrovision.CactusDataShield.cs @@ -7,6 +7,7 @@ using System.IO; using System.Linq; using System.Text; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.FLEXnet.cs b/BinaryObjectScanner/Protection/Macrovision.FLEXnet.cs index dbab4d9a..d05b8dfa 100644 --- a/BinaryObjectScanner/Protection/Macrovision.FLEXnet.cs +++ b/BinaryObjectScanner/Protection/Macrovision.FLEXnet.cs @@ -4,8 +4,8 @@ using System.Collections.Concurrent; #endif using System.Collections.Generic; using System.Linq; -using System.Security.Principal; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.RipGuard.cs b/BinaryObjectScanner/Protection/Macrovision.RipGuard.cs index 4b2d0480..055330cb 100644 --- a/BinaryObjectScanner/Protection/Macrovision.RipGuard.cs +++ b/BinaryObjectScanner/Protection/Macrovision.RipGuard.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.IO; using SabreTools.Hashing; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.SafeCast.cs b/BinaryObjectScanner/Protection/Macrovision.SafeCast.cs index 6b73298f..4da489ac 100644 --- a/BinaryObjectScanner/Protection/Macrovision.SafeCast.cs +++ b/BinaryObjectScanner/Protection/Macrovision.SafeCast.cs @@ -6,6 +6,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; using SabreTools.Matching; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs b/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs index fb8cc28b..e249233e 100644 --- a/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs +++ b/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs @@ -7,6 +7,7 @@ using System.IO; using System.Linq; using SabreTools.Hashing; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Macrovision.cs b/BinaryObjectScanner/Protection/Macrovision.cs index fb42ab3c..e81dbe99 100644 --- a/BinaryObjectScanner/Protection/Macrovision.cs +++ b/BinaryObjectScanner/Protection/Macrovision.cs @@ -9,6 +9,8 @@ using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Utilities; using SabreTools.IO.Extensions; using SabreTools.Matching; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/MediaCloQ.cs b/BinaryObjectScanner/Protection/MediaCloQ.cs index 82c794d3..8d9a84df 100644 --- a/BinaryObjectScanner/Protection/MediaCloQ.cs +++ b/BinaryObjectScanner/Protection/MediaCloQ.cs @@ -5,6 +5,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/MediaMaxCD3.cs b/BinaryObjectScanner/Protection/MediaMaxCD3.cs index e1a6251e..84b34d99 100644 --- a/BinaryObjectScanner/Protection/MediaMaxCD3.cs +++ b/BinaryObjectScanner/Protection/MediaMaxCD3.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/NEACProtect.cs b/BinaryObjectScanner/Protection/NEACProtect.cs index f1646107..c7ba6aa4 100644 --- a/BinaryObjectScanner/Protection/NEACProtect.cs +++ b/BinaryObjectScanner/Protection/NEACProtect.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/OnlineRegistration.cs b/BinaryObjectScanner/Protection/OnlineRegistration.cs index 21b1ee87..8be6623e 100644 --- a/BinaryObjectScanner/Protection/OnlineRegistration.cs +++ b/BinaryObjectScanner/Protection/OnlineRegistration.cs @@ -2,7 +2,7 @@ using BinaryObjectScanner.Interfaces; using SabreTools.Serialization.Wrappers; -namespace BinaryObjectScanner.ProtectionType +namespace BinaryObjectScanner.Protection { public class OnlineRegistration : IPortableExecutableCheck { diff --git a/BinaryObjectScanner/Protection/OpenMG.cs b/BinaryObjectScanner/Protection/OpenMG.cs index 92d02ea4..7b37ac91 100644 --- a/BinaryObjectScanner/Protection/OpenMG.cs +++ b/BinaryObjectScanner/Protection/OpenMG.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Origin.cs b/BinaryObjectScanner/Protection/Origin.cs index 98077a05..3d89766e 100644 --- a/BinaryObjectScanner/Protection/Origin.cs +++ b/BinaryObjectScanner/Protection/Origin.cs @@ -5,6 +5,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/PSXAntiModchip.cs b/BinaryObjectScanner/Protection/PSXAntiModchip.cs index 62ac21f2..8e5009e3 100644 --- a/BinaryObjectScanner/Protection/PSXAntiModchip.cs +++ b/BinaryObjectScanner/Protection/PSXAntiModchip.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/PlayJ.cs b/BinaryObjectScanner/Protection/PlayJ.cs index 949b7705..03c9bb67 100644 --- a/BinaryObjectScanner/Protection/PlayJ.cs +++ b/BinaryObjectScanner/Protection/PlayJ.cs @@ -5,6 +5,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/ProtectDisc.cs b/BinaryObjectScanner/Protection/ProtectDisc.cs index 822b6372..04cda66e 100644 --- a/BinaryObjectScanner/Protection/ProtectDisc.cs +++ b/BinaryObjectScanner/Protection/ProtectDisc.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/RainbowSentinel.cs b/BinaryObjectScanner/Protection/RainbowSentinel.cs index 45f0d7cb..1173b720 100644 --- a/BinaryObjectScanner/Protection/RainbowSentinel.cs +++ b/BinaryObjectScanner/Protection/RainbowSentinel.cs @@ -7,6 +7,8 @@ using System.Linq; using System.Text; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/RealArcade.cs b/BinaryObjectScanner/Protection/RealArcade.cs index 3a355670..9a855ee6 100644 --- a/BinaryObjectScanner/Protection/RealArcade.cs +++ b/BinaryObjectScanner/Protection/RealArcade.cs @@ -1,11 +1,11 @@ -using System; -#if NET40_OR_GREATER || NETCOREAPP +#if NET40_OR_GREATER || NETCOREAPP using System.Collections.Concurrent; #endif using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/RingPROTECH.cs b/BinaryObjectScanner/Protection/RingPROTECH.cs index 8fd911a7..b0e771d1 100644 --- a/BinaryObjectScanner/Protection/RingPROTECH.cs +++ b/BinaryObjectScanner/Protection/RingPROTECH.cs @@ -4,6 +4,8 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Roxxe.cs b/BinaryObjectScanner/Protection/Roxxe.cs index bfd0a6b3..cb2b22de 100644 --- a/BinaryObjectScanner/Protection/Roxxe.cs +++ b/BinaryObjectScanner/Protection/Roxxe.cs @@ -1,11 +1,11 @@ -using System; -#if NET40_OR_GREATER || NETCOREAPP +#if NET40_OR_GREATER || NETCOREAPP using System.Collections.Concurrent; #endif using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/SVKP.cs b/BinaryObjectScanner/Protection/SVKP.cs index b840d8a2..c3e92d17 100644 --- a/BinaryObjectScanner/Protection/SVKP.cs +++ b/BinaryObjectScanner/Protection/SVKP.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/SafeLock.cs b/BinaryObjectScanner/Protection/SafeLock.cs index 4352fcd7..09205c3e 100644 --- a/BinaryObjectScanner/Protection/SafeLock.cs +++ b/BinaryObjectScanner/Protection/SafeLock.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/SecuROM.cs b/BinaryObjectScanner/Protection/SecuROM.cs index 0c9b9bd7..3073c88d 100644 --- a/BinaryObjectScanner/Protection/SecuROM.cs +++ b/BinaryObjectScanner/Protection/SecuROM.cs @@ -7,6 +7,8 @@ using System.Linq; using System.Text; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection @@ -289,10 +291,10 @@ namespace BinaryObjectScanner.Protection 0x82, 0xD8, 0x0C, 0xAC ]); - (bool success, int position) = matcher.Match(dataSectionRaw); + int position = matcher.Match(dataSectionRaw); // If we can't find the string, we default to generic - if (!success) + if (position < 0) return "8"; #if NETFRAMEWORK diff --git a/BinaryObjectScanner/Protection/SmartE.cs b/BinaryObjectScanner/Protection/SmartE.cs index 27d7a13a..f70830c2 100644 --- a/BinaryObjectScanner/Protection/SmartE.cs +++ b/BinaryObjectScanner/Protection/SmartE.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/SoftLock.cs b/BinaryObjectScanner/Protection/SoftLock.cs index 0a3b6d0c..07827f39 100644 --- a/BinaryObjectScanner/Protection/SoftLock.cs +++ b/BinaryObjectScanner/Protection/SoftLock.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/SolidShield.cs b/BinaryObjectScanner/Protection/SolidShield.cs index eba74a35..2076b359 100644 --- a/BinaryObjectScanner/Protection/SolidShield.cs +++ b/BinaryObjectScanner/Protection/SolidShield.cs @@ -6,9 +6,11 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; -namespace BinaryObjectScanner.ProtectionType +namespace BinaryObjectScanner.Protection { // TODO: Not matching all SolidShield Wrapper v1 (See JackKeane) // TODO: Not matching all SolidShield Wrapper v1 (See NFS11) diff --git a/BinaryObjectScanner/Protection/StarForce.cs b/BinaryObjectScanner/Protection/StarForce.cs index e0089ae3..04848ecc 100644 --- a/BinaryObjectScanner/Protection/StarForce.cs +++ b/BinaryObjectScanner/Protection/StarForce.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/Steam.cs b/BinaryObjectScanner/Protection/Steam.cs index 3aae076f..c8383c1e 100644 --- a/BinaryObjectScanner/Protection/Steam.cs +++ b/BinaryObjectScanner/Protection/Steam.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/TZCopyProtection.cs b/BinaryObjectScanner/Protection/TZCopyProtection.cs index a6336899..9b18bf2f 100644 --- a/BinaryObjectScanner/Protection/TZCopyProtection.cs +++ b/BinaryObjectScanner/Protection/TZCopyProtection.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Tages.cs b/BinaryObjectScanner/Protection/Tages.cs index 9e942529..a0fd8004 100644 --- a/BinaryObjectScanner/Protection/Tages.cs +++ b/BinaryObjectScanner/Protection/Tages.cs @@ -6,9 +6,11 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Content; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; -namespace BinaryObjectScanner.ProtectionType +namespace BinaryObjectScanner.Protection { public class TAGES : IPathCheck, IPortableExecutableCheck { diff --git a/BinaryObjectScanner/Protection/TivolaRingProtection.cs b/BinaryObjectScanner/Protection/TivolaRingProtection.cs index 0cd89e2c..cbad75ae 100644 --- a/BinaryObjectScanner/Protection/TivolaRingProtection.cs +++ b/BinaryObjectScanner/Protection/TivolaRingProtection.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Uplay.cs b/BinaryObjectScanner/Protection/Uplay.cs index a14597de..aeb6ca3f 100644 --- a/BinaryObjectScanner/Protection/Uplay.cs +++ b/BinaryObjectScanner/Protection/Uplay.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/WMDS.cs b/BinaryObjectScanner/Protection/WMDS.cs index 38e069c1..1531d2e2 100644 --- a/BinaryObjectScanner/Protection/WMDS.cs +++ b/BinaryObjectScanner/Protection/WMDS.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/WTMCDProtect.cs b/BinaryObjectScanner/Protection/WTMCDProtect.cs index 9b03042f..e58a210c 100644 --- a/BinaryObjectScanner/Protection/WTMCDProtect.cs +++ b/BinaryObjectScanner/Protection/WTMCDProtect.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/BinaryObjectScanner/Protection/WinLock.cs b/BinaryObjectScanner/Protection/WinLock.cs index 7b49e52d..d9abe0a4 100644 --- a/BinaryObjectScanner/Protection/WinLock.cs +++ b/BinaryObjectScanner/Protection/WinLock.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/Zzxzz.cs b/BinaryObjectScanner/Protection/Zzxzz.cs index a951a38a..4b461260 100644 --- a/BinaryObjectScanner/Protection/Zzxzz.cs +++ b/BinaryObjectScanner/Protection/Zzxzz.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; namespace BinaryObjectScanner.Protection { diff --git a/BinaryObjectScanner/Protection/nProtect.cs b/BinaryObjectScanner/Protection/nProtect.cs index dd05354b..3a45335c 100644 --- a/BinaryObjectScanner/Protection/nProtect.cs +++ b/BinaryObjectScanner/Protection/nProtect.cs @@ -4,6 +4,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using BinaryObjectScanner.Interfaces; using SabreTools.Matching; +using SabreTools.Matching.Paths; using SabreTools.Serialization.Wrappers; namespace BinaryObjectScanner.Protection diff --git a/Test/Extractor.cs b/Test/Extractor.cs index 3f365ade..652e6d63 100644 --- a/Test/Extractor.cs +++ b/Test/Extractor.cs @@ -377,7 +377,7 @@ namespace Test if (!string.IsNullOrEmpty(directoryName) && !Directory.Exists(directoryName)) Directory.CreateDirectory(directoryName); - (byte[]? fileContents, string? error) = archive.Extract(cfile.Key); + byte[]? fileContents = archive.Extract(cfile.Key, out string? error); if (!string.IsNullOrEmpty(error)) continue; diff --git a/Test/Test.csproj b/Test/Test.csproj index 50bb4688..92fdbbf1 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -1,4 +1,4 @@ - + net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 @@ -40,12 +40,12 @@ - - - - - - + + + + + + \ No newline at end of file