From 8fe84abef3373bf5ea2660af166adc6ed4a667bc Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 13 Dec 2023 15:52:03 -0500 Subject: [PATCH] Use more lenient file reading --- BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs | 2 +- BinaryObjectScanner/FileType/BDPlusSVM.cs | 2 +- BinaryObjectScanner/FileType/BFPK.cs | 2 +- BinaryObjectScanner/FileType/BSP.cs | 2 +- BinaryObjectScanner/FileType/BZip2.cs | 2 +- BinaryObjectScanner/FileType/CFB.cs | 2 +- BinaryObjectScanner/FileType/Executable.cs | 2 +- BinaryObjectScanner/FileType/GCF.cs | 2 +- BinaryObjectScanner/FileType/GZIP.cs | 2 +- BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs | 2 +- BinaryObjectScanner/FileType/InstallShieldCAB.cs | 2 +- BinaryObjectScanner/FileType/LDSCRYPT.cs | 2 +- BinaryObjectScanner/FileType/MPQ.cs | 2 +- BinaryObjectScanner/FileType/MicrosoftCAB.cs | 2 +- BinaryObjectScanner/FileType/MicrosoftLZ.cs | 2 +- BinaryObjectScanner/FileType/PAK.cs | 2 +- BinaryObjectScanner/FileType/PFF.cs | 2 +- BinaryObjectScanner/FileType/PKZIP.cs | 2 +- BinaryObjectScanner/FileType/PLJ.cs | 2 +- BinaryObjectScanner/FileType/Quantum.cs | 2 +- BinaryObjectScanner/FileType/RAR.cs | 2 +- BinaryObjectScanner/FileType/SFFS.cs | 4 ++-- BinaryObjectScanner/FileType/SGA.cs | 2 +- BinaryObjectScanner/FileType/SevenZip.cs | 2 +- BinaryObjectScanner/FileType/TapeArchive.cs | 2 +- BinaryObjectScanner/FileType/Textfile.cs | 2 +- BinaryObjectScanner/FileType/VBSP.cs | 2 +- BinaryObjectScanner/FileType/VPK.cs | 4 ++-- BinaryObjectScanner/FileType/WAD.cs | 2 +- BinaryObjectScanner/FileType/XZ.cs | 2 +- BinaryObjectScanner/FileType/XZP.cs | 2 +- BinaryObjectScanner/Packer/ASPack.cs | 2 +- BinaryObjectScanner/Packer/AdvancedInstaller.cs | 2 +- BinaryObjectScanner/Packer/Armadillo.cs | 2 +- BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs | 2 +- BinaryObjectScanner/Packer/CExe.cs | 2 +- BinaryObjectScanner/Packer/EXEStealth.cs | 2 +- BinaryObjectScanner/Packer/EmbeddedExecutable.cs | 2 +- BinaryObjectScanner/Packer/GenteeInstaller.cs | 2 +- BinaryObjectScanner/Packer/HyperTechCrackProof.cs | 2 +- BinaryObjectScanner/Packer/InnoSetup.cs | 2 +- BinaryObjectScanner/Packer/InstallAnywhere.cs | 2 +- BinaryObjectScanner/Packer/InstallerVISE.cs | 2 +- BinaryObjectScanner/Packer/IntelInstallationFramework.cs | 2 +- BinaryObjectScanner/Packer/MicrosoftCABSFX.cs | 2 +- BinaryObjectScanner/Packer/NSIS.cs | 2 +- BinaryObjectScanner/Packer/NeoLite.cs | 2 +- BinaryObjectScanner/Packer/PECompact.cs | 2 +- BinaryObjectScanner/Packer/Petite.cs | 2 +- BinaryObjectScanner/Packer/SetupFactory.cs | 2 +- BinaryObjectScanner/Packer/SevenZipSFX.cs | 2 +- BinaryObjectScanner/Packer/Shrinker.cs | 2 +- BinaryObjectScanner/Packer/UPX.cs | 2 +- BinaryObjectScanner/Packer/WinRARSFX.cs | 2 +- BinaryObjectScanner/Packer/WinZipSFX.cs | 2 +- BinaryObjectScanner/Packer/WiseInstaller.cs | 2 +- BinaryObjectScanner/Packer/dotFuscator.cs | 2 +- BinaryObjectScanner/Scanner.cs | 2 +- BinaryObjectScanner/Utilities/Hashing.cs | 2 +- Test/Extractor.cs | 2 +- Test/Printer.cs | 2 +- 61 files changed, 63 insertions(+), 63 deletions(-) diff --git a/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs b/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs index c311af30..5d862741 100644 --- a/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs +++ b/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs @@ -16,7 +16,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Detect(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/BDPlusSVM.cs b/BinaryObjectScanner/FileType/BDPlusSVM.cs index a3d37945..a16f467e 100644 --- a/BinaryObjectScanner/FileType/BDPlusSVM.cs +++ b/BinaryObjectScanner/FileType/BDPlusSVM.cs @@ -15,7 +15,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Detect(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/BFPK.cs b/BinaryObjectScanner/FileType/BFPK.cs index a6dbd313..2df1f377 100644 --- a/BinaryObjectScanner/FileType/BFPK.cs +++ b/BinaryObjectScanner/FileType/BFPK.cs @@ -19,7 +19,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/BSP.cs b/BinaryObjectScanner/FileType/BSP.cs index f4d49b07..2479f4aa 100644 --- a/BinaryObjectScanner/FileType/BSP.cs +++ b/BinaryObjectScanner/FileType/BSP.cs @@ -16,7 +16,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/BZip2.cs b/BinaryObjectScanner/FileType/BZip2.cs index c8b0af66..66554a96 100644 --- a/BinaryObjectScanner/FileType/BZip2.cs +++ b/BinaryObjectScanner/FileType/BZip2.cs @@ -19,7 +19,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/CFB.cs b/BinaryObjectScanner/FileType/CFB.cs index 71869db3..d89a1f43 100644 --- a/BinaryObjectScanner/FileType/CFB.cs +++ b/BinaryObjectScanner/FileType/CFB.cs @@ -19,7 +19,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/Executable.cs b/BinaryObjectScanner/FileType/Executable.cs index 42fb69c4..015bbc50 100644 --- a/BinaryObjectScanner/FileType/Executable.cs +++ b/BinaryObjectScanner/FileType/Executable.cs @@ -132,7 +132,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Detect(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/GCF.cs b/BinaryObjectScanner/FileType/GCF.cs index ca6e5bc2..efc33d65 100644 --- a/BinaryObjectScanner/FileType/GCF.cs +++ b/BinaryObjectScanner/FileType/GCF.cs @@ -16,7 +16,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/GZIP.cs b/BinaryObjectScanner/FileType/GZIP.cs index c15c9f2c..c5a4cbc7 100644 --- a/BinaryObjectScanner/FileType/GZIP.cs +++ b/BinaryObjectScanner/FileType/GZIP.cs @@ -19,7 +19,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs b/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs index 0a85dce5..1e144a1f 100644 --- a/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs +++ b/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs @@ -19,7 +19,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/InstallShieldCAB.cs b/BinaryObjectScanner/FileType/InstallShieldCAB.cs index 60e9ea21..78ffd7a8 100644 --- a/BinaryObjectScanner/FileType/InstallShieldCAB.cs +++ b/BinaryObjectScanner/FileType/InstallShieldCAB.cs @@ -19,7 +19,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/LDSCRYPT.cs b/BinaryObjectScanner/FileType/LDSCRYPT.cs index 9d6237f1..44e80d65 100644 --- a/BinaryObjectScanner/FileType/LDSCRYPT.cs +++ b/BinaryObjectScanner/FileType/LDSCRYPT.cs @@ -16,7 +16,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Detect(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/MPQ.cs b/BinaryObjectScanner/FileType/MPQ.cs index bcc8038e..23ae2aad 100644 --- a/BinaryObjectScanner/FileType/MPQ.cs +++ b/BinaryObjectScanner/FileType/MPQ.cs @@ -18,7 +18,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/MicrosoftCAB.cs b/BinaryObjectScanner/FileType/MicrosoftCAB.cs index d6dfac19..f1f7192d 100644 --- a/BinaryObjectScanner/FileType/MicrosoftCAB.cs +++ b/BinaryObjectScanner/FileType/MicrosoftCAB.cs @@ -18,7 +18,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/MicrosoftLZ.cs b/BinaryObjectScanner/FileType/MicrosoftLZ.cs index bb50f5f0..5a2fd7ae 100644 --- a/BinaryObjectScanner/FileType/MicrosoftLZ.cs +++ b/BinaryObjectScanner/FileType/MicrosoftLZ.cs @@ -17,7 +17,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/PAK.cs b/BinaryObjectScanner/FileType/PAK.cs index fe64aa7a..980a1826 100644 --- a/BinaryObjectScanner/FileType/PAK.cs +++ b/BinaryObjectScanner/FileType/PAK.cs @@ -15,7 +15,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/PFF.cs b/BinaryObjectScanner/FileType/PFF.cs index b2c88741..a5a03413 100644 --- a/BinaryObjectScanner/FileType/PFF.cs +++ b/BinaryObjectScanner/FileType/PFF.cs @@ -15,7 +15,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/PKZIP.cs b/BinaryObjectScanner/FileType/PKZIP.cs index d34e6557..8eb00e59 100644 --- a/BinaryObjectScanner/FileType/PKZIP.cs +++ b/BinaryObjectScanner/FileType/PKZIP.cs @@ -19,7 +19,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/PLJ.cs b/BinaryObjectScanner/FileType/PLJ.cs index 752ffb4f..156a750e 100644 --- a/BinaryObjectScanner/FileType/PLJ.cs +++ b/BinaryObjectScanner/FileType/PLJ.cs @@ -16,7 +16,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Detect(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/Quantum.cs b/BinaryObjectScanner/FileType/Quantum.cs index 8e0a04cf..9757146e 100644 --- a/BinaryObjectScanner/FileType/Quantum.cs +++ b/BinaryObjectScanner/FileType/Quantum.cs @@ -15,7 +15,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/RAR.cs b/BinaryObjectScanner/FileType/RAR.cs index f162c500..8bddc8f2 100644 --- a/BinaryObjectScanner/FileType/RAR.cs +++ b/BinaryObjectScanner/FileType/RAR.cs @@ -19,7 +19,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/SFFS.cs b/BinaryObjectScanner/FileType/SFFS.cs index 2b67cb8f..9a300065 100644 --- a/BinaryObjectScanner/FileType/SFFS.cs +++ b/BinaryObjectScanner/FileType/SFFS.cs @@ -17,7 +17,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Detect(fs, file, includeDebug); } @@ -48,7 +48,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/SGA.cs b/BinaryObjectScanner/FileType/SGA.cs index f1eaa737..b7e07218 100644 --- a/BinaryObjectScanner/FileType/SGA.cs +++ b/BinaryObjectScanner/FileType/SGA.cs @@ -20,7 +20,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/SevenZip.cs b/BinaryObjectScanner/FileType/SevenZip.cs index d5de5710..75056575 100644 --- a/BinaryObjectScanner/FileType/SevenZip.cs +++ b/BinaryObjectScanner/FileType/SevenZip.cs @@ -19,7 +19,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/TapeArchive.cs b/BinaryObjectScanner/FileType/TapeArchive.cs index d5f56464..13fe09c1 100644 --- a/BinaryObjectScanner/FileType/TapeArchive.cs +++ b/BinaryObjectScanner/FileType/TapeArchive.cs @@ -19,7 +19,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/Textfile.cs b/BinaryObjectScanner/FileType/Textfile.cs index 851cd49f..dcd5e3d0 100644 --- a/BinaryObjectScanner/FileType/Textfile.cs +++ b/BinaryObjectScanner/FileType/Textfile.cs @@ -17,7 +17,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Detect(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/VBSP.cs b/BinaryObjectScanner/FileType/VBSP.cs index fbe7b7c1..1b2ede1f 100644 --- a/BinaryObjectScanner/FileType/VBSP.cs +++ b/BinaryObjectScanner/FileType/VBSP.cs @@ -15,7 +15,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/VPK.cs b/BinaryObjectScanner/FileType/VPK.cs index 6d7f4e59..06a04951 100644 --- a/BinaryObjectScanner/FileType/VPK.cs +++ b/BinaryObjectScanner/FileType/VPK.cs @@ -17,7 +17,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } @@ -124,7 +124,7 @@ namespace BinaryObjectScanner.FileType try { // Open the archive - archiveStream = File.OpenRead(archiveFileName); + archiveStream = File.Open(archiveFileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); // Seek to the data archiveStream.Seek(directoryItem.DirectoryEntry.EntryOffset, SeekOrigin.Begin); diff --git a/BinaryObjectScanner/FileType/WAD.cs b/BinaryObjectScanner/FileType/WAD.cs index 303ec1ee..25162401 100644 --- a/BinaryObjectScanner/FileType/WAD.cs +++ b/BinaryObjectScanner/FileType/WAD.cs @@ -15,7 +15,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/XZ.cs b/BinaryObjectScanner/FileType/XZ.cs index 48af693b..6c79e0dd 100644 --- a/BinaryObjectScanner/FileType/XZ.cs +++ b/BinaryObjectScanner/FileType/XZ.cs @@ -18,7 +18,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/FileType/XZP.cs b/BinaryObjectScanner/FileType/XZP.cs index b650c2f9..bad180e2 100644 --- a/BinaryObjectScanner/FileType/XZP.cs +++ b/BinaryObjectScanner/FileType/XZP.cs @@ -16,7 +16,7 @@ namespace BinaryObjectScanner.FileType if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/ASPack.cs b/BinaryObjectScanner/Packer/ASPack.cs index ba08b3f7..856e4d3b 100644 --- a/BinaryObjectScanner/Packer/ASPack.cs +++ b/BinaryObjectScanner/Packer/ASPack.cs @@ -56,7 +56,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/AdvancedInstaller.cs b/BinaryObjectScanner/Packer/AdvancedInstaller.cs index 1a844e82..bae483c4 100644 --- a/BinaryObjectScanner/Packer/AdvancedInstaller.cs +++ b/BinaryObjectScanner/Packer/AdvancedInstaller.cs @@ -35,7 +35,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/Armadillo.cs b/BinaryObjectScanner/Packer/Armadillo.cs index f6b1c5dd..756c3f44 100644 --- a/BinaryObjectScanner/Packer/Armadillo.cs +++ b/BinaryObjectScanner/Packer/Armadillo.cs @@ -47,7 +47,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs b/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs index 6d6eaad8..51ede304 100644 --- a/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs +++ b/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs @@ -39,7 +39,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/CExe.cs b/BinaryObjectScanner/Packer/CExe.cs index 01c51560..29994760 100644 --- a/BinaryObjectScanner/Packer/CExe.cs +++ b/BinaryObjectScanner/Packer/CExe.cs @@ -57,7 +57,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/EXEStealth.cs b/BinaryObjectScanner/Packer/EXEStealth.cs index ddca763e..ae0d1a8a 100644 --- a/BinaryObjectScanner/Packer/EXEStealth.cs +++ b/BinaryObjectScanner/Packer/EXEStealth.cs @@ -80,7 +80,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/EmbeddedExecutable.cs b/BinaryObjectScanner/Packer/EmbeddedExecutable.cs index 9108c3e1..b25288f2 100644 --- a/BinaryObjectScanner/Packer/EmbeddedExecutable.cs +++ b/BinaryObjectScanner/Packer/EmbeddedExecutable.cs @@ -34,7 +34,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/GenteeInstaller.cs b/BinaryObjectScanner/Packer/GenteeInstaller.cs index 7c7ec617..8de4adfe 100644 --- a/BinaryObjectScanner/Packer/GenteeInstaller.cs +++ b/BinaryObjectScanner/Packer/GenteeInstaller.cs @@ -38,7 +38,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/HyperTechCrackProof.cs b/BinaryObjectScanner/Packer/HyperTechCrackProof.cs index 1b96dd9a..1785ecb2 100644 --- a/BinaryObjectScanner/Packer/HyperTechCrackProof.cs +++ b/BinaryObjectScanner/Packer/HyperTechCrackProof.cs @@ -37,7 +37,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/InnoSetup.cs b/BinaryObjectScanner/Packer/InnoSetup.cs index 4ca75009..2626a73e 100644 --- a/BinaryObjectScanner/Packer/InnoSetup.cs +++ b/BinaryObjectScanner/Packer/InnoSetup.cs @@ -59,7 +59,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/InstallAnywhere.cs b/BinaryObjectScanner/Packer/InstallAnywhere.cs index 8d3e3b41..795e0885 100644 --- a/BinaryObjectScanner/Packer/InstallAnywhere.cs +++ b/BinaryObjectScanner/Packer/InstallAnywhere.cs @@ -34,7 +34,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/InstallerVISE.cs b/BinaryObjectScanner/Packer/InstallerVISE.cs index 0fb45e20..bc4dec8a 100644 --- a/BinaryObjectScanner/Packer/InstallerVISE.cs +++ b/BinaryObjectScanner/Packer/InstallerVISE.cs @@ -36,7 +36,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/IntelInstallationFramework.cs b/BinaryObjectScanner/Packer/IntelInstallationFramework.cs index a0db627c..b6405e19 100644 --- a/BinaryObjectScanner/Packer/IntelInstallationFramework.cs +++ b/BinaryObjectScanner/Packer/IntelInstallationFramework.cs @@ -39,7 +39,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs b/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs index 3f8fd590..4aec2120 100644 --- a/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs +++ b/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs @@ -53,7 +53,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/NSIS.cs b/BinaryObjectScanner/Packer/NSIS.cs index 8994911a..eae6c31c 100644 --- a/BinaryObjectScanner/Packer/NSIS.cs +++ b/BinaryObjectScanner/Packer/NSIS.cs @@ -38,7 +38,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/NeoLite.cs b/BinaryObjectScanner/Packer/NeoLite.cs index b85dadee..df4ef338 100644 --- a/BinaryObjectScanner/Packer/NeoLite.cs +++ b/BinaryObjectScanner/Packer/NeoLite.cs @@ -43,7 +43,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/PECompact.cs b/BinaryObjectScanner/Packer/PECompact.cs index 6b153edd..d9449a39 100644 --- a/BinaryObjectScanner/Packer/PECompact.cs +++ b/BinaryObjectScanner/Packer/PECompact.cs @@ -47,7 +47,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/Petite.cs b/BinaryObjectScanner/Packer/Petite.cs index 420c7d6a..d8592382 100644 --- a/BinaryObjectScanner/Packer/Petite.cs +++ b/BinaryObjectScanner/Packer/Petite.cs @@ -30,7 +30,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/SetupFactory.cs b/BinaryObjectScanner/Packer/SetupFactory.cs index 3f56364b..7bb0e3f0 100644 --- a/BinaryObjectScanner/Packer/SetupFactory.cs +++ b/BinaryObjectScanner/Packer/SetupFactory.cs @@ -44,7 +44,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/SevenZipSFX.cs b/BinaryObjectScanner/Packer/SevenZipSFX.cs index 32501c07..06ff29f8 100644 --- a/BinaryObjectScanner/Packer/SevenZipSFX.cs +++ b/BinaryObjectScanner/Packer/SevenZipSFX.cs @@ -51,7 +51,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/Shrinker.cs b/BinaryObjectScanner/Packer/Shrinker.cs index c29c48cd..4814e19b 100644 --- a/BinaryObjectScanner/Packer/Shrinker.cs +++ b/BinaryObjectScanner/Packer/Shrinker.cs @@ -31,7 +31,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/UPX.cs b/BinaryObjectScanner/Packer/UPX.cs index 3e68d618..d82ea555 100644 --- a/BinaryObjectScanner/Packer/UPX.cs +++ b/BinaryObjectScanner/Packer/UPX.cs @@ -69,7 +69,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/WinRARSFX.cs b/BinaryObjectScanner/Packer/WinRARSFX.cs index 00c3df13..7eeac8dc 100644 --- a/BinaryObjectScanner/Packer/WinRARSFX.cs +++ b/BinaryObjectScanner/Packer/WinRARSFX.cs @@ -38,7 +38,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/WinZipSFX.cs b/BinaryObjectScanner/Packer/WinZipSFX.cs index 8baad155..91d5270f 100644 --- a/BinaryObjectScanner/Packer/WinZipSFX.cs +++ b/BinaryObjectScanner/Packer/WinZipSFX.cs @@ -68,7 +68,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/WiseInstaller.cs b/BinaryObjectScanner/Packer/WiseInstaller.cs index 409317f9..750f740e 100644 --- a/BinaryObjectScanner/Packer/WiseInstaller.cs +++ b/BinaryObjectScanner/Packer/WiseInstaller.cs @@ -78,7 +78,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Packer/dotFuscator.cs b/BinaryObjectScanner/Packer/dotFuscator.cs index 6f8e88a5..2a05ff04 100644 --- a/BinaryObjectScanner/Packer/dotFuscator.cs +++ b/BinaryObjectScanner/Packer/dotFuscator.cs @@ -34,7 +34,7 @@ namespace BinaryObjectScanner.Packer if (!File.Exists(file)) return null; - using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) + using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { return Extract(fs, file, includeDebug); } diff --git a/BinaryObjectScanner/Scanner.cs b/BinaryObjectScanner/Scanner.cs index e2c0a942..24f5be91 100644 --- a/BinaryObjectScanner/Scanner.cs +++ b/BinaryObjectScanner/Scanner.cs @@ -266,7 +266,7 @@ namespace BinaryObjectScanner // Open the file and begin scanning try { - using FileStream fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using FileStream fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); return GetInternalProtections(file, fs); } catch (Exception ex) diff --git a/BinaryObjectScanner/Utilities/Hashing.cs b/BinaryObjectScanner/Utilities/Hashing.cs index 1dfcb4c2..739a7163 100644 --- a/BinaryObjectScanner/Utilities/Hashing.cs +++ b/BinaryObjectScanner/Utilities/Hashing.cs @@ -22,7 +22,7 @@ namespace BinaryObjectScanner.Utilities try { var sha1 = SHA1.Create(); - using (Stream fileStream = File.OpenRead(path)) + using (Stream fileStream = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { byte[] buffer = new byte[32768]; while (true) diff --git a/Test/Extractor.cs b/Test/Extractor.cs index f48608ee..0df62314 100644 --- a/Test/Extractor.cs +++ b/Test/Extractor.cs @@ -65,7 +65,7 @@ namespace Test private static void ExtractFile(string file, string outputDirectory) { Console.WriteLine($"Attempting to extract all files from {file}"); - using Stream stream = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using Stream stream = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); // Read the first 8 bytes byte[]? magic = stream.ReadBytes(8); diff --git a/Test/Printer.cs b/Test/Printer.cs index 5964506d..cd292673 100644 --- a/Test/Printer.cs +++ b/Test/Printer.cs @@ -49,7 +49,7 @@ namespace Test { Console.WriteLine($"Attempting to print info for {file}"); - using Stream stream = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read); + using Stream stream = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); // Read the first 8 bytes byte[]? magic = stream.ReadBytes(8);