diff --git a/SabreTools.Serialization.Test/Readers/InstallShieldExecutableFileTests.cs b/SabreTools.Serialization.Test/Readers/InstallShieldExecutableTests.cs similarity index 100% rename from SabreTools.Serialization.Test/Readers/InstallShieldExecutableFileTests.cs rename to SabreTools.Serialization.Test/Readers/InstallShieldExecutableTests.cs diff --git a/SabreTools.Serialization/Models/InstallShieldExecutable/Constants.cs b/SabreTools.Serialization/Models/InstallShieldExecutable/Constants.cs index 88038c83..7d28e614 100644 --- a/SabreTools.Serialization/Models/InstallShieldExecutable/Constants.cs +++ b/SabreTools.Serialization/Models/InstallShieldExecutable/Constants.cs @@ -12,4 +12,4 @@ namespace SabreTools.Data.Models.InstallShieldExecutable /// public const string ISSetupSignatureString = "ISSetupStream"; } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Models/InstallShieldExecutable/FileEntry.cs b/SabreTools.Serialization/Models/InstallShieldExecutable/FileEntry.cs index f35fe833..77aba466 100644 --- a/SabreTools.Serialization/Models/InstallShieldExecutable/FileEntry.cs +++ b/SabreTools.Serialization/Models/InstallShieldExecutable/FileEntry.cs @@ -27,7 +27,7 @@ namespace SabreTools.Data.Models.InstallShieldExecutable /// Length of the file. Stored in the installshield executable as a string. /// public ulong Length { get; set; } - + /// /// Offset of the file. /// diff --git a/SabreTools.Serialization/Readers/InstallShieldExecutable.cs b/SabreTools.Serialization/Readers/InstallShieldExecutable.cs index dd722d34..7b9037da 100644 --- a/SabreTools.Serialization/Readers/InstallShieldExecutable.cs +++ b/SabreTools.Serialization/Readers/InstallShieldExecutable.cs @@ -17,12 +17,12 @@ namespace SabreTools.Serialization.Readers try { var sfx = new SFX(); - + // Cache the initial offset long initialOffset = data.Position; var sfxList = new List(); - + while (data.Position < data.Length) { // Try to parse the entry @@ -38,10 +38,10 @@ namespace SabreTools.Serialization.Readers data.SeekIfPossible(length, SeekOrigin.Current); sfxList.Add(fileEntry); } - + if (sfxList.Count == 0) return null; - + sfx.Entries = [.. sfxList]; return sfx; } @@ -62,14 +62,14 @@ namespace SabreTools.Serialization.Readers string? name = data.ReadNullTerminatedAnsiString(); if (name == null) return null; - + // Both of these strings indicate that this is a different kind of encrypted and/or compressed format of - // ISEXE that is not yet supported, but will be in the future. + // ISEXE that is not yet supported, but will be in the future. // They return early because no extraction can be performed, like how MsCab currently returns if a folder // is LZX or Quantum. if (name == ISSignatureString) return null; - + if (name == ISSetupSignatureString) return null; @@ -91,7 +91,7 @@ namespace SabreTools.Serialization.Readers obj.Version = version; obj.Length = lengthValue; obj.Offset = data.Position - initialOffset; - + return obj; } } diff --git a/SabreTools.Serialization/Wrappers/InstallShieldExecutable.Extraction.cs b/SabreTools.Serialization/Wrappers/InstallShieldExecutable.Extraction.cs index 9e222e70..10982cfc 100644 --- a/SabreTools.Serialization/Wrappers/InstallShieldExecutable.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/InstallShieldExecutable.Extraction.cs @@ -18,12 +18,12 @@ namespace SabreTools.Serialization.Wrappers { var entry = Entries[i]; _dataSource.SeekIfPossible(entry.Offset, SeekOrigin.Begin); - + // Get the length, and make sure it won't EOF long length = (long)entry.Length; if (length > _dataSource.Length - _dataSource.Position) break; - + // Ensure directory separators are consistent var filename = entry.Path.TrimEnd('\0'); if (Path.DirectorySeparatorChar == '\\') diff --git a/SabreTools.Serialization/Wrappers/InstallShieldExecutable.cs b/SabreTools.Serialization/Wrappers/InstallShieldExecutable.cs index 3c8b82c0..c510c0b6 100644 --- a/SabreTools.Serialization/Wrappers/InstallShieldExecutable.cs +++ b/SabreTools.Serialization/Wrappers/InstallShieldExecutable.cs @@ -16,7 +16,7 @@ namespace SabreTools.Serialization.Wrappers /// public FileEntry[] Entries => Model.Entries; - + #endregion #region Constructors diff --git a/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs b/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs index 5d6d8fe1..5a8900ad 100644 --- a/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs @@ -539,7 +539,7 @@ namespace SabreTools.Serialization.Wrappers // Attempt to extract package return MatroschkaPackage.Extract(outputDirectory, includeDebug); } - + /// /// Extract data from an Installshield Executable /// diff --git a/SabreTools.Serialization/Wrappers/PortableExecutable.cs b/SabreTools.Serialization/Wrappers/PortableExecutable.cs index 8bb41617..b3762c7e 100644 --- a/SabreTools.Serialization/Wrappers/PortableExecutable.cs +++ b/SabreTools.Serialization/Wrappers/PortableExecutable.cs @@ -257,7 +257,7 @@ namespace SabreTools.Serialization.Wrappers } } } = null; - + /// /// InstallShield Executable wrapper, if it exists /// @@ -289,7 +289,7 @@ namespace SabreTools.Serialization.Wrappers _installshieldExecutableFailed = true; return null; } - + // Parse the package lock (_dataSourceLock) { @@ -1087,7 +1087,7 @@ namespace SabreTools.Serialization.Wrappers /// Cached attempt at creation for /// private bool _installshieldExecutableFailed = false; - + /// /// Lock object for ///