diff --git a/BinaryObjectScanner.Wrappers/AACSMediaKeyBlock.cs b/BinaryObjectScanner.Wrappers/AACSMediaKeyBlock.cs index 23ed4315..68f23f77 100644 --- a/BinaryObjectScanner.Wrappers/AACSMediaKeyBlock.cs +++ b/BinaryObjectScanner.Wrappers/AACSMediaKeyBlock.cs @@ -18,7 +18,7 @@ namespace BinaryObjectScanner.Wrappers #region Records /// - public BinaryObjectScanner.Models.AACS.Record[] Records => _mediaKeyBlock.Records; + public Models.AACS.Record[] Records => _mediaKeyBlock.Records; #endregion @@ -29,7 +29,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the AACS media key block /// - private BinaryObjectScanner.Models.AACS.MediaKeyBlock _mediaKeyBlock; + private Models.AACS.MediaKeyBlock _mediaKeyBlock; #endregion @@ -126,13 +126,13 @@ namespace BinaryObjectScanner.Wrappers switch (record.RecordType) { - case BinaryObjectScanner.Models.AACS.RecordType.EndOfMediaKeyBlock: - var eomkb = record as BinaryObjectScanner.Models.AACS.EndOfMediaKeyBlockRecord; + case Models.AACS.RecordType.EndOfMediaKeyBlock: + var eomkb = record as Models.AACS.EndOfMediaKeyBlockRecord; builder.AppendLine($" Signature data: {BitConverter.ToString(eomkb.SignatureData ?? new byte[0]).Replace('-', ' ')}"); break; - case BinaryObjectScanner.Models.AACS.RecordType.ExplicitSubsetDifference: - var esd = record as BinaryObjectScanner.Models.AACS.ExplicitSubsetDifferenceRecord; + case Models.AACS.RecordType.ExplicitSubsetDifference: + var esd = record as Models.AACS.ExplicitSubsetDifferenceRecord; builder.AppendLine($" Subset Differences:"); builder.AppendLine(" -------------------------"); if (esd.SubsetDifferences == null || esd.SubsetDifferences.Length == 0) @@ -151,8 +151,8 @@ namespace BinaryObjectScanner.Wrappers } break; - case BinaryObjectScanner.Models.AACS.RecordType.MediaKeyData: - var mkd = record as BinaryObjectScanner.Models.AACS.MediaKeyDataRecord; + case Models.AACS.RecordType.MediaKeyData: + var mkd = record as Models.AACS.MediaKeyDataRecord; builder.AppendLine($" Media Keys:"); builder.AppendLine(" -------------------------"); if (mkd.MediaKeyData == null || mkd.MediaKeyData.Length == 0) @@ -169,8 +169,8 @@ namespace BinaryObjectScanner.Wrappers } break; - case BinaryObjectScanner.Models.AACS.RecordType.SubsetDifferenceIndex: - var sdi = record as BinaryObjectScanner.Models.AACS.SubsetDifferenceIndexRecord; + case Models.AACS.RecordType.SubsetDifferenceIndex: + var sdi = record as Models.AACS.SubsetDifferenceIndexRecord; builder.AppendLine($" Span: {sdi.Span} (0x{sdi.Span:X})"); builder.AppendLine($" Offsets:"); builder.AppendLine(" -------------------------"); @@ -188,14 +188,14 @@ namespace BinaryObjectScanner.Wrappers } break; - case BinaryObjectScanner.Models.AACS.RecordType.TypeAndVersion: - var tav = record as BinaryObjectScanner.Models.AACS.TypeAndVersionRecord; + case Models.AACS.RecordType.TypeAndVersion: + var tav = record as Models.AACS.TypeAndVersionRecord; builder.AppendLine($" Media key block type: {tav.MediaKeyBlockType} (0x{tav.MediaKeyBlockType:X})"); builder.AppendLine($" Version number: {tav.VersionNumber} (0x{tav.VersionNumber:X})"); break; - case BinaryObjectScanner.Models.AACS.RecordType.DriveRevocationList: - var drl = record as BinaryObjectScanner.Models.AACS.DriveRevocationListRecord; + case Models.AACS.RecordType.DriveRevocationList: + var drl = record as Models.AACS.DriveRevocationListRecord; builder.AppendLine($" Total number of entries: {drl.TotalNumberOfEntries} (0x{drl.TotalNumberOfEntries:X})"); builder.AppendLine($" Signature Blocks:"); builder.AppendLine(" -------------------------"); @@ -230,8 +230,8 @@ namespace BinaryObjectScanner.Wrappers } break; - case BinaryObjectScanner.Models.AACS.RecordType.HostRevocationList: - var hrl = record as BinaryObjectScanner.Models.AACS.HostRevocationListRecord; + case Models.AACS.RecordType.HostRevocationList: + var hrl = record as Models.AACS.HostRevocationListRecord; builder.AppendLine($" Total number of entries: {hrl.TotalNumberOfEntries} (0x{hrl.TotalNumberOfEntries:X})"); builder.AppendLine($" Signature Blocks:"); builder.AppendLine(" -------------------------"); @@ -266,13 +266,13 @@ namespace BinaryObjectScanner.Wrappers } break; - case BinaryObjectScanner.Models.AACS.RecordType.VerifyMediaKey: - var vmk = record as BinaryObjectScanner.Models.AACS.VerifyMediaKeyRecord; + case Models.AACS.RecordType.VerifyMediaKey: + var vmk = record as Models.AACS.VerifyMediaKeyRecord; builder.AppendLine($" Ciphertext value: {BitConverter.ToString(vmk.CiphertextValue ?? new byte[0]).Replace('-', ' ')}"); break; - case BinaryObjectScanner.Models.AACS.RecordType.Copyright: - var c = record as BinaryObjectScanner.Models.AACS.CopyrightRecord; + case Models.AACS.RecordType.Copyright: + var c = record as Models.AACS.CopyrightRecord; builder.AppendLine($" Copyright: {c.Copyright ?? "[NULL]"}"); break; } diff --git a/BinaryObjectScanner.Wrappers/BFPK.cs b/BinaryObjectScanner.Wrappers/BFPK.cs index 5889d7d8..9d2ceb8a 100644 --- a/BinaryObjectScanner.Wrappers/BFPK.cs +++ b/BinaryObjectScanner.Wrappers/BFPK.cs @@ -32,7 +32,7 @@ namespace BinaryObjectScanner.Wrappers #region Files /// - public BinaryObjectScanner.Models.BFPK.FileEntry[] FileTable => _archive.Files; + public Models.BFPK.FileEntry[] FileTable => _archive.Files; #endregion @@ -43,7 +43,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the archive /// - private BinaryObjectScanner.Models.BFPK.Archive _archive; + private Models.BFPK.Archive _archive; #endregion diff --git a/BinaryObjectScanner.Wrappers/BSP.cs b/BinaryObjectScanner.Wrappers/BSP.cs index ee2424c7..c9db051d 100644 --- a/BinaryObjectScanner.Wrappers/BSP.cs +++ b/BinaryObjectScanner.Wrappers/BSP.cs @@ -27,7 +27,7 @@ namespace BinaryObjectScanner.Wrappers #region Lumps /// - public BinaryObjectScanner.Models.BSP.Lump[] Lumps => _file.Lumps; + public Models.BSP.Lump[] Lumps => _file.Lumps; #endregion @@ -44,7 +44,7 @@ namespace BinaryObjectScanner.Wrappers #region Textures /// - public BinaryObjectScanner.Models.BSP.Texture[] Textures => _file.Textures; + public Models.BSP.Texture[] Textures => _file.Textures; #endregion @@ -55,7 +55,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the BSP /// - private BinaryObjectScanner.Models.BSP.File _file; + private Models.BSP.File _file; #endregion @@ -410,14 +410,14 @@ namespace BinaryObjectScanner.Wrappers /// /// Texture object to format /// Byte array representing the texture as a bitmap - private static byte[] CreateTextureData(BinaryObjectScanner.Models.BSP.Texture texture) + private static byte[] CreateTextureData(Models.BSP.Texture texture) { // If there's no texture data if (texture.TextureData == null || texture.TextureData.Length == 0) return null; // Create the bitmap file header - var fileHeader = new BinaryObjectScanner.Models.BMP.BITMAPFILEHEADER() + var fileHeader = new Models.BMP.BITMAPFILEHEADER() { Type = ('M' << 8) | 'B', Size = 14 + 40 + (texture.PaletteSize * 4) + (texture.Width * texture.Height), @@ -425,7 +425,7 @@ namespace BinaryObjectScanner.Wrappers }; // Create the bitmap info header - var infoHeader = new BinaryObjectScanner.Models.BMP.BITMAPINFOHEADER + var infoHeader = new Models.BMP.BITMAPINFOHEADER { Size = 40, Width = (int)texture.Width, diff --git a/BinaryObjectScanner.Wrappers/CFB.cs b/BinaryObjectScanner.Wrappers/CFB.cs index 94c51b5c..7a1c8e60 100644 --- a/BinaryObjectScanner.Wrappers/CFB.cs +++ b/BinaryObjectScanner.Wrappers/CFB.cs @@ -70,35 +70,35 @@ namespace BinaryObjectScanner.Wrappers public uint NumberOfDIFATSectors => _binary.Header.NumberOfDIFATSectors; /// - public BinaryObjectScanner.Models.CFB.SectorNumber[] DIFAT => _binary.Header.DIFAT; + public Models.CFB.SectorNumber[] DIFAT => _binary.Header.DIFAT; #endregion #region FAT Sector Numbers /// - public BinaryObjectScanner.Models.CFB.SectorNumber[] FATSectorNumbers => _binary.FATSectorNumbers; + public Models.CFB.SectorNumber[] FATSectorNumbers => _binary.FATSectorNumbers; #endregion #region Mini FAT Sector Numbers /// - public BinaryObjectScanner.Models.CFB.SectorNumber[] MiniFATSectorNumbers => _binary.MiniFATSectorNumbers; + public Models.CFB.SectorNumber[] MiniFATSectorNumbers => _binary.MiniFATSectorNumbers; #endregion #region DIFAT Sector Numbers /// - public BinaryObjectScanner.Models.CFB.SectorNumber[] DIFATSectorNumbers => _binary.DIFATSectorNumbers; + public Models.CFB.SectorNumber[] DIFATSectorNumbers => _binary.DIFATSectorNumbers; #endregion #region Directory Entries /// - public BinaryObjectScanner.Models.CFB.DirectoryEntry[] DirectoryEntries => _binary.DirectoryEntries; + public Models.CFB.DirectoryEntry[] DirectoryEntries => _binary.DirectoryEntries; #endregion diff --git a/BinaryObjectScanner.Wrappers/CIA.cs b/BinaryObjectScanner.Wrappers/CIA.cs index 019a6b3c..2a5b1f5c 100644 --- a/BinaryObjectScanner.Wrappers/CIA.cs +++ b/BinaryObjectScanner.Wrappers/CIA.cs @@ -49,14 +49,14 @@ namespace BinaryObjectScanner.Wrappers #region Certificate Chain /// - public BinaryObjectScanner.Models.N3DS.Certificate[] CertificateChain => _cia.CertificateChain; + public Models.N3DS.Certificate[] CertificateChain => _cia.CertificateChain; #endregion #region Ticket /// - public BinaryObjectScanner.Models.N3DS.SignatureType T_SignatureType => _cia.Ticket.SignatureType; + public Models.N3DS.SignatureType T_SignatureType => _cia.Ticket.SignatureType; /// public ushort T_SignatureSize => _cia.Ticket.SignatureSize; @@ -140,14 +140,14 @@ namespace BinaryObjectScanner.Wrappers public byte[] T_ContentIndex => _cia.Ticket.ContentIndex; /// - public BinaryObjectScanner.Models.N3DS.Certificate[] T_CertificateChain => _cia.Ticket.CertificateChain; + public Models.N3DS.Certificate[] T_CertificateChain => _cia.Ticket.CertificateChain; #endregion #region Title Metadata /// - public BinaryObjectScanner.Models.N3DS.SignatureType TMD_SignatureType => _cia.TMDFileData.SignatureType; + public Models.N3DS.SignatureType TMD_SignatureType => _cia.TMDFileData.SignatureType; /// public ushort TMD_SignatureSize => _cia.TMDFileData.SignatureSize; @@ -222,20 +222,20 @@ namespace BinaryObjectScanner.Wrappers public byte[] TMD_SHA256HashContentInfoRecords => _cia.TMDFileData.SHA256HashContentInfoRecords; /// - public BinaryObjectScanner.Models.N3DS.ContentInfoRecord[] TMD_ContentInfoRecords => _cia.TMDFileData.ContentInfoRecords; + public Models.N3DS.ContentInfoRecord[] TMD_ContentInfoRecords => _cia.TMDFileData.ContentInfoRecords; /// - public BinaryObjectScanner.Models.N3DS.ContentChunkRecord[] TMD_ContentChunkRecords => _cia.TMDFileData.ContentChunkRecords; + public Models.N3DS.ContentChunkRecord[] TMD_ContentChunkRecords => _cia.TMDFileData.ContentChunkRecords; /// - public BinaryObjectScanner.Models.N3DS.Certificate[] TMD_CertificateChain => _cia.TMDFileData.CertificateChain; + public Models.N3DS.Certificate[] TMD_CertificateChain => _cia.TMDFileData.CertificateChain; #endregion #region Partitions /// - public BinaryObjectScanner.Models.N3DS.NCCHHeader[] Partitions => _cia.Partitions; + public Models.N3DS.NCCHHeader[] Partitions => _cia.Partitions; #endregion @@ -265,7 +265,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the cart /// - private BinaryObjectScanner.Models.N3DS.CIA _cia; + private Models.N3DS.CIA _cia; #endregion @@ -402,13 +402,13 @@ namespace BinaryObjectScanner.Wrappers builder.AppendLine($" Expiration time: {certificate.ExpirationTime} (0x{certificate.ExpirationTime:X})"); switch (certificate.KeyType) { - case BinaryObjectScanner.Models.N3DS.PublicKeyType.RSA_4096: - case BinaryObjectScanner.Models.N3DS.PublicKeyType.RSA_2048: + case Models.N3DS.PublicKeyType.RSA_4096: + case Models.N3DS.PublicKeyType.RSA_2048: builder.AppendLine($" Modulus: {BitConverter.ToString(certificate.RSAModulus).Replace('-', ' ')}"); builder.AppendLine($" Public exponent: {certificate.RSAPublicExponent} (0x{certificate.RSAPublicExponent:X})"); builder.AppendLine($" Padding: {BitConverter.ToString(certificate.RSAPadding).Replace('-', ' ')}"); break; - case BinaryObjectScanner.Models.N3DS.PublicKeyType.EllipticCurve: + case Models.N3DS.PublicKeyType.EllipticCurve: builder.AppendLine($" Public key: {BitConverter.ToString(certificate.ECCPublicKey).Replace('-', ' ')}"); builder.AppendLine($" Padding: {BitConverter.ToString(certificate.ECCPadding).Replace('-', ' ')}"); break; @@ -491,13 +491,13 @@ namespace BinaryObjectScanner.Wrappers builder.AppendLine($" Expiration time: {certificate.ExpirationTime} (0x{certificate.ExpirationTime:X})"); switch (certificate.KeyType) { - case BinaryObjectScanner.Models.N3DS.PublicKeyType.RSA_4096: - case BinaryObjectScanner.Models.N3DS.PublicKeyType.RSA_2048: + case Models.N3DS.PublicKeyType.RSA_4096: + case Models.N3DS.PublicKeyType.RSA_2048: builder.AppendLine($" Modulus: {BitConverter.ToString(certificate.RSAModulus).Replace('-', ' ')}"); builder.AppendLine($" Public exponent: {certificate.RSAPublicExponent} (0x{certificate.RSAPublicExponent:X})"); builder.AppendLine($" Padding: {BitConverter.ToString(certificate.RSAPadding).Replace('-', ' ')}"); break; - case BinaryObjectScanner.Models.N3DS.PublicKeyType.EllipticCurve: + case Models.N3DS.PublicKeyType.EllipticCurve: builder.AppendLine($" Public key: {BitConverter.ToString(certificate.ECCPublicKey).Replace('-', ' ')}"); builder.AppendLine($" Padding: {BitConverter.ToString(certificate.ECCPadding).Replace('-', ' ')}"); break; @@ -613,13 +613,13 @@ namespace BinaryObjectScanner.Wrappers builder.AppendLine($" Expiration time: {certificate.ExpirationTime} (0x{certificate.ExpirationTime:X})"); switch (certificate.KeyType) { - case BinaryObjectScanner.Models.N3DS.PublicKeyType.RSA_4096: - case BinaryObjectScanner.Models.N3DS.PublicKeyType.RSA_2048: + case Models.N3DS.PublicKeyType.RSA_4096: + case Models.N3DS.PublicKeyType.RSA_2048: builder.AppendLine($" Modulus: {BitConverter.ToString(certificate.RSAModulus).Replace('-', ' ')}"); builder.AppendLine($" Public exponent: {certificate.RSAPublicExponent} (0x{certificate.RSAPublicExponent:X})"); builder.AppendLine($" Padding: {BitConverter.ToString(certificate.RSAPadding).Replace('-', ' ')}"); break; - case BinaryObjectScanner.Models.N3DS.PublicKeyType.EllipticCurve: + case Models.N3DS.PublicKeyType.EllipticCurve: builder.AppendLine($" Public key: {BitConverter.ToString(certificate.ECCPublicKey).Replace('-', ' ')}"); builder.AppendLine($" Padding: {BitConverter.ToString(certificate.ECCPadding).Replace('-', ' ')}"); break; @@ -651,7 +651,7 @@ namespace BinaryObjectScanner.Wrappers { builder.AppendLine($" Empty partition, no data can be parsed"); } - else if (partitionHeader.MagicID != BinaryObjectScanner.Models.N3DS.Constants.NCCHMagicNumber) + else if (partitionHeader.MagicID != Models.N3DS.Constants.NCCHMagicNumber) { builder.AppendLine($" Unrecognized partition data, no data can be parsed"); } diff --git a/BinaryObjectScanner.Wrappers/GCF.cs b/BinaryObjectScanner.Wrappers/GCF.cs index e76c304e..6818501c 100644 --- a/BinaryObjectScanner.Wrappers/GCF.cs +++ b/BinaryObjectScanner.Wrappers/GCF.cs @@ -84,7 +84,7 @@ namespace BinaryObjectScanner.Wrappers #region Block Entries /// - public BinaryObjectScanner.Models.GCF.BlockEntry[] BlockEntries => _file.BlockEntries; + public Models.GCF.BlockEntry[] BlockEntries => _file.BlockEntries; #endregion @@ -107,7 +107,7 @@ namespace BinaryObjectScanner.Wrappers #region Fragmentation Maps /// - public BinaryObjectScanner.Models.GCF.FragmentationMap[] FragmentationMaps => _file.FragmentationMaps; + public Models.GCF.FragmentationMap[] FragmentationMaps => _file.FragmentationMaps; #endregion @@ -133,7 +133,7 @@ namespace BinaryObjectScanner.Wrappers #region Block Entry Maps /// - public BinaryObjectScanner.Models.GCF.BlockEntryMap[] BlockEntryMaps => _file.BlockEntryMaps; + public Models.GCF.BlockEntryMap[] BlockEntryMaps => _file.BlockEntryMaps; #endregion @@ -186,7 +186,7 @@ namespace BinaryObjectScanner.Wrappers #region Directory Entries /// - public BinaryObjectScanner.Models.GCF.DirectoryEntry[] DirectoryEntries => _file.DirectoryEntries; + public Models.GCF.DirectoryEntry[] DirectoryEntries => _file.DirectoryEntries; #endregion @@ -200,28 +200,28 @@ namespace BinaryObjectScanner.Wrappers #region Directory Info 1 Entries /// - public BinaryObjectScanner.Models.GCF.DirectoryInfo1Entry[] DirectoryInfo1Entries => _file.DirectoryInfo1Entries; + public Models.GCF.DirectoryInfo1Entry[] DirectoryInfo1Entries => _file.DirectoryInfo1Entries; #endregion #region Directory Info 2 Entries /// - public BinaryObjectScanner.Models.GCF.DirectoryInfo2Entry[] DirectoryInfo2Entries => _file.DirectoryInfo2Entries; + public Models.GCF.DirectoryInfo2Entry[] DirectoryInfo2Entries => _file.DirectoryInfo2Entries; #endregion #region Directory Copy Entries /// - public BinaryObjectScanner.Models.GCF.DirectoryCopyEntry[] DirectoryCopyEntries => _file.DirectoryCopyEntries; + public Models.GCF.DirectoryCopyEntry[] DirectoryCopyEntries => _file.DirectoryCopyEntries; #endregion #region Directory Local Entries /// - public BinaryObjectScanner.Models.GCF.DirectoryLocalEntry[] DirectoryLocalEntries => _file.DirectoryLocalEntries; + public Models.GCF.DirectoryLocalEntry[] DirectoryLocalEntries => _file.DirectoryLocalEntries; #endregion @@ -238,7 +238,7 @@ namespace BinaryObjectScanner.Wrappers #region Directory Map Entries /// - public BinaryObjectScanner.Models.GCF.DirectoryMapEntry[] DirectoryMapEntries => _file.DirectoryMapEntries; + public Models.GCF.DirectoryMapEntry[] DirectoryMapEntries => _file.DirectoryMapEntries; #endregion @@ -271,14 +271,14 @@ namespace BinaryObjectScanner.Wrappers #region Checksum Map Entries /// - public BinaryObjectScanner.Models.GCF.ChecksumMapEntry[] ChecksumMapEntries => _file.ChecksumMapEntries; + public Models.GCF.ChecksumMapEntry[] ChecksumMapEntries => _file.ChecksumMapEntries; #endregion #region Checksum Entries /// - public BinaryObjectScanner.Models.GCF.ChecksumEntry[] ChecksumEntries => _file.ChecksumEntries; + public Models.GCF.ChecksumEntry[] ChecksumEntries => _file.ChecksumEntries; #endregion @@ -328,17 +328,17 @@ namespace BinaryObjectScanner.Wrappers var directoryMapEntry = DirectoryMapEntries[i]; // If we have a directory, skip for now - if (!directoryEntry.DirectoryFlags.HasFlag(BinaryObjectScanner.Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_FILE)) + if (!directoryEntry.DirectoryFlags.HasFlag(Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_FILE)) continue; // Otherwise, start building the file info var fileInfo = new FileInfo() { Size = directoryEntry.ItemSize, - Encrypted = directoryEntry.DirectoryFlags.HasFlag(BinaryObjectScanner.Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_ENCRYPTED), + Encrypted = directoryEntry.DirectoryFlags.HasFlag(Models.GCF.HL_GCF_FLAG.HL_GCF_FLAG_ENCRYPTED), }; var pathParts = new List { directoryEntry.Name }; - var blockEntries = new List(); + var blockEntries = new List(); // Traverse the parent tree uint index = directoryEntry.ParentIndex; @@ -406,7 +406,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the GCF /// - private BinaryObjectScanner.Models.GCF.File _file; + private Models.GCF.File _file; /// /// Set of all files and their information @@ -1109,7 +1109,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Array of block entries /// - public BinaryObjectScanner.Models.GCF.BlockEntry[] BlockEntries; + public Models.GCF.BlockEntry[] BlockEntries; } #endregion diff --git a/BinaryObjectScanner.Wrappers/InstallShieldCabinet.cs b/BinaryObjectScanner.Wrappers/InstallShieldCabinet.cs index a09f160f..862e14c9 100644 --- a/BinaryObjectScanner.Wrappers/InstallShieldCabinet.cs +++ b/BinaryObjectScanner.Wrappers/InstallShieldCabinet.cs @@ -177,35 +177,35 @@ namespace BinaryObjectScanner.Wrappers #region File Descriptors /// - public BinaryObjectScanner.Models.InstallShieldCabinet.FileDescriptor[] FileDescriptors => _cabinet.FileDescriptors; + public Models.InstallShieldCabinet.FileDescriptor[] FileDescriptors => _cabinet.FileDescriptors; #endregion #region File Group Offsets /// - public Dictionary FileGroupOffsets => _cabinet.FileGroupOffsets; + public Dictionary FileGroupOffsets => _cabinet.FileGroupOffsets; #endregion #region File Groups /// - public BinaryObjectScanner.Models.InstallShieldCabinet.FileGroup[] FileGroups => _cabinet.FileGroups; + public Models.InstallShieldCabinet.FileGroup[] FileGroups => _cabinet.FileGroups; #endregion #region Component Offsets /// - public Dictionary ComponentOffsets => _cabinet.ComponentOffsets; + public Dictionary ComponentOffsets => _cabinet.ComponentOffsets; #endregion #region Components /// - public BinaryObjectScanner.Models.InstallShieldCabinet.Component[] Components => _cabinet.Components; + public Models.InstallShieldCabinet.Component[] Components => _cabinet.Components; #endregion @@ -243,7 +243,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the cabinet /// - private BinaryObjectScanner.Models.InstallShieldCabinet.Cabinet _cabinet; + private Models.InstallShieldCabinet.Cabinet _cabinet; #endregion diff --git a/BinaryObjectScanner.Wrappers/LinearExecutable.cs b/BinaryObjectScanner.Wrappers/LinearExecutable.cs index 6e1df012..fd483d34 100644 --- a/BinaryObjectScanner.Wrappers/LinearExecutable.cs +++ b/BinaryObjectScanner.Wrappers/LinearExecutable.cs @@ -90,25 +90,25 @@ namespace BinaryObjectScanner.Wrappers public string Signature => _executable.InformationBlock.Signature; /// - public BinaryObjectScanner.Models.LinearExecutable.ByteOrder ByteOrder => _executable.InformationBlock.ByteOrder; + public Models.LinearExecutable.ByteOrder ByteOrder => _executable.InformationBlock.ByteOrder; /// - public BinaryObjectScanner.Models.LinearExecutable.WordOrder WordOrder => _executable.InformationBlock.WordOrder; + public Models.LinearExecutable.WordOrder WordOrder => _executable.InformationBlock.WordOrder; /// public uint ExecutableFormatLevel => _executable.InformationBlock.ExecutableFormatLevel; /// - public BinaryObjectScanner.Models.LinearExecutable.CPUType CPUType => _executable.InformationBlock.CPUType; + public Models.LinearExecutable.CPUType CPUType => _executable.InformationBlock.CPUType; /// - public BinaryObjectScanner.Models.LinearExecutable.OperatingSystem ModuleOS => _executable.InformationBlock.ModuleOS; + public Models.LinearExecutable.OperatingSystem ModuleOS => _executable.InformationBlock.ModuleOS; /// public uint ModuleVersion => _executable.InformationBlock.ModuleVersion; /// - public BinaryObjectScanner.Models.LinearExecutable.ModuleFlags ModuleTypeFlags => _executable.InformationBlock.ModuleTypeFlags; + public Models.LinearExecutable.ModuleFlags ModuleTypeFlags => _executable.InformationBlock.ModuleTypeFlags; /// public uint ModuleNumberPages => _executable.InformationBlock.ModuleNumberPages; @@ -229,43 +229,43 @@ namespace BinaryObjectScanner.Wrappers #region Tables /// - public BinaryObjectScanner.Models.LinearExecutable.ObjectTableEntry[] ObjectTable => _executable.ObjectTable; + public Models.LinearExecutable.ObjectTableEntry[] ObjectTable => _executable.ObjectTable; /// - public BinaryObjectScanner.Models.LinearExecutable.ObjectPageMapEntry[] ObjectPageMap => _executable.ObjectPageMap; + public Models.LinearExecutable.ObjectPageMapEntry[] ObjectPageMap => _executable.ObjectPageMap; /// - public BinaryObjectScanner.Models.LinearExecutable.ResourceTableEntry[] ResourceTable => _executable.ResourceTable; + public Models.LinearExecutable.ResourceTableEntry[] ResourceTable => _executable.ResourceTable; /// - public BinaryObjectScanner.Models.LinearExecutable.ResidentNamesTableEntry[] ResidentNamesTable => _executable.ResidentNamesTable; + public Models.LinearExecutable.ResidentNamesTableEntry[] ResidentNamesTable => _executable.ResidentNamesTable; /// - public BinaryObjectScanner.Models.LinearExecutable.EntryTableBundle[] EntryTable => _executable.EntryTable; + public Models.LinearExecutable.EntryTableBundle[] EntryTable => _executable.EntryTable; /// - public BinaryObjectScanner.Models.LinearExecutable.ModuleFormatDirectivesTableEntry[] ModuleFormatDirectivesTable => _executable.ModuleFormatDirectivesTable; + public Models.LinearExecutable.ModuleFormatDirectivesTableEntry[] ModuleFormatDirectivesTable => _executable.ModuleFormatDirectivesTable; /// - public BinaryObjectScanner.Models.LinearExecutable.VerifyRecordDirectiveTableEntry[] VerifyRecordDirectiveTable => _executable.VerifyRecordDirectiveTable; + public Models.LinearExecutable.VerifyRecordDirectiveTableEntry[] VerifyRecordDirectiveTable => _executable.VerifyRecordDirectiveTable; /// - public BinaryObjectScanner.Models.LinearExecutable.PerPageChecksumTableEntry[] PerPageChecksumTable => _executable.PerPageChecksumTable; + public Models.LinearExecutable.PerPageChecksumTableEntry[] PerPageChecksumTable => _executable.PerPageChecksumTable; /// - public BinaryObjectScanner.Models.LinearExecutable.FixupPageTableEntry[] FixupPageTable => _executable.FixupPageTable; + public Models.LinearExecutable.FixupPageTableEntry[] FixupPageTable => _executable.FixupPageTable; /// - public BinaryObjectScanner.Models.LinearExecutable.FixupRecordTableEntry[] FixupRecordTable => _executable.FixupRecordTable; + public Models.LinearExecutable.FixupRecordTableEntry[] FixupRecordTable => _executable.FixupRecordTable; /// - public BinaryObjectScanner.Models.LinearExecutable.ImportModuleNameTableEntry[] ImportModuleNameTable => _executable.ImportModuleNameTable; + public Models.LinearExecutable.ImportModuleNameTableEntry[] ImportModuleNameTable => _executable.ImportModuleNameTable; /// - public BinaryObjectScanner.Models.LinearExecutable.ImportModuleProcedureNameTableEntry[] ImportModuleProcedureNameTable => _executable.ImportModuleProcedureNameTable; + public Models.LinearExecutable.ImportModuleProcedureNameTableEntry[] ImportModuleProcedureNameTable => _executable.ImportModuleProcedureNameTable; /// - public BinaryObjectScanner.Models.LinearExecutable.NonResidentNamesTableEntry[] NonResidentNamesTable => _executable.NonResidentNamesTable; + public Models.LinearExecutable.NonResidentNamesTableEntry[] NonResidentNamesTable => _executable.NonResidentNamesTable; #endregion @@ -275,7 +275,7 @@ namespace BinaryObjectScanner.Wrappers public string DI_Signature => _executable.DebugInformation?.Signature; /// - public BinaryObjectScanner.Models.LinearExecutable.DebugFormatType? DI_FormatType => _executable.DebugInformation?.FormatType; + public Models.LinearExecutable.DebugFormatType? DI_FormatType => _executable.DebugInformation?.FormatType; /// public byte[] DebuggerData => _executable.DebugInformation?.DebuggerData; @@ -295,7 +295,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the executable /// - private BinaryObjectScanner.Models.LinearExecutable.Executable _executable; + private Models.LinearExecutable.Executable _executable; #endregion @@ -628,32 +628,32 @@ namespace BinaryObjectScanner.Wrappers { var entry = bundle.TableEntries[j]; builder.AppendLine($" Entry Table Entry {j}"); - switch (bundle.BundleType & ~BinaryObjectScanner.Models.LinearExecutable.BundleType.ParameterTypingInformationPresent) + switch (bundle.BundleType & ~Models.LinearExecutable.BundleType.ParameterTypingInformationPresent) { - case BinaryObjectScanner.Models.LinearExecutable.BundleType.UnusedEntry: + case Models.LinearExecutable.BundleType.UnusedEntry: builder.AppendLine($" Unused, empty entry"); break; - case BinaryObjectScanner.Models.LinearExecutable.BundleType.SixteenBitEntry: + case Models.LinearExecutable.BundleType.SixteenBitEntry: builder.AppendLine($" Object number: {entry.SixteenBitObjectNumber} (0x{entry.SixteenBitObjectNumber:X})"); builder.AppendLine($" Entry flags: {entry.SixteenBitEntryFlags} (0x{entry.SixteenBitEntryFlags:X})"); builder.AppendLine($" Offset: {entry.SixteenBitOffset} (0x{entry.SixteenBitOffset:X})"); break; - case BinaryObjectScanner.Models.LinearExecutable.BundleType.TwoEightySixCallGateEntry: + case Models.LinearExecutable.BundleType.TwoEightySixCallGateEntry: builder.AppendLine($" Object number: {entry.TwoEightySixObjectNumber} (0x{entry.TwoEightySixObjectNumber:X})"); builder.AppendLine($" Entry flags: {entry.TwoEightySixEntryFlags} (0x{entry.TwoEightySixEntryFlags:X})"); builder.AppendLine($" Offset: {entry.TwoEightySixOffset} (0x{entry.TwoEightySixOffset:X})"); builder.AppendLine($" Callgate: {entry.TwoEightySixCallgate} (0x{entry.TwoEightySixCallgate:X})"); break; - case BinaryObjectScanner.Models.LinearExecutable.BundleType.ThirtyTwoBitEntry: + case Models.LinearExecutable.BundleType.ThirtyTwoBitEntry: builder.AppendLine($" Object number: {entry.ThirtyTwoBitObjectNumber} (0x{entry.ThirtyTwoBitObjectNumber:X})"); builder.AppendLine($" Entry flags: {entry.ThirtyTwoBitEntryFlags} (0x{entry.ThirtyTwoBitEntryFlags:X})"); builder.AppendLine($" Offset: {entry.ThirtyTwoBitOffset} (0x{entry.ThirtyTwoBitOffset:X})"); break; - case BinaryObjectScanner.Models.LinearExecutable.BundleType.ForwarderEntry: + case Models.LinearExecutable.BundleType.ForwarderEntry: builder.AppendLine($" Reserved: {entry.ForwarderReserved} (0x{entry.ForwarderReserved:X})"); builder.AppendLine($" Forwarder flags: {entry.ForwarderFlags} (0x{entry.ForwarderFlags:X})"); builder.AppendLine($" Module ordinal number: {entry.ForwarderModuleOrdinalNumber} (0x{entry.ForwarderModuleOrdinalNumber:X})"); @@ -775,25 +775,25 @@ namespace BinaryObjectScanner.Wrappers builder.AppendLine($" Target flags: {entry.TargetFlags} (0x{entry.TargetFlags:X})"); // Source list flag - if (entry.SourceType.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordSourceType.SourceListFlag)) + if (entry.SourceType.HasFlag(Models.LinearExecutable.FixupRecordSourceType.SourceListFlag)) builder.AppendLine($" Source offset list count: {entry.SourceOffsetListCount} (0x{entry.SourceOffsetListCount:X})"); else builder.AppendLine($" Source offset: {entry.SourceOffset} (0x{entry.SourceOffset:X})"); // OBJECT / TRGOFF - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.InternalReference)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.InternalReference)) { // 16-bit Object Number/Module Ordinal Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag)) builder.AppendLine($" Target object number: {entry.TargetObjectNumberWORD} (0x{entry.TargetObjectNumberWORD:X})"); else builder.AppendLine($" Target object number: {entry.TargetObjectNumberByte} (0x{entry.TargetObjectNumberByte:X})"); // 16-bit Selector fixup - if (!entry.SourceType.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordSourceType.SixteenBitSelectorFixup)) + if (!entry.SourceType.HasFlag(Models.LinearExecutable.FixupRecordSourceType.SixteenBitSelectorFixup)) { // 32-bit Target Offset Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag)) builder.AppendLine($" Target offset: {entry.TargetOffsetDWORD} (0x{entry.TargetOffsetDWORD:X})"); else builder.AppendLine($" Target offset: {entry.TargetOffsetWORD} (0x{entry.TargetOffsetWORD:X})"); @@ -801,27 +801,27 @@ namespace BinaryObjectScanner.Wrappers } // MOD ORD# / IMPORT ORD / ADDITIVE - else if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.ImportedReferenceByOrdinal)) + else if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.ImportedReferenceByOrdinal)) { // 16-bit Object Number/Module Ordinal Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag)) builder.AppendLine(value: $" Ordinal index import module name table: {entry.OrdinalIndexImportModuleNameTableWORD} (0x{entry.OrdinalIndexImportModuleNameTableWORD:X})"); else builder.AppendLine(value: $" Ordinal index import module name table: {entry.OrdinalIndexImportModuleNameTableByte} (0x{entry.OrdinalIndexImportModuleNameTableByte:X})"); // 8-bit Ordinal Flag & 32-bit Target Offset Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.EightBitOrdinalFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.EightBitOrdinalFlag)) builder.AppendLine(value: $" Imported ordinal number: {entry.ImportedOrdinalNumberByte} (0x{entry.ImportedOrdinalNumberByte:X})"); - else if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag)) + else if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag)) builder.AppendLine(value: $" Imported ordinal number: {entry.ImportedOrdinalNumberDWORD} (0x{entry.ImportedOrdinalNumberDWORD:X})"); else builder.AppendLine(value: $" Imported ordinal number: {entry.ImportedOrdinalNumberWORD} (0x{entry.ImportedOrdinalNumberWORD:X})"); // Additive Fixup Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.AdditiveFixupFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.AdditiveFixupFlag)) { // 32-bit Additive Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag)) builder.AppendLine(value: $" Additive fixup value: {entry.AdditiveFixupValueDWORD} (0x{entry.AdditiveFixupValueDWORD:X})"); else builder.AppendLine(value: $" Additive fixup value: {entry.AdditiveFixupValueWORD} (0x{entry.AdditiveFixupValueWORD:X})"); @@ -829,25 +829,25 @@ namespace BinaryObjectScanner.Wrappers } // MOD ORD# / PROCEDURE NAME OFFSET / ADDITIVE - else if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.ImportedReferenceByName)) + else if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.ImportedReferenceByName)) { // 16-bit Object Number/Module Ordinal Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag)) builder.AppendLine(value: $" Ordinal index import module name table: {entry.OrdinalIndexImportModuleNameTableWORD} (0x{entry.OrdinalIndexImportModuleNameTableWORD:X})"); else builder.AppendLine(value: $" Ordinal index import module name table: {entry.OrdinalIndexImportModuleNameTableByte} (0x{entry.OrdinalIndexImportModuleNameTableByte:X})"); // 32-bit Target Offset Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitTargetOffsetFlag)) builder.AppendLine(value: $" Offset import procedure name table: {entry.OffsetImportProcedureNameTableDWORD} (0x{entry.OffsetImportProcedureNameTableDWORD:X})"); else builder.AppendLine(value: $" Offset import procedure name table: {entry.OffsetImportProcedureNameTableWORD} (0x{entry.OffsetImportProcedureNameTableWORD:X})"); // Additive Fixup Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.AdditiveFixupFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.AdditiveFixupFlag)) { // 32-bit Additive Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag)) builder.AppendLine(value: $" Additive fixup value: {entry.AdditiveFixupValueDWORD} (0x{entry.AdditiveFixupValueDWORD:X})"); else builder.AppendLine(value: $" Additive fixup value: {entry.AdditiveFixupValueWORD} (0x{entry.AdditiveFixupValueWORD:X})"); @@ -855,19 +855,19 @@ namespace BinaryObjectScanner.Wrappers } // ORD # / ADDITIVE - else if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.InternalReferenceViaEntryTable)) + else if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.InternalReferenceViaEntryTable)) { // 16-bit Object Number/Module Ordinal Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.SixteenBitObjectNumberModuleOrdinalFlag)) builder.AppendLine($" Target object number: {entry.TargetObjectNumberWORD} (0x{entry.TargetObjectNumberWORD:X})"); else builder.AppendLine($" Target object number: {entry.TargetObjectNumberByte} (0x{entry.TargetObjectNumberByte:X})"); // Additive Fixup Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.AdditiveFixupFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.AdditiveFixupFlag)) { // 32-bit Additive Flag - if (entry.TargetFlags.HasFlag(BinaryObjectScanner.Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag)) + if (entry.TargetFlags.HasFlag(Models.LinearExecutable.FixupRecordTargetFlags.ThirtyTwoBitAdditiveFixupFlag)) builder.AppendLine(value: $" Additive fixup value: {entry.AdditiveFixupValueDWORD} (0x{entry.AdditiveFixupValueDWORD:X})"); else builder.AppendLine(value: $" Additive fixup value: {entry.AdditiveFixupValueWORD} (0x{entry.AdditiveFixupValueWORD:X})"); diff --git a/BinaryObjectScanner.Wrappers/MSDOS.cs b/BinaryObjectScanner.Wrappers/MSDOS.cs index 91574041..d9533f0e 100644 --- a/BinaryObjectScanner.Wrappers/MSDOS.cs +++ b/BinaryObjectScanner.Wrappers/MSDOS.cs @@ -82,7 +82,7 @@ namespace BinaryObjectScanner.Wrappers #region Relocation Table /// - public BinaryObjectScanner.Models.MSDOS.RelocationEntry[] RelocationTable => _executable.RelocationTable; + public Models.MSDOS.RelocationEntry[] RelocationTable => _executable.RelocationTable; #endregion @@ -93,7 +93,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the executable /// - private BinaryObjectScanner.Models.MSDOS.Executable _executable; + private Models.MSDOS.Executable _executable; #endregion diff --git a/BinaryObjectScanner.Wrappers/N3DS.cs b/BinaryObjectScanner.Wrappers/N3DS.cs index 5e6d0d2d..02caf0cd 100644 --- a/BinaryObjectScanner.Wrappers/N3DS.cs +++ b/BinaryObjectScanner.Wrappers/N3DS.cs @@ -32,13 +32,13 @@ namespace BinaryObjectScanner.Wrappers public byte[] MediaId => _cart.Header.MediaId; /// - public BinaryObjectScanner.Models.N3DS.FilesystemType PartitionsFSType => _cart.Header.PartitionsFSType; + public Models.N3DS.FilesystemType PartitionsFSType => _cart.Header.PartitionsFSType; /// public byte[] PartitionsCryptType => _cart.Header.PartitionsCryptType; /// - public BinaryObjectScanner.Models.N3DS.PartitionTableEntry[] PartitionsTable => _cart.Header.PartitionsTable; + public Models.N3DS.PartitionTableEntry[] PartitionsTable => _cart.Header.PartitionsTable; #endregion @@ -142,7 +142,7 @@ namespace BinaryObjectScanner.Wrappers public byte[] DCIH_ID_Reserved => _cart.DevelopmentCardInfoHeader?.InitialData?.Reserved; /// - public BinaryObjectScanner.Models.N3DS.NCCHHeader DCIH_ID_BackupHeader => _cart.DevelopmentCardInfoHeader?.InitialData?.BackupHeader; + public Models.N3DS.NCCHHeader DCIH_ID_BackupHeader => _cart.DevelopmentCardInfoHeader?.InitialData?.BackupHeader; #endregion @@ -194,28 +194,28 @@ namespace BinaryObjectScanner.Wrappers #region Partitions /// - public BinaryObjectScanner.Models.N3DS.NCCHHeader[] Partitions => _cart.Partitions; + public Models.N3DS.NCCHHeader[] Partitions => _cart.Partitions; #endregion #region Extended Headers /// - public BinaryObjectScanner.Models.N3DS.NCCHExtendedHeader[] ExtendedHeaders => _cart.ExtendedHeaders; + public Models.N3DS.NCCHExtendedHeader[] ExtendedHeaders => _cart.ExtendedHeaders; #endregion #region ExeFS Headers /// - public BinaryObjectScanner.Models.N3DS.ExeFSHeader[] ExeFSHeaders => _cart.ExeFSHeaders; + public Models.N3DS.ExeFSHeader[] ExeFSHeaders => _cart.ExeFSHeaders; #endregion #region RomFS Headers /// - public BinaryObjectScanner.Models.N3DS.RomFSHeader[] RomFSHeaders => _cart.RomFSHeaders; + public Models.N3DS.RomFSHeader[] RomFSHeaders => _cart.RomFSHeaders; #endregion @@ -226,7 +226,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the cart /// - private BinaryObjectScanner.Models.N3DS.Cart _cart; + private Models.N3DS.Cart _cart; #endregion diff --git a/BinaryObjectScanner.Wrappers/NCF.cs b/BinaryObjectScanner.Wrappers/NCF.cs index 42e502f8..a571e4b8 100644 --- a/BinaryObjectScanner.Wrappers/NCF.cs +++ b/BinaryObjectScanner.Wrappers/NCF.cs @@ -100,7 +100,7 @@ namespace BinaryObjectScanner.Wrappers #region Directory Entries /// - public BinaryObjectScanner.Models.NCF.DirectoryEntry[] DirectoryEntries => _file.DirectoryEntries; + public Models.NCF.DirectoryEntry[] DirectoryEntries => _file.DirectoryEntries; #endregion @@ -114,28 +114,28 @@ namespace BinaryObjectScanner.Wrappers #region Directory Info 1 Entries /// - public BinaryObjectScanner.Models.NCF.DirectoryInfo1Entry[] DirectoryInfo1Entries => _file.DirectoryInfo1Entries; + public Models.NCF.DirectoryInfo1Entry[] DirectoryInfo1Entries => _file.DirectoryInfo1Entries; #endregion #region Directory Info 2 Entries /// - public BinaryObjectScanner.Models.NCF.DirectoryInfo2Entry[] DirectoryInfo2Entries => _file.DirectoryInfo2Entries; + public Models.NCF.DirectoryInfo2Entry[] DirectoryInfo2Entries => _file.DirectoryInfo2Entries; #endregion #region Directory Copy Entries /// - public BinaryObjectScanner.Models.NCF.DirectoryCopyEntry[] DirectoryCopyEntries => _file.DirectoryCopyEntries; + public Models.NCF.DirectoryCopyEntry[] DirectoryCopyEntries => _file.DirectoryCopyEntries; #endregion #region Directory Local Entries /// - public BinaryObjectScanner.Models.NCF.DirectoryLocalEntry[] DirectoryLocalEntries => _file.DirectoryLocalEntries; + public Models.NCF.DirectoryLocalEntry[] DirectoryLocalEntries => _file.DirectoryLocalEntries; #endregion @@ -152,7 +152,7 @@ namespace BinaryObjectScanner.Wrappers #region Unknown Entries /// - public BinaryObjectScanner.Models.NCF.UnknownEntry[] UnknownEntries => _file.UnknownEntries; + public Models.NCF.UnknownEntry[] UnknownEntries => _file.UnknownEntries; #endregion @@ -185,14 +185,14 @@ namespace BinaryObjectScanner.Wrappers #region Checksum Map Entries /// - public BinaryObjectScanner.Models.NCF.ChecksumMapEntry[] ChecksumMapEntries => _file.ChecksumMapEntries; + public Models.NCF.ChecksumMapEntry[] ChecksumMapEntries => _file.ChecksumMapEntries; #endregion #region Checksum Entries /// - public BinaryObjectScanner.Models.NCF.ChecksumEntry[] ChecksumEntries => _file.ChecksumEntries; + public Models.NCF.ChecksumEntry[] ChecksumEntries => _file.ChecksumEntries; #endregion @@ -203,7 +203,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the NCF /// - private BinaryObjectScanner.Models.NCF.File _file; + private Models.NCF.File _file; #endregion diff --git a/BinaryObjectScanner.Wrappers/NewExecutable.cs b/BinaryObjectScanner.Wrappers/NewExecutable.cs index 08fd210f..5761318c 100644 --- a/BinaryObjectScanner.Wrappers/NewExecutable.cs +++ b/BinaryObjectScanner.Wrappers/NewExecutable.cs @@ -107,7 +107,7 @@ namespace BinaryObjectScanner.Wrappers public uint CrcChecksum => _executable.Header.CrcChecksum; /// - public BinaryObjectScanner.Models.NewExecutable.HeaderFlag FlagWord => _executable.Header.FlagWord; + public Models.NewExecutable.HeaderFlag FlagWord => _executable.Header.FlagWord; /// public ushort AutomaticDataSegmentNumber => _executable.Header.AutomaticDataSegmentNumber; @@ -161,10 +161,10 @@ namespace BinaryObjectScanner.Wrappers public ushort ResourceEntriesCount => _executable.Header.ResourceEntriesCount; /// - public BinaryObjectScanner.Models.NewExecutable.OperatingSystem TargetOperatingSystem => _executable.Header.TargetOperatingSystem; + public Models.NewExecutable.OperatingSystem TargetOperatingSystem => _executable.Header.TargetOperatingSystem; /// - public BinaryObjectScanner.Models.NewExecutable.OS2Flag AdditionalFlags => _executable.Header.AdditionalFlags; + public Models.NewExecutable.OS2Flag AdditionalFlags => _executable.Header.AdditionalFlags; /// public ushort ReturnThunkOffset => _executable.Header.ReturnThunkOffset; @@ -186,25 +186,25 @@ namespace BinaryObjectScanner.Wrappers #region Tables /// - public BinaryObjectScanner.Models.NewExecutable.SegmentTableEntry[] SegmentTable => _executable.SegmentTable; + public Models.NewExecutable.SegmentTableEntry[] SegmentTable => _executable.SegmentTable; /// - public BinaryObjectScanner.Models.NewExecutable.ResourceTable ResourceTable => _executable.ResourceTable; + public Models.NewExecutable.ResourceTable ResourceTable => _executable.ResourceTable; /// - public BinaryObjectScanner.Models.NewExecutable.ResidentNameTableEntry[] ResidentNameTable => _executable.ResidentNameTable; + public Models.NewExecutable.ResidentNameTableEntry[] ResidentNameTable => _executable.ResidentNameTable; /// - public BinaryObjectScanner.Models.NewExecutable.ModuleReferenceTableEntry[] ModuleReferenceTable => _executable.ModuleReferenceTable; + public Models.NewExecutable.ModuleReferenceTableEntry[] ModuleReferenceTable => _executable.ModuleReferenceTable; /// public Dictionary ImportedNameTable => _executable.ImportedNameTable; /// - public BinaryObjectScanner.Models.NewExecutable.EntryTableBundle[] EntryTable => _executable.EntryTable; + public Models.NewExecutable.EntryTableBundle[] EntryTable => _executable.EntryTable; /// - public BinaryObjectScanner.Models.NewExecutable.NonResidentNameTableEntry[] NonResidentNameTable => _executable.NonResidentNameTable; + public Models.NewExecutable.NonResidentNameTableEntry[] NonResidentNameTable => _executable.NonResidentNameTable; #endregion @@ -221,7 +221,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the executable /// - private BinaryObjectScanner.Models.NewExecutable.Executable _executable; + private Models.NewExecutable.Executable _executable; #endregion @@ -577,11 +577,11 @@ namespace BinaryObjectScanner.Wrappers builder.AppendLine($" Segment indicator: {entry.SegmentIndicator} (0x{entry.SegmentIndicator:X}) ({entry.GetEntryType()})"); switch (entry.GetEntryType()) { - case BinaryObjectScanner.Models.NewExecutable.SegmentEntryType.FixedSegment: + case Models.NewExecutable.SegmentEntryType.FixedSegment: builder.AppendLine($" Flag word: {entry.FixedFlagWord} (0x{entry.FixedFlagWord:X})"); builder.AppendLine($" Offset: {entry.FixedOffset} (0x{entry.FixedOffset:X})"); break; - case BinaryObjectScanner.Models.NewExecutable.SegmentEntryType.MoveableSegment: + case Models.NewExecutable.SegmentEntryType.MoveableSegment: builder.AppendLine($" Flag word: {entry.MoveableFlagWord} (0x{entry.MoveableFlagWord:X})"); builder.AppendLine($" Reserved: {entry.MoveableReserved} (0x{entry.MoveableReserved:X})"); builder.AppendLine($" Segment number: {entry.MoveableSegmentNumber} (0x{entry.MoveableSegmentNumber:X})"); diff --git a/BinaryObjectScanner.Wrappers/Nitro.cs b/BinaryObjectScanner.Wrappers/Nitro.cs index bb493a5e..5156e9de 100644 --- a/BinaryObjectScanner.Wrappers/Nitro.cs +++ b/BinaryObjectScanner.Wrappers/Nitro.cs @@ -27,7 +27,7 @@ namespace BinaryObjectScanner.Wrappers public string MakerCode => _cart.CommonHeader.MakerCode; /// - public BinaryObjectScanner.Models.Nitro.Unitcode UnitCode => _cart.CommonHeader.UnitCode; + public Models.Nitro.Unitcode UnitCode => _cart.CommonHeader.UnitCode; /// public byte EncryptionSeedSelect => _cart.CommonHeader.EncryptionSeedSelect; @@ -300,17 +300,17 @@ namespace BinaryObjectScanner.Wrappers #region Name Table /// - public BinaryObjectScanner.Models.Nitro.FolderAllocationTableEntry[] FolderAllocationTable => _cart.NameTable.FolderAllocationTable; + public Models.Nitro.FolderAllocationTableEntry[] FolderAllocationTable => _cart.NameTable.FolderAllocationTable; /// - public BinaryObjectScanner.Models.Nitro.NameListEntry[] NameList => _cart.NameTable.NameList; + public Models.Nitro.NameListEntry[] NameList => _cart.NameTable.NameList; #endregion #region File Allocation Table /// - public BinaryObjectScanner.Models.Nitro.FileAllocationTableEntry[] FileAllocationTable => _cart.FileAllocationTable; + public Models.Nitro.FileAllocationTableEntry[] FileAllocationTable => _cart.FileAllocationTable; #endregion diff --git a/BinaryObjectScanner.Wrappers/PAK.cs b/BinaryObjectScanner.Wrappers/PAK.cs index 48f7cfc8..54032288 100644 --- a/BinaryObjectScanner.Wrappers/PAK.cs +++ b/BinaryObjectScanner.Wrappers/PAK.cs @@ -30,7 +30,7 @@ namespace BinaryObjectScanner.Wrappers #region Directory Items /// - public BinaryObjectScanner.Models.PAK.DirectoryItem[] DirectoryItems => _file.DirectoryItems; + public Models.PAK.DirectoryItem[] DirectoryItems => _file.DirectoryItems; #endregion @@ -47,7 +47,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the PAK /// - private BinaryObjectScanner.Models.PAK.File _file; + private Models.PAK.File _file; #endregion diff --git a/BinaryObjectScanner.Wrappers/PFF.cs b/BinaryObjectScanner.Wrappers/PFF.cs index e28c3d5a..96a67bf3 100644 --- a/BinaryObjectScanner.Wrappers/PFF.cs +++ b/BinaryObjectScanner.Wrappers/PFF.cs @@ -36,7 +36,7 @@ namespace BinaryObjectScanner.Wrappers #region Segments /// - public BinaryObjectScanner.Models.PFF.Segment[] Segments => _archive.Segments; + public Models.PFF.Segment[] Segments => _archive.Segments; #endregion diff --git a/BinaryObjectScanner.Wrappers/PlayJAudioFile.cs b/BinaryObjectScanner.Wrappers/PlayJAudioFile.cs index 58b91125..43cdcc44 100644 --- a/BinaryObjectScanner.Wrappers/PlayJAudioFile.cs +++ b/BinaryObjectScanner.Wrappers/PlayJAudioFile.cs @@ -26,107 +26,107 @@ namespace BinaryObjectScanner.Wrappers #region V1 Only /// - public uint? V1_TrackID => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV1)?.TrackID; + public uint? V1_TrackID => (_audioFile.Header as Models.PlayJ.AudioHeaderV1)?.TrackID; /// - public uint? V1_UnknownOffset1 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV1)?.UnknownOffset1; + public uint? V1_UnknownOffset1 => (_audioFile.Header as Models.PlayJ.AudioHeaderV1)?.UnknownOffset1; /// - public uint? V1_UnknownOffset2 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV1)?.UnknownOffset2; + public uint? V1_UnknownOffset2 => (_audioFile.Header as Models.PlayJ.AudioHeaderV1)?.UnknownOffset2; /// - public uint? V1_UnknownOffset3 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV1)?.UnknownOffset3; + public uint? V1_UnknownOffset3 => (_audioFile.Header as Models.PlayJ.AudioHeaderV1)?.UnknownOffset3; /// - public uint? V1_Unknown1 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV1)?.Unknown1; + public uint? V1_Unknown1 => (_audioFile.Header as Models.PlayJ.AudioHeaderV1)?.Unknown1; /// - public uint? V1_Unknown2 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV1)?.Unknown2; + public uint? V1_Unknown2 => (_audioFile.Header as Models.PlayJ.AudioHeaderV1)?.Unknown2; /// - public uint? V1_Year => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV1)?.Year; + public uint? V1_Year => (_audioFile.Header as Models.PlayJ.AudioHeaderV1)?.Year; /// - public uint? V1_TrackNumber => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV1)?.TrackNumber; + public uint? V1_TrackNumber => (_audioFile.Header as Models.PlayJ.AudioHeaderV1)?.TrackNumber; /// - public BinaryObjectScanner.Models.PlayJ.Subgenre? V1_Subgenre => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV1)?.Subgenre; + public Models.PlayJ.Subgenre? V1_Subgenre => (_audioFile.Header as Models.PlayJ.AudioHeaderV1)?.Subgenre; /// - public uint? V1_Duration => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV1)?.Duration; + public uint? V1_Duration => (_audioFile.Header as Models.PlayJ.AudioHeaderV1)?.Duration; #endregion #region V2 Only /// - public uint? V2_Unknown1 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown1; + public uint? V2_Unknown1 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown1; /// - public uint? V2_Unknown2 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown2; + public uint? V2_Unknown2 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown2; /// - public uint? V2_Unknown3 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown3; + public uint? V2_Unknown3 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown3; /// - public uint? V2_Unknown4 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown4; + public uint? V2_Unknown4 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown4; /// - public uint? V2_Unknown5 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown5; + public uint? V2_Unknown5 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown5; /// - public uint? V2_Unknown6 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown6; + public uint? V2_Unknown6 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown6; /// - public uint? V2_UnknownOffset1 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.UnknownOffset1; + public uint? V2_UnknownOffset1 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.UnknownOffset1; /// - public uint? V2_Unknown7 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown7; + public uint? V2_Unknown7 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown7; /// - public uint? V2_Unknown8 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown8; + public uint? V2_Unknown8 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown8; /// - public uint? V2_Unknown9 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown9; + public uint? V2_Unknown9 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown9; /// - public uint? V2_UnknownOffset2 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.UnknownOffset2; + public uint? V2_UnknownOffset2 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.UnknownOffset2; /// - public uint? V2_Unknown10 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown10; + public uint? V2_Unknown10 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown10; /// - public uint? V2_Unknown11 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown11; + public uint? V2_Unknown11 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown11; /// - public uint? V2_Unknown12 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown12; + public uint? V2_Unknown12 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown12; /// - public uint? V2_Unknown13 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown13; + public uint? V2_Unknown13 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown13; /// - public uint? V2_Unknown14 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown14; + public uint? V2_Unknown14 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown14; /// - public uint? V2_Unknown15 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown15; + public uint? V2_Unknown15 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown15; /// - public uint? V2_Unknown16 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown16; + public uint? V2_Unknown16 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown16; /// - public uint? V2_Unknown17 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown17; + public uint? V2_Unknown17 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown17; /// - public uint? V2_TrackID => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.TrackID; + public uint? V2_TrackID => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.TrackID; /// - public uint? V2_Year => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Year; + public uint? V2_Year => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Year; /// - public uint? V2_TrackNumber => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.TrackNumber; + public uint? V2_TrackNumber => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.TrackNumber; /// - public uint? V2_Unknown18 => (_audioFile.Header as BinaryObjectScanner.Models.PlayJ.AudioHeaderV2)?.Unknown18; + public uint? V2_Unknown18 => (_audioFile.Header as Models.PlayJ.AudioHeaderV2)?.Unknown18; #endregion @@ -214,7 +214,7 @@ namespace BinaryObjectScanner.Wrappers #region Unknown Block 3 /// - public BinaryObjectScanner.Models.PlayJ.DataFile[] DataFiles => _audioFile.DataFiles; + public Models.PlayJ.DataFile[] DataFiles => _audioFile.DataFiles; #endregion @@ -227,7 +227,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the archive /// - private BinaryObjectScanner.Models.PlayJ.AudioFile _audioFile; + private Models.PlayJ.AudioFile _audioFile; #endregion diff --git a/BinaryObjectScanner.Wrappers/PortableExecutable.cs b/BinaryObjectScanner.Wrappers/PortableExecutable.cs index 922975f1..45b1184b 100644 --- a/BinaryObjectScanner.Wrappers/PortableExecutable.cs +++ b/BinaryObjectScanner.Wrappers/PortableExecutable.cs @@ -96,7 +96,7 @@ namespace BinaryObjectScanner.Wrappers #region COFF File Header /// - public BinaryObjectScanner.Models.PortableExecutable.MachineType Machine => _executable.COFFFileHeader.Machine; + public Models.PortableExecutable.MachineType Machine => _executable.COFFFileHeader.Machine; /// public ushort NumberOfSections => _executable.COFFFileHeader.NumberOfSections; @@ -114,7 +114,7 @@ namespace BinaryObjectScanner.Wrappers public uint SizeOfOptionalHeader => _executable.COFFFileHeader.SizeOfOptionalHeader; /// - public BinaryObjectScanner.Models.PortableExecutable.Characteristics Characteristics => _executable.COFFFileHeader.Characteristics; + public Models.PortableExecutable.Characteristics Characteristics => _executable.COFFFileHeader.Characteristics; #endregion @@ -123,7 +123,7 @@ namespace BinaryObjectScanner.Wrappers #region Standard Fields /// - public BinaryObjectScanner.Models.PortableExecutable.OptionalHeaderMagicNumber OH_Magic => _executable.OptionalHeader.Magic; + public Models.PortableExecutable.OptionalHeaderMagicNumber OH_Magic => _executable.OptionalHeader.Magic; /// public byte OH_MajorLinkerVersion => _executable.OptionalHeader.MajorLinkerVersion; @@ -197,10 +197,10 @@ namespace BinaryObjectScanner.Wrappers public uint OH_CheckSum => _executable.OptionalHeader.CheckSum; /// - public BinaryObjectScanner.Models.PortableExecutable.WindowsSubsystem OH_Subsystem => _executable.OptionalHeader.Subsystem; + public Models.PortableExecutable.WindowsSubsystem OH_Subsystem => _executable.OptionalHeader.Subsystem; /// - public BinaryObjectScanner.Models.PortableExecutable.DllCharacteristics OH_DllCharacteristics => _executable.OptionalHeader.DllCharacteristics; + public Models.PortableExecutable.DllCharacteristics OH_DllCharacteristics => _executable.OptionalHeader.DllCharacteristics; /// public ulong OH_SizeOfStackReserve => _executable.OptionalHeader.Magic == Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 @@ -233,49 +233,49 @@ namespace BinaryObjectScanner.Wrappers #region Data Directories /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_ExportTable => _executable.OptionalHeader.ExportTable; + public Models.PortableExecutable.DataDirectory OH_ExportTable => _executable.OptionalHeader.ExportTable; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_ImportTable => _executable.OptionalHeader.ImportTable; + public Models.PortableExecutable.DataDirectory OH_ImportTable => _executable.OptionalHeader.ImportTable; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_ResourceTable => _executable.OptionalHeader.ResourceTable; + public Models.PortableExecutable.DataDirectory OH_ResourceTable => _executable.OptionalHeader.ResourceTable; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_ExceptionTable => _executable.OptionalHeader.ExceptionTable; + public Models.PortableExecutable.DataDirectory OH_ExceptionTable => _executable.OptionalHeader.ExceptionTable; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_CertificateTable => _executable.OptionalHeader.CertificateTable; + public Models.PortableExecutable.DataDirectory OH_CertificateTable => _executable.OptionalHeader.CertificateTable; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_BaseRelocationTable => _executable.OptionalHeader.BaseRelocationTable; + public Models.PortableExecutable.DataDirectory OH_BaseRelocationTable => _executable.OptionalHeader.BaseRelocationTable; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_Debug => _executable.OptionalHeader.Debug; + public Models.PortableExecutable.DataDirectory OH_Debug => _executable.OptionalHeader.Debug; /// public ulong OH_Architecture => _executable.OptionalHeader.Architecture; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_GlobalPtr => _executable.OptionalHeader.GlobalPtr; + public Models.PortableExecutable.DataDirectory OH_GlobalPtr => _executable.OptionalHeader.GlobalPtr; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_ThreadLocalStorageTable => _executable.OptionalHeader.ThreadLocalStorageTable; + public Models.PortableExecutable.DataDirectory OH_ThreadLocalStorageTable => _executable.OptionalHeader.ThreadLocalStorageTable; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_LoadConfigTable => _executable.OptionalHeader.LoadConfigTable; + public Models.PortableExecutable.DataDirectory OH_LoadConfigTable => _executable.OptionalHeader.LoadConfigTable; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_BoundImport => _executable.OptionalHeader.BoundImport; + public Models.PortableExecutable.DataDirectory OH_BoundImport => _executable.OptionalHeader.BoundImport; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_ImportAddressTable => _executable.OptionalHeader.ImportAddressTable; + public Models.PortableExecutable.DataDirectory OH_ImportAddressTable => _executable.OptionalHeader.ImportAddressTable; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_DelayImportDescriptor => _executable.OptionalHeader.DelayImportDescriptor; + public Models.PortableExecutable.DataDirectory OH_DelayImportDescriptor => _executable.OptionalHeader.DelayImportDescriptor; /// - public BinaryObjectScanner.Models.PortableExecutable.DataDirectory OH_CLRRuntimeHeader => _executable.OptionalHeader.CLRRuntimeHeader; + public Models.PortableExecutable.DataDirectory OH_CLRRuntimeHeader => _executable.OptionalHeader.CLRRuntimeHeader; /// public ulong OH_Reserved => _executable.OptionalHeader.Reserved; @@ -287,38 +287,38 @@ namespace BinaryObjectScanner.Wrappers #region Tables /// - public BinaryObjectScanner.Models.PortableExecutable.SectionHeader[] SectionTable => _executable.SectionTable; + public Models.PortableExecutable.SectionHeader[] SectionTable => _executable.SectionTable; /// - public BinaryObjectScanner.Models.PortableExecutable.COFFSymbolTableEntry[] COFFSymbolTable => _executable.COFFSymbolTable; + public Models.PortableExecutable.COFFSymbolTableEntry[] COFFSymbolTable => _executable.COFFSymbolTable; /// - public BinaryObjectScanner.Models.PortableExecutable.COFFStringTable COFFStringTable => _executable.COFFStringTable; + public Models.PortableExecutable.COFFStringTable COFFStringTable => _executable.COFFStringTable; /// - public BinaryObjectScanner.Models.PortableExecutable.AttributeCertificateTableEntry[] AttributeCertificateTable => _executable.AttributeCertificateTable; + public Models.PortableExecutable.AttributeCertificateTableEntry[] AttributeCertificateTable => _executable.AttributeCertificateTable; /// - public BinaryObjectScanner.Models.PortableExecutable.DelayLoadDirectoryTable DelayLoadDirectoryTable => _executable.DelayLoadDirectoryTable; + public Models.PortableExecutable.DelayLoadDirectoryTable DelayLoadDirectoryTable => _executable.DelayLoadDirectoryTable; #endregion #region Sections /// - public BinaryObjectScanner.Models.PortableExecutable.BaseRelocationBlock[] BaseRelocationTable => _executable.BaseRelocationTable; + public Models.PortableExecutable.BaseRelocationBlock[] BaseRelocationTable => _executable.BaseRelocationTable; /// - public BinaryObjectScanner.Models.PortableExecutable.DebugTable DebugTable => _executable.DebugTable; + public Models.PortableExecutable.DebugTable DebugTable => _executable.DebugTable; /// - public BinaryObjectScanner.Models.PortableExecutable.ExportTable ExportTable => _executable.ExportTable; + public Models.PortableExecutable.ExportTable ExportTable => _executable.ExportTable; /// public string[] ExportNameTable => _executable.ExportTable?.ExportNameTable?.Strings; /// - public BinaryObjectScanner.Models.PortableExecutable.ImportTable ImportTable => _executable.ImportTable; + public Models.PortableExecutable.ImportTable ImportTable => _executable.ImportTable; /// public string[] ImportHintNameTable => _executable.ImportTable?.HintNameTable != null @@ -326,7 +326,7 @@ namespace BinaryObjectScanner.Wrappers : null; /// - public BinaryObjectScanner.Models.PortableExecutable.ResourceDirectoryTable ResourceDirectoryTable => _executable.ResourceDirectoryTable; + public Models.PortableExecutable.ResourceDirectoryTable ResourceDirectoryTable => _executable.ResourceDirectoryTable; #endregion @@ -884,7 +884,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the executable /// - private BinaryObjectScanner.Models.PortableExecutable.Executable _executable; + private Models.PortableExecutable.Executable _executable; /// /// Header padding data, if it exists @@ -959,12 +959,12 @@ namespace BinaryObjectScanner.Wrappers /// /// Cached version info data /// - private BinaryObjectScanner.Models.PortableExecutable.VersionInfo _versionInfo = null; + private Models.PortableExecutable.VersionInfo _versionInfo = null; /// /// Cached assembly manifest data /// - private BinaryObjectScanner.Models.PortableExecutable.AssemblyManifest _assemblyManifest = null; + private Models.PortableExecutable.AssemblyManifest _assemblyManifest = null; /// /// Lock object for reading from the source @@ -1069,7 +1069,7 @@ namespace BinaryObjectScanner.Wrappers /// Get the assembly manifest, if possible /// /// Assembly manifest object, null on error - private BinaryObjectScanner.Models.PortableExecutable.AssemblyManifest GetAssemblyManifest() + private Models.PortableExecutable.AssemblyManifest GetAssemblyManifest() { // Use the cached data if possible if (_assemblyManifest != null) @@ -2062,67 +2062,67 @@ namespace BinaryObjectScanner.Wrappers { switch ((Models.PortableExecutable.ResourceType)resourceType) { - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_CURSOR: + case Models.PortableExecutable.ResourceType.RT_CURSOR: PrintResourceRT_CURSOR(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_BITMAP: + case Models.PortableExecutable.ResourceType.RT_BITMAP: PrintResourceRT_BITMAP(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_ICON: + case Models.PortableExecutable.ResourceType.RT_ICON: PrintResourceRT_ICON(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_MENU: + case Models.PortableExecutable.ResourceType.RT_MENU: PrintResourceRT_MENU(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_DIALOG: + case Models.PortableExecutable.ResourceType.RT_DIALOG: PrintResourceRT_DIALOG(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_STRING: + case Models.PortableExecutable.ResourceType.RT_STRING: PrintResourceRT_STRING(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_FONTDIR: + case Models.PortableExecutable.ResourceType.RT_FONTDIR: PrintResourceRT_FONTDIR(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_FONT: + case Models.PortableExecutable.ResourceType.RT_FONT: PrintResourceRT_FONT(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_ACCELERATOR: + case Models.PortableExecutable.ResourceType.RT_ACCELERATOR: PrintResourceRT_ACCELERATOR(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_RCDATA: + case Models.PortableExecutable.ResourceType.RT_RCDATA: PrintResourceRT_RCDATA(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_MESSAGETABLE: + case Models.PortableExecutable.ResourceType.RT_MESSAGETABLE: PrintResourceRT_MESSAGETABLE(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_GROUP_CURSOR: + case Models.PortableExecutable.ResourceType.RT_GROUP_CURSOR: PrintResourceRT_GROUP_CURSOR(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_GROUP_ICON: + case Models.PortableExecutable.ResourceType.RT_GROUP_ICON: PrintResourceRT_GROUP_ICON(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_VERSION: + case Models.PortableExecutable.ResourceType.RT_VERSION: PrintResourceRT_VERSION(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_DLGINCLUDE: + case Models.PortableExecutable.ResourceType.RT_DLGINCLUDE: PrintResourceRT_DLGINCLUDE(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_PLUGPLAY: + case Models.PortableExecutable.ResourceType.RT_PLUGPLAY: PrintResourceRT_PLUGPLAY(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_VXD: + case Models.PortableExecutable.ResourceType.RT_VXD: PrintResourceRT_VXD(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_ANICURSOR: + case Models.PortableExecutable.ResourceType.RT_ANICURSOR: PrintResourceRT_ANICURSOR(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_ANIICON: + case Models.PortableExecutable.ResourceType.RT_ANIICON: PrintResourceRT_ANIICON(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_HTML: + case Models.PortableExecutable.ResourceType.RT_HTML: PrintResourceRT_HTML(entry, level, builder); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_MANIFEST: + case Models.PortableExecutable.ResourceType.RT_MANIFEST: PrintResourceRT_MANIFEST(entry, level, builder); break; default: @@ -2993,13 +2993,13 @@ namespace BinaryObjectScanner.Wrappers return Enumerable.Empty(); var nb10Found = DebugData.Select(r => r.Value) - .Select(r => r as BinaryObjectScanner.Models.PortableExecutable.NB10ProgramDatabase) + .Select(r => r as Models.PortableExecutable.NB10ProgramDatabase) .Where(n => n != null) .Where(n => n.PdbFileName.Contains(path)) .Select(n => (object)n); var rsdsFound = DebugData.Select(r => r.Value) - .Select(r => r as BinaryObjectScanner.Models.PortableExecutable.RSDSProgramDatabase) + .Select(r => r as Models.PortableExecutable.RSDSProgramDatabase) .Where(r => r != null) .Where(r => r.PathAndFileName.Contains(path)) .Select(r => (object)r); @@ -3127,7 +3127,7 @@ namespace BinaryObjectScanner.Wrappers return Enumerable.Empty(); return ResourceData.Select(r => r.Value) - .Select(r => r as BinaryObjectScanner.Models.PortableExecutable.DialogBoxResource) + .Select(r => r as Models.PortableExecutable.DialogBoxResource) .Where(d => d != null) .Where(d => { @@ -3148,7 +3148,7 @@ namespace BinaryObjectScanner.Wrappers return Enumerable.Empty(); return ResourceData.Select(r => r.Value) - .Select(r => r as BinaryObjectScanner.Models.PortableExecutable.DialogBoxResource) + .Select(r => r as Models.PortableExecutable.DialogBoxResource) .Where(d => d != null) .Where(d => { @@ -3303,68 +3303,68 @@ namespace BinaryObjectScanner.Wrappers { switch ((Models.PortableExecutable.ResourceType)resourceType) { - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_CURSOR: + case Models.PortableExecutable.ResourceType.RT_CURSOR: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_BITMAP: + case Models.PortableExecutable.ResourceType.RT_BITMAP: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_ICON: + case Models.PortableExecutable.ResourceType.RT_ICON: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_MENU: + case Models.PortableExecutable.ResourceType.RT_MENU: value = entry.AsMenu(); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_DIALOG: + case Models.PortableExecutable.ResourceType.RT_DIALOG: value = entry.AsDialogBox(); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_STRING: + case Models.PortableExecutable.ResourceType.RT_STRING: value = entry.AsStringTable(); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_FONTDIR: + case Models.PortableExecutable.ResourceType.RT_FONTDIR: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_FONT: + case Models.PortableExecutable.ResourceType.RT_FONT: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_ACCELERATOR: + case Models.PortableExecutable.ResourceType.RT_ACCELERATOR: value = entry.AsAcceleratorTableResource(); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_RCDATA: + case Models.PortableExecutable.ResourceType.RT_RCDATA: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_MESSAGETABLE: + case Models.PortableExecutable.ResourceType.RT_MESSAGETABLE: value = entry.AsMessageResourceData(); break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_GROUP_CURSOR: + case Models.PortableExecutable.ResourceType.RT_GROUP_CURSOR: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_GROUP_ICON: + case Models.PortableExecutable.ResourceType.RT_GROUP_ICON: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_VERSION: + case Models.PortableExecutable.ResourceType.RT_VERSION: _versionInfo = entry.AsVersionInfo(); value = _versionInfo; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_DLGINCLUDE: + case Models.PortableExecutable.ResourceType.RT_DLGINCLUDE: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_PLUGPLAY: + case Models.PortableExecutable.ResourceType.RT_PLUGPLAY: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_VXD: + case Models.PortableExecutable.ResourceType.RT_VXD: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_ANICURSOR: + case Models.PortableExecutable.ResourceType.RT_ANICURSOR: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_ANIICON: + case Models.PortableExecutable.ResourceType.RT_ANIICON: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_HTML: + case Models.PortableExecutable.ResourceType.RT_HTML: value = entry.Data; break; - case BinaryObjectScanner.Models.PortableExecutable.ResourceType.RT_MANIFEST: + case Models.PortableExecutable.ResourceType.RT_MANIFEST: _assemblyManifest = entry.AsAssemblyManifest(); value = _versionInfo; break; @@ -3435,7 +3435,7 @@ namespace BinaryObjectScanner.Wrappers /// Name of the section to check for /// True to enable exact matching of names, false for starts-with /// Section data on success, null on error - public BinaryObjectScanner.Models.PortableExecutable.SectionHeader GetFirstSection(string name, bool exact = false) + public Models.PortableExecutable.SectionHeader GetFirstSection(string name, bool exact = false) { // If we have no sections if (SectionTable == null || !SectionTable.Any()) @@ -3460,7 +3460,7 @@ namespace BinaryObjectScanner.Wrappers /// Name of the section to check for /// True to enable exact matching of names, false for starts-with /// Section data on success, null on error - public BinaryObjectScanner.Models.PortableExecutable.SectionHeader GetLastSection(string name, bool exact = false) + public Models.PortableExecutable.SectionHeader GetLastSection(string name, bool exact = false) { // If we have no sections if (SectionTable == null || !SectionTable.Any()) @@ -3484,7 +3484,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Index of the section to check for /// Section data on success, null on error - public BinaryObjectScanner.Models.PortableExecutable.SectionHeader GetSection(int index) + public Models.PortableExecutable.SectionHeader GetSection(int index) { // If we have no sections if (SectionTable == null || !SectionTable.Any()) diff --git a/BinaryObjectScanner.Wrappers/Quantum.cs b/BinaryObjectScanner.Wrappers/Quantum.cs index a6ccd9e0..d81ca5e3 100644 --- a/BinaryObjectScanner.Wrappers/Quantum.cs +++ b/BinaryObjectScanner.Wrappers/Quantum.cs @@ -39,7 +39,7 @@ namespace BinaryObjectScanner.Wrappers #region File List /// - public BinaryObjectScanner.Models.Quantum.FileDescriptor[] FileList => _archive.FileList; + public Models.Quantum.FileDescriptor[] FileList => _archive.FileList; #endregion @@ -53,7 +53,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the archive /// - private BinaryObjectScanner.Models.Quantum.Archive _archive; + private Models.Quantum.Archive _archive; #endregion diff --git a/BinaryObjectScanner.Wrappers/VBSP.cs b/BinaryObjectScanner.Wrappers/VBSP.cs index 602a46f5..d0fb5e95 100644 --- a/BinaryObjectScanner.Wrappers/VBSP.cs +++ b/BinaryObjectScanner.Wrappers/VBSP.cs @@ -22,7 +22,7 @@ namespace BinaryObjectScanner.Wrappers public int Version => _file.Header.Version; /// - public BinaryObjectScanner.Models.VBSP.Lump[] Lumps => _file.Header.Lumps; + public Models.VBSP.Lump[] Lumps => _file.Header.Lumps; /// public int MapRevision => _file.Header.MapRevision; @@ -40,7 +40,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the VBSP /// - private BinaryObjectScanner.Models.VBSP.File _file; + private Models.VBSP.File _file; #endregion diff --git a/BinaryObjectScanner.Wrappers/WAD.cs b/BinaryObjectScanner.Wrappers/WAD.cs index 5d581300..de537828 100644 --- a/BinaryObjectScanner.Wrappers/WAD.cs +++ b/BinaryObjectScanner.Wrappers/WAD.cs @@ -30,14 +30,14 @@ namespace BinaryObjectScanner.Wrappers #region Lumps /// - public BinaryObjectScanner.Models.WAD.Lump[] Lumps => _file.Lumps; + public Models.WAD.Lump[] Lumps => _file.Lumps; #endregion #region Lump Infos /// - public BinaryObjectScanner.Models.WAD.LumpInfo[] LumpInfos => _file.LumpInfos; + public Models.WAD.LumpInfo[] LumpInfos => _file.LumpInfos; #endregion @@ -54,7 +54,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the WAD /// - private BinaryObjectScanner.Models.WAD.File _file; + private Models.WAD.File _file; #endregion diff --git a/BinaryObjectScanner.Wrappers/XZP.cs b/BinaryObjectScanner.Wrappers/XZP.cs index bcc6be31..0d68970b 100644 --- a/BinaryObjectScanner.Wrappers/XZP.cs +++ b/BinaryObjectScanner.Wrappers/XZP.cs @@ -49,28 +49,28 @@ namespace BinaryObjectScanner.Wrappers #region Directory Entries /// - public BinaryObjectScanner.Models.XZP.DirectoryEntry[] DirectoryEntries => _file.DirectoryEntries; + public Models.XZP.DirectoryEntry[] DirectoryEntries => _file.DirectoryEntries; #endregion #region Preload Directory Entries /// - public BinaryObjectScanner.Models.XZP.DirectoryEntry[] PreloadDirectoryEntries => _file.PreloadDirectoryEntries; + public Models.XZP.DirectoryEntry[] PreloadDirectoryEntries => _file.PreloadDirectoryEntries; #endregion #region Preload Directory Entries /// - public BinaryObjectScanner.Models.XZP.DirectoryMapping[] PreloadDirectoryMappings => _file.PreloadDirectoryMappings; + public Models.XZP.DirectoryMapping[] PreloadDirectoryMappings => _file.PreloadDirectoryMappings; #endregion #region Directory Items /// - public BinaryObjectScanner.Models.XZP.DirectoryItem[] DirectoryItems => _file.DirectoryItems; + public Models.XZP.DirectoryItem[] DirectoryItems => _file.DirectoryItems; #endregion @@ -97,7 +97,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Internal representation of the XZP /// - private BinaryObjectScanner.Models.XZP.File _file; + private Models.XZP.File _file; #endregion