diff --git a/BinaryObjectScanner.Wrappers/AACSMediaKeyBlock.cs b/BinaryObjectScanner.Wrappers/AACSMediaKeyBlock.cs index 6a990403..1b623f5b 100644 --- a/BinaryObjectScanner.Wrappers/AACSMediaKeyBlock.cs +++ b/BinaryObjectScanner.Wrappers/AACSMediaKeyBlock.cs @@ -19,9 +19,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public Record[] Records => _model.Records; + public Record[] Records => this.Model.Records; #else - public Record?[]? Records => _model.Records; + public Record?[]? Records => this.Model.Records; #endif #endregion @@ -114,17 +114,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.AACSMediaKeyBlock.Print(builder, _model); + Printing.AACSMediaKeyBlock.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/BDPlusSVM.cs b/BinaryObjectScanner.Wrappers/BDPlusSVM.cs index 755526c9..3327b9bd 100644 --- a/BinaryObjectScanner.Wrappers/BDPlusSVM.cs +++ b/BinaryObjectScanner.Wrappers/BDPlusSVM.cs @@ -17,42 +17,42 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Signature => _model.Signature; + public string Signature => this.Model.Signature; #else - public string? Signature => _model.Signature; + public string? Signature => this.Model.Signature; #endif /// #if NET48 - public byte[] Unknown1 => _model.Unknown1; + public byte[] Unknown1 => this.Model.Unknown1; #else - public byte[]? Unknown1 => _model.Unknown1; + public byte[]? Unknown1 => this.Model.Unknown1; #endif /// - public ushort Year => _model.Year; + public ushort Year => this.Model.Year; /// - public byte Month => _model.Month; + public byte Month => this.Model.Month; /// - public byte Day => _model.Day; + public byte Day => this.Model.Day; /// #if NET48 - public byte[] Unknown2 => _model.Unknown2; + public byte[] Unknown2 => this.Model.Unknown2; #else - public byte[]? Unknown2 => _model.Unknown2; + public byte[]? Unknown2 => this.Model.Unknown2; #endif /// - public uint Length => _model.Length; + public uint Length => this.Model.Length; /// #if NET48 - public byte[] Data => _model.Data; + public byte[] Data => this.Model.Data; #else - public byte[]? Data => _model.Data; + public byte[]? Data => this.Model.Data; #endif #endregion @@ -143,17 +143,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.BDPlusSVM.Print(builder, _model); + Printing.BDPlusSVM.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/BFPK.cs b/BinaryObjectScanner.Wrappers/BFPK.cs index 5195896a..62cb703b 100644 --- a/BinaryObjectScanner.Wrappers/BFPK.cs +++ b/BinaryObjectScanner.Wrappers/BFPK.cs @@ -20,23 +20,23 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Magic => _model.Header.Magic; + public string Magic => this.Model.Header.Magic; #else - public string? Magic => _model.Header?.Magic; + public string? Magic => this.Model.Header?.Magic; #endif /// #if NET48 - public int Version => _model.Header.Version; + public int Version => this.Model.Header.Version; #else - public int? Version => _model.Header?.Version; + public int? Version => this.Model.Header?.Version; #endif /// #if NET48 - public int Files => _model.Header.Files; + public int Files => this.Model.Header.Files; #else - public int? Files => _model.Header?.Files; + public int? Files => this.Model.Header?.Files; #endif #endregion @@ -45,9 +45,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.BFPK.FileEntry[] FileTable => _model.Files; + public SabreTools.Models.BFPK.FileEntry[] FileTable => this.Model.Files; #else - public SabreTools.Models.BFPK.FileEntry?[]? FileTable => _model.Files; + public SabreTools.Models.BFPK.FileEntry?[]? FileTable => this.Model.Files; #endif #endregion @@ -236,17 +236,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.BFPK.Print(builder, _model); + Printing.BFPK.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/BSP.cs b/BinaryObjectScanner.Wrappers/BSP.cs index 5bec791d..5b4324af 100644 --- a/BinaryObjectScanner.Wrappers/BSP.cs +++ b/BinaryObjectScanner.Wrappers/BSP.cs @@ -21,9 +21,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint Version => _model.Header.Version; + public uint Version => this.Model.Header.Version; #else - public uint? Version => _model.Header?.Version; + public uint? Version => this.Model.Header?.Version; #endif #endregion @@ -32,9 +32,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.BSP.Lump[] Lumps => _model.Lumps; + public SabreTools.Models.BSP.Lump[] Lumps => this.Model.Lumps; #else - public SabreTools.Models.BSP.Lump?[]? Lumps => _model.Lumps; + public SabreTools.Models.BSP.Lump?[]? Lumps => this.Model.Lumps; #endif #endregion @@ -43,16 +43,16 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint TextureCount => _model.TextureHeader.TextureCount; + public uint TextureCount => this.Model.TextureHeader.TextureCount; #else - public uint? TextureCount => _model.TextureHeader?.TextureCount; + public uint? TextureCount => this.Model.TextureHeader?.TextureCount; #endif /// #if NET48 - public uint[] Offsets => _model.TextureHeader.Offsets; + public uint[] Offsets => this.Model.TextureHeader.Offsets; #else - public uint[]? Offsets => _model.TextureHeader?.Offsets; + public uint[]? Offsets => this.Model.TextureHeader?.Offsets; #endif #endregion @@ -61,9 +61,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.BSP.Texture[] Textures => _model.Textures; + public SabreTools.Models.BSP.Texture[] Textures => this.Model.Textures; #else - public SabreTools.Models.BSP.Texture?[]? Textures => _model.Textures; + public SabreTools.Models.BSP.Texture?[]? Textures => this.Model.Textures; #endif #endregion @@ -156,17 +156,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.BSP.Print(builder, _model); + Printing.BSP.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion #region Extraction diff --git a/BinaryObjectScanner.Wrappers/CFB.cs b/BinaryObjectScanner.Wrappers/CFB.cs index c3c136b3..743a5a6a 100644 --- a/BinaryObjectScanner.Wrappers/CFB.cs +++ b/BinaryObjectScanner.Wrappers/CFB.cs @@ -20,128 +20,128 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public ulong Signature => _model.Header.Signature; + public ulong Signature => this.Model.Header.Signature; #else - public ulong? Signature => _model.Header?.Signature; + public ulong? Signature => this.Model.Header?.Signature; #endif /// #if NET48 - public Guid CLSID => _model.Header.CLSID; + public Guid CLSID => this.Model.Header.CLSID; #else - public Guid? CLSID => _model.Header?.CLSID; + public Guid? CLSID => this.Model.Header?.CLSID; #endif /// #if NET48 - public ushort MinorVersion => _model.Header.MinorVersion; + public ushort MinorVersion => this.Model.Header.MinorVersion; #else - public ushort? MinorVersion => _model.Header?.MinorVersion; + public ushort? MinorVersion => this.Model.Header?.MinorVersion; #endif /// #if NET48 - public ushort MajorVersion => _model.Header.MajorVersion; + public ushort MajorVersion => this.Model.Header.MajorVersion; #else - public ushort? MajorVersion => _model.Header?.MajorVersion; + public ushort? MajorVersion => this.Model.Header?.MajorVersion; #endif /// #if NET48 - public ushort ByteOrder => _model.Header.ByteOrder; + public ushort ByteOrder => this.Model.Header.ByteOrder; #else - public ushort? ByteOrder => _model.Header?.ByteOrder; + public ushort? ByteOrder => this.Model.Header?.ByteOrder; #endif /// #if NET48 - public ushort SectorShift => _model.Header.SectorShift; + public ushort SectorShift => this.Model.Header.SectorShift; #else - public ushort? SectorShift => _model.Header?.SectorShift; + public ushort? SectorShift => this.Model.Header?.SectorShift; #endif /// #if NET48 - public ushort MiniSectorShift => _model.Header.MiniSectorShift; + public ushort MiniSectorShift => this.Model.Header.MiniSectorShift; #else - public ushort? MiniSectorShift => _model.Header?.MiniSectorShift; + public ushort? MiniSectorShift => this.Model.Header?.MiniSectorShift; #endif /// #if NET48 - public byte[] Reserved => _model.Header.Reserved; + public byte[] Reserved => this.Model.Header.Reserved; #else - public byte[]? Reserved => _model.Header?.Reserved; + public byte[]? Reserved => this.Model.Header?.Reserved; #endif /// #if NET48 - public uint NumberOfDirectorySectors => _model.Header.NumberOfDirectorySectors; + public uint NumberOfDirectorySectors => this.Model.Header.NumberOfDirectorySectors; #else - public uint? NumberOfDirectorySectors => _model.Header?.NumberOfDirectorySectors; + public uint? NumberOfDirectorySectors => this.Model.Header?.NumberOfDirectorySectors; #endif /// #if NET48 - public uint NumberOfFATSectors => _model.Header.NumberOfFATSectors; + public uint NumberOfFATSectors => this.Model.Header.NumberOfFATSectors; #else - public uint? NumberOfFATSectors => _model.Header?.NumberOfFATSectors; + public uint? NumberOfFATSectors => this.Model.Header?.NumberOfFATSectors; #endif /// #if NET48 - public uint FirstDirectorySectorLocation => _model.Header.FirstDirectorySectorLocation; + public uint FirstDirectorySectorLocation => this.Model.Header.FirstDirectorySectorLocation; #else - public uint? FirstDirectorySectorLocation => _model.Header?.FirstDirectorySectorLocation; + public uint? FirstDirectorySectorLocation => this.Model.Header?.FirstDirectorySectorLocation; #endif /// #if NET48 - public uint TransactionSignatureNumber => _model.Header.TransactionSignatureNumber; + public uint TransactionSignatureNumber => this.Model.Header.TransactionSignatureNumber; #else - public uint? TransactionSignatureNumber => _model.Header?.TransactionSignatureNumber; + public uint? TransactionSignatureNumber => this.Model.Header?.TransactionSignatureNumber; #endif /// #if NET48 - public uint MiniStreamCutoffSize => _model.Header.MiniStreamCutoffSize; + public uint MiniStreamCutoffSize => this.Model.Header.MiniStreamCutoffSize; #else - public uint? MiniStreamCutoffSize => _model.Header?.MiniStreamCutoffSize; + public uint? MiniStreamCutoffSize => this.Model.Header?.MiniStreamCutoffSize; #endif /// #if NET48 - public uint FirstMiniFATSectorLocation => _model.Header.FirstMiniFATSectorLocation; + public uint FirstMiniFATSectorLocation => this.Model.Header.FirstMiniFATSectorLocation; #else - public uint? FirstMiniFATSectorLocation => _model.Header?.FirstMiniFATSectorLocation; + public uint? FirstMiniFATSectorLocation => this.Model.Header?.FirstMiniFATSectorLocation; #endif /// #if NET48 - public uint NumberOfMiniFATSectors => _model.Header.NumberOfMiniFATSectors; + public uint NumberOfMiniFATSectors => this.Model.Header.NumberOfMiniFATSectors; #else - public uint? NumberOfMiniFATSectors => _model.Header?.NumberOfMiniFATSectors; + public uint? NumberOfMiniFATSectors => this.Model.Header?.NumberOfMiniFATSectors; #endif /// #if NET48 - public uint FirstDIFATSectorLocation => _model.Header.FirstDIFATSectorLocation; + public uint FirstDIFATSectorLocation => this.Model.Header.FirstDIFATSectorLocation; #else - public uint? FirstDIFATSectorLocation => _model.Header?.FirstDIFATSectorLocation; + public uint? FirstDIFATSectorLocation => this.Model.Header?.FirstDIFATSectorLocation; #endif /// #if NET48 - public uint NumberOfDIFATSectors => _model.Header.NumberOfDIFATSectors; + public uint NumberOfDIFATSectors => this.Model.Header.NumberOfDIFATSectors; #else - public uint? NumberOfDIFATSectors => _model.Header?.NumberOfDIFATSectors; + public uint? NumberOfDIFATSectors => this.Model.Header?.NumberOfDIFATSectors; #endif /// #if NET48 - public SabreTools.Models.CFB.SectorNumber[] DIFAT => _model.Header.DIFAT; + public SabreTools.Models.CFB.SectorNumber[] DIFAT => this.Model.Header.DIFAT; #else - public SabreTools.Models.CFB.SectorNumber?[]? DIFAT => _model.Header?.DIFAT; + public SabreTools.Models.CFB.SectorNumber?[]? DIFAT => this.Model.Header?.DIFAT; #endif #endregion @@ -150,9 +150,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.CFB.SectorNumber[] FATSectorNumbers => _model.FATSectorNumbers; + public SabreTools.Models.CFB.SectorNumber[] FATSectorNumbers => this.Model.FATSectorNumbers; #else - public SabreTools.Models.CFB.SectorNumber?[]? FATSectorNumbers => _model.FATSectorNumbers; + public SabreTools.Models.CFB.SectorNumber?[]? FATSectorNumbers => this.Model.FATSectorNumbers; #endif #endregion @@ -161,9 +161,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.CFB.SectorNumber[] MiniFATSectorNumbers => _model.MiniFATSectorNumbers; + public SabreTools.Models.CFB.SectorNumber[] MiniFATSectorNumbers => this.Model.MiniFATSectorNumbers; #else - public SabreTools.Models.CFB.SectorNumber?[]? MiniFATSectorNumbers => _model.MiniFATSectorNumbers; + public SabreTools.Models.CFB.SectorNumber?[]? MiniFATSectorNumbers => this.Model.MiniFATSectorNumbers; #endif #endregion @@ -172,9 +172,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.CFB.SectorNumber[] DIFATSectorNumbers => _model.DIFATSectorNumbers; + public SabreTools.Models.CFB.SectorNumber[] DIFATSectorNumbers => this.Model.DIFATSectorNumbers; #else - public SabreTools.Models.CFB.SectorNumber?[]? DIFATSectorNumbers => _model.DIFATSectorNumbers; + public SabreTools.Models.CFB.SectorNumber?[]? DIFATSectorNumbers => this.Model.DIFATSectorNumbers; #endif #endregion @@ -183,9 +183,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.CFB.DirectoryEntry[] DirectoryEntries => _model.DirectoryEntries; + public SabreTools.Models.CFB.DirectoryEntry[] DirectoryEntries => this.Model.DirectoryEntries; #else - public SabreTools.Models.CFB.DirectoryEntry?[]? DirectoryEntries => _model.DirectoryEntries; + public SabreTools.Models.CFB.DirectoryEntry?[]? DirectoryEntries => this.Model.DirectoryEntries; #endif #endregion @@ -534,17 +534,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.CFB.Print(builder, _model); + Printing.CFB.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/CIA.cs b/BinaryObjectScanner.Wrappers/CIA.cs index 1f7be43f..c95071b5 100644 --- a/BinaryObjectScanner.Wrappers/CIA.cs +++ b/BinaryObjectScanner.Wrappers/CIA.cs @@ -18,65 +18,65 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint HeaderSize => _model.Header.HeaderSize; + public uint HeaderSize => this.Model.Header.HeaderSize; #else - public uint? HeaderSize => _model.Header?.HeaderSize; + public uint? HeaderSize => this.Model.Header?.HeaderSize; #endif /// #if NET48 - public ushort Type => _model.Header.Type; + public ushort Type => this.Model.Header.Type; #else - public ushort? Type => _model.Header?.Type; + public ushort? Type => this.Model.Header?.Type; #endif /// #if NET48 - public ushort Version => _model.Header.Version; + public ushort Version => this.Model.Header.Version; #else - public ushort? Version => _model.Header?.Version; + public ushort? Version => this.Model.Header?.Version; #endif /// #if NET48 - public uint CertificateChainSize => _model.Header.CertificateChainSize; + public uint CertificateChainSize => this.Model.Header.CertificateChainSize; #else - public uint? CertificateChainSize => _model.Header?.CertificateChainSize; + public uint? CertificateChainSize => this.Model.Header?.CertificateChainSize; #endif /// #if NET48 - public uint TicketSize => _model.Header.TicketSize; + public uint TicketSize => this.Model.Header.TicketSize; #else - public uint? TicketSize => _model.Header?.TicketSize; + public uint? TicketSize => this.Model.Header?.TicketSize; #endif /// #if NET48 - public uint TMDFileSize => _model.Header.TMDFileSize; + public uint TMDFileSize => this.Model.Header.TMDFileSize; #else - public uint? TMDFileSize => _model.Header?.TMDFileSize; + public uint? TMDFileSize => this.Model.Header?.TMDFileSize; #endif /// #if NET48 - public uint MetaSize => _model.Header.MetaSize; + public uint MetaSize => this.Model.Header.MetaSize; #else - public uint? MetaSize => _model.Header?.MetaSize; + public uint? MetaSize => this.Model.Header?.MetaSize; #endif /// #if NET48 - public ulong ContentSize => _model.Header.ContentSize; + public ulong ContentSize => this.Model.Header.ContentSize; #else - public ulong? ContentSize => _model.Header?.ContentSize; + public ulong? ContentSize => this.Model.Header?.ContentSize; #endif /// #if NET48 - public byte[] ContentIndex => _model.Header.ContentIndex; + public byte[] ContentIndex => this.Model.Header.ContentIndex; #else - public byte[]? ContentIndex => _model.Header?.ContentIndex; + public byte[]? ContentIndex => this.Model.Header?.ContentIndex; #endif #endregion @@ -85,9 +85,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.N3DS.Certificate[] CertificateChain => _model.CertificateChain; + public SabreTools.Models.N3DS.Certificate[] CertificateChain => this.Model.CertificateChain; #else - public SabreTools.Models.N3DS.Certificate?[]? CertificateChain => _model.CertificateChain; + public SabreTools.Models.N3DS.Certificate?[]? CertificateChain => this.Model.CertificateChain; #endif #endregion @@ -96,205 +96,205 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.N3DS.SignatureType T_SignatureType => _model.Ticket.SignatureType; + public SabreTools.Models.N3DS.SignatureType T_SignatureType => this.Model.Ticket.SignatureType; #else - public SabreTools.Models.N3DS.SignatureType? T_SignatureType => _model.Ticket?.SignatureType; + public SabreTools.Models.N3DS.SignatureType? T_SignatureType => this.Model.Ticket?.SignatureType; #endif /// #if NET48 - public ushort T_SignatureSize => _model.Ticket.SignatureSize; + public ushort T_SignatureSize => this.Model.Ticket.SignatureSize; #else - public ushort? T_SignatureSize => _model.Ticket?.SignatureSize; + public ushort? T_SignatureSize => this.Model.Ticket?.SignatureSize; #endif /// #if NET48 - public byte T_PaddingSize => _model.Ticket.PaddingSize; + public byte T_PaddingSize => this.Model.Ticket.PaddingSize; #else - public byte? T_PaddingSize => _model.Ticket?.PaddingSize; + public byte? T_PaddingSize => this.Model.Ticket?.PaddingSize; #endif /// #if NET48 - public byte[] T_Signature => _model.Ticket.Signature; + public byte[] T_Signature => this.Model.Ticket.Signature; #else - public byte[]? T_Signature => _model.Ticket?.Signature; + public byte[]? T_Signature => this.Model.Ticket?.Signature; #endif /// #if NET48 - public byte[] T_Padding => _model.Ticket.Padding; + public byte[] T_Padding => this.Model.Ticket.Padding; #else - public byte[]? T_Padding => _model.Ticket?.Padding; + public byte[]? T_Padding => this.Model.Ticket?.Padding; #endif /// #if NET48 - public string T_Issuer => _model.Ticket.Issuer; + public string T_Issuer => this.Model.Ticket.Issuer; #else - public string? T_Issuer => _model.Ticket?.Issuer; + public string? T_Issuer => this.Model.Ticket?.Issuer; #endif /// #if NET48 - public byte[] T_ECCPublicKey => _model.Ticket.ECCPublicKey; + public byte[] T_ECCPublicKey => this.Model.Ticket.ECCPublicKey; #else - public byte[]? T_ECCPublicKey => _model.Ticket?.ECCPublicKey; + public byte[]? T_ECCPublicKey => this.Model.Ticket?.ECCPublicKey; #endif /// #if NET48 - public byte T_Version => _model.Ticket.Version; + public byte T_Version => this.Model.Ticket.Version; #else - public byte? T_Version => _model.Ticket?.Version; + public byte? T_Version => this.Model.Ticket?.Version; #endif /// #if NET48 - public byte T_CaCrlVersion => _model.Ticket.CaCrlVersion; + public byte T_CaCrlVersion => this.Model.Ticket.CaCrlVersion; #else - public byte? T_CaCrlVersion => _model.Ticket?.CaCrlVersion; + public byte? T_CaCrlVersion => this.Model.Ticket?.CaCrlVersion; #endif /// #if NET48 - public byte T_SignerCrlVersion => _model.Ticket.SignerCrlVersion; + public byte T_SignerCrlVersion => this.Model.Ticket.SignerCrlVersion; #else - public byte? T_SignerCrlVersion => _model.Ticket?.SignerCrlVersion; + public byte? T_SignerCrlVersion => this.Model.Ticket?.SignerCrlVersion; #endif /// #if NET48 - public byte[] T_TitleKey => _model.Ticket.TitleKey; + public byte[] T_TitleKey => this.Model.Ticket.TitleKey; #else - public byte[]? T_TitleKey => _model.Ticket?.TitleKey; + public byte[]? T_TitleKey => this.Model.Ticket?.TitleKey; #endif /// #if NET48 - public byte T_Reserved1 => _model.Ticket.Reserved1; + public byte T_Reserved1 => this.Model.Ticket.Reserved1; #else - public byte? T_Reserved1 => _model.Ticket?.Reserved1; + public byte? T_Reserved1 => this.Model.Ticket?.Reserved1; #endif /// #if NET48 - public ulong T_TicketID => _model.Ticket.TicketID; + public ulong T_TicketID => this.Model.Ticket.TicketID; #else - public ulong? T_TicketID => _model.Ticket?.TicketID; + public ulong? T_TicketID => this.Model.Ticket?.TicketID; #endif /// #if NET48 - public uint T_ConsoleID => _model.Ticket.ConsoleID; + public uint T_ConsoleID => this.Model.Ticket.ConsoleID; #else - public uint? T_ConsoleID => _model.Ticket?.ConsoleID; + public uint? T_ConsoleID => this.Model.Ticket?.ConsoleID; #endif /// #if NET48 - public ulong T_TitleID => _model.Ticket.TitleID; + public ulong T_TitleID => this.Model.Ticket.TitleID; #else - public ulong? T_TitleID => _model.Ticket?.TitleID; + public ulong? T_TitleID => this.Model.Ticket?.TitleID; #endif /// #if NET48 - public byte[] T_Reserved2 => _model.Ticket.Reserved2; + public byte[] T_Reserved2 => this.Model.Ticket.Reserved2; #else - public byte[]? T_Reserved2 => _model.Ticket?.Reserved2; + public byte[]? T_Reserved2 => this.Model.Ticket?.Reserved2; #endif /// #if NET48 - public ushort T_TicketTitleVersion => _model.Ticket.TicketTitleVersion; + public ushort T_TicketTitleVersion => this.Model.Ticket.TicketTitleVersion; #else - public ushort? T_TicketTitleVersion => _model.Ticket?.TicketTitleVersion; + public ushort? T_TicketTitleVersion => this.Model.Ticket?.TicketTitleVersion; #endif /// #if NET48 - public byte[] T_Reserved3 => _model.Ticket.Reserved3; + public byte[] T_Reserved3 => this.Model.Ticket.Reserved3; #else - public byte[]? T_Reserved3 => _model.Ticket?.Reserved3; + public byte[]? T_Reserved3 => this.Model.Ticket?.Reserved3; #endif /// #if NET48 - public byte T_LicenseType => _model.Ticket.LicenseType; + public byte T_LicenseType => this.Model.Ticket.LicenseType; #else - public byte? T_LicenseType => _model.Ticket?.LicenseType; + public byte? T_LicenseType => this.Model.Ticket?.LicenseType; #endif /// #if NET48 - public byte T_CommonKeyYIndex => _model.Ticket.CommonKeyYIndex; + public byte T_CommonKeyYIndex => this.Model.Ticket.CommonKeyYIndex; #else - public byte? T_CommonKeyYIndex => _model.Ticket?.CommonKeyYIndex; + public byte? T_CommonKeyYIndex => this.Model.Ticket?.CommonKeyYIndex; #endif /// #if NET48 - public byte[] T_Reserved4 => _model.Ticket.Reserved4; + public byte[] T_Reserved4 => this.Model.Ticket.Reserved4; #else - public byte[]? T_Reserved4 => _model.Ticket?.Reserved4; + public byte[]? T_Reserved4 => this.Model.Ticket?.Reserved4; #endif /// #if NET48 - public uint T_eShopAccountID => _model.Ticket.eShopAccountID; + public uint T_eShopAccountID => this.Model.Ticket.eShopAccountID; #else - public uint? T_eShopAccountID => _model.Ticket?.eShopAccountID; + public uint? T_eShopAccountID => this.Model.Ticket?.eShopAccountID; #endif /// #if NET48 - public byte T_Reserved5 => _model.Ticket.Reserved5; + public byte T_Reserved5 => this.Model.Ticket.Reserved5; #else - public byte? T_Reserved5 => _model.Ticket?.Reserved5; + public byte? T_Reserved5 => this.Model.Ticket?.Reserved5; #endif /// #if NET48 - public byte T_Audit => _model.Ticket.Audit; + public byte T_Audit => this.Model.Ticket.Audit; #else - public byte? T_Audit => _model.Ticket?.Audit; + public byte? T_Audit => this.Model.Ticket?.Audit; #endif /// #if NET48 - public byte[] T_Reserved6 => _model.Ticket.Reserved6; + public byte[] T_Reserved6 => this.Model.Ticket.Reserved6; #else - public byte[]? T_Reserved6 => _model.Ticket?.Reserved6; + public byte[]? T_Reserved6 => this.Model.Ticket?.Reserved6; #endif /// #if NET48 - public uint[] T_Limits => _model.Ticket.Limits; + public uint[] T_Limits => this.Model.Ticket.Limits; #else - public uint[]? T_Limits => _model.Ticket?.Limits; + public uint[]? T_Limits => this.Model.Ticket?.Limits; #endif /// #if NET48 - public uint T_ContentIndexSize => _model.Ticket.ContentIndexSize; + public uint T_ContentIndexSize => this.Model.Ticket.ContentIndexSize; #else - public uint? T_ContentIndexSize => _model.Ticket?.ContentIndexSize; + public uint? T_ContentIndexSize => this.Model.Ticket?.ContentIndexSize; #endif /// #if NET48 - public byte[] T_ContentIndex => _model.Ticket.ContentIndex; + public byte[] T_ContentIndex => this.Model.Ticket.ContentIndex; #else - public byte[]? T_ContentIndex => _model.Ticket?.ContentIndex; + public byte[]? T_ContentIndex => this.Model.Ticket?.ContentIndex; #endif /// #if NET48 - public SabreTools.Models.N3DS.Certificate[] T_CertificateChain => _model.Ticket.CertificateChain; + public SabreTools.Models.N3DS.Certificate[] T_CertificateChain => this.Model.Ticket.CertificateChain; #else - public SabreTools.Models.N3DS.Certificate?[]? T_CertificateChain => _model.Ticket?.CertificateChain; + public SabreTools.Models.N3DS.Certificate?[]? T_CertificateChain => this.Model.Ticket?.CertificateChain; #endif #endregion @@ -303,198 +303,198 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.N3DS.SignatureType TMD_SignatureType => _model.TMDFileData.SignatureType; + public SabreTools.Models.N3DS.SignatureType TMD_SignatureType => this.Model.TMDFileData.SignatureType; #else - public SabreTools.Models.N3DS.SignatureType? TMD_SignatureType => _model.TMDFileData?.SignatureType; + public SabreTools.Models.N3DS.SignatureType? TMD_SignatureType => this.Model.TMDFileData?.SignatureType; #endif /// #if NET48 - public ushort TMD_SignatureSize => _model.TMDFileData.SignatureSize; + public ushort TMD_SignatureSize => this.Model.TMDFileData.SignatureSize; #else - public ushort? TMD_SignatureSize => _model.TMDFileData?.SignatureSize; + public ushort? TMD_SignatureSize => this.Model.TMDFileData?.SignatureSize; #endif /// #if NET48 - public byte TMD_PaddingSize => _model.TMDFileData.PaddingSize; + public byte TMD_PaddingSize => this.Model.TMDFileData.PaddingSize; #else - public byte? TMD_PaddingSize => _model.TMDFileData?.PaddingSize; + public byte? TMD_PaddingSize => this.Model.TMDFileData?.PaddingSize; #endif /// #if NET48 - public byte[] TMD_Signature => _model.TMDFileData.Signature; + public byte[] TMD_Signature => this.Model.TMDFileData.Signature; #else - public byte[]? TMD_Signature => _model.TMDFileData?.Signature; + public byte[]? TMD_Signature => this.Model.TMDFileData?.Signature; #endif /// #if NET48 - public byte[] TMD_Padding1 => _model.TMDFileData.Padding1; + public byte[] TMD_Padding1 => this.Model.TMDFileData.Padding1; #else - public byte[]? TMD_Padding1 => _model.TMDFileData?.Padding1; + public byte[]? TMD_Padding1 => this.Model.TMDFileData?.Padding1; #endif /// #if NET48 - public string TMD_Issuer => _model.TMDFileData.Issuer; + public string TMD_Issuer => this.Model.TMDFileData.Issuer; #else - public string? TMD_Issuer => _model.TMDFileData?.Issuer; + public string? TMD_Issuer => this.Model.TMDFileData?.Issuer; #endif /// #if NET48 - public byte TMD_Version => _model.TMDFileData.Version; + public byte TMD_Version => this.Model.TMDFileData.Version; #else - public byte? TMD_Version => _model.TMDFileData?.Version; + public byte? TMD_Version => this.Model.TMDFileData?.Version; #endif /// #if NET48 - public byte TMD_CaCrlVersion => _model.TMDFileData.CaCrlVersion; + public byte TMD_CaCrlVersion => this.Model.TMDFileData.CaCrlVersion; #else - public byte? TMD_CaCrlVersion => _model.TMDFileData?.CaCrlVersion; + public byte? TMD_CaCrlVersion => this.Model.TMDFileData?.CaCrlVersion; #endif /// #if NET48 - public byte TMD_SignerCrlVersion => _model.TMDFileData.SignerCrlVersion; + public byte TMD_SignerCrlVersion => this.Model.TMDFileData.SignerCrlVersion; #else - public byte? TMD_SignerCrlVersion => _model.TMDFileData?.SignerCrlVersion; + public byte? TMD_SignerCrlVersion => this.Model.TMDFileData?.SignerCrlVersion; #endif /// #if NET48 - public byte TMD_Reserved1 => _model.TMDFileData.Reserved1; + public byte TMD_Reserved1 => this.Model.TMDFileData.Reserved1; #else - public byte? TMD_Reserved1 => _model.TMDFileData?.Reserved1; + public byte? TMD_Reserved1 => this.Model.TMDFileData?.Reserved1; #endif /// #if NET48 - public ulong TMD_SystemVersion => _model.TMDFileData.SystemVersion; + public ulong TMD_SystemVersion => this.Model.TMDFileData.SystemVersion; #else - public ulong? TMD_SystemVersion => _model.TMDFileData?.SystemVersion; + public ulong? TMD_SystemVersion => this.Model.TMDFileData?.SystemVersion; #endif /// #if NET48 - public ulong TMD_TitleID => _model.TMDFileData.TitleID; + public ulong TMD_TitleID => this.Model.TMDFileData.TitleID; #else - public ulong? TMD_TitleID => _model.TMDFileData?.TitleID; + public ulong? TMD_TitleID => this.Model.TMDFileData?.TitleID; #endif /// #if NET48 - public uint TMD_TitleType => _model.TMDFileData.TitleType; + public uint TMD_TitleType => this.Model.TMDFileData.TitleType; #else - public uint? TMD_TitleType => _model.TMDFileData?.TitleType; + public uint? TMD_TitleType => this.Model.TMDFileData?.TitleType; #endif /// #if NET48 - public ushort TMD_GroupID => _model.TMDFileData.GroupID; + public ushort TMD_GroupID => this.Model.TMDFileData.GroupID; #else - public ushort? TMD_GroupID => _model.TMDFileData?.GroupID; + public ushort? TMD_GroupID => this.Model.TMDFileData?.GroupID; #endif /// #if NET48 - public uint TMD_SaveDataSize => _model.TMDFileData.SaveDataSize; + public uint TMD_SaveDataSize => this.Model.TMDFileData.SaveDataSize; #else - public uint? TMD_SaveDataSize => _model.TMDFileData?.SaveDataSize; + public uint? TMD_SaveDataSize => this.Model.TMDFileData?.SaveDataSize; #endif /// #if NET48 - public uint TMD_SRLPrivateSaveDataSize => _model.TMDFileData.SRLPrivateSaveDataSize; + public uint TMD_SRLPrivateSaveDataSize => this.Model.TMDFileData.SRLPrivateSaveDataSize; #else - public uint? TMD_SRLPrivateSaveDataSize => _model.TMDFileData?.SRLPrivateSaveDataSize; + public uint? TMD_SRLPrivateSaveDataSize => this.Model.TMDFileData?.SRLPrivateSaveDataSize; #endif /// #if NET48 - public byte[] TMD_Reserved2 => _model.TMDFileData.Reserved2; + public byte[] TMD_Reserved2 => this.Model.TMDFileData.Reserved2; #else - public byte[]? TMD_Reserved2 => _model.TMDFileData?.Reserved2; + public byte[]? TMD_Reserved2 => this.Model.TMDFileData?.Reserved2; #endif /// #if NET48 - public byte TMD_SRLFlag => _model.TMDFileData.SRLFlag; + public byte TMD_SRLFlag => this.Model.TMDFileData.SRLFlag; #else - public byte? TMD_SRLFlag => _model.TMDFileData?.SRLFlag; + public byte? TMD_SRLFlag => this.Model.TMDFileData?.SRLFlag; #endif /// #if NET48 - public byte[] TMD_Reserved3 => _model.TMDFileData.Reserved3; + public byte[] TMD_Reserved3 => this.Model.TMDFileData.Reserved3; #else - public byte[]? TMD_Reserved3 => _model.TMDFileData?.Reserved3; + public byte[]? TMD_Reserved3 => this.Model.TMDFileData?.Reserved3; #endif /// #if NET48 - public uint TMD_AccessRights => _model.TMDFileData.AccessRights; + public uint TMD_AccessRights => this.Model.TMDFileData.AccessRights; #else - public uint? TMD_AccessRights => _model.TMDFileData?.AccessRights; + public uint? TMD_AccessRights => this.Model.TMDFileData?.AccessRights; #endif /// #if NET48 - public ushort TMD_TitleVersion => _model.TMDFileData.TitleVersion; + public ushort TMD_TitleVersion => this.Model.TMDFileData.TitleVersion; #else - public ushort? TMD_TitleVersion => _model.TMDFileData?.TitleVersion; + public ushort? TMD_TitleVersion => this.Model.TMDFileData?.TitleVersion; #endif /// #if NET48 - public ushort TMD_ContentCount => _model.TMDFileData.ContentCount; + public ushort TMD_ContentCount => this.Model.TMDFileData.ContentCount; #else - public ushort? TMD_ContentCount => _model.TMDFileData?.ContentCount; + public ushort? TMD_ContentCount => this.Model.TMDFileData?.ContentCount; #endif /// #if NET48 - public ushort TMD_BootContent => _model.TMDFileData.BootContent; + public ushort TMD_BootContent => this.Model.TMDFileData.BootContent; #else - public ushort? TMD_BootContent => _model.TMDFileData?.BootContent; + public ushort? TMD_BootContent => this.Model.TMDFileData?.BootContent; #endif /// #if NET48 - public byte[] TMD_Padding2 => _model.TMDFileData.Padding2; + public byte[] TMD_Padding2 => this.Model.TMDFileData.Padding2; #else - public byte[]? TMD_Padding2 => _model.TMDFileData?.Padding2; + public byte[]? TMD_Padding2 => this.Model.TMDFileData?.Padding2; #endif /// #if NET48 - public byte[] TMD_SHA256HashContentInfoRecords => _model.TMDFileData.SHA256HashContentInfoRecords; + public byte[] TMD_SHA256HashContentInfoRecords => this.Model.TMDFileData.SHA256HashContentInfoRecords; #else - public byte[]? TMD_SHA256HashContentInfoRecords => _model.TMDFileData?.SHA256HashContentInfoRecords; + public byte[]? TMD_SHA256HashContentInfoRecords => this.Model.TMDFileData?.SHA256HashContentInfoRecords; #endif /// #if NET48 - public SabreTools.Models.N3DS.ContentInfoRecord[] TMD_ContentInfoRecords => _model.TMDFileData.ContentInfoRecords; + public SabreTools.Models.N3DS.ContentInfoRecord[] TMD_ContentInfoRecords => this.Model.TMDFileData.ContentInfoRecords; #else - public SabreTools.Models.N3DS.ContentInfoRecord?[]? TMD_ContentInfoRecords => _model.TMDFileData?.ContentInfoRecords; + public SabreTools.Models.N3DS.ContentInfoRecord?[]? TMD_ContentInfoRecords => this.Model.TMDFileData?.ContentInfoRecords; #endif /// #if NET48 - public SabreTools.Models.N3DS.ContentChunkRecord[] TMD_ContentChunkRecords => _model.TMDFileData.ContentChunkRecords; + public SabreTools.Models.N3DS.ContentChunkRecord[] TMD_ContentChunkRecords => this.Model.TMDFileData.ContentChunkRecords; #else - public SabreTools.Models.N3DS.ContentChunkRecord?[]? TMD_ContentChunkRecords => _model.TMDFileData?.ContentChunkRecords; + public SabreTools.Models.N3DS.ContentChunkRecord?[]? TMD_ContentChunkRecords => this.Model.TMDFileData?.ContentChunkRecords; #endif /// #if NET48 - public SabreTools.Models.N3DS.Certificate[] TMD_CertificateChain => _model.TMDFileData.CertificateChain; + public SabreTools.Models.N3DS.Certificate[] TMD_CertificateChain => this.Model.TMDFileData.CertificateChain; #else - public SabreTools.Models.N3DS.Certificate?[]? TMD_CertificateChain => _model.TMDFileData?.CertificateChain; + public SabreTools.Models.N3DS.Certificate?[]? TMD_CertificateChain => this.Model.TMDFileData?.CertificateChain; #endif #endregion @@ -503,9 +503,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.N3DS.NCCHHeader[] Partitions => _model.Partitions; + public SabreTools.Models.N3DS.NCCHHeader[] Partitions => this.Model.Partitions; #else - public SabreTools.Models.N3DS.NCCHHeader?[]? Partitions => _model.Partitions; + public SabreTools.Models.N3DS.NCCHHeader?[]? Partitions => this.Model.Partitions; #endif #endregion @@ -514,33 +514,33 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public byte[] MD_TitleIDDependencyList => _model.MetaData?.TitleIDDependencyList; + public byte[] MD_TitleIDDependencyList => this.Model.MetaData?.TitleIDDependencyList; #else - public byte[]? MD_TitleIDDependencyList => _model.MetaData?.TitleIDDependencyList; + public byte[]? MD_TitleIDDependencyList => this.Model.MetaData?.TitleIDDependencyList; #endif /// #if NET48 - public byte[] MD_Reserved1 => _model.MetaData?.Reserved1; + public byte[] MD_Reserved1 => this.Model.MetaData?.Reserved1; #else - public byte[]? MD_Reserved1 => _model.MetaData?.Reserved1; + public byte[]? MD_Reserved1 => this.Model.MetaData?.Reserved1; #endif /// - public uint? MD_CoreVersion => _model.MetaData?.CoreVersion; + public uint? MD_CoreVersion => this.Model.MetaData?.CoreVersion; /// #if NET48 - public byte[] MD_Reserved2 => _model.MetaData?.Reserved2; + public byte[] MD_Reserved2 => this.Model.MetaData?.Reserved2; #else - public byte[]? MD_Reserved2 => _model.MetaData?.Reserved2; + public byte[]? MD_Reserved2 => this.Model.MetaData?.Reserved2; #endif /// #if NET48 - public byte[] MD_IconData => _model.MetaData?.IconData; + public byte[] MD_IconData => this.Model.MetaData?.IconData; #else - public byte[]? MD_IconData => _model.MetaData?.IconData; + public byte[]? MD_IconData => this.Model.MetaData?.IconData; #endif #endregion @@ -633,17 +633,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.CIA.Print(builder, _model); + Printing.CIA.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/GCF.cs b/BinaryObjectScanner.Wrappers/GCF.cs index 7b9108b4..8c848f4b 100644 --- a/BinaryObjectScanner.Wrappers/GCF.cs +++ b/BinaryObjectScanner.Wrappers/GCF.cs @@ -20,79 +20,79 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint Dummy0 => _model.Header.Dummy0; + public uint Dummy0 => this.Model.Header.Dummy0; #else - public uint? Dummy0 => _model.Header?.Dummy0; + public uint? Dummy0 => this.Model.Header?.Dummy0; #endif /// #if NET48 - public uint MajorVersion => _model.Header.MajorVersion; + public uint MajorVersion => this.Model.Header.MajorVersion; #else - public uint? MajorVersion => _model.Header?.MajorVersion; + public uint? MajorVersion => this.Model.Header?.MajorVersion; #endif /// #if NET48 - public uint MinorVersion => _model.Header.MinorVersion; + public uint MinorVersion => this.Model.Header.MinorVersion; #else - public uint? MinorVersion => _model.Header?.MinorVersion; + public uint? MinorVersion => this.Model.Header?.MinorVersion; #endif /// #if NET48 - public uint CacheID => _model.Header.CacheID; + public uint CacheID => this.Model.Header.CacheID; #else - public uint? CacheID => _model.Header?.CacheID; + public uint? CacheID => this.Model.Header?.CacheID; #endif /// #if NET48 - public uint LastVersionPlayed => _model.Header.LastVersionPlayed; + public uint LastVersionPlayed => this.Model.Header.LastVersionPlayed; #else - public uint? LastVersionPlayed => _model.Header?.LastVersionPlayed; + public uint? LastVersionPlayed => this.Model.Header?.LastVersionPlayed; #endif /// #if NET48 - public uint Dummy1 => _model.Header.Dummy1; + public uint Dummy1 => this.Model.Header.Dummy1; #else - public uint? Dummy1 => _model.Header?.Dummy1; + public uint? Dummy1 => this.Model.Header?.Dummy1; #endif /// #if NET48 - public uint Dummy2 => _model.Header.Dummy2; + public uint Dummy2 => this.Model.Header.Dummy2; #else - public uint? Dummy2 => _model.Header?.Dummy2; + public uint? Dummy2 => this.Model.Header?.Dummy2; #endif /// #if NET48 - public uint FileSize => _model.Header.FileSize; + public uint FileSize => this.Model.Header.FileSize; #else - public uint? FileSize => _model.Header?.FileSize; + public uint? FileSize => this.Model.Header?.FileSize; #endif /// #if NET48 - public uint BlockSize => _model.Header.BlockSize; + public uint BlockSize => this.Model.Header.BlockSize; #else - public uint? BlockSize => _model.Header?.BlockSize; + public uint? BlockSize => this.Model.Header?.BlockSize; #endif /// #if NET48 - public uint BlockCount => _model.Header.BlockCount; + public uint BlockCount => this.Model.Header.BlockCount; #else - public uint? BlockCount => _model.Header?.BlockCount; + public uint? BlockCount => this.Model.Header?.BlockCount; #endif /// #if NET48 - public uint Dummy3 => _model.Header.Dummy3; + public uint Dummy3 => this.Model.Header.Dummy3; #else - public uint? Dummy3 => _model.Header?.Dummy3; + public uint? Dummy3 => this.Model.Header?.Dummy3; #endif #endregion @@ -101,58 +101,58 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint BEH_BlockCount => _model.BlockEntryHeader.BlockCount; + public uint BEH_BlockCount => this.Model.BlockEntryHeader.BlockCount; #else - public uint? BEH_BlockCount => _model.BlockEntryHeader?.BlockCount; + public uint? BEH_BlockCount => this.Model.BlockEntryHeader?.BlockCount; #endif /// #if NET48 - public uint BEH_BlocksUsed => _model.BlockEntryHeader.BlocksUsed; + public uint BEH_BlocksUsed => this.Model.BlockEntryHeader.BlocksUsed; #else - public uint? BEH_BlocksUsed => _model.BlockEntryHeader?.BlocksUsed; + public uint? BEH_BlocksUsed => this.Model.BlockEntryHeader?.BlocksUsed; #endif /// #if NET48 - public uint BEH_Dummy0 => _model.BlockEntryHeader.Dummy0; + public uint BEH_Dummy0 => this.Model.BlockEntryHeader.Dummy0; #else - public uint? BEH_Dummy0 => _model.BlockEntryHeader?.Dummy0; + public uint? BEH_Dummy0 => this.Model.BlockEntryHeader?.Dummy0; #endif /// #if NET48 - public uint BEH_Dummy1 => _model.BlockEntryHeader.Dummy1; + public uint BEH_Dummy1 => this.Model.BlockEntryHeader.Dummy1; #else - public uint? BEH_Dummy1 => _model.BlockEntryHeader?.Dummy1; + public uint? BEH_Dummy1 => this.Model.BlockEntryHeader?.Dummy1; #endif /// #if NET48 - public uint BEH_Dummy2 => _model.BlockEntryHeader.Dummy2; + public uint BEH_Dummy2 => this.Model.BlockEntryHeader.Dummy2; #else - public uint? BEH_Dummy2 => _model.BlockEntryHeader?.Dummy2; + public uint? BEH_Dummy2 => this.Model.BlockEntryHeader?.Dummy2; #endif /// #if NET48 - public uint BEH_Dummy3 => _model.BlockEntryHeader.Dummy3; + public uint BEH_Dummy3 => this.Model.BlockEntryHeader.Dummy3; #else - public uint? BEH_Dummy3 => _model.BlockEntryHeader?.Dummy3; + public uint? BEH_Dummy3 => this.Model.BlockEntryHeader?.Dummy3; #endif /// #if NET48 - public uint BEH_Dummy4 => _model.BlockEntryHeader.Dummy4; + public uint BEH_Dummy4 => this.Model.BlockEntryHeader.Dummy4; #else - public uint? BEH_Dummy4 => _model.BlockEntryHeader?.Dummy4; + public uint? BEH_Dummy4 => this.Model.BlockEntryHeader?.Dummy4; #endif /// #if NET48 - public uint BEH_Checksum => _model.BlockEntryHeader.Checksum; + public uint BEH_Checksum => this.Model.BlockEntryHeader.Checksum; #else - public uint? BEH_Checksum => _model.BlockEntryHeader?.Checksum; + public uint? BEH_Checksum => this.Model.BlockEntryHeader?.Checksum; #endif #endregion @@ -161,9 +161,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.GCF.BlockEntry[] BlockEntries => _model.BlockEntries; + public SabreTools.Models.GCF.BlockEntry[] BlockEntries => this.Model.BlockEntries; #else - public SabreTools.Models.GCF.BlockEntry?[]? BlockEntries => _model.BlockEntries; + public SabreTools.Models.GCF.BlockEntry?[]? BlockEntries => this.Model.BlockEntries; #endif #endregion @@ -172,30 +172,30 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint FMH_BlockCount => _model.FragmentationMapHeader.BlockCount; + public uint FMH_BlockCount => this.Model.FragmentationMapHeader.BlockCount; #else - public uint? FMH_BlockCount => _model.FragmentationMapHeader?.BlockCount; + public uint? FMH_BlockCount => this.Model.FragmentationMapHeader?.BlockCount; #endif /// #if NET48 - public uint FMH_FirstUnusedEntry => _model.FragmentationMapHeader.FirstUnusedEntry; + public uint FMH_FirstUnusedEntry => this.Model.FragmentationMapHeader.FirstUnusedEntry; #else - public uint? FMH_FirstUnusedEntry => _model.FragmentationMapHeader?.FirstUnusedEntry; + public uint? FMH_FirstUnusedEntry => this.Model.FragmentationMapHeader?.FirstUnusedEntry; #endif /// #if NET48 - public uint FMH_Terminator => _model.FragmentationMapHeader.Terminator; + public uint FMH_Terminator => this.Model.FragmentationMapHeader.Terminator; #else - public uint? FMH_Terminator => _model.FragmentationMapHeader?.Terminator; + public uint? FMH_Terminator => this.Model.FragmentationMapHeader?.Terminator; #endif /// #if NET48 - public uint FMH_Checksum => _model.FragmentationMapHeader.Checksum; + public uint FMH_Checksum => this.Model.FragmentationMapHeader.Checksum; #else - public uint? FMH_Checksum => _model.FragmentationMapHeader?.Checksum; + public uint? FMH_Checksum => this.Model.FragmentationMapHeader?.Checksum; #endif #endregion @@ -204,9 +204,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.GCF.FragmentationMap[] FragmentationMaps => _model.FragmentationMaps; + public SabreTools.Models.GCF.FragmentationMap[] FragmentationMaps => this.Model.FragmentationMaps; #else - public SabreTools.Models.GCF.FragmentationMap?[]? FragmentationMaps => _model.FragmentationMaps; + public SabreTools.Models.GCF.FragmentationMap?[]? FragmentationMaps => this.Model.FragmentationMaps; #endif #endregion @@ -214,19 +214,19 @@ namespace BinaryObjectScanner.Wrappers #region Block Entry Map Header /// - public uint? BEMH_BlockCount => _model.BlockEntryMapHeader?.BlockCount; + public uint? BEMH_BlockCount => this.Model.BlockEntryMapHeader?.BlockCount; /// - public uint? BEMH_FirstBlockEntryIndex => _model.BlockEntryMapHeader?.FirstBlockEntryIndex; + public uint? BEMH_FirstBlockEntryIndex => this.Model.BlockEntryMapHeader?.FirstBlockEntryIndex; /// - public uint? BEMH_LastBlockEntryIndex => _model.BlockEntryMapHeader?.LastBlockEntryIndex; + public uint? BEMH_LastBlockEntryIndex => this.Model.BlockEntryMapHeader?.LastBlockEntryIndex; /// - public uint? BEMH_Dummy0 => _model.BlockEntryMapHeader?.Dummy0; + public uint? BEMH_Dummy0 => this.Model.BlockEntryMapHeader?.Dummy0; /// - public uint? BEMH_Checksum => _model.BlockEntryMapHeader?.Checksum; + public uint? BEMH_Checksum => this.Model.BlockEntryMapHeader?.Checksum; #endregion @@ -234,9 +234,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.GCF.BlockEntryMap[] BlockEntryMaps => _model.BlockEntryMaps; + public SabreTools.Models.GCF.BlockEntryMap[] BlockEntryMaps => this.Model.BlockEntryMaps; #else - public SabreTools.Models.GCF.BlockEntryMap?[]? BlockEntryMaps => _model.BlockEntryMaps; + public SabreTools.Models.GCF.BlockEntryMap?[]? BlockEntryMaps => this.Model.BlockEntryMaps; #endif #endregion @@ -245,100 +245,100 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint DH_Dummy0 => _model.DirectoryHeader.Dummy0; + public uint DH_Dummy0 => this.Model.DirectoryHeader.Dummy0; #else - public uint? DH_Dummy0 => _model.DirectoryHeader?.Dummy0; + public uint? DH_Dummy0 => this.Model.DirectoryHeader?.Dummy0; #endif /// #if NET48 - public uint DH_CacheID => _model.DirectoryHeader.CacheID; + public uint DH_CacheID => this.Model.DirectoryHeader.CacheID; #else - public uint? DH_CacheID => _model.DirectoryHeader?.CacheID; + public uint? DH_CacheID => this.Model.DirectoryHeader?.CacheID; #endif /// #if NET48 - public uint DH_LastVersionPlayed => _model.DirectoryHeader.LastVersionPlayed; + public uint DH_LastVersionPlayed => this.Model.DirectoryHeader.LastVersionPlayed; #else - public uint? DH_LastVersionPlayed => _model.DirectoryHeader?.LastVersionPlayed; + public uint? DH_LastVersionPlayed => this.Model.DirectoryHeader?.LastVersionPlayed; #endif /// #if NET48 - public uint DH_ItemCount => _model.DirectoryHeader.ItemCount; + public uint DH_ItemCount => this.Model.DirectoryHeader.ItemCount; #else - public uint? DH_ItemCount => _model.DirectoryHeader?.ItemCount; + public uint? DH_ItemCount => this.Model.DirectoryHeader?.ItemCount; #endif /// #if NET48 - public uint DH_FileCount => _model.DirectoryHeader.FileCount; + public uint DH_FileCount => this.Model.DirectoryHeader.FileCount; #else - public uint? DH_FileCount => _model.DirectoryHeader?.FileCount; + public uint? DH_FileCount => this.Model.DirectoryHeader?.FileCount; #endif /// #if NET48 - public uint DH_Dummy1 => _model.DirectoryHeader.Dummy1; + public uint DH_Dummy1 => this.Model.DirectoryHeader.Dummy1; #else - public uint? DH_Dummy1 => _model.DirectoryHeader?.Dummy1; + public uint? DH_Dummy1 => this.Model.DirectoryHeader?.Dummy1; #endif /// #if NET48 - public uint DH_DirectorySize => _model.DirectoryHeader.DirectorySize; + public uint DH_DirectorySize => this.Model.DirectoryHeader.DirectorySize; #else - public uint? DH_DirectorySize => _model.DirectoryHeader?.DirectorySize; + public uint? DH_DirectorySize => this.Model.DirectoryHeader?.DirectorySize; #endif /// #if NET48 - public uint DH_NameSize => _model.DirectoryHeader.NameSize; + public uint DH_NameSize => this.Model.DirectoryHeader.NameSize; #else - public uint? DH_NameSize => _model.DirectoryHeader?.NameSize; + public uint? DH_NameSize => this.Model.DirectoryHeader?.NameSize; #endif /// #if NET48 - public uint DH_Info1Count => _model.DirectoryHeader.Info1Count; + public uint DH_Info1Count => this.Model.DirectoryHeader.Info1Count; #else - public uint? DH_Info1Count => _model.DirectoryHeader?.Info1Count; + public uint? DH_Info1Count => this.Model.DirectoryHeader?.Info1Count; #endif /// #if NET48 - public uint DH_CopyCount => _model.DirectoryHeader.CopyCount; + public uint DH_CopyCount => this.Model.DirectoryHeader.CopyCount; #else - public uint? DH_CopyCount => _model.DirectoryHeader?.CopyCount; + public uint? DH_CopyCount => this.Model.DirectoryHeader?.CopyCount; #endif /// #if NET48 - public uint DH_LocalCount => _model.DirectoryHeader.LocalCount; + public uint DH_LocalCount => this.Model.DirectoryHeader.LocalCount; #else - public uint? DH_LocalCount => _model.DirectoryHeader?.LocalCount; + public uint? DH_LocalCount => this.Model.DirectoryHeader?.LocalCount; #endif /// #if NET48 - public uint DH_Dummy2 => _model.DirectoryHeader.Dummy2; + public uint DH_Dummy2 => this.Model.DirectoryHeader.Dummy2; #else - public uint? DH_Dummy2 => _model.DirectoryHeader?.Dummy2; + public uint? DH_Dummy2 => this.Model.DirectoryHeader?.Dummy2; #endif /// #if NET48 - public uint DH_Dummy3 => _model.DirectoryHeader.Dummy3; + public uint DH_Dummy3 => this.Model.DirectoryHeader.Dummy3; #else - public uint? DH_Dummy3 => _model.DirectoryHeader?.Dummy3; + public uint? DH_Dummy3 => this.Model.DirectoryHeader?.Dummy3; #endif /// #if NET48 - public uint DH_Checksum => _model.DirectoryHeader.Checksum; + public uint DH_Checksum => this.Model.DirectoryHeader.Checksum; #else - public uint? DH_Checksum => _model.DirectoryHeader?.Checksum; + public uint? DH_Checksum => this.Model.DirectoryHeader?.Checksum; #endif #endregion @@ -347,9 +347,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.GCF.DirectoryEntry[] DirectoryEntries => _model.DirectoryEntries; + public SabreTools.Models.GCF.DirectoryEntry[] DirectoryEntries => this.Model.DirectoryEntries; #else - public SabreTools.Models.GCF.DirectoryEntry?[]? DirectoryEntries => _model.DirectoryEntries; + public SabreTools.Models.GCF.DirectoryEntry?[]? DirectoryEntries => this.Model.DirectoryEntries; #endif #endregion @@ -358,9 +358,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public Dictionary DirectoryNames => _model.DirectoryNames; + public Dictionary DirectoryNames => this.Model.DirectoryNames; #else - public Dictionary? DirectoryNames => _model.DirectoryNames; + public Dictionary? DirectoryNames => this.Model.DirectoryNames; #endif #endregion @@ -369,9 +369,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.GCF.DirectoryInfo1Entry[] DirectoryInfo1Entries => _model.DirectoryInfo1Entries; + public SabreTools.Models.GCF.DirectoryInfo1Entry[] DirectoryInfo1Entries => this.Model.DirectoryInfo1Entries; #else - public SabreTools.Models.GCF.DirectoryInfo1Entry?[]? DirectoryInfo1Entries => _model.DirectoryInfo1Entries; + public SabreTools.Models.GCF.DirectoryInfo1Entry?[]? DirectoryInfo1Entries => this.Model.DirectoryInfo1Entries; #endif #endregion @@ -380,9 +380,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.GCF.DirectoryInfo2Entry[] DirectoryInfo2Entries => _model.DirectoryInfo2Entries; + public SabreTools.Models.GCF.DirectoryInfo2Entry[] DirectoryInfo2Entries => this.Model.DirectoryInfo2Entries; #else - public SabreTools.Models.GCF.DirectoryInfo2Entry?[]? DirectoryInfo2Entries => _model.DirectoryInfo2Entries; + public SabreTools.Models.GCF.DirectoryInfo2Entry?[]? DirectoryInfo2Entries => this.Model.DirectoryInfo2Entries; #endif #endregion @@ -391,9 +391,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.GCF.DirectoryCopyEntry[] DirectoryCopyEntries => _model.DirectoryCopyEntries; + public SabreTools.Models.GCF.DirectoryCopyEntry[] DirectoryCopyEntries => this.Model.DirectoryCopyEntries; #else - public SabreTools.Models.GCF.DirectoryCopyEntry?[]? DirectoryCopyEntries => _model.DirectoryCopyEntries; + public SabreTools.Models.GCF.DirectoryCopyEntry?[]? DirectoryCopyEntries => this.Model.DirectoryCopyEntries; #endif #endregion @@ -402,9 +402,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.GCF.DirectoryLocalEntry[] DirectoryLocalEntries => _model.DirectoryLocalEntries; + public SabreTools.Models.GCF.DirectoryLocalEntry[] DirectoryLocalEntries => this.Model.DirectoryLocalEntries; #else - public SabreTools.Models.GCF.DirectoryLocalEntry?[]? DirectoryLocalEntries => _model.DirectoryLocalEntries; + public SabreTools.Models.GCF.DirectoryLocalEntry?[]? DirectoryLocalEntries => this.Model.DirectoryLocalEntries; #endif #endregion @@ -412,10 +412,10 @@ namespace BinaryObjectScanner.Wrappers #region Directory Map Header /// - public uint? DMH_Dummy0 => _model.DirectoryMapHeader?.Dummy0; + public uint? DMH_Dummy0 => this.Model.DirectoryMapHeader?.Dummy0; /// - public uint? DMH_Dummy1 => _model.DirectoryMapHeader?.Dummy1; + public uint? DMH_Dummy1 => this.Model.DirectoryMapHeader?.Dummy1; #endregion @@ -423,9 +423,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.GCF.DirectoryMapEntry[] DirectoryMapEntries => _model.DirectoryMapEntries; + public SabreTools.Models.GCF.DirectoryMapEntry[] DirectoryMapEntries => this.Model.DirectoryMapEntries; #else - public SabreTools.Models.GCF.DirectoryMapEntry?[]? DirectoryMapEntries => _model.DirectoryMapEntries; + public SabreTools.Models.GCF.DirectoryMapEntry?[]? DirectoryMapEntries => this.Model.DirectoryMapEntries; #endif #endregion @@ -434,16 +434,16 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint CH_Dummy0 => _model.ChecksumHeader.Dummy0; + public uint CH_Dummy0 => this.Model.ChecksumHeader.Dummy0; #else - public uint? CH_Dummy0 => _model.ChecksumHeader?.Dummy0; + public uint? CH_Dummy0 => this.Model.ChecksumHeader?.Dummy0; #endif /// #if NET48 - public uint CH_ChecksumSize => _model.ChecksumHeader.ChecksumSize; + public uint CH_ChecksumSize => this.Model.ChecksumHeader.ChecksumSize; #else - public uint? CH_ChecksumSize => _model.ChecksumHeader?.ChecksumSize; + public uint? CH_ChecksumSize => this.Model.ChecksumHeader?.ChecksumSize; #endif #endregion @@ -452,30 +452,30 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint CMH_Dummy0 => _model.ChecksumMapHeader.Dummy0; + public uint CMH_Dummy0 => this.Model.ChecksumMapHeader.Dummy0; #else - public uint? CMH_Dummy0 => _model.ChecksumMapHeader?.Dummy0; + public uint? CMH_Dummy0 => this.Model.ChecksumMapHeader?.Dummy0; #endif /// #if NET48 - public uint CMH_Dummy1 => _model.ChecksumMapHeader.Dummy1; + public uint CMH_Dummy1 => this.Model.ChecksumMapHeader.Dummy1; #else - public uint? CMH_Dummy1 => _model.ChecksumMapHeader?.Dummy1; + public uint? CMH_Dummy1 => this.Model.ChecksumMapHeader?.Dummy1; #endif /// #if NET48 - public uint CMH_ItemCount => _model.ChecksumMapHeader.ItemCount; + public uint CMH_ItemCount => this.Model.ChecksumMapHeader.ItemCount; #else - public uint? CMH_ItemCount => _model.ChecksumMapHeader?.ItemCount; + public uint? CMH_ItemCount => this.Model.ChecksumMapHeader?.ItemCount; #endif /// #if NET48 - public uint CMH_ChecksumCount => _model.ChecksumMapHeader.ChecksumCount; + public uint CMH_ChecksumCount => this.Model.ChecksumMapHeader.ChecksumCount; #else - public uint? CMH_ChecksumCount => _model.ChecksumMapHeader?.ChecksumCount; + public uint? CMH_ChecksumCount => this.Model.ChecksumMapHeader?.ChecksumCount; #endif #endregion @@ -484,9 +484,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.GCF.ChecksumMapEntry[] ChecksumMapEntries => _model.ChecksumMapEntries; + public SabreTools.Models.GCF.ChecksumMapEntry[] ChecksumMapEntries => this.Model.ChecksumMapEntries; #else - public SabreTools.Models.GCF.ChecksumMapEntry?[]? ChecksumMapEntries => _model.ChecksumMapEntries; + public SabreTools.Models.GCF.ChecksumMapEntry?[]? ChecksumMapEntries => this.Model.ChecksumMapEntries; #endif #endregion @@ -495,9 +495,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.GCF.ChecksumEntry[] ChecksumEntries => _model.ChecksumEntries; + public SabreTools.Models.GCF.ChecksumEntry[] ChecksumEntries => this.Model.ChecksumEntries; #else - public SabreTools.Models.GCF.ChecksumEntry?[]? ChecksumEntries => _model.ChecksumEntries; + public SabreTools.Models.GCF.ChecksumEntry?[]? ChecksumEntries => this.Model.ChecksumEntries; #endif #endregion @@ -506,44 +506,44 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint DBH_LastVersionPlayed => _model.DataBlockHeader.LastVersionPlayed; + public uint DBH_LastVersionPlayed => this.Model.DataBlockHeader.LastVersionPlayed; #else - public uint? DBH_LastVersionPlayed => _model.DataBlockHeader?.LastVersionPlayed; + public uint? DBH_LastVersionPlayed => this.Model.DataBlockHeader?.LastVersionPlayed; #endif /// #if NET48 - public uint DBH_BlockCount => _model.DataBlockHeader.BlockCount; + public uint DBH_BlockCount => this.Model.DataBlockHeader.BlockCount; #else - public uint? DBH_BlockCount => _model.DataBlockHeader?.BlockCount; + public uint? DBH_BlockCount => this.Model.DataBlockHeader?.BlockCount; #endif /// #if NET48 - public uint DBH_BlockSize => _model.DataBlockHeader.BlockSize; + public uint DBH_BlockSize => this.Model.DataBlockHeader.BlockSize; #else - public uint? DBH_BlockSize => _model.DataBlockHeader?.BlockSize; + public uint? DBH_BlockSize => this.Model.DataBlockHeader?.BlockSize; #endif /// #if NET48 - public uint DBH_FirstBlockOffset => _model.DataBlockHeader.FirstBlockOffset; + public uint DBH_FirstBlockOffset => this.Model.DataBlockHeader.FirstBlockOffset; #else - public uint? DBH_FirstBlockOffset => _model.DataBlockHeader?.FirstBlockOffset; + public uint? DBH_FirstBlockOffset => this.Model.DataBlockHeader?.FirstBlockOffset; #endif /// #if NET48 - public uint DBH_BlocksUsed => _model.DataBlockHeader.BlocksUsed; + public uint DBH_BlocksUsed => this.Model.DataBlockHeader.BlocksUsed; #else - public uint? DBH_BlocksUsed => _model.DataBlockHeader?.BlocksUsed; + public uint? DBH_BlocksUsed => this.Model.DataBlockHeader?.BlocksUsed; #endif /// #if NET48 - public uint DBH_Checksum => _model.DataBlockHeader.Checksum; + public uint DBH_Checksum => this.Model.DataBlockHeader.Checksum; #else - public uint? DBH_Checksum => _model.DataBlockHeader?.Checksum; + public uint? DBH_Checksum => this.Model.DataBlockHeader?.Checksum; #endif #endregion @@ -791,17 +791,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.GCF.Print(builder, _model); + Printing.GCF.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion #region Extraction diff --git a/BinaryObjectScanner.Wrappers/InstallShieldCabinet.cs b/BinaryObjectScanner.Wrappers/InstallShieldCabinet.cs index 9b571d3a..f7c8969d 100644 --- a/BinaryObjectScanner.Wrappers/InstallShieldCabinet.cs +++ b/BinaryObjectScanner.Wrappers/InstallShieldCabinet.cs @@ -19,37 +19,37 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Signature => _model.CommonHeader.Signature; + public string Signature => this.Model.CommonHeader.Signature; #else - public string? Signature => _model.CommonHeader?.Signature; + public string? Signature => this.Model.CommonHeader?.Signature; #endif /// #if NET48 - public uint Version => _model.CommonHeader.Version; + public uint Version => this.Model.CommonHeader.Version; #else - public uint? Version => _model.CommonHeader?.Version; + public uint? Version => this.Model.CommonHeader?.Version; #endif /// #if NET48 - public uint VolumeInfo => _model.CommonHeader.VolumeInfo; + public uint VolumeInfo => this.Model.CommonHeader.VolumeInfo; #else - public uint? VolumeInfo => _model.CommonHeader?.VolumeInfo; + public uint? VolumeInfo => this.Model.CommonHeader?.VolumeInfo; #endif /// #if NET48 - public uint DescriptorOffset => _model.CommonHeader.DescriptorOffset; + public uint DescriptorOffset => this.Model.CommonHeader.DescriptorOffset; #else - public uint? DescriptorOffset => _model.CommonHeader?.DescriptorOffset; + public uint? DescriptorOffset => this.Model.CommonHeader?.DescriptorOffset; #endif /// #if NET48 - public uint DescriptorSize => _model.CommonHeader.DescriptorSize; + public uint DescriptorSize => this.Model.CommonHeader.DescriptorSize; #else - public uint? DescriptorSize => _model.CommonHeader?.DescriptorSize; + public uint? DescriptorSize => this.Model.CommonHeader?.DescriptorSize; #endif #endregion @@ -58,114 +58,114 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint DataOffset => _model.VolumeHeader.DataOffset; + public uint DataOffset => this.Model.VolumeHeader.DataOffset; #else - public uint? DataOffset => _model.VolumeHeader?.DataOffset; + public uint? DataOffset => this.Model.VolumeHeader?.DataOffset; #endif /// #if NET48 - public uint DataOffsetHigh => _model.VolumeHeader.DataOffsetHigh; + public uint DataOffsetHigh => this.Model.VolumeHeader.DataOffsetHigh; #else - public uint? DataOffsetHigh => _model.VolumeHeader?.DataOffsetHigh; + public uint? DataOffsetHigh => this.Model.VolumeHeader?.DataOffsetHigh; #endif /// #if NET48 - public uint FirstFileIndex => _model.VolumeHeader.FirstFileIndex; + public uint FirstFileIndex => this.Model.VolumeHeader.FirstFileIndex; #else - public uint? FirstFileIndex => _model.VolumeHeader?.FirstFileIndex; + public uint? FirstFileIndex => this.Model.VolumeHeader?.FirstFileIndex; #endif /// #if NET48 - public uint LastFileIndex => _model.VolumeHeader.LastFileIndex; + public uint LastFileIndex => this.Model.VolumeHeader.LastFileIndex; #else - public uint? LastFileIndex => _model.VolumeHeader?.LastFileIndex; + public uint? LastFileIndex => this.Model.VolumeHeader?.LastFileIndex; #endif /// #if NET48 - public uint FirstFileOffset => _model.VolumeHeader.FirstFileOffset; + public uint FirstFileOffset => this.Model.VolumeHeader.FirstFileOffset; #else - public uint? FirstFileOffset => _model.VolumeHeader?.FirstFileOffset; + public uint? FirstFileOffset => this.Model.VolumeHeader?.FirstFileOffset; #endif /// #if NET48 - public uint FirstFileOffsetHigh => _model.VolumeHeader.FirstFileOffsetHigh; + public uint FirstFileOffsetHigh => this.Model.VolumeHeader.FirstFileOffsetHigh; #else - public uint? FirstFileOffsetHigh => _model.VolumeHeader?.FirstFileOffsetHigh; + public uint? FirstFileOffsetHigh => this.Model.VolumeHeader?.FirstFileOffsetHigh; #endif /// #if NET48 - public uint FirstFileSizeExpanded => _model.VolumeHeader.FirstFileSizeExpanded; + public uint FirstFileSizeExpanded => this.Model.VolumeHeader.FirstFileSizeExpanded; #else - public uint? FirstFileSizeExpanded => _model.VolumeHeader?.FirstFileSizeExpanded; + public uint? FirstFileSizeExpanded => this.Model.VolumeHeader?.FirstFileSizeExpanded; #endif /// #if NET48 - public uint FirstFileSizeExpandedHigh => _model.VolumeHeader.FirstFileSizeExpandedHigh; + public uint FirstFileSizeExpandedHigh => this.Model.VolumeHeader.FirstFileSizeExpandedHigh; #else - public uint? FirstFileSizeExpandedHigh => _model.VolumeHeader?.FirstFileSizeExpandedHigh; + public uint? FirstFileSizeExpandedHigh => this.Model.VolumeHeader?.FirstFileSizeExpandedHigh; #endif /// #if NET48 - public uint FirstFileSizeCompressed => _model.VolumeHeader.FirstFileSizeCompressed; + public uint FirstFileSizeCompressed => this.Model.VolumeHeader.FirstFileSizeCompressed; #else - public uint? FirstFileSizeCompressed => _model.VolumeHeader?.FirstFileSizeCompressed; + public uint? FirstFileSizeCompressed => this.Model.VolumeHeader?.FirstFileSizeCompressed; #endif /// #if NET48 - public uint FirstFileSizeCompressedHigh => _model.VolumeHeader.FirstFileSizeCompressedHigh; + public uint FirstFileSizeCompressedHigh => this.Model.VolumeHeader.FirstFileSizeCompressedHigh; #else - public uint? FirstFileSizeCompressedHigh => _model.VolumeHeader?.FirstFileSizeCompressedHigh; + public uint? FirstFileSizeCompressedHigh => this.Model.VolumeHeader?.FirstFileSizeCompressedHigh; #endif /// #if NET48 - public uint LastFileOffset => _model.VolumeHeader.LastFileOffset; + public uint LastFileOffset => this.Model.VolumeHeader.LastFileOffset; #else - public uint? LastFileOffset => _model.VolumeHeader?.LastFileOffset; + public uint? LastFileOffset => this.Model.VolumeHeader?.LastFileOffset; #endif /// #if NET48 - public uint LastFileOffsetHigh => _model.VolumeHeader.LastFileOffsetHigh; + public uint LastFileOffsetHigh => this.Model.VolumeHeader.LastFileOffsetHigh; #else - public uint? LastFileOffsetHigh => _model.VolumeHeader?.LastFileOffsetHigh; + public uint? LastFileOffsetHigh => this.Model.VolumeHeader?.LastFileOffsetHigh; #endif /// #if NET48 - public uint LastFileSizeExpanded => _model.VolumeHeader.LastFileSizeExpanded; + public uint LastFileSizeExpanded => this.Model.VolumeHeader.LastFileSizeExpanded; #else - public uint? LastFileSizeExpanded => _model.VolumeHeader?.LastFileSizeExpanded; + public uint? LastFileSizeExpanded => this.Model.VolumeHeader?.LastFileSizeExpanded; #endif /// #if NET48 - public uint LastFileSizeExpandedHigh => _model.VolumeHeader.LastFileSizeExpandedHigh; + public uint LastFileSizeExpandedHigh => this.Model.VolumeHeader.LastFileSizeExpandedHigh; #else - public uint? LastFileSizeExpandedHigh => _model.VolumeHeader?.LastFileSizeExpandedHigh; + public uint? LastFileSizeExpandedHigh => this.Model.VolumeHeader?.LastFileSizeExpandedHigh; #endif /// #if NET48 - public uint LastFileSizeCompressed => _model.VolumeHeader.LastFileSizeCompressed; + public uint LastFileSizeCompressed => this.Model.VolumeHeader.LastFileSizeCompressed; #else - public uint? LastFileSizeCompressed => _model.VolumeHeader?.LastFileSizeCompressed; + public uint? LastFileSizeCompressed => this.Model.VolumeHeader?.LastFileSizeCompressed; #endif /// #if NET48 - public uint LastFileSizeCompressedHigh => _model.VolumeHeader.LastFileSizeCompressedHigh; + public uint LastFileSizeCompressedHigh => this.Model.VolumeHeader.LastFileSizeCompressedHigh; #else - public uint? LastFileSizeCompressedHigh => _model.VolumeHeader?.LastFileSizeCompressedHigh; + public uint? LastFileSizeCompressedHigh => this.Model.VolumeHeader?.LastFileSizeCompressedHigh; #endif #endregion @@ -174,163 +174,163 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint StringsOffset => _model.Descriptor.StringsOffset; + public uint StringsOffset => this.Model.Descriptor.StringsOffset; #else - public uint? StringsOffset => _model.Descriptor?.StringsOffset; + public uint? StringsOffset => this.Model.Descriptor?.StringsOffset; #endif /// #if NET48 - public byte[] Reserved0 => _model.Descriptor.Reserved0; + public byte[] Reserved0 => this.Model.Descriptor.Reserved0; #else - public byte[]? Reserved0 => _model.Descriptor?.Reserved0; + public byte[]? Reserved0 => this.Model.Descriptor?.Reserved0; #endif /// #if NET48 - public uint ComponentListOffset => _model.Descriptor.ComponentListOffset; + public uint ComponentListOffset => this.Model.Descriptor.ComponentListOffset; #else - public uint? ComponentListOffset => _model.Descriptor?.ComponentListOffset; + public uint? ComponentListOffset => this.Model.Descriptor?.ComponentListOffset; #endif /// #if NET48 - public uint FileTableOffset => _model.Descriptor.FileTableOffset; + public uint FileTableOffset => this.Model.Descriptor.FileTableOffset; #else - public uint? FileTableOffset => _model.Descriptor?.FileTableOffset; + public uint? FileTableOffset => this.Model.Descriptor?.FileTableOffset; #endif /// #if NET48 - public byte[] Reserved1 => _model.Descriptor.Reserved1; + public byte[] Reserved1 => this.Model.Descriptor.Reserved1; #else - public byte[]? Reserved1 => _model.Descriptor?.Reserved1; + public byte[]? Reserved1 => this.Model.Descriptor?.Reserved1; #endif /// #if NET48 - public uint FileTableSize => _model.Descriptor.FileTableSize; + public uint FileTableSize => this.Model.Descriptor.FileTableSize; #else - public uint? FileTableSize => _model.Descriptor?.FileTableSize; + public uint? FileTableSize => this.Model.Descriptor?.FileTableSize; #endif /// #if NET48 - public uint FileTableSize2 => _model.Descriptor.FileTableSize2; + public uint FileTableSize2 => this.Model.Descriptor.FileTableSize2; #else - public uint? FileTableSize2 => _model.Descriptor?.FileTableSize2; + public uint? FileTableSize2 => this.Model.Descriptor?.FileTableSize2; #endif /// #if NET48 - public ushort DirectoryCount => _model.Descriptor.DirectoryCount; + public ushort DirectoryCount => this.Model.Descriptor.DirectoryCount; #else - public ushort? DirectoryCount => _model.Descriptor?.DirectoryCount; + public ushort? DirectoryCount => this.Model.Descriptor?.DirectoryCount; #endif /// #if NET48 - public byte[] Reserved2 => _model.Descriptor.Reserved2; + public byte[] Reserved2 => this.Model.Descriptor.Reserved2; #else - public byte[]? Reserved2 => _model.Descriptor?.Reserved2; + public byte[]? Reserved2 => this.Model.Descriptor?.Reserved2; #endif /// #if NET48 - public byte[] Reserved3 => _model.Descriptor.Reserved3; + public byte[] Reserved3 => this.Model.Descriptor.Reserved3; #else - public byte[]? Reserved3 => _model.Descriptor?.Reserved3; + public byte[]? Reserved3 => this.Model.Descriptor?.Reserved3; #endif /// #if NET48 - public byte[] Reserved4 => _model.Descriptor.Reserved4; + public byte[] Reserved4 => this.Model.Descriptor.Reserved4; #else - public byte[]? Reserved4 => _model.Descriptor?.Reserved4; + public byte[]? Reserved4 => this.Model.Descriptor?.Reserved4; #endif /// #if NET48 - public uint FileCount => _model.Descriptor.FileCount; + public uint FileCount => this.Model.Descriptor.FileCount; #else - public uint? FileCount => _model.Descriptor?.FileCount; + public uint? FileCount => this.Model.Descriptor?.FileCount; #endif /// #if NET48 - public uint FileTableOffset2 => _model.Descriptor.FileTableOffset2; + public uint FileTableOffset2 => this.Model.Descriptor.FileTableOffset2; #else - public uint? FileTableOffset2 => _model.Descriptor?.FileTableOffset2; + public uint? FileTableOffset2 => this.Model.Descriptor?.FileTableOffset2; #endif /// #if NET48 - public ushort ComponentTableInfoCount => _model.Descriptor.ComponentTableInfoCount; + public ushort ComponentTableInfoCount => this.Model.Descriptor.ComponentTableInfoCount; #else - public ushort? ComponentTableInfoCount => _model.Descriptor?.ComponentTableInfoCount; + public ushort? ComponentTableInfoCount => this.Model.Descriptor?.ComponentTableInfoCount; #endif /// #if NET48 - public uint ComponentTableOffset => _model.Descriptor.ComponentTableOffset; + public uint ComponentTableOffset => this.Model.Descriptor.ComponentTableOffset; #else - public uint? ComponentTableOffset => _model.Descriptor?.ComponentTableOffset; + public uint? ComponentTableOffset => this.Model.Descriptor?.ComponentTableOffset; #endif /// #if NET48 - public byte[] Reserved5 => _model.Descriptor.Reserved5; + public byte[] Reserved5 => this.Model.Descriptor.Reserved5; #else - public byte[]? Reserved5 => _model.Descriptor?.Reserved5; + public byte[]? Reserved5 => this.Model.Descriptor?.Reserved5; #endif /// #if NET48 - public byte[] Reserved6 => _model.Descriptor.Reserved6; + public byte[] Reserved6 => this.Model.Descriptor.Reserved6; #else - public byte[]? Reserved6 => _model.Descriptor?.Reserved6; + public byte[]? Reserved6 => this.Model.Descriptor?.Reserved6; #endif /// #if NET48 - public uint[] D_FileGroupOffsets => _model.Descriptor.FileGroupOffsets; + public uint[] D_FileGroupOffsets => this.Model.Descriptor.FileGroupOffsets; #else - public uint[]? D_FileGroupOffsets => _model.Descriptor?.FileGroupOffsets; + public uint[]? D_FileGroupOffsets => this.Model.Descriptor?.FileGroupOffsets; #endif /// #if NET48 - public uint[] D_ComponentOffsets => _model.Descriptor.ComponentOffsets; + public uint[] D_ComponentOffsets => this.Model.Descriptor.ComponentOffsets; #else - public uint[]? D_ComponentOffsets => _model.Descriptor?.ComponentOffsets; + public uint[]? D_ComponentOffsets => this.Model.Descriptor?.ComponentOffsets; #endif /// #if NET48 - public uint SetupTypesOffset => _model.Descriptor.SetupTypesOffset; + public uint SetupTypesOffset => this.Model.Descriptor.SetupTypesOffset; #else - public uint? SetupTypesOffset => _model.Descriptor?.SetupTypesOffset; + public uint? SetupTypesOffset => this.Model.Descriptor?.SetupTypesOffset; #endif /// #if NET48 - public uint SetupTableOffset => _model.Descriptor.SetupTableOffset; + public uint SetupTableOffset => this.Model.Descriptor.SetupTableOffset; #else - public uint? SetupTableOffset => _model.Descriptor?.SetupTableOffset; + public uint? SetupTableOffset => this.Model.Descriptor?.SetupTableOffset; #endif /// #if NET48 - public byte[] Reserved7 => _model.Descriptor.Reserved7; + public byte[] Reserved7 => this.Model.Descriptor.Reserved7; #else - public byte[]? Reserved7 => _model.Descriptor?.Reserved7; + public byte[]? Reserved7 => this.Model.Descriptor?.Reserved7; #endif /// #if NET48 - public byte[] Reserved8 => _model.Descriptor.Reserved8; + public byte[] Reserved8 => this.Model.Descriptor.Reserved8; #else - public byte[]? Reserved8 => _model.Descriptor?.Reserved8; + public byte[]? Reserved8 => this.Model.Descriptor?.Reserved8; #endif #endregion @@ -339,9 +339,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint[] FileDescriptorOffsets => _model.FileDescriptorOffsets; + public uint[] FileDescriptorOffsets => this.Model.FileDescriptorOffsets; #else - public uint[]? FileDescriptorOffsets => _model.FileDescriptorOffsets; + public uint[]? FileDescriptorOffsets => this.Model.FileDescriptorOffsets; #endif #endregion @@ -350,9 +350,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string[] DirectoryNames => _model.DirectoryNames; + public string[] DirectoryNames => this.Model.DirectoryNames; #else - public string[]? DirectoryNames => _model.DirectoryNames; + public string[]? DirectoryNames => this.Model.DirectoryNames; #endif #endregion @@ -361,9 +361,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.InstallShieldCabinet.FileDescriptor[] FileDescriptors => _model.FileDescriptors; + public SabreTools.Models.InstallShieldCabinet.FileDescriptor[] FileDescriptors => this.Model.FileDescriptors; #else - public SabreTools.Models.InstallShieldCabinet.FileDescriptor?[]? FileDescriptors => _model.FileDescriptors; + public SabreTools.Models.InstallShieldCabinet.FileDescriptor?[]? FileDescriptors => this.Model.FileDescriptors; #endif #endregion @@ -372,9 +372,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public Dictionary FileGroupOffsets => _model.FileGroupOffsets; + public Dictionary FileGroupOffsets => this.Model.FileGroupOffsets; #else - public Dictionary? FileGroupOffsets => _model.FileGroupOffsets; + public Dictionary? FileGroupOffsets => this.Model.FileGroupOffsets; #endif #endregion @@ -383,9 +383,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.InstallShieldCabinet.FileGroup[] FileGroups => _model.FileGroups; + public SabreTools.Models.InstallShieldCabinet.FileGroup[] FileGroups => this.Model.FileGroups; #else - public SabreTools.Models.InstallShieldCabinet.FileGroup?[]? FileGroups => _model.FileGroups; + public SabreTools.Models.InstallShieldCabinet.FileGroup?[]? FileGroups => this.Model.FileGroups; #endif #endregion @@ -394,9 +394,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public Dictionary ComponentOffsets => _model.ComponentOffsets; + public Dictionary ComponentOffsets => this.Model.ComponentOffsets; #else - public Dictionary? ComponentOffsets => _model.ComponentOffsets; + public Dictionary? ComponentOffsets => this.Model.ComponentOffsets; #endif #endregion @@ -405,9 +405,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.InstallShieldCabinet.Component[] Components => _model.Components; + public SabreTools.Models.InstallShieldCabinet.Component[] Components => this.Model.Components; #else - public SabreTools.Models.InstallShieldCabinet.Component?[]? Components => _model.Components; + public SabreTools.Models.InstallShieldCabinet.Component?[]? Components => this.Model.Components; #endif #endregion @@ -531,17 +531,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.InstallShieldCabinet.Print(builder, _model); + Printing.InstallShieldCabinet.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } diff --git a/BinaryObjectScanner.Wrappers/LinearExecutable.cs b/BinaryObjectScanner.Wrappers/LinearExecutable.cs index c72f1697..60be683e 100644 --- a/BinaryObjectScanner.Wrappers/LinearExecutable.cs +++ b/BinaryObjectScanner.Wrappers/LinearExecutable.cs @@ -21,100 +21,100 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Stub_Magic => _model.Stub.Header.Magic; + public string Stub_Magic => this.Model.Stub.Header.Magic; #else - public string? Stub_Magic => _model.Stub?.Header?.Magic; + public string? Stub_Magic => this.Model.Stub?.Header?.Magic; #endif /// #if NET48 - public ushort Stub_LastPageBytes => _model.Stub.Header.LastPageBytes; + public ushort Stub_LastPageBytes => this.Model.Stub.Header.LastPageBytes; #else - public ushort? Stub_LastPageBytes => _model.Stub?.Header?.LastPageBytes; + public ushort? Stub_LastPageBytes => this.Model.Stub?.Header?.LastPageBytes; #endif /// #if NET48 - public ushort Stub_Pages => _model.Stub.Header.Pages; + public ushort Stub_Pages => this.Model.Stub.Header.Pages; #else - public ushort? Stub_Pages => _model.Stub?.Header?.Pages; + public ushort? Stub_Pages => this.Model.Stub?.Header?.Pages; #endif /// #if NET48 - public ushort Stub_RelocationItems => _model.Stub.Header.RelocationItems; + public ushort Stub_RelocationItems => this.Model.Stub.Header.RelocationItems; #else - public ushort? Stub_RelocationItems => _model.Stub?.Header?.RelocationItems; + public ushort? Stub_RelocationItems => this.Model.Stub?.Header?.RelocationItems; #endif /// #if NET48 - public ushort Stub_HeaderParagraphSize => _model.Stub.Header.HeaderParagraphSize; + public ushort Stub_HeaderParagraphSize => this.Model.Stub.Header.HeaderParagraphSize; #else - public ushort? Stub_HeaderParagraphSize => _model.Stub?.Header?.HeaderParagraphSize; + public ushort? Stub_HeaderParagraphSize => this.Model.Stub?.Header?.HeaderParagraphSize; #endif /// #if NET48 - public ushort Stub_MinimumExtraParagraphs => _model.Stub.Header.MinimumExtraParagraphs; + public ushort Stub_MinimumExtraParagraphs => this.Model.Stub.Header.MinimumExtraParagraphs; #else - public ushort? Stub_MinimumExtraParagraphs => _model.Stub?.Header?.MinimumExtraParagraphs; + public ushort? Stub_MinimumExtraParagraphs => this.Model.Stub?.Header?.MinimumExtraParagraphs; #endif /// #if NET48 - public ushort Stub_MaximumExtraParagraphs => _model.Stub.Header.MaximumExtraParagraphs; + public ushort Stub_MaximumExtraParagraphs => this.Model.Stub.Header.MaximumExtraParagraphs; #else - public ushort? Stub_MaximumExtraParagraphs => _model.Stub?.Header?.MaximumExtraParagraphs; + public ushort? Stub_MaximumExtraParagraphs => this.Model.Stub?.Header?.MaximumExtraParagraphs; #endif /// #if NET48 - public ushort Stub_InitialSSValue => _model.Stub.Header.InitialSSValue; + public ushort Stub_InitialSSValue => this.Model.Stub.Header.InitialSSValue; #else - public ushort? Stub_InitialSSValue => _model.Stub?.Header?.InitialSSValue; + public ushort? Stub_InitialSSValue => this.Model.Stub?.Header?.InitialSSValue; #endif /// #if NET48 - public ushort Stub_InitialSPValue => _model.Stub.Header.InitialSPValue; + public ushort Stub_InitialSPValue => this.Model.Stub.Header.InitialSPValue; #else - public ushort? Stub_InitialSPValue => _model.Stub?.Header?.InitialSPValue; + public ushort? Stub_InitialSPValue => this.Model.Stub?.Header?.InitialSPValue; #endif /// #if NET48 - public ushort Stub_Checksum => _model.Stub.Header.Checksum; + public ushort Stub_Checksum => this.Model.Stub.Header.Checksum; #else - public ushort? Stub_Checksum => _model.Stub?.Header?.Checksum; + public ushort? Stub_Checksum => this.Model.Stub?.Header?.Checksum; #endif /// #if NET48 - public ushort Stub_InitialIPValue => _model.Stub.Header.InitialIPValue; + public ushort Stub_InitialIPValue => this.Model.Stub.Header.InitialIPValue; #else - public ushort? Stub_InitialIPValue => _model.Stub?.Header?.InitialIPValue; + public ushort? Stub_InitialIPValue => this.Model.Stub?.Header?.InitialIPValue; #endif /// #if NET48 - public ushort Stub_InitialCSValue => _model.Stub.Header.InitialCSValue; + public ushort Stub_InitialCSValue => this.Model.Stub.Header.InitialCSValue; #else - public ushort? Stub_InitialCSValue => _model.Stub?.Header?.InitialCSValue; + public ushort? Stub_InitialCSValue => this.Model.Stub?.Header?.InitialCSValue; #endif /// #if NET48 - public ushort Stub_RelocationTableAddr => _model.Stub.Header.RelocationTableAddr; + public ushort Stub_RelocationTableAddr => this.Model.Stub.Header.RelocationTableAddr; #else - public ushort? Stub_RelocationTableAddr => _model.Stub?.Header?.RelocationTableAddr; + public ushort? Stub_RelocationTableAddr => this.Model.Stub?.Header?.RelocationTableAddr; #endif /// #if NET48 - public ushort Stub_OverlayNumber => _model.Stub.Header.OverlayNumber; + public ushort Stub_OverlayNumber => this.Model.Stub.Header.OverlayNumber; #else - public ushort? Stub_OverlayNumber => _model.Stub?.Header?.OverlayNumber; + public ushort? Stub_OverlayNumber => this.Model.Stub?.Header?.OverlayNumber; #endif #endregion @@ -123,37 +123,37 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public ushort[] Stub_Reserved1 => _model.Stub.Header.Reserved1; + public ushort[] Stub_Reserved1 => this.Model.Stub.Header.Reserved1; #else - public ushort[]? Stub_Reserved1 => _model.Stub?.Header?.Reserved1; + public ushort[]? Stub_Reserved1 => this.Model.Stub?.Header?.Reserved1; #endif /// #if NET48 - public ushort Stub_OEMIdentifier => _model.Stub.Header.OEMIdentifier; + public ushort Stub_OEMIdentifier => this.Model.Stub.Header.OEMIdentifier; #else - public ushort? Stub_OEMIdentifier => _model.Stub?.Header?.OEMIdentifier; + public ushort? Stub_OEMIdentifier => this.Model.Stub?.Header?.OEMIdentifier; #endif /// #if NET48 - public ushort Stub_OEMInformation => _model.Stub.Header.OEMInformation; + public ushort Stub_OEMInformation => this.Model.Stub.Header.OEMInformation; #else - public ushort? Stub_OEMInformation => _model.Stub?.Header?.OEMInformation; + public ushort? Stub_OEMInformation => this.Model.Stub?.Header?.OEMInformation; #endif /// #if NET48 - public ushort[] Stub_Reserved2 => _model.Stub.Header.Reserved2; + public ushort[] Stub_Reserved2 => this.Model.Stub.Header.Reserved2; #else - public ushort[]? Stub_Reserved2 => _model?.Stub?.Header?.Reserved2; + public ushort[]? Stub_Reserved2 => Model?.Stub?.Header?.Reserved2; #endif /// #if NET48 - public uint Stub_NewExeHeaderAddr => _model.Stub.Header.NewExeHeaderAddr; + public uint Stub_NewExeHeaderAddr => this.Model.Stub.Header.NewExeHeaderAddr; #else - public uint? Stub_NewExeHeaderAddr => _model.Stub?.Header?.NewExeHeaderAddr; + public uint? Stub_NewExeHeaderAddr => this.Model.Stub?.Header?.NewExeHeaderAddr; #endif #endregion @@ -164,324 +164,324 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Signature => _model.InformationBlock.Signature; + public string Signature => this.Model.InformationBlock.Signature; #else - public string? Signature => _model.InformationBlock?.Signature; + public string? Signature => this.Model.InformationBlock?.Signature; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.ByteOrder ByteOrder => _model.InformationBlock.ByteOrder; + public SabreTools.Models.LinearExecutable.ByteOrder ByteOrder => this.Model.InformationBlock.ByteOrder; #else - public SabreTools.Models.LinearExecutable.ByteOrder? ByteOrder => _model.InformationBlock?.ByteOrder; + public SabreTools.Models.LinearExecutable.ByteOrder? ByteOrder => this.Model.InformationBlock?.ByteOrder; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.WordOrder WordOrder => _model.InformationBlock.WordOrder; + public SabreTools.Models.LinearExecutable.WordOrder WordOrder => this.Model.InformationBlock.WordOrder; #else - public SabreTools.Models.LinearExecutable.WordOrder? WordOrder => _model.InformationBlock?.WordOrder; + public SabreTools.Models.LinearExecutable.WordOrder? WordOrder => this.Model.InformationBlock?.WordOrder; #endif /// #if NET48 - public uint ExecutableFormatLevel => _model.InformationBlock.ExecutableFormatLevel; + public uint ExecutableFormatLevel => this.Model.InformationBlock.ExecutableFormatLevel; #else - public uint? ExecutableFormatLevel => _model.InformationBlock?.ExecutableFormatLevel; + public uint? ExecutableFormatLevel => this.Model.InformationBlock?.ExecutableFormatLevel; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.CPUType CPUType => _model.InformationBlock.CPUType; + public SabreTools.Models.LinearExecutable.CPUType CPUType => this.Model.InformationBlock.CPUType; #else - public SabreTools.Models.LinearExecutable.CPUType? CPUType => _model.InformationBlock?.CPUType; + public SabreTools.Models.LinearExecutable.CPUType? CPUType => this.Model.InformationBlock?.CPUType; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.OperatingSystem ModuleOS => _model.InformationBlock.ModuleOS; + public SabreTools.Models.LinearExecutable.OperatingSystem ModuleOS => this.Model.InformationBlock.ModuleOS; #else - public SabreTools.Models.LinearExecutable.OperatingSystem? ModuleOS => _model.InformationBlock?.ModuleOS; + public SabreTools.Models.LinearExecutable.OperatingSystem? ModuleOS => this.Model.InformationBlock?.ModuleOS; #endif /// #if NET48 - public uint ModuleVersion => _model.InformationBlock.ModuleVersion; + public uint ModuleVersion => this.Model.InformationBlock.ModuleVersion; #else - public uint? ModuleVersion => _model.InformationBlock?.ModuleVersion; + public uint? ModuleVersion => this.Model.InformationBlock?.ModuleVersion; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.ModuleFlags ModuleTypeFlags => _model.InformationBlock.ModuleTypeFlags; + public SabreTools.Models.LinearExecutable.ModuleFlags ModuleTypeFlags => this.Model.InformationBlock.ModuleTypeFlags; #else - public SabreTools.Models.LinearExecutable.ModuleFlags? ModuleTypeFlags => _model.InformationBlock?.ModuleTypeFlags; + public SabreTools.Models.LinearExecutable.ModuleFlags? ModuleTypeFlags => this.Model.InformationBlock?.ModuleTypeFlags; #endif /// #if NET48 - public uint ModuleNumberPages => _model.InformationBlock.ModuleNumberPages; + public uint ModuleNumberPages => this.Model.InformationBlock.ModuleNumberPages; #else - public uint? ModuleNumberPages => _model.InformationBlock?.ModuleNumberPages; + public uint? ModuleNumberPages => this.Model.InformationBlock?.ModuleNumberPages; #endif /// #if NET48 - public uint InitialObjectCS => _model.InformationBlock.InitialObjectCS; + public uint InitialObjectCS => this.Model.InformationBlock.InitialObjectCS; #else - public uint? InitialObjectCS => _model.InformationBlock?.InitialObjectCS; + public uint? InitialObjectCS => this.Model.InformationBlock?.InitialObjectCS; #endif /// #if NET48 - public uint InitialEIP => _model.InformationBlock.InitialEIP; + public uint InitialEIP => this.Model.InformationBlock.InitialEIP; #else - public uint? InitialEIP => _model.InformationBlock?.InitialEIP; + public uint? InitialEIP => this.Model.InformationBlock?.InitialEIP; #endif /// #if NET48 - public uint InitialObjectSS => _model.InformationBlock.InitialObjectSS; + public uint InitialObjectSS => this.Model.InformationBlock.InitialObjectSS; #else - public uint? InitialObjectSS => _model.InformationBlock?.InitialObjectSS; + public uint? InitialObjectSS => this.Model.InformationBlock?.InitialObjectSS; #endif /// #if NET48 - public uint InitialESP => _model.InformationBlock.InitialESP; + public uint InitialESP => this.Model.InformationBlock.InitialESP; #else - public uint? InitialESP => _model.InformationBlock?.InitialESP; + public uint? InitialESP => this.Model.InformationBlock?.InitialESP; #endif /// #if NET48 - public uint MemoryPageSize => _model.InformationBlock.MemoryPageSize; + public uint MemoryPageSize => this.Model.InformationBlock.MemoryPageSize; #else - public uint? MemoryPageSize => _model.InformationBlock?.MemoryPageSize; + public uint? MemoryPageSize => this.Model.InformationBlock?.MemoryPageSize; #endif /// #if NET48 - public uint BytesOnLastPage => _model.InformationBlock.BytesOnLastPage; + public uint BytesOnLastPage => this.Model.InformationBlock.BytesOnLastPage; #else - public uint? BytesOnLastPage => _model.InformationBlock?.BytesOnLastPage; + public uint? BytesOnLastPage => this.Model.InformationBlock?.BytesOnLastPage; #endif /// #if NET48 - public uint FixupSectionSize => _model.InformationBlock.FixupSectionSize; + public uint FixupSectionSize => this.Model.InformationBlock.FixupSectionSize; #else - public uint? FixupSectionSize => _model.InformationBlock?.FixupSectionSize; + public uint? FixupSectionSize => this.Model.InformationBlock?.FixupSectionSize; #endif /// #if NET48 - public uint FixupSectionChecksum => _model.InformationBlock.FixupSectionChecksum; + public uint FixupSectionChecksum => this.Model.InformationBlock.FixupSectionChecksum; #else - public uint? FixupSectionChecksum => _model.InformationBlock?.FixupSectionChecksum; + public uint? FixupSectionChecksum => this.Model.InformationBlock?.FixupSectionChecksum; #endif /// #if NET48 - public uint LoaderSectionSize => _model.InformationBlock.LoaderSectionSize; + public uint LoaderSectionSize => this.Model.InformationBlock.LoaderSectionSize; #else - public uint? LoaderSectionSize => _model.InformationBlock?.LoaderSectionSize; + public uint? LoaderSectionSize => this.Model.InformationBlock?.LoaderSectionSize; #endif /// #if NET48 - public uint LoaderSectionChecksum => _model.InformationBlock.LoaderSectionChecksum; + public uint LoaderSectionChecksum => this.Model.InformationBlock.LoaderSectionChecksum; #else - public uint? LoaderSectionChecksum => _model.InformationBlock?.LoaderSectionChecksum; + public uint? LoaderSectionChecksum => this.Model.InformationBlock?.LoaderSectionChecksum; #endif /// #if NET48 - public uint ObjectTableOffset => _model.InformationBlock.ObjectTableOffset; + public uint ObjectTableOffset => this.Model.InformationBlock.ObjectTableOffset; #else - public uint? ObjectTableOffset => _model.InformationBlock?.ObjectTableOffset; + public uint? ObjectTableOffset => this.Model.InformationBlock?.ObjectTableOffset; #endif /// #if NET48 - public uint ObjectTableCount => _model.InformationBlock.ObjectTableCount; + public uint ObjectTableCount => this.Model.InformationBlock.ObjectTableCount; #else - public uint? ObjectTableCount => _model.InformationBlock?.ObjectTableCount; + public uint? ObjectTableCount => this.Model.InformationBlock?.ObjectTableCount; #endif /// #if NET48 - public uint ObjectPageMapOffset => _model.InformationBlock.ObjectPageMapOffset; + public uint ObjectPageMapOffset => this.Model.InformationBlock.ObjectPageMapOffset; #else - public uint? ObjectPageMapOffset => _model.InformationBlock?.ObjectPageMapOffset; + public uint? ObjectPageMapOffset => this.Model.InformationBlock?.ObjectPageMapOffset; #endif /// #if NET48 - public uint ObjectIterateDataMapOffset => _model.InformationBlock.ObjectIterateDataMapOffset; + public uint ObjectIterateDataMapOffset => this.Model.InformationBlock.ObjectIterateDataMapOffset; #else - public uint? ObjectIterateDataMapOffset => _model.InformationBlock?.ObjectIterateDataMapOffset; + public uint? ObjectIterateDataMapOffset => this.Model.InformationBlock?.ObjectIterateDataMapOffset; #endif /// #if NET48 - public uint ResourceTableOffset => _model.InformationBlock.ResourceTableOffset; + public uint ResourceTableOffset => this.Model.InformationBlock.ResourceTableOffset; #else - public uint? ResourceTableOffset => _model.InformationBlock?.ResourceTableOffset; + public uint? ResourceTableOffset => this.Model.InformationBlock?.ResourceTableOffset; #endif /// #if NET48 - public uint ResourceTableCount => _model.InformationBlock.ResourceTableCount; + public uint ResourceTableCount => this.Model.InformationBlock.ResourceTableCount; #else - public uint? ResourceTableCount => _model.InformationBlock?.ResourceTableCount; + public uint? ResourceTableCount => this.Model.InformationBlock?.ResourceTableCount; #endif /// #if NET48 - public uint ResidentNamesTableOffset => _model.InformationBlock.ResidentNamesTableOffset; + public uint ResidentNamesTableOffset => this.Model.InformationBlock.ResidentNamesTableOffset; #else - public uint? ResidentNamesTableOffset => _model.InformationBlock?.ResidentNamesTableOffset; + public uint? ResidentNamesTableOffset => this.Model.InformationBlock?.ResidentNamesTableOffset; #endif /// #if NET48 - public uint EntryTableOffset => _model.InformationBlock.EntryTableOffset; + public uint EntryTableOffset => this.Model.InformationBlock.EntryTableOffset; #else - public uint? EntryTableOffset => _model.InformationBlock?.EntryTableOffset; + public uint? EntryTableOffset => this.Model.InformationBlock?.EntryTableOffset; #endif /// #if NET48 - public uint ModuleDirectivesTableOffset => _model.InformationBlock.ModuleDirectivesTableOffset; + public uint ModuleDirectivesTableOffset => this.Model.InformationBlock.ModuleDirectivesTableOffset; #else - public uint? ModuleDirectivesTableOffset => _model.InformationBlock?.ModuleDirectivesTableOffset; + public uint? ModuleDirectivesTableOffset => this.Model.InformationBlock?.ModuleDirectivesTableOffset; #endif /// #if NET48 - public uint ModuleDirectivesCount => _model.InformationBlock.ModuleDirectivesCount; + public uint ModuleDirectivesCount => this.Model.InformationBlock.ModuleDirectivesCount; #else - public uint? ModuleDirectivesCount => _model.InformationBlock?.ModuleDirectivesCount; + public uint? ModuleDirectivesCount => this.Model.InformationBlock?.ModuleDirectivesCount; #endif /// #if NET48 - public uint FixupPageTableOffset => _model.InformationBlock.FixupPageTableOffset; + public uint FixupPageTableOffset => this.Model.InformationBlock.FixupPageTableOffset; #else - public uint? FixupPageTableOffset => _model.InformationBlock?.FixupPageTableOffset; + public uint? FixupPageTableOffset => this.Model.InformationBlock?.FixupPageTableOffset; #endif /// #if NET48 - public uint FixupRecordTableOffset => _model.InformationBlock.FixupRecordTableOffset; + public uint FixupRecordTableOffset => this.Model.InformationBlock.FixupRecordTableOffset; #else - public uint? FixupRecordTableOffset => _model.InformationBlock?.FixupRecordTableOffset; + public uint? FixupRecordTableOffset => this.Model.InformationBlock?.FixupRecordTableOffset; #endif /// #if NET48 - public uint ImportedModulesNameTableOffset => _model.InformationBlock.ImportedModulesNameTableOffset; + public uint ImportedModulesNameTableOffset => this.Model.InformationBlock.ImportedModulesNameTableOffset; #else - public uint? ImportedModulesNameTableOffset => _model.InformationBlock?.ImportedModulesNameTableOffset; + public uint? ImportedModulesNameTableOffset => this.Model.InformationBlock?.ImportedModulesNameTableOffset; #endif /// #if NET48 - public uint ImportedModulesCount => _model.InformationBlock.ImportedModulesCount; + public uint ImportedModulesCount => this.Model.InformationBlock.ImportedModulesCount; #else - public uint? ImportedModulesCount => _model.InformationBlock?.ImportedModulesCount; + public uint? ImportedModulesCount => this.Model.InformationBlock?.ImportedModulesCount; #endif /// #if NET48 - public uint ImportProcedureNameTableOffset => _model.InformationBlock.ImportProcedureNameTableOffset; + public uint ImportProcedureNameTableOffset => this.Model.InformationBlock.ImportProcedureNameTableOffset; #else - public uint? ImportProcedureNameTableOffset => _model.InformationBlock?.ImportProcedureNameTableOffset; + public uint? ImportProcedureNameTableOffset => this.Model.InformationBlock?.ImportProcedureNameTableOffset; #endif /// #if NET48 - public uint PerPageChecksumTableOffset => _model.InformationBlock.PerPageChecksumTableOffset; + public uint PerPageChecksumTableOffset => this.Model.InformationBlock.PerPageChecksumTableOffset; #else - public uint? PerPageChecksumTableOffset => _model.InformationBlock?.PerPageChecksumTableOffset; + public uint? PerPageChecksumTableOffset => this.Model.InformationBlock?.PerPageChecksumTableOffset; #endif /// #if NET48 - public uint DataPagesOffset => _model.InformationBlock.DataPagesOffset; + public uint DataPagesOffset => this.Model.InformationBlock.DataPagesOffset; #else - public uint? DataPagesOffset => _model.InformationBlock?.DataPagesOffset; + public uint? DataPagesOffset => this.Model.InformationBlock?.DataPagesOffset; #endif /// #if NET48 - public uint PreloadPageCount => _model.InformationBlock.PreloadPageCount; + public uint PreloadPageCount => this.Model.InformationBlock.PreloadPageCount; #else - public uint? PreloadPageCount => _model.InformationBlock?.PreloadPageCount; + public uint? PreloadPageCount => this.Model.InformationBlock?.PreloadPageCount; #endif /// #if NET48 - public uint NonResidentNamesTableOffset => _model.InformationBlock.NonResidentNamesTableOffset; + public uint NonResidentNamesTableOffset => this.Model.InformationBlock.NonResidentNamesTableOffset; #else - public uint? NonResidentNamesTableOffset => _model.InformationBlock?.NonResidentNamesTableOffset; + public uint? NonResidentNamesTableOffset => this.Model.InformationBlock?.NonResidentNamesTableOffset; #endif /// #if NET48 - public uint NonResidentNamesTableLength => _model.InformationBlock.NonResidentNamesTableLength; + public uint NonResidentNamesTableLength => this.Model.InformationBlock.NonResidentNamesTableLength; #else - public uint? NonResidentNamesTableLength => _model.InformationBlock?.NonResidentNamesTableLength; + public uint? NonResidentNamesTableLength => this.Model.InformationBlock?.NonResidentNamesTableLength; #endif /// #if NET48 - public uint NonResidentNamesTableChecksum => _model.InformationBlock.NonResidentNamesTableChecksum; + public uint NonResidentNamesTableChecksum => this.Model.InformationBlock.NonResidentNamesTableChecksum; #else - public uint? NonResidentNamesTableChecksum => _model.InformationBlock?.NonResidentNamesTableChecksum; + public uint? NonResidentNamesTableChecksum => this.Model.InformationBlock?.NonResidentNamesTableChecksum; #endif /// #if NET48 - public uint AutomaticDataObject => _model.InformationBlock.AutomaticDataObject; + public uint AutomaticDataObject => this.Model.InformationBlock.AutomaticDataObject; #else - public uint? AutomaticDataObject => _model.InformationBlock?.AutomaticDataObject; + public uint? AutomaticDataObject => this.Model.InformationBlock?.AutomaticDataObject; #endif /// #if NET48 - public uint DebugInformationOffset => _model.InformationBlock.DebugInformationOffset; + public uint DebugInformationOffset => this.Model.InformationBlock.DebugInformationOffset; #else - public uint? DebugInformationOffset => _model.InformationBlock?.DebugInformationOffset; + public uint? DebugInformationOffset => this.Model.InformationBlock?.DebugInformationOffset; #endif /// #if NET48 - public uint DebugInformationLength => _model.InformationBlock.DebugInformationLength; + public uint DebugInformationLength => this.Model.InformationBlock.DebugInformationLength; #else - public uint? DebugInformationLength => _model.InformationBlock?.DebugInformationLength; + public uint? DebugInformationLength => this.Model.InformationBlock?.DebugInformationLength; #endif /// #if NET48 - public uint PreloadInstancePagesNumber => _model.InformationBlock.PreloadInstancePagesNumber; + public uint PreloadInstancePagesNumber => this.Model.InformationBlock.PreloadInstancePagesNumber; #else - public uint? PreloadInstancePagesNumber => _model.InformationBlock?.PreloadInstancePagesNumber; + public uint? PreloadInstancePagesNumber => this.Model.InformationBlock?.PreloadInstancePagesNumber; #endif /// #if NET48 - public uint DemandInstancePagesNumber => _model.InformationBlock.DemandInstancePagesNumber; + public uint DemandInstancePagesNumber => this.Model.InformationBlock.DemandInstancePagesNumber; #else - public uint? DemandInstancePagesNumber => _model.InformationBlock?.DemandInstancePagesNumber; + public uint? DemandInstancePagesNumber => this.Model.InformationBlock?.DemandInstancePagesNumber; #endif /// #if NET48 - public uint ExtraHeapAllocation => _model.InformationBlock.ExtraHeapAllocation; + public uint ExtraHeapAllocation => this.Model.InformationBlock.ExtraHeapAllocation; #else - public uint? ExtraHeapAllocation => _model.InformationBlock?.ExtraHeapAllocation; + public uint? ExtraHeapAllocation => this.Model.InformationBlock?.ExtraHeapAllocation; #endif #endregion @@ -490,93 +490,93 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.LinearExecutable.ObjectTableEntry[] ObjectTable => _model.ObjectTable; + public SabreTools.Models.LinearExecutable.ObjectTableEntry[] ObjectTable => this.Model.ObjectTable; #else - public SabreTools.Models.LinearExecutable.ObjectTableEntry?[]? ObjectTable => _model.ObjectTable; + public SabreTools.Models.LinearExecutable.ObjectTableEntry?[]? ObjectTable => this.Model.ObjectTable; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.ObjectPageMapEntry[] ObjectPageMap => _model.ObjectPageMap; + public SabreTools.Models.LinearExecutable.ObjectPageMapEntry[] ObjectPageMap => this.Model.ObjectPageMap; #else - public SabreTools.Models.LinearExecutable.ObjectPageMapEntry?[]? ObjectPageMap => _model.ObjectPageMap; + public SabreTools.Models.LinearExecutable.ObjectPageMapEntry?[]? ObjectPageMap => this.Model.ObjectPageMap; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.ResourceTableEntry[] ResourceTable => _model.ResourceTable; + public SabreTools.Models.LinearExecutable.ResourceTableEntry[] ResourceTable => this.Model.ResourceTable; #else - public SabreTools.Models.LinearExecutable.ResourceTableEntry?[]? ResourceTable => _model.ResourceTable; + public SabreTools.Models.LinearExecutable.ResourceTableEntry?[]? ResourceTable => this.Model.ResourceTable; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.ResidentNamesTableEntry[] ResidentNamesTable => _model.ResidentNamesTable; + public SabreTools.Models.LinearExecutable.ResidentNamesTableEntry[] ResidentNamesTable => this.Model.ResidentNamesTable; #else - public SabreTools.Models.LinearExecutable.ResidentNamesTableEntry?[]? ResidentNamesTable => _model.ResidentNamesTable; + public SabreTools.Models.LinearExecutable.ResidentNamesTableEntry?[]? ResidentNamesTable => this.Model.ResidentNamesTable; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.EntryTableBundle[] EntryTable => _model.EntryTable; + public SabreTools.Models.LinearExecutable.EntryTableBundle[] EntryTable => this.Model.EntryTable; #else - public SabreTools.Models.LinearExecutable.EntryTableBundle?[]? EntryTable => _model.EntryTable; + public SabreTools.Models.LinearExecutable.EntryTableBundle?[]? EntryTable => this.Model.EntryTable; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.ModuleFormatDirectivesTableEntry[] ModuleFormatDirectivesTable => _model.ModuleFormatDirectivesTable; + public SabreTools.Models.LinearExecutable.ModuleFormatDirectivesTableEntry[] ModuleFormatDirectivesTable => this.Model.ModuleFormatDirectivesTable; #else - public SabreTools.Models.LinearExecutable.ModuleFormatDirectivesTableEntry?[]? ModuleFormatDirectivesTable => _model.ModuleFormatDirectivesTable; + public SabreTools.Models.LinearExecutable.ModuleFormatDirectivesTableEntry?[]? ModuleFormatDirectivesTable => this.Model.ModuleFormatDirectivesTable; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.VerifyRecordDirectiveTableEntry[] VerifyRecordDirectiveTable => _model.VerifyRecordDirectiveTable; + public SabreTools.Models.LinearExecutable.VerifyRecordDirectiveTableEntry[] VerifyRecordDirectiveTable => this.Model.VerifyRecordDirectiveTable; #else - public SabreTools.Models.LinearExecutable.VerifyRecordDirectiveTableEntry?[]? VerifyRecordDirectiveTable => _model.VerifyRecordDirectiveTable; + public SabreTools.Models.LinearExecutable.VerifyRecordDirectiveTableEntry?[]? VerifyRecordDirectiveTable => this.Model.VerifyRecordDirectiveTable; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.PerPageChecksumTableEntry[] PerPageChecksumTable => _model.PerPageChecksumTable; + public SabreTools.Models.LinearExecutable.PerPageChecksumTableEntry[] PerPageChecksumTable => this.Model.PerPageChecksumTable; #else - public SabreTools.Models.LinearExecutable.PerPageChecksumTableEntry?[]? PerPageChecksumTable => _model.PerPageChecksumTable; + public SabreTools.Models.LinearExecutable.PerPageChecksumTableEntry?[]? PerPageChecksumTable => this.Model.PerPageChecksumTable; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.FixupPageTableEntry[] FixupPageTable => _model.FixupPageTable; + public SabreTools.Models.LinearExecutable.FixupPageTableEntry[] FixupPageTable => this.Model.FixupPageTable; #else - public SabreTools.Models.LinearExecutable.FixupPageTableEntry?[]? FixupPageTable => _model.FixupPageTable; + public SabreTools.Models.LinearExecutable.FixupPageTableEntry?[]? FixupPageTable => this.Model.FixupPageTable; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.FixupRecordTableEntry[] FixupRecordTable => _model.FixupRecordTable; + public SabreTools.Models.LinearExecutable.FixupRecordTableEntry[] FixupRecordTable => this.Model.FixupRecordTable; #else - public SabreTools.Models.LinearExecutable.FixupRecordTableEntry?[]? FixupRecordTable => _model.FixupRecordTable; + public SabreTools.Models.LinearExecutable.FixupRecordTableEntry?[]? FixupRecordTable => this.Model.FixupRecordTable; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.ImportModuleNameTableEntry[] ImportModuleNameTable => _model.ImportModuleNameTable; + public SabreTools.Models.LinearExecutable.ImportModuleNameTableEntry[] ImportModuleNameTable => this.Model.ImportModuleNameTable; #else - public SabreTools.Models.LinearExecutable.ImportModuleNameTableEntry?[]? ImportModuleNameTable => _model.ImportModuleNameTable; + public SabreTools.Models.LinearExecutable.ImportModuleNameTableEntry?[]? ImportModuleNameTable => this.Model.ImportModuleNameTable; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.ImportModuleProcedureNameTableEntry[] ImportModuleProcedureNameTable => _model.ImportModuleProcedureNameTable; + public SabreTools.Models.LinearExecutable.ImportModuleProcedureNameTableEntry[] ImportModuleProcedureNameTable => this.Model.ImportModuleProcedureNameTable; #else - public SabreTools.Models.LinearExecutable.ImportModuleProcedureNameTableEntry?[]? ImportModuleProcedureNameTable => _model.ImportModuleProcedureNameTable; + public SabreTools.Models.LinearExecutable.ImportModuleProcedureNameTableEntry?[]? ImportModuleProcedureNameTable => this.Model.ImportModuleProcedureNameTable; #endif /// #if NET48 - public SabreTools.Models.LinearExecutable.NonResidentNamesTableEntry[] NonResidentNamesTable => _model.NonResidentNamesTable; + public SabreTools.Models.LinearExecutable.NonResidentNamesTableEntry[] NonResidentNamesTable => this.Model.NonResidentNamesTable; #else - public SabreTools.Models.LinearExecutable.NonResidentNamesTableEntry?[]? NonResidentNamesTable => _model.NonResidentNamesTable; + public SabreTools.Models.LinearExecutable.NonResidentNamesTableEntry?[]? NonResidentNamesTable => this.Model.NonResidentNamesTable; #endif #endregion @@ -585,19 +585,19 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string DI_Signature => _model.DebugInformation?.Signature; + public string DI_Signature => this.Model.DebugInformation?.Signature; #else - public string? DI_Signature => _model.DebugInformation?.Signature; + public string? DI_Signature => this.Model.DebugInformation?.Signature; #endif /// - public SabreTools.Models.LinearExecutable.DebugFormatType? DI_FormatType => _model.DebugInformation?.FormatType; + public SabreTools.Models.LinearExecutable.DebugFormatType? DI_FormatType => this.Model.DebugInformation?.FormatType; /// #if NET48 - public byte[] DebuggerData => _model.DebugInformation?.DebuggerData; + public byte[] DebuggerData => this.Model.DebugInformation?.DebuggerData; #else - public byte[]? DebuggerData => _model.DebugInformation?.DebuggerData; + public byte[]? DebuggerData => this.Model.DebugInformation?.DebuggerData; #endif #endregion @@ -694,17 +694,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.LinearExecutable.Print(builder, _model); + Printing.LinearExecutable.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion #region REMOVE -- DO NOT USE diff --git a/BinaryObjectScanner.Wrappers/MSDOS.cs b/BinaryObjectScanner.Wrappers/MSDOS.cs index c01ce6a8..a4570e93 100644 --- a/BinaryObjectScanner.Wrappers/MSDOS.cs +++ b/BinaryObjectScanner.Wrappers/MSDOS.cs @@ -18,100 +18,100 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Magic => _model.Header.Magic; + public string Magic => this.Model.Header.Magic; #else - public string? Magic => _model.Header?.Magic; + public string? Magic => this.Model.Header?.Magic; #endif /// #if NET48 - public ushort LastPageBytes => _model.Header.LastPageBytes; + public ushort LastPageBytes => this.Model.Header.LastPageBytes; #else - public ushort? LastPageBytes => _model.Header?.LastPageBytes; + public ushort? LastPageBytes => this.Model.Header?.LastPageBytes; #endif /// #if NET48 - public ushort Pages => _model.Header.Pages; + public ushort Pages => this.Model.Header.Pages; #else - public ushort? Pages => _model.Header?.Pages; + public ushort? Pages => this.Model.Header?.Pages; #endif /// #if NET48 - public ushort RelocationItems => _model.Header.RelocationItems; + public ushort RelocationItems => this.Model.Header.RelocationItems; #else - public ushort? RelocationItems => _model.Header?.RelocationItems; + public ushort? RelocationItems => this.Model.Header?.RelocationItems; #endif /// #if NET48 - public ushort HeaderParagraphSize => _model.Header.HeaderParagraphSize; + public ushort HeaderParagraphSize => this.Model.Header.HeaderParagraphSize; #else - public ushort? HeaderParagraphSize => _model.Header?.HeaderParagraphSize; + public ushort? HeaderParagraphSize => this.Model.Header?.HeaderParagraphSize; #endif /// #if NET48 - public ushort MinimumExtraParagraphs => _model.Header.MinimumExtraParagraphs; + public ushort MinimumExtraParagraphs => this.Model.Header.MinimumExtraParagraphs; #else - public ushort? MinimumExtraParagraphs => _model.Header?.MinimumExtraParagraphs; + public ushort? MinimumExtraParagraphs => this.Model.Header?.MinimumExtraParagraphs; #endif /// #if NET48 - public ushort MaximumExtraParagraphs => _model.Header.MaximumExtraParagraphs; + public ushort MaximumExtraParagraphs => this.Model.Header.MaximumExtraParagraphs; #else - public ushort? MaximumExtraParagraphs => _model.Header?.MaximumExtraParagraphs; + public ushort? MaximumExtraParagraphs => this.Model.Header?.MaximumExtraParagraphs; #endif /// #if NET48 - public ushort InitialSSValue => _model.Header.InitialSSValue; + public ushort InitialSSValue => this.Model.Header.InitialSSValue; #else - public ushort? InitialSSValue => _model.Header?.InitialSSValue; + public ushort? InitialSSValue => this.Model.Header?.InitialSSValue; #endif /// #if NET48 - public ushort InitialSPValue => _model.Header.InitialSPValue; + public ushort InitialSPValue => this.Model.Header.InitialSPValue; #else - public ushort? InitialSPValue => _model.Header?.InitialSPValue; + public ushort? InitialSPValue => this.Model.Header?.InitialSPValue; #endif /// #if NET48 - public ushort Checksum => _model.Header.Checksum; + public ushort Checksum => this.Model.Header.Checksum; #else - public ushort? Checksum => _model.Header?.Checksum; + public ushort? Checksum => this.Model.Header?.Checksum; #endif /// #if NET48 - public ushort InitialIPValue => _model.Header.InitialIPValue; + public ushort InitialIPValue => this.Model.Header.InitialIPValue; #else - public ushort? InitialIPValue => _model.Header?.InitialIPValue; + public ushort? InitialIPValue => this.Model.Header?.InitialIPValue; #endif /// #if NET48 - public ushort InitialCSValue => _model.Header.InitialCSValue; + public ushort InitialCSValue => this.Model.Header.InitialCSValue; #else - public ushort? InitialCSValue => _model.Header?.InitialCSValue; + public ushort? InitialCSValue => this.Model.Header?.InitialCSValue; #endif /// #if NET48 - public ushort RelocationTableAddr => _model.Header.RelocationTableAddr; + public ushort RelocationTableAddr => this.Model.Header.RelocationTableAddr; #else - public ushort? RelocationTableAddr => _model.Header?.RelocationTableAddr; + public ushort? RelocationTableAddr => this.Model.Header?.RelocationTableAddr; #endif /// #if NET48 - public ushort OverlayNumber => _model.Header.OverlayNumber; + public ushort OverlayNumber => this.Model.Header.OverlayNumber; #else - public ushort? OverlayNumber => _model.Header?.OverlayNumber; + public ushort? OverlayNumber => this.Model.Header?.OverlayNumber; #endif #endregion @@ -120,37 +120,37 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public ushort[] Reserved1 => _model.Header.Reserved1; + public ushort[] Reserved1 => this.Model.Header.Reserved1; #else - public ushort[]? Reserved1 => _model.Header?.Reserved1; + public ushort[]? Reserved1 => this.Model.Header?.Reserved1; #endif /// #if NET48 - public ushort OEMIdentifier => _model.Header.OEMIdentifier; + public ushort OEMIdentifier => this.Model.Header.OEMIdentifier; #else - public ushort? OEMIdentifier => _model.Header?.OEMIdentifier; + public ushort? OEMIdentifier => this.Model.Header?.OEMIdentifier; #endif /// #if NET48 - public ushort OEMInformation => _model.Header.OEMInformation; + public ushort OEMInformation => this.Model.Header.OEMInformation; #else - public ushort? OEMInformation => _model.Header?.OEMInformation; + public ushort? OEMInformation => this.Model.Header?.OEMInformation; #endif /// #if NET48 - public ushort[] Reserved2 => _model.Header.Reserved2; + public ushort[] Reserved2 => this.Model.Header.Reserved2; #else - public ushort[]? Reserved2 => _model.Header?.Reserved2; + public ushort[]? Reserved2 => this.Model.Header?.Reserved2; #endif /// #if NET48 - public uint NewExeHeaderAddr => _model.Header.NewExeHeaderAddr; + public uint NewExeHeaderAddr => this.Model.Header.NewExeHeaderAddr; #else - public uint? NewExeHeaderAddr => _model.Header?.NewExeHeaderAddr; + public uint? NewExeHeaderAddr => this.Model.Header?.NewExeHeaderAddr; #endif #endregion @@ -159,9 +159,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.MSDOS.RelocationEntry[] RelocationTable => _model.RelocationTable; + public SabreTools.Models.MSDOS.RelocationEntry[] RelocationTable => this.Model.RelocationTable; #else - public SabreTools.Models.MSDOS.RelocationEntry?[]? RelocationTable => _model.RelocationTable; + public SabreTools.Models.MSDOS.RelocationEntry?[]? RelocationTable => this.Model.RelocationTable; #endif #endregion @@ -252,17 +252,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.MSDOS.Print(builder, _model); + Printing.MSDOS.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/MicrosoftCabinet.cs b/BinaryObjectScanner.Wrappers/MicrosoftCabinet.cs index 47e7ed66..a8cbe8d3 100644 --- a/BinaryObjectScanner.Wrappers/MicrosoftCabinet.cs +++ b/BinaryObjectScanner.Wrappers/MicrosoftCabinet.cs @@ -20,149 +20,149 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Signature => _model.Header.Signature; + public string Signature => this.Model.Header.Signature; #else - public string? Signature => _model.Header?.Signature; + public string? Signature => this.Model.Header?.Signature; #endif /// #if NET48 - public uint Reserved1 => _model.Header.Reserved1; + public uint Reserved1 => this.Model.Header.Reserved1; #else - public uint? Reserved1 => _model.Header?.Reserved1; + public uint? Reserved1 => this.Model.Header?.Reserved1; #endif /// #if NET48 - public uint CabinetSize => _model.Header.CabinetSize; + public uint CabinetSize => this.Model.Header.CabinetSize; #else - public uint? CabinetSize => _model.Header?.CabinetSize; + public uint? CabinetSize => this.Model.Header?.CabinetSize; #endif /// #if NET48 - public uint Reserved2 => _model.Header.Reserved2; + public uint Reserved2 => this.Model.Header.Reserved2; #else - public uint? Reserved2 => _model.Header?.Reserved2; + public uint? Reserved2 => this.Model.Header?.Reserved2; #endif /// #if NET48 - public uint FilesOffset => _model.Header.FilesOffset; + public uint FilesOffset => this.Model.Header.FilesOffset; #else - public uint? FilesOffset => _model.Header?.FilesOffset; + public uint? FilesOffset => this.Model.Header?.FilesOffset; #endif /// #if NET48 - public uint Reserved3 => _model.Header.Reserved3; + public uint Reserved3 => this.Model.Header.Reserved3; #else - public uint? Reserved3 => _model.Header?.Reserved3; + public uint? Reserved3 => this.Model.Header?.Reserved3; #endif /// #if NET48 - public byte VersionMinor => _model.Header.VersionMinor; + public byte VersionMinor => this.Model.Header.VersionMinor; #else - public byte? VersionMinor => _model.Header?.VersionMinor; + public byte? VersionMinor => this.Model.Header?.VersionMinor; #endif /// #if NET48 - public byte VersionMajor => _model.Header.VersionMajor; + public byte VersionMajor => this.Model.Header.VersionMajor; #else - public byte? VersionMajor => _model.Header?.VersionMajor; + public byte? VersionMajor => this.Model.Header?.VersionMajor; #endif /// #if NET48 - public ushort FolderCount => _model.Header.FolderCount; + public ushort FolderCount => this.Model.Header.FolderCount; #else - public ushort? FolderCount => _model.Header?.FolderCount; + public ushort? FolderCount => this.Model.Header?.FolderCount; #endif /// #if NET48 - public ushort FileCount => _model.Header.FileCount; + public ushort FileCount => this.Model.Header.FileCount; #else - public ushort? FileCount => _model.Header?.FileCount; + public ushort? FileCount => this.Model.Header?.FileCount; #endif /// #if NET48 - public SabreTools.Models.MicrosoftCabinet.HeaderFlags Flags => _model.Header.Flags; + public SabreTools.Models.MicrosoftCabinet.HeaderFlags Flags => this.Model.Header.Flags; #else - public SabreTools.Models.MicrosoftCabinet.HeaderFlags? Flags => _model.Header?.Flags; + public SabreTools.Models.MicrosoftCabinet.HeaderFlags? Flags => this.Model.Header?.Flags; #endif /// #if NET48 - public ushort SetID => _model.Header.SetID; + public ushort SetID => this.Model.Header.SetID; #else - public ushort? SetID => _model.Header?.SetID; + public ushort? SetID => this.Model.Header?.SetID; #endif /// #if NET48 - public ushort CabinetIndex => _model.Header.CabinetIndex; + public ushort CabinetIndex => this.Model.Header.CabinetIndex; #else - public ushort? CabinetIndex => _model.Header?.CabinetIndex; + public ushort? CabinetIndex => this.Model.Header?.CabinetIndex; #endif /// #if NET48 - public ushort HeaderReservedSize => _model.Header.HeaderReservedSize; + public ushort HeaderReservedSize => this.Model.Header.HeaderReservedSize; #else - public ushort? HeaderReservedSize => _model.Header?.HeaderReservedSize; + public ushort? HeaderReservedSize => this.Model.Header?.HeaderReservedSize; #endif /// #if NET48 - public byte FolderReservedSize => _model.Header.FolderReservedSize; + public byte FolderReservedSize => this.Model.Header.FolderReservedSize; #else - public byte? FolderReservedSize => _model.Header?.FolderReservedSize; + public byte? FolderReservedSize => this.Model.Header?.FolderReservedSize; #endif /// #if NET48 - public byte DataReservedSize => _model.Header.DataReservedSize; + public byte DataReservedSize => this.Model.Header.DataReservedSize; #else - public byte? DataReservedSize => _model.Header?.DataReservedSize; + public byte? DataReservedSize => this.Model.Header?.DataReservedSize; #endif /// #if NET48 - public byte[] ReservedData => _model.Header.ReservedData; + public byte[] ReservedData => this.Model.Header.ReservedData; #else - public byte[]? ReservedData => _model.Header?.ReservedData; + public byte[]? ReservedData => this.Model.Header?.ReservedData; #endif /// #if NET48 - public string CabinetPrev => _model.Header.CabinetPrev; + public string CabinetPrev => this.Model.Header.CabinetPrev; #else - public string? CabinetPrev => _model.Header?.CabinetPrev; + public string? CabinetPrev => this.Model.Header?.CabinetPrev; #endif /// #if NET48 - public string DiskPrev => _model.Header.DiskPrev; + public string DiskPrev => this.Model.Header.DiskPrev; #else - public string? DiskPrev => _model.Header?.DiskPrev; + public string? DiskPrev => this.Model.Header?.DiskPrev; #endif /// #if NET48 - public string CabinetNext => _model.Header.CabinetNext; + public string CabinetNext => this.Model.Header.CabinetNext; #else - public string? CabinetNext => _model.Header?.CabinetNext; + public string? CabinetNext => this.Model.Header?.CabinetNext; #endif /// #if NET48 - public string DiskNext => _model.Header.DiskNext; + public string DiskNext => this.Model.Header.DiskNext; #else - public string? DiskNext => _model.Header?.DiskNext; + public string? DiskNext => this.Model.Header?.DiskNext; #endif #endregion @@ -171,9 +171,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.MicrosoftCabinet.CFFOLDER[] Folders => _model.Folders; + public SabreTools.Models.MicrosoftCabinet.CFFOLDER[] Folders => this.Model.Folders; #else - public SabreTools.Models.MicrosoftCabinet.CFFOLDER?[]? Folders => _model.Folders; + public SabreTools.Models.MicrosoftCabinet.CFFOLDER?[]? Folders => this.Model.Folders; #endif #endregion @@ -182,9 +182,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.MicrosoftCabinet.CFFILE[] Files => _model.Files; + public SabreTools.Models.MicrosoftCabinet.CFFILE[] Files => this.Model.Files; #else - public SabreTools.Models.MicrosoftCabinet.CFFILE?[]? Files => _model.Files; + public SabreTools.Models.MicrosoftCabinet.CFFILE?[]? Files => this.Model.Files; #endif #endregion @@ -540,17 +540,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.MicrosoftCabinet.Print(builder, _model); + Printing.MicrosoftCabinet.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } diff --git a/BinaryObjectScanner.Wrappers/N3DS.cs b/BinaryObjectScanner.Wrappers/N3DS.cs index 0a11765c..91399142 100644 --- a/BinaryObjectScanner.Wrappers/N3DS.cs +++ b/BinaryObjectScanner.Wrappers/N3DS.cs @@ -20,51 +20,51 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public byte[] RSA2048Signature => _model.Header.RSA2048Signature; + public byte[] RSA2048Signature => this.Model.Header.RSA2048Signature; #else - public byte[]? RSA2048Signature => _model.Header?.RSA2048Signature; + public byte[]? RSA2048Signature => this.Model.Header?.RSA2048Signature; #endif /// #if NET48 - public string MagicNumber => _model.Header.MagicNumber; + public string MagicNumber => this.Model.Header.MagicNumber; #else - public string? MagicNumber => _model.Header?.MagicNumber; + public string? MagicNumber => this.Model.Header?.MagicNumber; #endif /// #if NET48 - public uint ImageSizeInMediaUnits => _model.Header.ImageSizeInMediaUnits; + public uint ImageSizeInMediaUnits => this.Model.Header.ImageSizeInMediaUnits; #else - public uint? ImageSizeInMediaUnits => _model.Header?.ImageSizeInMediaUnits; + public uint? ImageSizeInMediaUnits => this.Model.Header?.ImageSizeInMediaUnits; #endif /// #if NET48 - public byte[] MediaId => _model.Header.MediaId; + public byte[] MediaId => this.Model.Header.MediaId; #else - public byte[]? MediaId => _model.Header?.MediaId; + public byte[]? MediaId => this.Model.Header?.MediaId; #endif /// #if NET48 - public SabreTools.Models.N3DS.FilesystemType PartitionsFSType => _model.Header.PartitionsFSType; + public SabreTools.Models.N3DS.FilesystemType PartitionsFSType => this.Model.Header.PartitionsFSType; #else - public SabreTools.Models.N3DS.FilesystemType? PartitionsFSType => _model.Header?.PartitionsFSType; + public SabreTools.Models.N3DS.FilesystemType? PartitionsFSType => this.Model.Header?.PartitionsFSType; #endif /// #if NET48 - public byte[] PartitionsCryptType => _model.Header.PartitionsCryptType; + public byte[] PartitionsCryptType => this.Model.Header.PartitionsCryptType; #else - public byte[]? PartitionsCryptType => _model.Header?.PartitionsCryptType; + public byte[]? PartitionsCryptType => this.Model.Header?.PartitionsCryptType; #endif /// #if NET48 - public SabreTools.Models.N3DS.PartitionTableEntry[] PartitionsTable => _model.Header.PartitionsTable; + public SabreTools.Models.N3DS.PartitionTableEntry[] PartitionsTable => this.Model.Header.PartitionsTable; #else - public SabreTools.Models.N3DS.PartitionTableEntry?[]? PartitionsTable => _model.Header?.PartitionsTable; + public SabreTools.Models.N3DS.PartitionTableEntry?[]? PartitionsTable => this.Model.Header?.PartitionsTable; #endif #endregion @@ -73,65 +73,65 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public byte[] ExheaderHash => _model.Header.ExheaderHash; + public byte[] ExheaderHash => this.Model.Header.ExheaderHash; #else - public byte[]? ExheaderHash => _model.Header?.ExheaderHash; + public byte[]? ExheaderHash => this.Model.Header?.ExheaderHash; #endif /// #if NET48 - public uint AdditionalHeaderSize => _model.Header.AdditionalHeaderSize; + public uint AdditionalHeaderSize => this.Model.Header.AdditionalHeaderSize; #else - public uint? AdditionalHeaderSize => _model.Header?.AdditionalHeaderSize; + public uint? AdditionalHeaderSize => this.Model.Header?.AdditionalHeaderSize; #endif /// #if NET48 - public uint SectorZeroOffset => _model.Header.SectorZeroOffset; + public uint SectorZeroOffset => this.Model.Header.SectorZeroOffset; #else - public uint? SectorZeroOffset => _model.Header?.SectorZeroOffset; + public uint? SectorZeroOffset => this.Model.Header?.SectorZeroOffset; #endif /// #if NET48 - public byte[] PartitionFlags => _model.Header.PartitionFlags; + public byte[] PartitionFlags => this.Model.Header.PartitionFlags; #else - public byte[]? PartitionFlags => _model.Header?.PartitionFlags; + public byte[]? PartitionFlags => this.Model.Header?.PartitionFlags; #endif /// #if NET48 - public ulong[] PartitionIdTable => _model.Header.PartitionIdTable; + public ulong[] PartitionIdTable => this.Model.Header.PartitionIdTable; #else - public ulong[]? PartitionIdTable => _model.Header?.PartitionIdTable; + public ulong[]? PartitionIdTable => this.Model.Header?.PartitionIdTable; #endif /// #if NET48 - public byte[] Reserved1 => _model.Header.Reserved1; + public byte[] Reserved1 => this.Model.Header.Reserved1; #else - public byte[]? Reserved1 => _model.Header?.Reserved1; + public byte[]? Reserved1 => this.Model.Header?.Reserved1; #endif /// #if NET48 - public byte[] Reserved2 => _model.Header.Reserved2; + public byte[] Reserved2 => this.Model.Header.Reserved2; #else - public byte[]? Reserved2 => _model.Header?.Reserved2; + public byte[]? Reserved2 => this.Model.Header?.Reserved2; #endif /// #if NET48 - public byte FirmUpdateByte1 => _model.Header.FirmUpdateByte1; + public byte FirmUpdateByte1 => this.Model.Header.FirmUpdateByte1; #else - public byte? FirmUpdateByte1 => _model.Header?.FirmUpdateByte1; + public byte? FirmUpdateByte1 => this.Model.Header?.FirmUpdateByte1; #endif /// #if NET48 - public byte FirmUpdateByte2 => _model.Header.FirmUpdateByte2; + public byte FirmUpdateByte2 => this.Model.Header.FirmUpdateByte2; #else - public byte? FirmUpdateByte2 => _model.Header?.FirmUpdateByte2; + public byte? FirmUpdateByte2 => this.Model.Header?.FirmUpdateByte2; #endif #endregion @@ -140,16 +140,16 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public byte[] Unknown => _model.Header.Unknown; + public byte[] Unknown => this.Model.Header.Unknown; #else - public byte[]? Unknown => _model.Header?.Unknown; + public byte[]? Unknown => this.Model.Header?.Unknown; #endif /// #if NET48 - public byte[] EncryptedMBR => _model.Header.EncryptedMBR; + public byte[] EncryptedMBR => this.Model.Header.EncryptedMBR; #else - public byte[]? EncryptedMBR => _model.Header?.EncryptedMBR; + public byte[]? EncryptedMBR => this.Model.Header?.EncryptedMBR; #endif #endregion @@ -160,79 +160,79 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint CIH_WritableAddressMediaUnits => _model.CardInfoHeader.WritableAddressMediaUnits; + public uint CIH_WritableAddressMediaUnits => this.Model.CardInfoHeader.WritableAddressMediaUnits; #else - public uint? CIH_WritableAddressMediaUnits => _model.CardInfoHeader?.WritableAddressMediaUnits; + public uint? CIH_WritableAddressMediaUnits => this.Model.CardInfoHeader?.WritableAddressMediaUnits; #endif /// #if NET48 - public uint CIH_CardInfoBitmask => _model.CardInfoHeader.CardInfoBitmask; + public uint CIH_CardInfoBitmask => this.Model.CardInfoHeader.CardInfoBitmask; #else - public uint? CIH_CardInfoBitmask => _model.CardInfoHeader?.CardInfoBitmask; + public uint? CIH_CardInfoBitmask => this.Model.CardInfoHeader?.CardInfoBitmask; #endif /// #if NET48 - public byte[] CIH_Reserved1 => _model.CardInfoHeader.Reserved1; + public byte[] CIH_Reserved1 => this.Model.CardInfoHeader.Reserved1; #else - public byte[]? CIH_Reserved1 => _model.CardInfoHeader?.Reserved1; + public byte[]? CIH_Reserved1 => this.Model.CardInfoHeader?.Reserved1; #endif /// #if NET48 - public uint CIH_FilledSize => _model.CardInfoHeader.FilledSize; + public uint CIH_FilledSize => this.Model.CardInfoHeader.FilledSize; #else - public uint? CIH_FilledSize => _model.CardInfoHeader?.FilledSize; + public uint? CIH_FilledSize => this.Model.CardInfoHeader?.FilledSize; #endif /// #if NET48 - public byte[] CIH_Reserved2 => _model.CardInfoHeader.Reserved2; + public byte[] CIH_Reserved2 => this.Model.CardInfoHeader.Reserved2; #else - public byte[]? CIH_Reserved2 => _model.CardInfoHeader?.Reserved2; + public byte[]? CIH_Reserved2 => this.Model.CardInfoHeader?.Reserved2; #endif /// #if NET48 - public ushort CIH_TitleVersion => _model.CardInfoHeader.TitleVersion; + public ushort CIH_TitleVersion => this.Model.CardInfoHeader.TitleVersion; #else - public ushort? CIH_TitleVersion => _model.CardInfoHeader?.TitleVersion; + public ushort? CIH_TitleVersion => this.Model.CardInfoHeader?.TitleVersion; #endif /// #if NET48 - public ushort CIH_CardRevision => _model.CardInfoHeader.CardRevision; + public ushort CIH_CardRevision => this.Model.CardInfoHeader.CardRevision; #else - public ushort? CIH_CardRevision => _model.CardInfoHeader?.CardRevision; + public ushort? CIH_CardRevision => this.Model.CardInfoHeader?.CardRevision; #endif /// #if NET48 - public byte[] CIH_Reserved3 => _model.CardInfoHeader.Reserved3; + public byte[] CIH_Reserved3 => this.Model.CardInfoHeader.Reserved3; #else - public byte[]? CIH_Reserved3 => _model.CardInfoHeader?.Reserved3; + public byte[]? CIH_Reserved3 => this.Model.CardInfoHeader?.Reserved3; #endif /// #if NET48 - public byte[] CIH_CVerTitleID => _model.CardInfoHeader.CVerTitleID; + public byte[] CIH_CVerTitleID => this.Model.CardInfoHeader.CVerTitleID; #else - public byte[]? CIH_CVerTitleID => _model.CardInfoHeader?.CVerTitleID; + public byte[]? CIH_CVerTitleID => this.Model.CardInfoHeader?.CVerTitleID; #endif /// #if NET48 - public ushort CIH_CVerVersionNumber => _model.CardInfoHeader.CVerVersionNumber; + public ushort CIH_CVerVersionNumber => this.Model.CardInfoHeader.CVerVersionNumber; #else - public ushort? CIH_CVerVersionNumber => _model.CardInfoHeader?.CVerVersionNumber; + public ushort? CIH_CVerVersionNumber => this.Model.CardInfoHeader?.CVerVersionNumber; #endif /// #if NET48 - public byte[] CIH_Reserved4 => _model.CardInfoHeader.Reserved4; + public byte[] CIH_Reserved4 => this.Model.CardInfoHeader.Reserved4; #else - public byte[]? CIH_Reserved4 => _model.CardInfoHeader?.Reserved4; + public byte[]? CIH_Reserved4 => this.Model.CardInfoHeader?.Reserved4; #endif #endregion @@ -243,136 +243,136 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public byte[] DCIH_ID_CardSeedKeyY => _model.DevelopmentCardInfoHeader?.InitialData?.CardSeedKeyY; + public byte[] DCIH_ID_CardSeedKeyY => this.Model.DevelopmentCardInfoHeader?.InitialData?.CardSeedKeyY; #else - public byte[]? DCIH_ID_CardSeedKeyY => _model.DevelopmentCardInfoHeader?.InitialData?.CardSeedKeyY; + public byte[]? DCIH_ID_CardSeedKeyY => this.Model.DevelopmentCardInfoHeader?.InitialData?.CardSeedKeyY; #endif /// #if NET48 - public byte[] DCIH_ID_EncryptedCardSeed => _model.DevelopmentCardInfoHeader?.InitialData?.EncryptedCardSeed; + public byte[] DCIH_ID_EncryptedCardSeed => this.Model.DevelopmentCardInfoHeader?.InitialData?.EncryptedCardSeed; #else - public byte[]? DCIH_ID_EncryptedCardSeed => _model.DevelopmentCardInfoHeader?.InitialData?.EncryptedCardSeed; + public byte[]? DCIH_ID_EncryptedCardSeed => this.Model.DevelopmentCardInfoHeader?.InitialData?.EncryptedCardSeed; #endif /// #if NET48 - public byte[] DCIH_ID_CardSeedAESMAC => _model.DevelopmentCardInfoHeader?.InitialData?.CardSeedAESMAC; + public byte[] DCIH_ID_CardSeedAESMAC => this.Model.DevelopmentCardInfoHeader?.InitialData?.CardSeedAESMAC; #else - public byte[]? DCIH_ID_CardSeedAESMAC => _model.DevelopmentCardInfoHeader?.InitialData?.CardSeedAESMAC; + public byte[]? DCIH_ID_CardSeedAESMAC => this.Model.DevelopmentCardInfoHeader?.InitialData?.CardSeedAESMAC; #endif /// #if NET48 - public byte[] DCIH_ID_CardSeedNonce => _model.DevelopmentCardInfoHeader?.InitialData?.CardSeedNonce; + public byte[] DCIH_ID_CardSeedNonce => this.Model.DevelopmentCardInfoHeader?.InitialData?.CardSeedNonce; #else - public byte[]? DCIH_ID_CardSeedNonce => _model.DevelopmentCardInfoHeader?.InitialData?.CardSeedNonce; + public byte[]? DCIH_ID_CardSeedNonce => this.Model.DevelopmentCardInfoHeader?.InitialData?.CardSeedNonce; #endif /// #if NET48 - public byte[] DCIH_ID_Reserved => _model.DevelopmentCardInfoHeader?.InitialData?.Reserved; + public byte[] DCIH_ID_Reserved => this.Model.DevelopmentCardInfoHeader?.InitialData?.Reserved; #else - public byte[]? DCIH_ID_Reserved => _model.DevelopmentCardInfoHeader?.InitialData?.Reserved; + public byte[]? DCIH_ID_Reserved => this.Model.DevelopmentCardInfoHeader?.InitialData?.Reserved; #endif /// #if NET48 - public SabreTools.Models.N3DS.NCCHHeader DCIH_ID_BackupHeader => _model.DevelopmentCardInfoHeader?.InitialData?.BackupHeader; + public SabreTools.Models.N3DS.NCCHHeader DCIH_ID_BackupHeader => this.Model.DevelopmentCardInfoHeader?.InitialData?.BackupHeader; #else - public SabreTools.Models.N3DS.NCCHHeader? DCIH_ID_BackupHeader => _model.DevelopmentCardInfoHeader?.InitialData?.BackupHeader; + public SabreTools.Models.N3DS.NCCHHeader? DCIH_ID_BackupHeader => this.Model.DevelopmentCardInfoHeader?.InitialData?.BackupHeader; #endif #endregion /// #if NET48 - public byte[] DCIH_CardDeviceReserved1 => _model.DevelopmentCardInfoHeader?.CardDeviceReserved1; + public byte[] DCIH_CardDeviceReserved1 => this.Model.DevelopmentCardInfoHeader?.CardDeviceReserved1; #else - public byte[]? DCIH_CardDeviceReserved1 => _model.DevelopmentCardInfoHeader?.CardDeviceReserved1; + public byte[]? DCIH_CardDeviceReserved1 => this.Model.DevelopmentCardInfoHeader?.CardDeviceReserved1; #endif /// #if NET48 - public byte[] DCIH_TitleKey => _model.DevelopmentCardInfoHeader?.TitleKey; + public byte[] DCIH_TitleKey => this.Model.DevelopmentCardInfoHeader?.TitleKey; #else - public byte[]? DCIH_TitleKey => _model.DevelopmentCardInfoHeader?.TitleKey; + public byte[]? DCIH_TitleKey => this.Model.DevelopmentCardInfoHeader?.TitleKey; #endif /// #if NET48 - public byte[] DCIH_CardDeviceReserved2 => _model.DevelopmentCardInfoHeader?.CardDeviceReserved2; + public byte[] DCIH_CardDeviceReserved2 => this.Model.DevelopmentCardInfoHeader?.CardDeviceReserved2; #else - public byte[]? DCIH_CardDeviceReserved2 => _model.DevelopmentCardInfoHeader?.CardDeviceReserved2; + public byte[]? DCIH_CardDeviceReserved2 => this.Model.DevelopmentCardInfoHeader?.CardDeviceReserved2; #endif #region Test Data /// #if NET48 - public byte[] DCIH_TD_Signature => _model.DevelopmentCardInfoHeader?.TestData?.Signature; + public byte[] DCIH_TD_Signature => this.Model.DevelopmentCardInfoHeader?.TestData?.Signature; #else - public byte[]? DCIH_TD_Signature => _model.DevelopmentCardInfoHeader?.TestData?.Signature; + public byte[]? DCIH_TD_Signature => this.Model.DevelopmentCardInfoHeader?.TestData?.Signature; #endif /// #if NET48 - public byte[] DCIH_TD_AscendingByteSequence => _model.DevelopmentCardInfoHeader?.TestData?.AscendingByteSequence; + public byte[] DCIH_TD_AscendingByteSequence => this.Model.DevelopmentCardInfoHeader?.TestData?.AscendingByteSequence; #else - public byte[]? DCIH_TD_AscendingByteSequence => _model.DevelopmentCardInfoHeader?.TestData?.AscendingByteSequence; + public byte[]? DCIH_TD_AscendingByteSequence => this.Model.DevelopmentCardInfoHeader?.TestData?.AscendingByteSequence; #endif /// #if NET48 - public byte[] DCIH_TD_DescendingByteSequence => _model.DevelopmentCardInfoHeader?.TestData?.DescendingByteSequence; + public byte[] DCIH_TD_DescendingByteSequence => this.Model.DevelopmentCardInfoHeader?.TestData?.DescendingByteSequence; #else - public byte[]? DCIH_TD_DescendingByteSequence => _model.DevelopmentCardInfoHeader?.TestData?.DescendingByteSequence; + public byte[]? DCIH_TD_DescendingByteSequence => this.Model.DevelopmentCardInfoHeader?.TestData?.DescendingByteSequence; #endif /// #if NET48 - public byte[] DCIH_TD_Filled00 => _model.DevelopmentCardInfoHeader?.TestData?.Filled00; + public byte[] DCIH_TD_Filled00 => this.Model.DevelopmentCardInfoHeader?.TestData?.Filled00; #else - public byte[]? DCIH_TD_Filled00 => _model.DevelopmentCardInfoHeader?.TestData?.Filled00; + public byte[]? DCIH_TD_Filled00 => this.Model.DevelopmentCardInfoHeader?.TestData?.Filled00; #endif /// #if NET48 - public byte[] DCIH_TD_FilledFF => _model.DevelopmentCardInfoHeader?.TestData?.FilledFF; + public byte[] DCIH_TD_FilledFF => this.Model.DevelopmentCardInfoHeader?.TestData?.FilledFF; #else - public byte[]? DCIH_TD_FilledFF => _model.DevelopmentCardInfoHeader?.TestData?.FilledFF; + public byte[]? DCIH_TD_FilledFF => this.Model.DevelopmentCardInfoHeader?.TestData?.FilledFF; #endif /// #if NET48 - public byte[] DCIH_TD_Filled0F => _model.DevelopmentCardInfoHeader?.TestData?.Filled0F; + public byte[] DCIH_TD_Filled0F => this.Model.DevelopmentCardInfoHeader?.TestData?.Filled0F; #else - public byte[]? DCIH_TD_Filled0F => _model.DevelopmentCardInfoHeader?.TestData?.Filled0F; + public byte[]? DCIH_TD_Filled0F => this.Model.DevelopmentCardInfoHeader?.TestData?.Filled0F; #endif /// #if NET48 - public byte[] DCIH_TD_FilledF0 => _model.DevelopmentCardInfoHeader?.TestData?.FilledF0; + public byte[] DCIH_TD_FilledF0 => this.Model.DevelopmentCardInfoHeader?.TestData?.FilledF0; #else - public byte[]? DCIH_TD_FilledF0 => _model.DevelopmentCardInfoHeader?.TestData?.FilledF0; + public byte[]? DCIH_TD_FilledF0 => this.Model.DevelopmentCardInfoHeader?.TestData?.FilledF0; #endif /// #if NET48 - public byte[] DCIH_TD_Filled55 => _model.DevelopmentCardInfoHeader?.TestData?.Filled55; + public byte[] DCIH_TD_Filled55 => this.Model.DevelopmentCardInfoHeader?.TestData?.Filled55; #else - public byte[]? DCIH_TD_Filled55 => _model.DevelopmentCardInfoHeader?.TestData?.Filled55; + public byte[]? DCIH_TD_Filled55 => this.Model.DevelopmentCardInfoHeader?.TestData?.Filled55; #endif /// #if NET48 - public byte[] DCIH_TD_FilledAA => _model.DevelopmentCardInfoHeader?.TestData?.FilledAA; + public byte[] DCIH_TD_FilledAA => this.Model.DevelopmentCardInfoHeader?.TestData?.FilledAA; #else - public byte[]? DCIH_TD_FilledAA => _model.DevelopmentCardInfoHeader?.TestData?.FilledAA; + public byte[]? DCIH_TD_FilledAA => this.Model.DevelopmentCardInfoHeader?.TestData?.FilledAA; #endif /// - public byte? DCIH_TD_FinalByte => _model.DevelopmentCardInfoHeader?.TestData?.FinalByte; + public byte? DCIH_TD_FinalByte => this.Model.DevelopmentCardInfoHeader?.TestData?.FinalByte; #endregion @@ -382,9 +382,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.N3DS.NCCHHeader[] Partitions => _model.Partitions; + public SabreTools.Models.N3DS.NCCHHeader[] Partitions => this.Model.Partitions; #else - public SabreTools.Models.N3DS.NCCHHeader?[]? Partitions => _model.Partitions; + public SabreTools.Models.N3DS.NCCHHeader?[]? Partitions => this.Model.Partitions; #endif #endregion @@ -393,9 +393,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.N3DS.NCCHExtendedHeader[] ExtendedHeaders => _model.ExtendedHeaders; + public SabreTools.Models.N3DS.NCCHExtendedHeader[] ExtendedHeaders => this.Model.ExtendedHeaders; #else - public SabreTools.Models.N3DS.NCCHExtendedHeader?[]? ExtendedHeaders => _model.ExtendedHeaders; + public SabreTools.Models.N3DS.NCCHExtendedHeader?[]? ExtendedHeaders => this.Model.ExtendedHeaders; #endif #endregion @@ -404,9 +404,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.N3DS.ExeFSHeader[] ExeFSHeaders => _model.ExeFSHeaders; + public SabreTools.Models.N3DS.ExeFSHeader[] ExeFSHeaders => this.Model.ExeFSHeaders; #else - public SabreTools.Models.N3DS.ExeFSHeader?[]? ExeFSHeaders => _model.ExeFSHeaders; + public SabreTools.Models.N3DS.ExeFSHeader?[]? ExeFSHeaders => this.Model.ExeFSHeaders; #endif #endregion @@ -415,9 +415,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.N3DS.RomFSHeader[] RomFSHeaders => _model.RomFSHeaders; + public SabreTools.Models.N3DS.RomFSHeader[] RomFSHeaders => this.Model.RomFSHeaders; #else - public SabreTools.Models.N3DS.RomFSHeader?[]? RomFSHeaders => _model.RomFSHeaders; + public SabreTools.Models.N3DS.RomFSHeader?[]? RomFSHeaders => this.Model.RomFSHeaders; #endif #endregion @@ -510,17 +510,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.N3DS.Print(builder, _model); + Printing.N3DS.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/NCF.cs b/BinaryObjectScanner.Wrappers/NCF.cs index 9b4009e2..263269f4 100644 --- a/BinaryObjectScanner.Wrappers/NCF.cs +++ b/BinaryObjectScanner.Wrappers/NCF.cs @@ -19,79 +19,79 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint Dummy0 => _model.Header.Dummy0; + public uint Dummy0 => this.Model.Header.Dummy0; #else - public uint? Dummy0 => _model.Header?.Dummy0; + public uint? Dummy0 => this.Model.Header?.Dummy0; #endif /// #if NET48 - public uint MajorVersion => _model.Header.MajorVersion; + public uint MajorVersion => this.Model.Header.MajorVersion; #else - public uint? MajorVersion => _model.Header?.MajorVersion; + public uint? MajorVersion => this.Model.Header?.MajorVersion; #endif /// #if NET48 - public uint MinorVersion => _model.Header.MinorVersion; + public uint MinorVersion => this.Model.Header.MinorVersion; #else - public uint? MinorVersion => _model.Header?.MinorVersion; + public uint? MinorVersion => this.Model.Header?.MinorVersion; #endif /// #if NET48 - public uint CacheID => _model.Header.CacheID; + public uint CacheID => this.Model.Header.CacheID; #else - public uint? CacheID => _model.Header?.CacheID; + public uint? CacheID => this.Model.Header?.CacheID; #endif /// #if NET48 - public uint LastVersionPlayed => _model.Header.LastVersionPlayed; + public uint LastVersionPlayed => this.Model.Header.LastVersionPlayed; #else - public uint? LastVersionPlayed => _model.Header?.LastVersionPlayed; + public uint? LastVersionPlayed => this.Model.Header?.LastVersionPlayed; #endif /// #if NET48 - public uint Dummy1 => _model.Header.Dummy1; + public uint Dummy1 => this.Model.Header.Dummy1; #else - public uint? Dummy1 => _model.Header?.Dummy1; + public uint? Dummy1 => this.Model.Header?.Dummy1; #endif /// #if NET48 - public uint Dummy2 => _model.Header.Dummy2; + public uint Dummy2 => this.Model.Header.Dummy2; #else - public uint? Dummy2 => _model.Header?.Dummy2; + public uint? Dummy2 => this.Model.Header?.Dummy2; #endif /// #if NET48 - public uint FileSize => _model.Header.FileSize; + public uint FileSize => this.Model.Header.FileSize; #else - public uint? FileSize => _model.Header?.FileSize; + public uint? FileSize => this.Model.Header?.FileSize; #endif /// #if NET48 - public uint BlockSize => _model.Header.BlockSize; + public uint BlockSize => this.Model.Header.BlockSize; #else - public uint? BlockSize => _model.Header?.BlockSize; + public uint? BlockSize => this.Model.Header?.BlockSize; #endif /// #if NET48 - public uint BlockCount => _model.Header.BlockCount; + public uint BlockCount => this.Model.Header.BlockCount; #else - public uint? BlockCount => _model.Header?.BlockCount; + public uint? BlockCount => this.Model.Header?.BlockCount; #endif /// #if NET48 - public uint Dummy3 => _model.Header.Dummy3; + public uint Dummy3 => this.Model.Header.Dummy3; #else - public uint? Dummy3 => _model.Header?.Dummy3; + public uint? Dummy3 => this.Model.Header?.Dummy3; #endif #endregion @@ -100,100 +100,100 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint DH_Dummy0 => _model.DirectoryHeader.Dummy0; + public uint DH_Dummy0 => this.Model.DirectoryHeader.Dummy0; #else - public uint? DH_Dummy0 => _model.DirectoryHeader?.Dummy0; + public uint? DH_Dummy0 => this.Model.DirectoryHeader?.Dummy0; #endif /// #if NET48 - public uint DH_CacheID => _model.DirectoryHeader.CacheID; + public uint DH_CacheID => this.Model.DirectoryHeader.CacheID; #else - public uint? DH_CacheID => _model.DirectoryHeader?.CacheID; + public uint? DH_CacheID => this.Model.DirectoryHeader?.CacheID; #endif /// #if NET48 - public uint DH_LastVersionPlayed => _model.DirectoryHeader.LastVersionPlayed; + public uint DH_LastVersionPlayed => this.Model.DirectoryHeader.LastVersionPlayed; #else - public uint? DH_LastVersionPlayed => _model.DirectoryHeader?.LastVersionPlayed; + public uint? DH_LastVersionPlayed => this.Model.DirectoryHeader?.LastVersionPlayed; #endif /// #if NET48 - public uint DH_ItemCount => _model.DirectoryHeader.ItemCount; + public uint DH_ItemCount => this.Model.DirectoryHeader.ItemCount; #else - public uint? DH_ItemCount => _model.DirectoryHeader?.ItemCount; + public uint? DH_ItemCount => this.Model.DirectoryHeader?.ItemCount; #endif /// #if NET48 - public uint DH_FileCount => _model.DirectoryHeader.FileCount; + public uint DH_FileCount => this.Model.DirectoryHeader.FileCount; #else - public uint? DH_FileCount => _model.DirectoryHeader?.FileCount; + public uint? DH_FileCount => this.Model.DirectoryHeader?.FileCount; #endif /// #if NET48 - public uint DH_ChecksumDataLength => _model.DirectoryHeader.ChecksumDataLength; + public uint DH_ChecksumDataLength => this.Model.DirectoryHeader.ChecksumDataLength; #else - public uint? DH_ChecksumDataLength => _model.DirectoryHeader?.ChecksumDataLength; + public uint? DH_ChecksumDataLength => this.Model.DirectoryHeader?.ChecksumDataLength; #endif /// #if NET48 - public uint DH_DirectorySize => _model.DirectoryHeader.DirectorySize; + public uint DH_DirectorySize => this.Model.DirectoryHeader.DirectorySize; #else - public uint? DH_DirectorySize => _model.DirectoryHeader?.DirectorySize; + public uint? DH_DirectorySize => this.Model.DirectoryHeader?.DirectorySize; #endif /// #if NET48 - public uint DH_NameSize => _model.DirectoryHeader.NameSize; + public uint DH_NameSize => this.Model.DirectoryHeader.NameSize; #else - public uint? DH_NameSize => _model.DirectoryHeader?.NameSize; + public uint? DH_NameSize => this.Model.DirectoryHeader?.NameSize; #endif /// #if NET48 - public uint DH_Info1Count => _model.DirectoryHeader.Info1Count; + public uint DH_Info1Count => this.Model.DirectoryHeader.Info1Count; #else - public uint? DH_Info1Count => _model.DirectoryHeader?.Info1Count; + public uint? DH_Info1Count => this.Model.DirectoryHeader?.Info1Count; #endif /// #if NET48 - public uint DH_CopyCount => _model.DirectoryHeader.CopyCount; + public uint DH_CopyCount => this.Model.DirectoryHeader.CopyCount; #else - public uint? DH_CopyCount => _model.DirectoryHeader?.CopyCount; + public uint? DH_CopyCount => this.Model.DirectoryHeader?.CopyCount; #endif /// #if NET48 - public uint DH_LocalCount => _model.DirectoryHeader.LocalCount; + public uint DH_LocalCount => this.Model.DirectoryHeader.LocalCount; #else - public uint? DH_LocalCount => _model.DirectoryHeader?.LocalCount; + public uint? DH_LocalCount => this.Model.DirectoryHeader?.LocalCount; #endif /// #if NET48 - public uint DH_Dummy1 => _model.DirectoryHeader.Dummy1; + public uint DH_Dummy1 => this.Model.DirectoryHeader.Dummy1; #else - public uint? DH_Dummy1 => _model.DirectoryHeader?.Dummy1; + public uint? DH_Dummy1 => this.Model.DirectoryHeader?.Dummy1; #endif /// #if NET48 - public uint DH_Dummy2 => _model.DirectoryHeader.Dummy2; + public uint DH_Dummy2 => this.Model.DirectoryHeader.Dummy2; #else - public uint? DH_Dummy2 => _model.DirectoryHeader?.Dummy2; + public uint? DH_Dummy2 => this.Model.DirectoryHeader?.Dummy2; #endif /// #if NET48 - public uint DH_Checksum => _model.DirectoryHeader.Checksum; + public uint DH_Checksum => this.Model.DirectoryHeader.Checksum; #else - public uint? DH_Checksum => _model.DirectoryHeader?.Checksum; + public uint? DH_Checksum => this.Model.DirectoryHeader?.Checksum; #endif #endregion @@ -202,9 +202,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.NCF.DirectoryEntry[] DirectoryEntries => _model.DirectoryEntries; + public SabreTools.Models.NCF.DirectoryEntry[] DirectoryEntries => this.Model.DirectoryEntries; #else - public SabreTools.Models.NCF.DirectoryEntry?[]? DirectoryEntries => _model.DirectoryEntries; + public SabreTools.Models.NCF.DirectoryEntry?[]? DirectoryEntries => this.Model.DirectoryEntries; #endif #endregion @@ -213,9 +213,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public Dictionary DirectoryNames => _model.DirectoryNames; + public Dictionary DirectoryNames => this.Model.DirectoryNames; #else - public Dictionary? DirectoryNames => _model.DirectoryNames; + public Dictionary? DirectoryNames => this.Model.DirectoryNames; #endif #endregion @@ -224,9 +224,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.NCF.DirectoryInfo1Entry[] DirectoryInfo1Entries => _model.DirectoryInfo1Entries; + public SabreTools.Models.NCF.DirectoryInfo1Entry[] DirectoryInfo1Entries => this.Model.DirectoryInfo1Entries; #else - public SabreTools.Models.NCF.DirectoryInfo1Entry?[]? DirectoryInfo1Entries => _model.DirectoryInfo1Entries; + public SabreTools.Models.NCF.DirectoryInfo1Entry?[]? DirectoryInfo1Entries => this.Model.DirectoryInfo1Entries; #endif #endregion @@ -235,9 +235,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.NCF.DirectoryInfo2Entry[] DirectoryInfo2Entries => _model.DirectoryInfo2Entries; + public SabreTools.Models.NCF.DirectoryInfo2Entry[] DirectoryInfo2Entries => this.Model.DirectoryInfo2Entries; #else - public SabreTools.Models.NCF.DirectoryInfo2Entry?[]? DirectoryInfo2Entries => _model.DirectoryInfo2Entries; + public SabreTools.Models.NCF.DirectoryInfo2Entry?[]? DirectoryInfo2Entries => this.Model.DirectoryInfo2Entries; #endif #endregion @@ -246,9 +246,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.NCF.DirectoryCopyEntry[] DirectoryCopyEntries => _model.DirectoryCopyEntries; + public SabreTools.Models.NCF.DirectoryCopyEntry[] DirectoryCopyEntries => this.Model.DirectoryCopyEntries; #else - public SabreTools.Models.NCF.DirectoryCopyEntry?[]? DirectoryCopyEntries => _model.DirectoryCopyEntries; + public SabreTools.Models.NCF.DirectoryCopyEntry?[]? DirectoryCopyEntries => this.Model.DirectoryCopyEntries; #endif #endregion @@ -257,9 +257,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.NCF.DirectoryLocalEntry[] DirectoryLocalEntries => _model.DirectoryLocalEntries; + public SabreTools.Models.NCF.DirectoryLocalEntry[] DirectoryLocalEntries => this.Model.DirectoryLocalEntries; #else - public SabreTools.Models.NCF.DirectoryLocalEntry?[]? DirectoryLocalEntries => _model.DirectoryLocalEntries; + public SabreTools.Models.NCF.DirectoryLocalEntry?[]? DirectoryLocalEntries => this.Model.DirectoryLocalEntries; #endif #endregion @@ -268,16 +268,16 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint UH_Dummy0 => _model.UnknownHeader.Dummy0; + public uint UH_Dummy0 => this.Model.UnknownHeader.Dummy0; #else - public uint? UH_Dummy0 => _model.UnknownHeader?.Dummy0; + public uint? UH_Dummy0 => this.Model.UnknownHeader?.Dummy0; #endif /// #if NET48 - public uint UH_Dummy1 => _model.UnknownHeader.Dummy1; + public uint UH_Dummy1 => this.Model.UnknownHeader.Dummy1; #else - public uint? UH_Dummy1 => _model.UnknownHeader?.Dummy1; + public uint? UH_Dummy1 => this.Model.UnknownHeader?.Dummy1; #endif #endregion @@ -286,9 +286,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.NCF.UnknownEntry[] UnknownEntries => _model.UnknownEntries; + public SabreTools.Models.NCF.UnknownEntry[] UnknownEntries => this.Model.UnknownEntries; #else - public SabreTools.Models.NCF.UnknownEntry?[]? UnknownEntries => _model.UnknownEntries; + public SabreTools.Models.NCF.UnknownEntry?[]? UnknownEntries => this.Model.UnknownEntries; #endif #endregion @@ -297,16 +297,16 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint CH_Dummy0 => _model.ChecksumHeader.Dummy0; + public uint CH_Dummy0 => this.Model.ChecksumHeader.Dummy0; #else - public uint? CH_Dummy0 => _model.ChecksumHeader?.Dummy0; + public uint? CH_Dummy0 => this.Model.ChecksumHeader?.Dummy0; #endif /// #if NET48 - public uint CH_ChecksumSize => _model.ChecksumHeader.ChecksumSize; + public uint CH_ChecksumSize => this.Model.ChecksumHeader.ChecksumSize; #else - public uint? CH_ChecksumSize => _model.ChecksumHeader?.ChecksumSize; + public uint? CH_ChecksumSize => this.Model.ChecksumHeader?.ChecksumSize; #endif #endregion @@ -315,30 +315,30 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint CMH_Dummy0 => _model.ChecksumMapHeader.Dummy0; + public uint CMH_Dummy0 => this.Model.ChecksumMapHeader.Dummy0; #else - public uint? CMH_Dummy0 => _model.ChecksumMapHeader?.Dummy0; + public uint? CMH_Dummy0 => this.Model.ChecksumMapHeader?.Dummy0; #endif /// #if NET48 - public uint CMH_Dummy1 => _model.ChecksumMapHeader.Dummy1; + public uint CMH_Dummy1 => this.Model.ChecksumMapHeader.Dummy1; #else - public uint? CMH_Dummy1 => _model.ChecksumMapHeader?.Dummy1; + public uint? CMH_Dummy1 => this.Model.ChecksumMapHeader?.Dummy1; #endif /// #if NET48 - public uint CMH_ItemCount => _model.ChecksumMapHeader.ItemCount; + public uint CMH_ItemCount => this.Model.ChecksumMapHeader.ItemCount; #else - public uint? CMH_ItemCount => _model.ChecksumMapHeader?.ItemCount; + public uint? CMH_ItemCount => this.Model.ChecksumMapHeader?.ItemCount; #endif /// #if NET48 - public uint CMH_ChecksumCount => _model.ChecksumMapHeader.ChecksumCount; + public uint CMH_ChecksumCount => this.Model.ChecksumMapHeader.ChecksumCount; #else - public uint? CMH_ChecksumCount => _model.ChecksumMapHeader?.ChecksumCount; + public uint? CMH_ChecksumCount => this.Model.ChecksumMapHeader?.ChecksumCount; #endif #endregion @@ -347,9 +347,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.NCF.ChecksumMapEntry[] ChecksumMapEntries => _model.ChecksumMapEntries; + public SabreTools.Models.NCF.ChecksumMapEntry[] ChecksumMapEntries => this.Model.ChecksumMapEntries; #else - public SabreTools.Models.NCF.ChecksumMapEntry?[]? ChecksumMapEntries => _model.ChecksumMapEntries; + public SabreTools.Models.NCF.ChecksumMapEntry?[]? ChecksumMapEntries => this.Model.ChecksumMapEntries; #endif #endregion @@ -358,9 +358,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.NCF.ChecksumEntry[] ChecksumEntries => _model.ChecksumEntries; + public SabreTools.Models.NCF.ChecksumEntry[] ChecksumEntries => this.Model.ChecksumEntries; #else - public SabreTools.Models.NCF.ChecksumEntry?[]? ChecksumEntries => _model.ChecksumEntries; + public SabreTools.Models.NCF.ChecksumEntry?[]? ChecksumEntries => this.Model.ChecksumEntries; #endif #endregion @@ -453,17 +453,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.NCF.Print(builder, _model); + Printing.NCF.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/NewExecutable.cs b/BinaryObjectScanner.Wrappers/NewExecutable.cs index 6cd93b85..9b377b99 100644 --- a/BinaryObjectScanner.Wrappers/NewExecutable.cs +++ b/BinaryObjectScanner.Wrappers/NewExecutable.cs @@ -22,100 +22,100 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Stub_Magic => _model.Stub.Header.Magic; + public string Stub_Magic => this.Model.Stub.Header.Magic; #else - public string? Stub_Magic => _model.Stub?.Header?.Magic; + public string? Stub_Magic => this.Model.Stub?.Header?.Magic; #endif /// #if NET48 - public ushort Stub_LastPageBytes => _model.Stub.Header.LastPageBytes; + public ushort Stub_LastPageBytes => this.Model.Stub.Header.LastPageBytes; #else - public ushort? Stub_LastPageBytes => _model.Stub?.Header?.LastPageBytes; + public ushort? Stub_LastPageBytes => this.Model.Stub?.Header?.LastPageBytes; #endif /// #if NET48 - public ushort Stub_Pages => _model.Stub.Header.Pages; + public ushort Stub_Pages => this.Model.Stub.Header.Pages; #else - public ushort? Stub_Pages => _model.Stub?.Header?.Pages; + public ushort? Stub_Pages => this.Model.Stub?.Header?.Pages; #endif /// #if NET48 - public ushort Stub_RelocationItems => _model.Stub.Header.RelocationItems; + public ushort Stub_RelocationItems => this.Model.Stub.Header.RelocationItems; #else - public ushort? Stub_RelocationItems => _model.Stub?.Header?.RelocationItems; + public ushort? Stub_RelocationItems => this.Model.Stub?.Header?.RelocationItems; #endif /// #if NET48 - public ushort Stub_HeaderParagraphSize => _model.Stub.Header.HeaderParagraphSize; + public ushort Stub_HeaderParagraphSize => this.Model.Stub.Header.HeaderParagraphSize; #else - public ushort? Stub_HeaderParagraphSize => _model.Stub?.Header?.HeaderParagraphSize; + public ushort? Stub_HeaderParagraphSize => this.Model.Stub?.Header?.HeaderParagraphSize; #endif /// #if NET48 - public ushort Stub_MinimumExtraParagraphs => _model.Stub.Header.MinimumExtraParagraphs; + public ushort Stub_MinimumExtraParagraphs => this.Model.Stub.Header.MinimumExtraParagraphs; #else - public ushort? Stub_MinimumExtraParagraphs => _model.Stub?.Header?.MinimumExtraParagraphs; + public ushort? Stub_MinimumExtraParagraphs => this.Model.Stub?.Header?.MinimumExtraParagraphs; #endif /// #if NET48 - public ushort Stub_MaximumExtraParagraphs => _model.Stub.Header.MaximumExtraParagraphs; + public ushort Stub_MaximumExtraParagraphs => this.Model.Stub.Header.MaximumExtraParagraphs; #else - public ushort? Stub_MaximumExtraParagraphs => _model.Stub?.Header?.MaximumExtraParagraphs; + public ushort? Stub_MaximumExtraParagraphs => this.Model.Stub?.Header?.MaximumExtraParagraphs; #endif /// #if NET48 - public ushort Stub_InitialSSValue => _model.Stub.Header.InitialSSValue; + public ushort Stub_InitialSSValue => this.Model.Stub.Header.InitialSSValue; #else - public ushort? Stub_InitialSSValue => _model.Stub?.Header?.InitialSSValue; + public ushort? Stub_InitialSSValue => this.Model.Stub?.Header?.InitialSSValue; #endif /// #if NET48 - public ushort Stub_InitialSPValue => _model.Stub.Header.InitialSPValue; + public ushort Stub_InitialSPValue => this.Model.Stub.Header.InitialSPValue; #else - public ushort? Stub_InitialSPValue => _model.Stub?.Header?.InitialSPValue; + public ushort? Stub_InitialSPValue => this.Model.Stub?.Header?.InitialSPValue; #endif /// #if NET48 - public ushort Stub_Checksum => _model.Stub.Header.Checksum; + public ushort Stub_Checksum => this.Model.Stub.Header.Checksum; #else - public ushort? Stub_Checksum => _model.Stub?.Header?.Checksum; + public ushort? Stub_Checksum => this.Model.Stub?.Header?.Checksum; #endif /// #if NET48 - public ushort Stub_InitialIPValue => _model.Stub.Header.InitialIPValue; + public ushort Stub_InitialIPValue => this.Model.Stub.Header.InitialIPValue; #else - public ushort? Stub_InitialIPValue => _model.Stub?.Header?.InitialIPValue; + public ushort? Stub_InitialIPValue => this.Model.Stub?.Header?.InitialIPValue; #endif /// #if NET48 - public ushort Stub_InitialCSValue => _model.Stub.Header.InitialCSValue; + public ushort Stub_InitialCSValue => this.Model.Stub.Header.InitialCSValue; #else - public ushort? Stub_InitialCSValue => _model.Stub?.Header?.InitialCSValue; + public ushort? Stub_InitialCSValue => this.Model.Stub?.Header?.InitialCSValue; #endif /// #if NET48 - public ushort Stub_RelocationTableAddr => _model.Stub.Header.RelocationTableAddr; + public ushort Stub_RelocationTableAddr => this.Model.Stub.Header.RelocationTableAddr; #else - public ushort? Stub_RelocationTableAddr => _model.Stub?.Header?.RelocationTableAddr; + public ushort? Stub_RelocationTableAddr => this.Model.Stub?.Header?.RelocationTableAddr; #endif /// #if NET48 - public ushort Stub_OverlayNumber => _model.Stub.Header.OverlayNumber; + public ushort Stub_OverlayNumber => this.Model.Stub.Header.OverlayNumber; #else - public ushort? Stub_OverlayNumber => _model.Stub?.Header?.OverlayNumber; + public ushort? Stub_OverlayNumber => this.Model.Stub?.Header?.OverlayNumber; #endif #endregion @@ -124,37 +124,37 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public ushort[] Stub_Reserved1 => _model.Stub.Header.Reserved1; + public ushort[] Stub_Reserved1 => this.Model.Stub.Header.Reserved1; #else - public ushort[]? Stub_Reserved1 => _model.Stub?.Header?.Reserved1; + public ushort[]? Stub_Reserved1 => this.Model.Stub?.Header?.Reserved1; #endif /// #if NET48 - public ushort Stub_OEMIdentifier => _model.Stub.Header.OEMIdentifier; + public ushort Stub_OEMIdentifier => this.Model.Stub.Header.OEMIdentifier; #else - public ushort? Stub_OEMIdentifier => _model.Stub?.Header?.OEMIdentifier; + public ushort? Stub_OEMIdentifier => this.Model.Stub?.Header?.OEMIdentifier; #endif /// #if NET48 - public ushort Stub_OEMInformation => _model.Stub.Header.OEMInformation; + public ushort Stub_OEMInformation => this.Model.Stub.Header.OEMInformation; #else - public ushort? Stub_OEMInformation => _model.Stub?.Header?.OEMInformation; + public ushort? Stub_OEMInformation => this.Model.Stub?.Header?.OEMInformation; #endif /// #if NET48 - public ushort[] Stub_Reserved2 => _model.Stub.Header.Reserved2; + public ushort[] Stub_Reserved2 => this.Model.Stub.Header.Reserved2; #else - public ushort[]? Stub_Reserved2 => _model.Stub?.Header?.Reserved2; + public ushort[]? Stub_Reserved2 => this.Model.Stub?.Header?.Reserved2; #endif /// #if NET48 - public uint Stub_NewExeHeaderAddr => _model.Stub.Header.NewExeHeaderAddr; + public uint Stub_NewExeHeaderAddr => this.Model.Stub.Header.NewExeHeaderAddr; #else - public uint? Stub_NewExeHeaderAddr => _model.Stub?.Header?.NewExeHeaderAddr; + public uint? Stub_NewExeHeaderAddr => this.Model.Stub?.Header?.NewExeHeaderAddr; #endif #endregion @@ -165,219 +165,219 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Magic => _model.Header.Magic; + public string Magic => this.Model.Header.Magic; #else - public string? Magic => _model.Header?.Magic; + public string? Magic => this.Model.Header?.Magic; #endif /// #if NET48 - public byte LinkerVersion => _model.Header.LinkerVersion; + public byte LinkerVersion => this.Model.Header.LinkerVersion; #else - public byte? LinkerVersion => _model.Header?.LinkerVersion; + public byte? LinkerVersion => this.Model.Header?.LinkerVersion; #endif /// #if NET48 - public byte LinkerRevision => _model.Header.LinkerRevision; + public byte LinkerRevision => this.Model.Header.LinkerRevision; #else - public byte? LinkerRevision => _model.Header?.LinkerRevision; + public byte? LinkerRevision => this.Model.Header?.LinkerRevision; #endif /// #if NET48 - public ushort EntryTableOffset => _model.Header.EntryTableOffset; + public ushort EntryTableOffset => this.Model.Header.EntryTableOffset; #else - public ushort? EntryTableOffset => _model.Header?.EntryTableOffset; + public ushort? EntryTableOffset => this.Model.Header?.EntryTableOffset; #endif /// #if NET48 - public ushort EntryTableSize => _model.Header.EntryTableSize; + public ushort EntryTableSize => this.Model.Header.EntryTableSize; #else - public ushort? EntryTableSize => _model.Header?.EntryTableSize; + public ushort? EntryTableSize => this.Model.Header?.EntryTableSize; #endif /// #if NET48 - public uint CrcChecksum => _model.Header.CrcChecksum; + public uint CrcChecksum => this.Model.Header.CrcChecksum; #else - public uint? CrcChecksum => _model.Header?.CrcChecksum; + public uint? CrcChecksum => this.Model.Header?.CrcChecksum; #endif /// #if NET48 - public SabreTools.Models.NewExecutable.HeaderFlag FlagWord => _model.Header.FlagWord; + public SabreTools.Models.NewExecutable.HeaderFlag FlagWord => this.Model.Header.FlagWord; #else - public SabreTools.Models.NewExecutable.HeaderFlag? FlagWord => _model.Header?.FlagWord; + public SabreTools.Models.NewExecutable.HeaderFlag? FlagWord => this.Model.Header?.FlagWord; #endif /// #if NET48 - public ushort AutomaticDataSegmentNumber => _model.Header.AutomaticDataSegmentNumber; + public ushort AutomaticDataSegmentNumber => this.Model.Header.AutomaticDataSegmentNumber; #else - public ushort? AutomaticDataSegmentNumber => _model.Header?.AutomaticDataSegmentNumber; + public ushort? AutomaticDataSegmentNumber => this.Model.Header?.AutomaticDataSegmentNumber; #endif /// #if NET48 - public ushort InitialHeapAlloc => _model.Header.InitialHeapAlloc; + public ushort InitialHeapAlloc => this.Model.Header.InitialHeapAlloc; #else - public ushort? InitialHeapAlloc => _model.Header?.InitialHeapAlloc; + public ushort? InitialHeapAlloc => this.Model.Header?.InitialHeapAlloc; #endif /// #if NET48 - public ushort InitialStackAlloc => _model.Header.InitialStackAlloc; + public ushort InitialStackAlloc => this.Model.Header.InitialStackAlloc; #else - public ushort? InitialStackAlloc => _model.Header?.InitialStackAlloc; + public ushort? InitialStackAlloc => this.Model.Header?.InitialStackAlloc; #endif /// #if NET48 - public uint InitialCSIPSetting => _model.Header.InitialCSIPSetting; + public uint InitialCSIPSetting => this.Model.Header.InitialCSIPSetting; #else - public uint? InitialCSIPSetting => _model.Header?.InitialCSIPSetting; + public uint? InitialCSIPSetting => this.Model.Header?.InitialCSIPSetting; #endif /// #if NET48 - public uint InitialSSSPSetting => _model.Header.InitialSSSPSetting; + public uint InitialSSSPSetting => this.Model.Header.InitialSSSPSetting; #else - public uint? InitialSSSPSetting => _model.Header?.InitialSSSPSetting; + public uint? InitialSSSPSetting => this.Model.Header?.InitialSSSPSetting; #endif /// #if NET48 - public ushort FileSegmentCount => _model.Header.FileSegmentCount; + public ushort FileSegmentCount => this.Model.Header.FileSegmentCount; #else - public ushort? FileSegmentCount => _model.Header?.FileSegmentCount; + public ushort? FileSegmentCount => this.Model.Header?.FileSegmentCount; #endif /// #if NET48 - public ushort ModuleReferenceTableSize => _model.Header.ModuleReferenceTableSize; + public ushort ModuleReferenceTableSize => this.Model.Header.ModuleReferenceTableSize; #else - public ushort? ModuleReferenceTableSize => _model.Header?.ModuleReferenceTableSize; + public ushort? ModuleReferenceTableSize => this.Model.Header?.ModuleReferenceTableSize; #endif /// #if NET48 - public ushort NonResidentNameTableSize => _model.Header.NonResidentNameTableSize; + public ushort NonResidentNameTableSize => this.Model.Header.NonResidentNameTableSize; #else - public ushort? NonResidentNameTableSize => _model.Header?.NonResidentNameTableSize; + public ushort? NonResidentNameTableSize => this.Model.Header?.NonResidentNameTableSize; #endif /// #if NET48 - public ushort SegmentTableOffset => _model.Header.SegmentTableOffset; + public ushort SegmentTableOffset => this.Model.Header.SegmentTableOffset; #else - public ushort? SegmentTableOffset => _model.Header?.SegmentTableOffset; + public ushort? SegmentTableOffset => this.Model.Header?.SegmentTableOffset; #endif /// #if NET48 - public ushort ResourceTableOffset => _model.Header.ResourceTableOffset; + public ushort ResourceTableOffset => this.Model.Header.ResourceTableOffset; #else - public ushort? ResourceTableOffset => _model.Header?.ResourceTableOffset; + public ushort? ResourceTableOffset => this.Model.Header?.ResourceTableOffset; #endif /// #if NET48 - public ushort ResidentNameTableOffset => _model.Header.ResidentNameTableOffset; + public ushort ResidentNameTableOffset => this.Model.Header.ResidentNameTableOffset; #else - public ushort? ResidentNameTableOffset => _model.Header?.ResidentNameTableOffset; + public ushort? ResidentNameTableOffset => this.Model.Header?.ResidentNameTableOffset; #endif /// #if NET48 - public ushort ModuleReferenceTableOffset => _model.Header.ModuleReferenceTableOffset; + public ushort ModuleReferenceTableOffset => this.Model.Header.ModuleReferenceTableOffset; #else - public ushort? ModuleReferenceTableOffset => _model.Header?.ModuleReferenceTableOffset; + public ushort? ModuleReferenceTableOffset => this.Model.Header?.ModuleReferenceTableOffset; #endif /// #if NET48 - public ushort ImportedNamesTableOffset => _model.Header.ImportedNamesTableOffset; + public ushort ImportedNamesTableOffset => this.Model.Header.ImportedNamesTableOffset; #else - public ushort? ImportedNamesTableOffset => _model.Header?.ImportedNamesTableOffset; + public ushort? ImportedNamesTableOffset => this.Model.Header?.ImportedNamesTableOffset; #endif /// #if NET48 - public uint NonResidentNamesTableOffset => _model.Header.NonResidentNamesTableOffset; + public uint NonResidentNamesTableOffset => this.Model.Header.NonResidentNamesTableOffset; #else - public uint? NonResidentNamesTableOffset => _model.Header?.NonResidentNamesTableOffset; + public uint? NonResidentNamesTableOffset => this.Model.Header?.NonResidentNamesTableOffset; #endif /// #if NET48 - public ushort MovableEntriesCount => _model.Header.MovableEntriesCount; + public ushort MovableEntriesCount => this.Model.Header.MovableEntriesCount; #else - public ushort? MovableEntriesCount => _model.Header?.MovableEntriesCount; + public ushort? MovableEntriesCount => this.Model.Header?.MovableEntriesCount; #endif /// #if NET48 - public ushort SegmentAlignmentShiftCount => _model.Header.SegmentAlignmentShiftCount; + public ushort SegmentAlignmentShiftCount => this.Model.Header.SegmentAlignmentShiftCount; #else - public ushort? SegmentAlignmentShiftCount => _model.Header?.SegmentAlignmentShiftCount; + public ushort? SegmentAlignmentShiftCount => this.Model.Header?.SegmentAlignmentShiftCount; #endif /// #if NET48 - public ushort ResourceEntriesCount => _model.Header.ResourceEntriesCount; + public ushort ResourceEntriesCount => this.Model.Header.ResourceEntriesCount; #else - public ushort? ResourceEntriesCount => _model.Header?.ResourceEntriesCount; + public ushort? ResourceEntriesCount => this.Model.Header?.ResourceEntriesCount; #endif /// #if NET48 - public SabreTools.Models.NewExecutable.OperatingSystem TargetOperatingSystem => _model.Header.TargetOperatingSystem; + public SabreTools.Models.NewExecutable.OperatingSystem TargetOperatingSystem => this.Model.Header.TargetOperatingSystem; #else - public SabreTools.Models.NewExecutable.OperatingSystem? TargetOperatingSystem => _model.Header?.TargetOperatingSystem; + public SabreTools.Models.NewExecutable.OperatingSystem? TargetOperatingSystem => this.Model.Header?.TargetOperatingSystem; #endif /// #if NET48 - public SabreTools.Models.NewExecutable.OS2Flag AdditionalFlags => _model.Header.AdditionalFlags; + public SabreTools.Models.NewExecutable.OS2Flag AdditionalFlags => this.Model.Header.AdditionalFlags; #else - public SabreTools.Models.NewExecutable.OS2Flag? AdditionalFlags => _model.Header?.AdditionalFlags; + public SabreTools.Models.NewExecutable.OS2Flag? AdditionalFlags => this.Model.Header?.AdditionalFlags; #endif /// #if NET48 - public ushort ReturnThunkOffset => _model.Header.ReturnThunkOffset; + public ushort ReturnThunkOffset => this.Model.Header.ReturnThunkOffset; #else - public ushort? ReturnThunkOffset => _model.Header?.ReturnThunkOffset; + public ushort? ReturnThunkOffset => this.Model.Header?.ReturnThunkOffset; #endif /// #if NET48 - public ushort SegmentReferenceThunkOffset => _model.Header.SegmentReferenceThunkOffset; + public ushort SegmentReferenceThunkOffset => this.Model.Header.SegmentReferenceThunkOffset; #else - public ushort? SegmentReferenceThunkOffset => _model.Header?.SegmentReferenceThunkOffset; + public ushort? SegmentReferenceThunkOffset => this.Model.Header?.SegmentReferenceThunkOffset; #endif /// #if NET48 - public ushort MinCodeSwapAreaSize => _model.Header.MinCodeSwapAreaSize; + public ushort MinCodeSwapAreaSize => this.Model.Header.MinCodeSwapAreaSize; #else - public ushort? MinCodeSwapAreaSize => _model.Header?.MinCodeSwapAreaSize; + public ushort? MinCodeSwapAreaSize => this.Model.Header?.MinCodeSwapAreaSize; #endif /// #if NET48 - public byte WindowsSDKRevision => _model.Header.WindowsSDKRevision; + public byte WindowsSDKRevision => this.Model.Header.WindowsSDKRevision; #else - public byte? WindowsSDKRevision => _model.Header?.WindowsSDKRevision; + public byte? WindowsSDKRevision => this.Model.Header?.WindowsSDKRevision; #endif /// #if NET48 - public byte WindowsSDKVersion => _model.Header.WindowsSDKVersion; + public byte WindowsSDKVersion => this.Model.Header.WindowsSDKVersion; #else - public byte? WindowsSDKVersion => _model.Header?.WindowsSDKVersion; + public byte? WindowsSDKVersion => this.Model.Header?.WindowsSDKVersion; #endif #endregion @@ -386,51 +386,51 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.NewExecutable.SegmentTableEntry[] SegmentTable => _model.SegmentTable; + public SabreTools.Models.NewExecutable.SegmentTableEntry[] SegmentTable => this.Model.SegmentTable; #else - public SabreTools.Models.NewExecutable.SegmentTableEntry?[]? SegmentTable => _model.SegmentTable; + public SabreTools.Models.NewExecutable.SegmentTableEntry?[]? SegmentTable => this.Model.SegmentTable; #endif /// #if NET48 - public SabreTools.Models.NewExecutable.ResourceTable ResourceTable => _model.ResourceTable; + public SabreTools.Models.NewExecutable.ResourceTable ResourceTable => this.Model.ResourceTable; #else - public SabreTools.Models.NewExecutable.ResourceTable? ResourceTable => _model.ResourceTable; + public SabreTools.Models.NewExecutable.ResourceTable? ResourceTable => this.Model.ResourceTable; #endif /// #if NET48 - public SabreTools.Models.NewExecutable.ResidentNameTableEntry[] ResidentNameTable => _model.ResidentNameTable; + public SabreTools.Models.NewExecutable.ResidentNameTableEntry[] ResidentNameTable => this.Model.ResidentNameTable; #else - public SabreTools.Models.NewExecutable.ResidentNameTableEntry?[]? ResidentNameTable => _model.ResidentNameTable; + public SabreTools.Models.NewExecutable.ResidentNameTableEntry?[]? ResidentNameTable => this.Model.ResidentNameTable; #endif /// #if NET48 - public SabreTools.Models.NewExecutable.ModuleReferenceTableEntry[] ModuleReferenceTable => _model.ModuleReferenceTable; + public SabreTools.Models.NewExecutable.ModuleReferenceTableEntry[] ModuleReferenceTable => this.Model.ModuleReferenceTable; #else - public SabreTools.Models.NewExecutable.ModuleReferenceTableEntry?[]? ModuleReferenceTable => _model.ModuleReferenceTable; + public SabreTools.Models.NewExecutable.ModuleReferenceTableEntry?[]? ModuleReferenceTable => this.Model.ModuleReferenceTable; #endif /// #if NET48 - public Dictionary ImportedNameTable => _model.ImportedNameTable; + public Dictionary ImportedNameTable => this.Model.ImportedNameTable; #else - public Dictionary? ImportedNameTable => _model.ImportedNameTable; + public Dictionary? ImportedNameTable => this.Model.ImportedNameTable; #endif /// #if NET48 - public SabreTools.Models.NewExecutable.EntryTableBundle[] EntryTable => _model.EntryTable; + public SabreTools.Models.NewExecutable.EntryTableBundle[] EntryTable => this.Model.EntryTable; #else - public SabreTools.Models.NewExecutable.EntryTableBundle?[]? EntryTable => _model.EntryTable; + public SabreTools.Models.NewExecutable.EntryTableBundle?[]? EntryTable => this.Model.EntryTable; #endif /// #if NET48 - public SabreTools.Models.NewExecutable.NonResidentNameTableEntry[] NonResidentNameTable => _model.NonResidentNameTable; + public SabreTools.Models.NewExecutable.NonResidentNameTableEntry[] NonResidentNameTable => this.Model.NonResidentNameTable; #else - public SabreTools.Models.NewExecutable.NonResidentNameTableEntry?[]? NonResidentNameTable => _model.NonResidentNameTable; + public SabreTools.Models.NewExecutable.NonResidentNameTableEntry?[]? NonResidentNameTable => this.Model.NonResidentNameTable; #endif #endregion @@ -529,17 +529,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.NewExecutable.Print(builder, _model); + Printing.NewExecutable.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion #region REMOVE -- DO NOT USE diff --git a/BinaryObjectScanner.Wrappers/Nitro.cs b/BinaryObjectScanner.Wrappers/Nitro.cs index 0aaa0141..bd07a1e5 100644 --- a/BinaryObjectScanner.Wrappers/Nitro.cs +++ b/BinaryObjectScanner.Wrappers/Nitro.cs @@ -18,289 +18,289 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string GameTitle => _model.CommonHeader.GameTitle; + public string GameTitle => this.Model.CommonHeader.GameTitle; #else - public string? GameTitle => _model.CommonHeader?.GameTitle; + public string? GameTitle => this.Model.CommonHeader?.GameTitle; #endif /// #if NET48 - public uint GameCode => _model.CommonHeader.GameCode; + public uint GameCode => this.Model.CommonHeader.GameCode; #else - public uint? GameCode => _model.CommonHeader?.GameCode; + public uint? GameCode => this.Model.CommonHeader?.GameCode; #endif /// #if NET48 - public string MakerCode => _model.CommonHeader.MakerCode; + public string MakerCode => this.Model.CommonHeader.MakerCode; #else - public string? MakerCode => _model.CommonHeader?.MakerCode; + public string? MakerCode => this.Model.CommonHeader?.MakerCode; #endif /// #if NET48 - public SabreTools.Models.Nitro.Unitcode UnitCode => _model.CommonHeader.UnitCode; + public SabreTools.Models.Nitro.Unitcode UnitCode => this.Model.CommonHeader.UnitCode; #else - public SabreTools.Models.Nitro.Unitcode? UnitCode => _model.CommonHeader?.UnitCode; + public SabreTools.Models.Nitro.Unitcode? UnitCode => this.Model.CommonHeader?.UnitCode; #endif /// #if NET48 - public byte EncryptionSeedSelect => _model.CommonHeader.EncryptionSeedSelect; + public byte EncryptionSeedSelect => this.Model.CommonHeader.EncryptionSeedSelect; #else - public byte? EncryptionSeedSelect => _model.CommonHeader?.EncryptionSeedSelect; + public byte? EncryptionSeedSelect => this.Model.CommonHeader?.EncryptionSeedSelect; #endif /// #if NET48 - public byte DeviceCapacity => _model.CommonHeader.DeviceCapacity; + public byte DeviceCapacity => this.Model.CommonHeader.DeviceCapacity; #else - public byte? DeviceCapacity => _model.CommonHeader?.DeviceCapacity; + public byte? DeviceCapacity => this.Model.CommonHeader?.DeviceCapacity; #endif /// #if NET48 - public byte[] Reserved1 => _model.CommonHeader.Reserved1; + public byte[] Reserved1 => this.Model.CommonHeader.Reserved1; #else - public byte[]? Reserved1 => _model.CommonHeader?.Reserved1; + public byte[]? Reserved1 => this.Model.CommonHeader?.Reserved1; #endif /// #if NET48 - public ushort GameRevision => _model.CommonHeader.GameRevision; + public ushort GameRevision => this.Model.CommonHeader.GameRevision; #else - public ushort? GameRevision => _model.CommonHeader?.GameRevision; + public ushort? GameRevision => this.Model.CommonHeader?.GameRevision; #endif /// #if NET48 - public byte RomVersion => _model.CommonHeader.RomVersion; + public byte RomVersion => this.Model.CommonHeader.RomVersion; #else - public byte? RomVersion => _model.CommonHeader?.RomVersion; + public byte? RomVersion => this.Model.CommonHeader?.RomVersion; #endif /// #if NET48 - public byte InternalFlags => _model.CommonHeader.InternalFlags; + public byte InternalFlags => this.Model.CommonHeader.InternalFlags; #else - public byte? InternalFlags => _model.CommonHeader?.InternalFlags; + public byte? InternalFlags => this.Model.CommonHeader?.InternalFlags; #endif /// #if NET48 - public uint ARM9RomOffset => _model.CommonHeader.ARM9RomOffset; + public uint ARM9RomOffset => this.Model.CommonHeader.ARM9RomOffset; #else - public uint? ARM9RomOffset => _model.CommonHeader?.ARM9RomOffset; + public uint? ARM9RomOffset => this.Model.CommonHeader?.ARM9RomOffset; #endif /// #if NET48 - public uint ARM9EntryAddress => _model.CommonHeader.ARM9EntryAddress; + public uint ARM9EntryAddress => this.Model.CommonHeader.ARM9EntryAddress; #else - public uint? ARM9EntryAddress => _model.CommonHeader?.ARM9EntryAddress; + public uint? ARM9EntryAddress => this.Model.CommonHeader?.ARM9EntryAddress; #endif /// #if NET48 - public uint ARM9LoadAddress => _model.CommonHeader.ARM9LoadAddress; + public uint ARM9LoadAddress => this.Model.CommonHeader.ARM9LoadAddress; #else - public uint? ARM9LoadAddress => _model.CommonHeader?.ARM9LoadAddress; + public uint? ARM9LoadAddress => this.Model.CommonHeader?.ARM9LoadAddress; #endif /// #if NET48 - public uint ARM9Size => _model.CommonHeader.ARM9Size; + public uint ARM9Size => this.Model.CommonHeader.ARM9Size; #else - public uint? ARM9Size => _model.CommonHeader?.ARM9Size; + public uint? ARM9Size => this.Model.CommonHeader?.ARM9Size; #endif /// #if NET48 - public uint ARM7RomOffset => _model.CommonHeader.ARM7RomOffset; + public uint ARM7RomOffset => this.Model.CommonHeader.ARM7RomOffset; #else - public uint? ARM7RomOffset => _model.CommonHeader?.ARM7RomOffset; + public uint? ARM7RomOffset => this.Model.CommonHeader?.ARM7RomOffset; #endif /// #if NET48 - public uint ARM7EntryAddress => _model.CommonHeader.ARM7EntryAddress; + public uint ARM7EntryAddress => this.Model.CommonHeader.ARM7EntryAddress; #else - public uint? ARM7EntryAddress => _model.CommonHeader?.ARM7EntryAddress; + public uint? ARM7EntryAddress => this.Model.CommonHeader?.ARM7EntryAddress; #endif /// #if NET48 - public uint ARM7LoadAddress => _model.CommonHeader.ARM7LoadAddress; + public uint ARM7LoadAddress => this.Model.CommonHeader.ARM7LoadAddress; #else - public uint? ARM7LoadAddress => _model.CommonHeader?.ARM7LoadAddress; + public uint? ARM7LoadAddress => this.Model.CommonHeader?.ARM7LoadAddress; #endif /// #if NET48 - public uint ARM7Size => _model.CommonHeader.ARM7Size; + public uint ARM7Size => this.Model.CommonHeader.ARM7Size; #else - public uint? ARM7Size => _model.CommonHeader?.ARM7Size; + public uint? ARM7Size => this.Model.CommonHeader?.ARM7Size; #endif /// #if NET48 - public uint FileNameTableOffset => _model.CommonHeader.FileNameTableOffset; + public uint FileNameTableOffset => this.Model.CommonHeader.FileNameTableOffset; #else - public uint? FileNameTableOffset => _model.CommonHeader?.FileNameTableOffset; + public uint? FileNameTableOffset => this.Model.CommonHeader?.FileNameTableOffset; #endif /// #if NET48 - public uint FileNameTableLength => _model.CommonHeader.FileNameTableLength; + public uint FileNameTableLength => this.Model.CommonHeader.FileNameTableLength; #else - public uint? FileNameTableLength => _model.CommonHeader?.FileNameTableLength; + public uint? FileNameTableLength => this.Model.CommonHeader?.FileNameTableLength; #endif /// #if NET48 - public uint FileAllocationTableOffset => _model.CommonHeader.FileAllocationTableOffset; + public uint FileAllocationTableOffset => this.Model.CommonHeader.FileAllocationTableOffset; #else - public uint? FileAllocationTableOffset => _model.CommonHeader?.FileAllocationTableOffset; + public uint? FileAllocationTableOffset => this.Model.CommonHeader?.FileAllocationTableOffset; #endif /// #if NET48 - public uint FileAllocationTableLength => _model.CommonHeader.FileAllocationTableLength; + public uint FileAllocationTableLength => this.Model.CommonHeader.FileAllocationTableLength; #else - public uint? FileAllocationTableLength => _model.CommonHeader?.FileAllocationTableLength; + public uint? FileAllocationTableLength => this.Model.CommonHeader?.FileAllocationTableLength; #endif /// #if NET48 - public uint ARM9OverlayOffset => _model.CommonHeader.ARM9OverlayOffset; + public uint ARM9OverlayOffset => this.Model.CommonHeader.ARM9OverlayOffset; #else - public uint? ARM9OverlayOffset => _model.CommonHeader?.ARM9OverlayOffset; + public uint? ARM9OverlayOffset => this.Model.CommonHeader?.ARM9OverlayOffset; #endif /// #if NET48 - public uint ARM9OverlayLength => _model.CommonHeader.ARM9OverlayLength; + public uint ARM9OverlayLength => this.Model.CommonHeader.ARM9OverlayLength; #else - public uint? ARM9OverlayLength => _model.CommonHeader?.ARM9OverlayLength; + public uint? ARM9OverlayLength => this.Model.CommonHeader?.ARM9OverlayLength; #endif /// #if NET48 - public uint ARM7OverlayOffset => _model.CommonHeader.ARM7OverlayOffset; + public uint ARM7OverlayOffset => this.Model.CommonHeader.ARM7OverlayOffset; #else - public uint? ARM7OverlayOffset => _model.CommonHeader?.ARM7OverlayOffset; + public uint? ARM7OverlayOffset => this.Model.CommonHeader?.ARM7OverlayOffset; #endif /// #if NET48 - public uint ARM7OverlayLength => _model.CommonHeader.ARM7OverlayLength; + public uint ARM7OverlayLength => this.Model.CommonHeader.ARM7OverlayLength; #else - public uint? ARM7OverlayLength => _model.CommonHeader?.ARM7OverlayLength; + public uint? ARM7OverlayLength => this.Model.CommonHeader?.ARM7OverlayLength; #endif /// #if NET48 - public uint NormalCardControlRegisterSettings => _model.CommonHeader.NormalCardControlRegisterSettings; + public uint NormalCardControlRegisterSettings => this.Model.CommonHeader.NormalCardControlRegisterSettings; #else - public uint? NormalCardControlRegisterSettings => _model.CommonHeader?.NormalCardControlRegisterSettings; + public uint? NormalCardControlRegisterSettings => this.Model.CommonHeader?.NormalCardControlRegisterSettings; #endif /// #if NET48 - public uint SecureCardControlRegisterSettings => _model.CommonHeader.SecureCardControlRegisterSettings; + public uint SecureCardControlRegisterSettings => this.Model.CommonHeader.SecureCardControlRegisterSettings; #else - public uint? SecureCardControlRegisterSettings => _model.CommonHeader?.SecureCardControlRegisterSettings; + public uint? SecureCardControlRegisterSettings => this.Model.CommonHeader?.SecureCardControlRegisterSettings; #endif /// #if NET48 - public uint IconBannerOffset => _model.CommonHeader.IconBannerOffset; + public uint IconBannerOffset => this.Model.CommonHeader.IconBannerOffset; #else - public uint? IconBannerOffset => _model.CommonHeader?.IconBannerOffset; + public uint? IconBannerOffset => this.Model.CommonHeader?.IconBannerOffset; #endif /// #if NET48 - public ushort SecureAreaCRC => _model.CommonHeader.SecureAreaCRC; + public ushort SecureAreaCRC => this.Model.CommonHeader.SecureAreaCRC; #else - public ushort? SecureAreaCRC => _model.CommonHeader?.SecureAreaCRC; + public ushort? SecureAreaCRC => this.Model.CommonHeader?.SecureAreaCRC; #endif /// #if NET48 - public ushort SecureTransferTimeout => _model.CommonHeader.SecureTransferTimeout; + public ushort SecureTransferTimeout => this.Model.CommonHeader.SecureTransferTimeout; #else - public ushort? SecureTransferTimeout => _model.CommonHeader?.SecureTransferTimeout; + public ushort? SecureTransferTimeout => this.Model.CommonHeader?.SecureTransferTimeout; #endif /// #if NET48 - public uint ARM9Autoload => _model.CommonHeader.ARM9Autoload; + public uint ARM9Autoload => this.Model.CommonHeader.ARM9Autoload; #else - public uint? ARM9Autoload => _model.CommonHeader?.ARM9Autoload; + public uint? ARM9Autoload => this.Model.CommonHeader?.ARM9Autoload; #endif /// #if NET48 - public uint ARM7Autoload => _model.CommonHeader.ARM7Autoload; + public uint ARM7Autoload => this.Model.CommonHeader.ARM7Autoload; #else - public uint? ARM7Autoload => _model.CommonHeader?.ARM7Autoload; + public uint? ARM7Autoload => this.Model.CommonHeader?.ARM7Autoload; #endif /// #if NET48 - public byte[] SecureDisable => _model.CommonHeader.SecureDisable; + public byte[] SecureDisable => this.Model.CommonHeader.SecureDisable; #else - public byte[]? SecureDisable => _model.CommonHeader?.SecureDisable; + public byte[]? SecureDisable => this.Model.CommonHeader?.SecureDisable; #endif /// #if NET48 - public uint NTRRegionRomSize => _model.CommonHeader.NTRRegionRomSize; + public uint NTRRegionRomSize => this.Model.CommonHeader.NTRRegionRomSize; #else - public uint? NTRRegionRomSize => _model.CommonHeader?.NTRRegionRomSize; + public uint? NTRRegionRomSize => this.Model.CommonHeader?.NTRRegionRomSize; #endif /// #if NET48 - public uint HeaderSize => _model.CommonHeader.HeaderSize; + public uint HeaderSize => this.Model.CommonHeader.HeaderSize; #else - public uint? HeaderSize => _model.CommonHeader?.HeaderSize; + public uint? HeaderSize => this.Model.CommonHeader?.HeaderSize; #endif /// #if NET48 - public byte[] Reserved2 => _model.CommonHeader.Reserved2; + public byte[] Reserved2 => this.Model.CommonHeader.Reserved2; #else - public byte[]? Reserved2 => _model.CommonHeader?.Reserved2; + public byte[]? Reserved2 => this.Model.CommonHeader?.Reserved2; #endif /// #if NET48 - public byte[] NintendoLogo => _model.CommonHeader.NintendoLogo; + public byte[] NintendoLogo => this.Model.CommonHeader.NintendoLogo; #else - public byte[]? NintendoLogo => _model.CommonHeader?.NintendoLogo; + public byte[]? NintendoLogo => this.Model.CommonHeader?.NintendoLogo; #endif /// #if NET48 - public ushort NintendoLogoCRC => _model.CommonHeader.NintendoLogoCRC; + public ushort NintendoLogoCRC => this.Model.CommonHeader.NintendoLogoCRC; #else - public ushort? NintendoLogoCRC => _model.CommonHeader?.NintendoLogoCRC; + public ushort? NintendoLogoCRC => this.Model.CommonHeader?.NintendoLogoCRC; #endif /// #if NET48 - public ushort HeaderCRC => _model.CommonHeader.HeaderCRC; + public ushort HeaderCRC => this.Model.CommonHeader.HeaderCRC; #else - public ushort? HeaderCRC => _model.CommonHeader?.HeaderCRC; + public ushort? HeaderCRC => this.Model.CommonHeader?.HeaderCRC; #endif /// #if NET48 - public byte[] DebuggerReserved => _model.CommonHeader.DebuggerReserved; + public byte[] DebuggerReserved => this.Model.CommonHeader.DebuggerReserved; #else - public byte[]? DebuggerReserved => _model.CommonHeader?.DebuggerReserved; + public byte[]? DebuggerReserved => this.Model.CommonHeader?.DebuggerReserved; #endif #endregion @@ -309,214 +309,214 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint[] GlobalMBK15Settings => _model.ExtendedDSiHeader?.GlobalMBK15Settings; + public uint[] GlobalMBK15Settings => this.Model.ExtendedDSiHeader?.GlobalMBK15Settings; #else - public uint[]? GlobalMBK15Settings => _model.ExtendedDSiHeader?.GlobalMBK15Settings; + public uint[]? GlobalMBK15Settings => this.Model.ExtendedDSiHeader?.GlobalMBK15Settings; #endif /// #if NET48 - public uint[] LocalMBK68SettingsARM9 => _model.ExtendedDSiHeader?.LocalMBK68SettingsARM9; + public uint[] LocalMBK68SettingsARM9 => this.Model.ExtendedDSiHeader?.LocalMBK68SettingsARM9; #else - public uint[]? LocalMBK68SettingsARM9 => _model.ExtendedDSiHeader?.LocalMBK68SettingsARM9; + public uint[]? LocalMBK68SettingsARM9 => this.Model.ExtendedDSiHeader?.LocalMBK68SettingsARM9; #endif /// #if NET48 - public uint[] LocalMBK68SettingsARM7 => _model.ExtendedDSiHeader?.LocalMBK68SettingsARM7; + public uint[] LocalMBK68SettingsARM7 => this.Model.ExtendedDSiHeader?.LocalMBK68SettingsARM7; #else - public uint[]? LocalMBK68SettingsARM7 => _model.ExtendedDSiHeader?.LocalMBK68SettingsARM7; + public uint[]? LocalMBK68SettingsARM7 => this.Model.ExtendedDSiHeader?.LocalMBK68SettingsARM7; #endif /// - public uint? GlobalMBK9Setting => _model.ExtendedDSiHeader?.GlobalMBK9Setting; + public uint? GlobalMBK9Setting => this.Model.ExtendedDSiHeader?.GlobalMBK9Setting; /// - public uint? RegionFlags => _model.ExtendedDSiHeader?.RegionFlags; + public uint? RegionFlags => this.Model.ExtendedDSiHeader?.RegionFlags; /// - public uint? AccessControl => _model.ExtendedDSiHeader?.AccessControl; + public uint? AccessControl => this.Model.ExtendedDSiHeader?.AccessControl; /// - public uint? ARM7SCFGEXTMask => _model.ExtendedDSiHeader?.ARM7SCFGEXTMask; + public uint? ARM7SCFGEXTMask => this.Model.ExtendedDSiHeader?.ARM7SCFGEXTMask; /// - public uint? ReservedFlags => _model.ExtendedDSiHeader?.ReservedFlags; + public uint? ReservedFlags => this.Model.ExtendedDSiHeader?.ReservedFlags; /// - public uint? ARM9iRomOffset => _model.ExtendedDSiHeader?.ARM9iRomOffset; + public uint? ARM9iRomOffset => this.Model.ExtendedDSiHeader?.ARM9iRomOffset; /// - public uint? Reserved3 => _model.ExtendedDSiHeader?.Reserved3; + public uint? Reserved3 => this.Model.ExtendedDSiHeader?.Reserved3; /// - public uint? ARM9iLoadAddress => _model.ExtendedDSiHeader?.ARM9iLoadAddress; + public uint? ARM9iLoadAddress => this.Model.ExtendedDSiHeader?.ARM9iLoadAddress; /// - public uint? ARM9iSize => _model.ExtendedDSiHeader?.ARM9iSize; + public uint? ARM9iSize => this.Model.ExtendedDSiHeader?.ARM9iSize; /// - public uint? ARM7iRomOffset => _model.ExtendedDSiHeader?.ARM7iRomOffset; + public uint? ARM7iRomOffset => this.Model.ExtendedDSiHeader?.ARM7iRomOffset; /// - public uint? Reserved4 => _model.ExtendedDSiHeader?.Reserved4; + public uint? Reserved4 => this.Model.ExtendedDSiHeader?.Reserved4; /// - public uint? ARM7iLoadAddress => _model.ExtendedDSiHeader?.ARM7iLoadAddress; + public uint? ARM7iLoadAddress => this.Model.ExtendedDSiHeader?.ARM7iLoadAddress; /// - public uint? ARM7iSize => _model.ExtendedDSiHeader?.ARM7iSize; + public uint? ARM7iSize => this.Model.ExtendedDSiHeader?.ARM7iSize; /// - public uint? DigestNTRRegionOffset => _model.ExtendedDSiHeader?.DigestNTRRegionOffset; + public uint? DigestNTRRegionOffset => this.Model.ExtendedDSiHeader?.DigestNTRRegionOffset; /// - public uint? DigestNTRRegionLength => _model.ExtendedDSiHeader?.DigestNTRRegionLength; + public uint? DigestNTRRegionLength => this.Model.ExtendedDSiHeader?.DigestNTRRegionLength; /// - public uint? DigestTWLRegionOffset => _model.ExtendedDSiHeader?.DigestTWLRegionOffset; + public uint? DigestTWLRegionOffset => this.Model.ExtendedDSiHeader?.DigestTWLRegionOffset; /// - public uint? DigestTWLRegionLength => _model.ExtendedDSiHeader?.DigestTWLRegionLength; + public uint? DigestTWLRegionLength => this.Model.ExtendedDSiHeader?.DigestTWLRegionLength; /// - public uint? DigestSectorHashtableRegionOffset => _model.ExtendedDSiHeader?.DigestSectorHashtableRegionOffset; + public uint? DigestSectorHashtableRegionOffset => this.Model.ExtendedDSiHeader?.DigestSectorHashtableRegionOffset; /// - public uint? DigestSectorHashtableRegionLength => _model.ExtendedDSiHeader?.DigestSectorHashtableRegionLength; + public uint? DigestSectorHashtableRegionLength => this.Model.ExtendedDSiHeader?.DigestSectorHashtableRegionLength; /// - public uint? DigestBlockHashtableRegionOffset => _model.ExtendedDSiHeader?.DigestBlockHashtableRegionOffset; + public uint? DigestBlockHashtableRegionOffset => this.Model.ExtendedDSiHeader?.DigestBlockHashtableRegionOffset; /// - public uint? DigestBlockHashtableRegionLength => _model.ExtendedDSiHeader?.DigestBlockHashtableRegionLength; + public uint? DigestBlockHashtableRegionLength => this.Model.ExtendedDSiHeader?.DigestBlockHashtableRegionLength; /// - public uint? DigestSectorSize => _model.ExtendedDSiHeader?.DigestSectorSize; + public uint? DigestSectorSize => this.Model.ExtendedDSiHeader?.DigestSectorSize; /// - public uint? DigestBlockSectorCount => _model.ExtendedDSiHeader?.DigestBlockSectorCount; + public uint? DigestBlockSectorCount => this.Model.ExtendedDSiHeader?.DigestBlockSectorCount; /// - public uint? IconBannerSize => _model.ExtendedDSiHeader?.IconBannerSize; + public uint? IconBannerSize => this.Model.ExtendedDSiHeader?.IconBannerSize; /// - public uint? Unknown1 => _model.ExtendedDSiHeader?.Unknown1; + public uint? Unknown1 => this.Model.ExtendedDSiHeader?.Unknown1; /// - public uint? ModcryptArea1Offset => _model.ExtendedDSiHeader?.ModcryptArea1Offset; + public uint? ModcryptArea1Offset => this.Model.ExtendedDSiHeader?.ModcryptArea1Offset; /// - public uint? ModcryptArea1Size => _model.ExtendedDSiHeader?.ModcryptArea1Size; + public uint? ModcryptArea1Size => this.Model.ExtendedDSiHeader?.ModcryptArea1Size; /// - public uint? ModcryptArea2Offset => _model.ExtendedDSiHeader?.ModcryptArea2Offset; + public uint? ModcryptArea2Offset => this.Model.ExtendedDSiHeader?.ModcryptArea2Offset; /// - public uint? ModcryptArea2Size => _model.ExtendedDSiHeader?.ModcryptArea2Size; + public uint? ModcryptArea2Size => this.Model.ExtendedDSiHeader?.ModcryptArea2Size; /// #if NET48 - public byte[] TitleID => _model.ExtendedDSiHeader?.TitleID; + public byte[] TitleID => this.Model.ExtendedDSiHeader?.TitleID; #else - public byte[]? TitleID => _model.ExtendedDSiHeader?.TitleID; + public byte[]? TitleID => this.Model.ExtendedDSiHeader?.TitleID; #endif /// - public uint? DSiWarePublicSavSize => _model.ExtendedDSiHeader?.DSiWarePublicSavSize; + public uint? DSiWarePublicSavSize => this.Model.ExtendedDSiHeader?.DSiWarePublicSavSize; /// - public uint? DSiWarePrivateSavSize => _model.ExtendedDSiHeader?.DSiWarePrivateSavSize; + public uint? DSiWarePrivateSavSize => this.Model.ExtendedDSiHeader?.DSiWarePrivateSavSize; /// #if NET48 - public byte[] ReservedZero => _model.ExtendedDSiHeader?.ReservedZero; + public byte[] ReservedZero => this.Model.ExtendedDSiHeader?.ReservedZero; #else - public byte[]? ReservedZero => _model.ExtendedDSiHeader?.ReservedZero; + public byte[]? ReservedZero => this.Model.ExtendedDSiHeader?.ReservedZero; #endif /// #if NET48 - public byte[] Unknown2 => _model.ExtendedDSiHeader?.Unknown2; + public byte[] Unknown2 => this.Model.ExtendedDSiHeader?.Unknown2; #else - public byte[]? Unknown2 => _model.ExtendedDSiHeader?.Unknown2; + public byte[]? Unknown2 => this.Model.ExtendedDSiHeader?.Unknown2; #endif /// #if NET48 - public byte[] ARM9WithSecureAreaSHA1HMACHash => _model.ExtendedDSiHeader?.ARM9WithSecureAreaSHA1HMACHash; + public byte[] ARM9WithSecureAreaSHA1HMACHash => this.Model.ExtendedDSiHeader?.ARM9WithSecureAreaSHA1HMACHash; #else - public byte[]? ARM9WithSecureAreaSHA1HMACHash => _model.ExtendedDSiHeader?.ARM9WithSecureAreaSHA1HMACHash; + public byte[]? ARM9WithSecureAreaSHA1HMACHash => this.Model.ExtendedDSiHeader?.ARM9WithSecureAreaSHA1HMACHash; #endif /// #if NET48 - public byte[] ARM7SHA1HMACHash => _model.ExtendedDSiHeader?.ARM7SHA1HMACHash; + public byte[] ARM7SHA1HMACHash => this.Model.ExtendedDSiHeader?.ARM7SHA1HMACHash; #else - public byte[]? ARM7SHA1HMACHash => _model.ExtendedDSiHeader?.ARM7SHA1HMACHash; + public byte[]? ARM7SHA1HMACHash => this.Model.ExtendedDSiHeader?.ARM7SHA1HMACHash; #endif /// #if NET48 - public byte[] DigestMasterSHA1HMACHash => _model.ExtendedDSiHeader?.DigestMasterSHA1HMACHash; + public byte[] DigestMasterSHA1HMACHash => this.Model.ExtendedDSiHeader?.DigestMasterSHA1HMACHash; #else - public byte[]? DigestMasterSHA1HMACHash => _model.ExtendedDSiHeader?.DigestMasterSHA1HMACHash; + public byte[]? DigestMasterSHA1HMACHash => this.Model.ExtendedDSiHeader?.DigestMasterSHA1HMACHash; #endif /// #if NET48 - public byte[] BannerSHA1HMACHash => _model.ExtendedDSiHeader?.BannerSHA1HMACHash; + public byte[] BannerSHA1HMACHash => this.Model.ExtendedDSiHeader?.BannerSHA1HMACHash; #else - public byte[]? BannerSHA1HMACHash => _model.ExtendedDSiHeader?.BannerSHA1HMACHash; + public byte[]? BannerSHA1HMACHash => this.Model.ExtendedDSiHeader?.BannerSHA1HMACHash; #endif /// #if NET48 - public byte[] ARM9iDecryptedSHA1HMACHash => _model.ExtendedDSiHeader?.ARM9iDecryptedSHA1HMACHash; + public byte[] ARM9iDecryptedSHA1HMACHash => this.Model.ExtendedDSiHeader?.ARM9iDecryptedSHA1HMACHash; #else - public byte[]? ARM9iDecryptedSHA1HMACHash => _model.ExtendedDSiHeader?.ARM9iDecryptedSHA1HMACHash; + public byte[]? ARM9iDecryptedSHA1HMACHash => this.Model.ExtendedDSiHeader?.ARM9iDecryptedSHA1HMACHash; #endif /// #if NET48 - public byte[] ARM7iDecryptedSHA1HMACHash => _model.ExtendedDSiHeader?.ARM7iDecryptedSHA1HMACHash; + public byte[] ARM7iDecryptedSHA1HMACHash => this.Model.ExtendedDSiHeader?.ARM7iDecryptedSHA1HMACHash; #else - public byte[]? ARM7iDecryptedSHA1HMACHash => _model.ExtendedDSiHeader?.ARM7iDecryptedSHA1HMACHash; + public byte[]? ARM7iDecryptedSHA1HMACHash => this.Model.ExtendedDSiHeader?.ARM7iDecryptedSHA1HMACHash; #endif /// #if NET48 - public byte[] Reserved5 => _model.ExtendedDSiHeader?.Reserved5; + public byte[] Reserved5 => this.Model.ExtendedDSiHeader?.Reserved5; #else - public byte[]? Reserved5 => _model.ExtendedDSiHeader?.Reserved5; + public byte[]? Reserved5 => this.Model.ExtendedDSiHeader?.Reserved5; #endif /// #if NET48 - public byte[] ARM9NoSecureAreaSHA1HMACHash => _model.ExtendedDSiHeader?.ARM9NoSecureAreaSHA1HMACHash; + public byte[] ARM9NoSecureAreaSHA1HMACHash => this.Model.ExtendedDSiHeader?.ARM9NoSecureAreaSHA1HMACHash; #else - public byte[]? ARM9NoSecureAreaSHA1HMACHash => _model.ExtendedDSiHeader?.ARM9NoSecureAreaSHA1HMACHash; + public byte[]? ARM9NoSecureAreaSHA1HMACHash => this.Model.ExtendedDSiHeader?.ARM9NoSecureAreaSHA1HMACHash; #endif /// #if NET48 - public byte[] Reserved6 => _model.ExtendedDSiHeader?.Reserved6; + public byte[] Reserved6 => this.Model.ExtendedDSiHeader?.Reserved6; #else - public byte[]? Reserved6 => _model.ExtendedDSiHeader?.Reserved6; + public byte[]? Reserved6 => this.Model.ExtendedDSiHeader?.Reserved6; #endif /// #if NET48 - public byte[] ReservedAndUnchecked => _model.ExtendedDSiHeader?.ReservedAndUnchecked; + public byte[] ReservedAndUnchecked => this.Model.ExtendedDSiHeader?.ReservedAndUnchecked; #else - public byte[]? ReservedAndUnchecked => _model.ExtendedDSiHeader?.ReservedAndUnchecked; + public byte[]? ReservedAndUnchecked => this.Model.ExtendedDSiHeader?.ReservedAndUnchecked; #endif /// #if NET48 - public byte[] RSASignature => _model.ExtendedDSiHeader?.RSASignature; + public byte[] RSASignature => this.Model.ExtendedDSiHeader?.RSASignature; #else - public byte[]? RSASignature => _model.ExtendedDSiHeader?.RSASignature; + public byte[]? RSASignature => this.Model.ExtendedDSiHeader?.RSASignature; #endif #endregion @@ -525,9 +525,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public byte[] SecureArea => _model.SecureArea; + public byte[] SecureArea => this.Model.SecureArea; #else - public byte[]? SecureArea => _model.SecureArea; + public byte[]? SecureArea => this.Model.SecureArea; #endif #endregion @@ -536,16 +536,16 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.Nitro.FolderAllocationTableEntry[] FolderAllocationTable => _model.NameTable.FolderAllocationTable; + public SabreTools.Models.Nitro.FolderAllocationTableEntry[] FolderAllocationTable => this.Model.NameTable.FolderAllocationTable; #else - public SabreTools.Models.Nitro.FolderAllocationTableEntry?[]? FolderAllocationTable => _model.NameTable?.FolderAllocationTable; + public SabreTools.Models.Nitro.FolderAllocationTableEntry?[]? FolderAllocationTable => this.Model.NameTable?.FolderAllocationTable; #endif /// #if NET48 - public SabreTools.Models.Nitro.NameListEntry[] NameList => _model.NameTable.NameList; + public SabreTools.Models.Nitro.NameListEntry[] NameList => this.Model.NameTable.NameList; #else - public SabreTools.Models.Nitro.NameListEntry?[]? NameList => _model.NameTable?.NameList; + public SabreTools.Models.Nitro.NameListEntry?[]? NameList => this.Model.NameTable?.NameList; #endif #endregion @@ -554,9 +554,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.Nitro.FileAllocationTableEntry[] FileAllocationTable => _model.FileAllocationTable; + public SabreTools.Models.Nitro.FileAllocationTableEntry[] FileAllocationTable => this.Model.FileAllocationTable; #else - public SabreTools.Models.Nitro.FileAllocationTableEntry?[]? FileAllocationTable => _model.FileAllocationTable; + public SabreTools.Models.Nitro.FileAllocationTableEntry?[]? FileAllocationTable => this.Model.FileAllocationTable; #endif #endregion @@ -649,17 +649,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.Nitro.Print(builder, _model); + Printing.Nitro.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/PAK.cs b/BinaryObjectScanner.Wrappers/PAK.cs index 76bf9029..21782f77 100644 --- a/BinaryObjectScanner.Wrappers/PAK.cs +++ b/BinaryObjectScanner.Wrappers/PAK.cs @@ -18,23 +18,23 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Signature => _model.Header.Signature; + public string Signature => this.Model.Header.Signature; #else - public string? Signature => _model.Header?.Signature; + public string? Signature => this.Model.Header?.Signature; #endif /// #if NET48 - public uint DirectoryOffset => _model.Header.DirectoryOffset; + public uint DirectoryOffset => this.Model.Header.DirectoryOffset; #else - public uint? DirectoryOffset => _model.Header?.DirectoryOffset; + public uint? DirectoryOffset => this.Model.Header?.DirectoryOffset; #endif /// #if NET48 - public uint DirectoryLength => _model.Header.DirectoryLength; + public uint DirectoryLength => this.Model.Header.DirectoryLength; #else - public uint? DirectoryLength => _model.Header?.DirectoryLength; + public uint? DirectoryLength => this.Model.Header?.DirectoryLength; #endif #endregion @@ -43,9 +43,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.PAK.DirectoryItem[] DirectoryItems => _model.DirectoryItems; + public SabreTools.Models.PAK.DirectoryItem[] DirectoryItems => this.Model.DirectoryItems; #else - public SabreTools.Models.PAK.DirectoryItem?[]? DirectoryItems => _model.DirectoryItems; + public SabreTools.Models.PAK.DirectoryItem?[]? DirectoryItems => this.Model.DirectoryItems; #endif #endregion @@ -144,17 +144,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.PAK.Print(builder, _model); + Printing.PAK.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion #region Extraction diff --git a/BinaryObjectScanner.Wrappers/PFF.cs b/BinaryObjectScanner.Wrappers/PFF.cs index 0846ba89..7c8d6555 100644 --- a/BinaryObjectScanner.Wrappers/PFF.cs +++ b/BinaryObjectScanner.Wrappers/PFF.cs @@ -18,37 +18,37 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint HeaderSize => _model.Header.HeaderSize; + public uint HeaderSize => this.Model.Header.HeaderSize; #else - public uint? HeaderSize => _model.Header?.HeaderSize; + public uint? HeaderSize => this.Model.Header?.HeaderSize; #endif /// #if NET48 - public string Signature => _model.Header.Signature; + public string Signature => this.Model.Header.Signature; #else - public string? Signature => _model.Header?.Signature; + public string? Signature => this.Model.Header?.Signature; #endif /// #if NET48 - public uint NumberOfFiles => _model.Header.NumberOfFiles; + public uint NumberOfFiles => this.Model.Header.NumberOfFiles; #else - public uint? NumberOfFiles => _model.Header?.NumberOfFiles; + public uint? NumberOfFiles => this.Model.Header?.NumberOfFiles; #endif /// #if NET48 - public uint FileSegmentSize => _model.Header.FileSegmentSize; + public uint FileSegmentSize => this.Model.Header.FileSegmentSize; #else - public uint? FileSegmentSize => _model.Header?.FileSegmentSize; + public uint? FileSegmentSize => this.Model.Header?.FileSegmentSize; #endif /// #if NET48 - public uint FileListOffset => _model.Header.FileListOffset; + public uint FileListOffset => this.Model.Header.FileListOffset; #else - public uint? FileListOffset => _model.Header?.FileListOffset; + public uint? FileListOffset => this.Model.Header?.FileListOffset; #endif #endregion @@ -57,9 +57,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.PFF.Segment[] Segments => _model.Segments; + public SabreTools.Models.PFF.Segment[] Segments => this.Model.Segments; #else - public SabreTools.Models.PFF.Segment?[]? Segments => _model.Segments; + public SabreTools.Models.PFF.Segment?[]? Segments => this.Model.Segments; #endif #endregion @@ -68,23 +68,23 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint SystemIP => _model.Footer.SystemIP; + public uint SystemIP => this.Model.Footer.SystemIP; #else - public uint? SystemIP => _model.Footer?.SystemIP; + public uint? SystemIP => this.Model.Footer?.SystemIP; #endif /// #if NET48 - public uint Reserved => _model.Footer.Reserved; + public uint Reserved => this.Model.Footer.Reserved; #else - public uint? Reserved => _model.Footer?.Reserved; + public uint? Reserved => this.Model.Footer?.Reserved; #endif /// #if NET48 - public string KingTag => _model.Footer.KingTag; + public string KingTag => this.Model.Footer.KingTag; #else - public string? KingTag => _model.Footer?.KingTag; + public string? KingTag => this.Model.Footer?.KingTag; #endif #endregion @@ -255,17 +255,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.PFF.Print(builder, _model); + Printing.PFF.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/PlayJAudioFile.cs b/BinaryObjectScanner.Wrappers/PlayJAudioFile.cs index 272253b2..4d81528f 100644 --- a/BinaryObjectScanner.Wrappers/PlayJAudioFile.cs +++ b/BinaryObjectScanner.Wrappers/PlayJAudioFile.cs @@ -18,221 +18,221 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint Signature => _model.Header.Signature; + public uint Signature => this.Model.Header.Signature; #else - public uint? Signature => _model.Header?.Signature; + public uint? Signature => this.Model.Header?.Signature; #endif /// #if NET48 - public uint Version => _model.Header.Version; + public uint Version => this.Model.Header.Version; #else - public uint? Version => _model.Header?.Version; + public uint? Version => this.Model.Header?.Version; #endif #region V1 Only /// - public uint? V1_TrackID => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.TrackID; + public uint? V1_TrackID => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.TrackID; /// - public uint? V1_UnknownOffset1 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.UnknownOffset1; + public uint? V1_UnknownOffset1 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.UnknownOffset1; /// - public uint? V1_UnknownOffset2 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.UnknownOffset2; + public uint? V1_UnknownOffset2 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.UnknownOffset2; /// - public uint? V1_UnknownOffset3 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.UnknownOffset3; + public uint? V1_UnknownOffset3 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.UnknownOffset3; /// - public uint? V1_Unknown1 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.Unknown1; + public uint? V1_Unknown1 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.Unknown1; /// - public uint? V1_Unknown2 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.Unknown2; + public uint? V1_Unknown2 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.Unknown2; /// - public uint? V1_Year => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.Year; + public uint? V1_Year => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.Year; /// - public uint? V1_TrackNumber => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.TrackNumber; + public uint? V1_TrackNumber => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.TrackNumber; /// - public SabreTools.Models.PlayJ.Subgenre? V1_Subgenre => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.Subgenre; + public SabreTools.Models.PlayJ.Subgenre? V1_Subgenre => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.Subgenre; /// - public uint? V1_Duration => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.Duration; + public uint? V1_Duration => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV1)?.Duration; #endregion #region V2 Only /// - public uint? V2_Unknown1 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown1; + public uint? V2_Unknown1 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown1; /// - public uint? V2_Unknown2 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown2; + public uint? V2_Unknown2 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown2; /// - public uint? V2_Unknown3 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown3; + public uint? V2_Unknown3 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown3; /// - public uint? V2_Unknown4 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown4; + public uint? V2_Unknown4 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown4; /// - public uint? V2_Unknown5 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown5; + public uint? V2_Unknown5 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown5; /// - public uint? V2_Unknown6 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown6; + public uint? V2_Unknown6 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown6; /// - public uint? V2_UnknownOffset1 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.UnknownOffset1; + public uint? V2_UnknownOffset1 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.UnknownOffset1; /// - public uint? V2_Unknown7 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown7; + public uint? V2_Unknown7 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown7; /// - public uint? V2_Unknown8 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown8; + public uint? V2_Unknown8 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown8; /// - public uint? V2_Unknown9 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown9; + public uint? V2_Unknown9 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown9; /// - public uint? V2_UnknownOffset2 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.UnknownOffset2; + public uint? V2_UnknownOffset2 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.UnknownOffset2; /// - public uint? V2_Unknown10 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown10; + public uint? V2_Unknown10 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown10; /// - public uint? V2_Unknown11 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown11; + public uint? V2_Unknown11 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown11; /// - public uint? V2_Unknown12 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown12; + public uint? V2_Unknown12 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown12; /// - public uint? V2_Unknown13 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown13; + public uint? V2_Unknown13 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown13; /// - public uint? V2_Unknown14 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown14; + public uint? V2_Unknown14 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown14; /// - public uint? V2_Unknown15 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown15; + public uint? V2_Unknown15 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown15; /// - public uint? V2_Unknown16 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown16; + public uint? V2_Unknown16 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown16; /// - public uint? V2_Unknown17 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown17; + public uint? V2_Unknown17 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown17; /// - public uint? V2_TrackID => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.TrackID; + public uint? V2_TrackID => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.TrackID; /// - public uint? V2_Year => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Year; + public uint? V2_Year => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Year; /// - public uint? V2_TrackNumber => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.TrackNumber; + public uint? V2_TrackNumber => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.TrackNumber; /// - public uint? V2_Unknown18 => (_model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown18; + public uint? V2_Unknown18 => (Model.Header as SabreTools.Models.PlayJ.AudioHeaderV2)?.Unknown18; #endregion /// #if NET48 - public ushort TrackLength => _model.Header.TrackLength; + public ushort TrackLength => this.Model.Header.TrackLength; #else - public ushort? TrackLength => _model.Header?.TrackLength; + public ushort? TrackLength => this.Model.Header?.TrackLength; #endif /// #if NET48 - public string Track => _model.Header.Track; + public string Track => this.Model.Header.Track; #else - public string? Track => _model.Header?.Track; + public string? Track => this.Model.Header?.Track; #endif /// #if NET48 - public ushort ArtistLength => _model.Header.ArtistLength; + public ushort ArtistLength => this.Model.Header.ArtistLength; #else - public ushort? ArtistLength => _model.Header?.ArtistLength; + public ushort? ArtistLength => this.Model.Header?.ArtistLength; #endif /// #if NET48 - public string Artist => _model.Header.Artist; + public string Artist => this.Model.Header.Artist; #else - public string? Artist => _model.Header?.Artist; + public string? Artist => this.Model.Header?.Artist; #endif /// #if NET48 - public ushort AlbumLength => _model.Header.AlbumLength; + public ushort AlbumLength => this.Model.Header.AlbumLength; #else - public ushort? AlbumLength => _model.Header?.AlbumLength; + public ushort? AlbumLength => this.Model.Header?.AlbumLength; #endif /// #if NET48 - public string Album => _model.Header.Album; + public string Album => this.Model.Header.Album; #else - public string? Album => _model.Header?.Album; + public string? Album => this.Model.Header?.Album; #endif /// #if NET48 - public ushort WriterLength => _model.Header.WriterLength; + public ushort WriterLength => this.Model.Header.WriterLength; #else - public ushort? WriterLength => _model.Header?.WriterLength; + public ushort? WriterLength => this.Model.Header?.WriterLength; #endif /// #if NET48 - public string Writer => _model.Header.Writer; + public string Writer => this.Model.Header.Writer; #else - public string? Writer => _model.Header?.Writer; + public string? Writer => this.Model.Header?.Writer; #endif /// #if NET48 - public ushort PublisherLength => _model.Header.PublisherLength; + public ushort PublisherLength => this.Model.Header.PublisherLength; #else - public ushort? PublisherLength => _model.Header?.PublisherLength; + public ushort? PublisherLength => this.Model.Header?.PublisherLength; #endif /// #if NET48 - public string Publisher => _model.Header.Publisher; + public string Publisher => this.Model.Header.Publisher; #else - public string? Publisher => _model.Header?.Publisher; + public string? Publisher => this.Model.Header?.Publisher; #endif /// #if NET48 - public ushort LabelLength => _model.Header.LabelLength; + public ushort LabelLength => this.Model.Header.LabelLength; #else - public ushort? LabelLength => _model.Header?.LabelLength; + public ushort? LabelLength => this.Model.Header?.LabelLength; #endif /// #if NET48 - public string Label => _model.Header.Label; + public string Label => this.Model.Header.Label; #else - public string? Label => _model.Header?.Label; + public string? Label => this.Model.Header?.Label; #endif /// #if NET48 - public ushort CommentsLength => _model.Header.CommentsLength; + public ushort CommentsLength => this.Model.Header.CommentsLength; #else - public ushort? CommentsLength => _model.Header?.CommentsLength; + public ushort? CommentsLength => this.Model.Header?.CommentsLength; #endif /// #if NET48 - public string Comments => _model.Header.Comments; + public string Comments => this.Model.Header.Comments; #else - public string? Comments => _model.Header?.Comments; + public string? Comments => this.Model.Header?.Comments; #endif #endregion @@ -241,16 +241,16 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint UB1_Length => _model.UnknownBlock1.Length; + public uint UB1_Length => this.Model.UnknownBlock1.Length; #else - public uint? UB1_Length => _model.UnknownBlock1?.Length; + public uint? UB1_Length => this.Model.UnknownBlock1?.Length; #endif /// #if NET48 - public byte[] UB1_Data => _model.UnknownBlock1.Data; + public byte[] UB1_Data => this.Model.UnknownBlock1.Data; #else - public byte[]? UB1_Data => _model.UnknownBlock1?.Data; + public byte[]? UB1_Data => this.Model.UnknownBlock1?.Data; #endif #endregion @@ -260,7 +260,7 @@ namespace BinaryObjectScanner.Wrappers #region Unknown Value 2 /// - public uint UnknownValue2 => _model.UnknownValue2; + public uint UnknownValue2 => this.Model.UnknownValue2; #endregion @@ -268,9 +268,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public byte[] UB3_Data => _model.UnknownBlock3.Data; + public byte[] UB3_Data => this.Model.UnknownBlock3.Data; #else - public byte[]? UB3_Data => _model.UnknownBlock3?.Data; + public byte[]? UB3_Data => this.Model.UnknownBlock3?.Data; #endif #endregion @@ -282,7 +282,7 @@ namespace BinaryObjectScanner.Wrappers #region Data Files Count /// - public uint DataFilesCount => _model.DataFilesCount; + public uint DataFilesCount => this.Model.DataFilesCount; #endregion @@ -290,9 +290,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.PlayJ.DataFile[] DataFiles => _model.DataFiles; + public SabreTools.Models.PlayJ.DataFile[] DataFiles => this.Model.DataFiles; #else - public SabreTools.Models.PlayJ.DataFile?[]? DataFiles => _model.DataFiles; + public SabreTools.Models.PlayJ.DataFile?[]? DataFiles => this.Model.DataFiles; #endif #endregion @@ -387,17 +387,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.PlayJAudioFile.Print(builder, _model); + Printing.PlayJAudioFile.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/PortableExecutable.cs b/BinaryObjectScanner.Wrappers/PortableExecutable.cs index 33bbef6a..8be9c174 100644 --- a/BinaryObjectScanner.Wrappers/PortableExecutable.cs +++ b/BinaryObjectScanner.Wrappers/PortableExecutable.cs @@ -25,100 +25,100 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Stub_Magic => _model.Stub.Header.Magic; + public string Stub_Magic => this.Model.Stub.Header.Magic; #else - public string? Stub_Magic => _model.Stub?.Header?.Magic; + public string? Stub_Magic => this.Model.Stub?.Header?.Magic; #endif /// #if NET48 - public ushort Stub_LastPageBytes => _model.Stub.Header.LastPageBytes; + public ushort Stub_LastPageBytes => this.Model.Stub.Header.LastPageBytes; #else - public ushort? Stub_LastPageBytes => _model.Stub?.Header?.LastPageBytes; + public ushort? Stub_LastPageBytes => this.Model.Stub?.Header?.LastPageBytes; #endif /// #if NET48 - public ushort Stub_Pages => _model.Stub.Header.Pages; + public ushort Stub_Pages => this.Model.Stub.Header.Pages; #else - public ushort? Stub_Pages => _model.Stub?.Header?.Pages; + public ushort? Stub_Pages => this.Model.Stub?.Header?.Pages; #endif /// #if NET48 - public ushort Stub_RelocationItems => _model.Stub.Header.RelocationItems; + public ushort Stub_RelocationItems => this.Model.Stub.Header.RelocationItems; #else - public ushort? Stub_RelocationItems => _model.Stub?.Header?.RelocationItems; + public ushort? Stub_RelocationItems => this.Model.Stub?.Header?.RelocationItems; #endif /// #if NET48 - public ushort Stub_HeaderParagraphSize => _model.Stub.Header.HeaderParagraphSize; + public ushort Stub_HeaderParagraphSize => this.Model.Stub.Header.HeaderParagraphSize; #else - public ushort? Stub_HeaderParagraphSize => _model.Stub?.Header?.HeaderParagraphSize; + public ushort? Stub_HeaderParagraphSize => this.Model.Stub?.Header?.HeaderParagraphSize; #endif /// #if NET48 - public ushort Stub_MinimumExtraParagraphs => _model.Stub.Header.MinimumExtraParagraphs; + public ushort Stub_MinimumExtraParagraphs => this.Model.Stub.Header.MinimumExtraParagraphs; #else - public ushort? Stub_MinimumExtraParagraphs => _model.Stub?.Header?.MinimumExtraParagraphs; + public ushort? Stub_MinimumExtraParagraphs => this.Model.Stub?.Header?.MinimumExtraParagraphs; #endif /// #if NET48 - public ushort Stub_MaximumExtraParagraphs => _model.Stub.Header.MaximumExtraParagraphs; + public ushort Stub_MaximumExtraParagraphs => this.Model.Stub.Header.MaximumExtraParagraphs; #else - public ushort? Stub_MaximumExtraParagraphs => _model.Stub?.Header?.MaximumExtraParagraphs; + public ushort? Stub_MaximumExtraParagraphs => this.Model.Stub?.Header?.MaximumExtraParagraphs; #endif /// #if NET48 - public ushort Stub_InitialSSValue => _model.Stub.Header.InitialSSValue; + public ushort Stub_InitialSSValue => this.Model.Stub.Header.InitialSSValue; #else - public ushort? Stub_InitialSSValue => _model.Stub?.Header?.InitialSSValue; + public ushort? Stub_InitialSSValue => this.Model.Stub?.Header?.InitialSSValue; #endif /// #if NET48 - public ushort Stub_InitialSPValue => _model.Stub.Header.InitialSPValue; + public ushort Stub_InitialSPValue => this.Model.Stub.Header.InitialSPValue; #else - public ushort? Stub_InitialSPValue => _model.Stub?.Header?.InitialSPValue; + public ushort? Stub_InitialSPValue => this.Model.Stub?.Header?.InitialSPValue; #endif /// #if NET48 - public ushort Stub_Checksum => _model.Stub.Header.Checksum; + public ushort Stub_Checksum => this.Model.Stub.Header.Checksum; #else - public ushort? Stub_Checksum => _model.Stub?.Header?.Checksum; + public ushort? Stub_Checksum => this.Model.Stub?.Header?.Checksum; #endif /// #if NET48 - public ushort Stub_InitialIPValue => _model.Stub.Header.InitialIPValue; + public ushort Stub_InitialIPValue => this.Model.Stub.Header.InitialIPValue; #else - public ushort? Stub_InitialIPValue => _model.Stub?.Header?.InitialIPValue; + public ushort? Stub_InitialIPValue => this.Model.Stub?.Header?.InitialIPValue; #endif /// #if NET48 - public ushort Stub_InitialCSValue => _model.Stub.Header.InitialCSValue; + public ushort Stub_InitialCSValue => this.Model.Stub.Header.InitialCSValue; #else - public ushort? Stub_InitialCSValue => _model.Stub?.Header?.InitialCSValue; + public ushort? Stub_InitialCSValue => this.Model.Stub?.Header?.InitialCSValue; #endif /// #if NET48 - public ushort Stub_RelocationTableAddr => _model.Stub.Header.RelocationTableAddr; + public ushort Stub_RelocationTableAddr => this.Model.Stub.Header.RelocationTableAddr; #else - public ushort? Stub_RelocationTableAddr => _model.Stub?.Header?.RelocationTableAddr; + public ushort? Stub_RelocationTableAddr => this.Model.Stub?.Header?.RelocationTableAddr; #endif /// #if NET48 - public ushort Stub_OverlayNumber => _model.Stub.Header.OverlayNumber; + public ushort Stub_OverlayNumber => this.Model.Stub.Header.OverlayNumber; #else - public ushort? Stub_OverlayNumber => _model.Stub?.Header?.OverlayNumber; + public ushort? Stub_OverlayNumber => this.Model.Stub?.Header?.OverlayNumber; #endif #endregion @@ -127,37 +127,37 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public ushort[] Stub_Reserved1 => _model.Stub.Header.Reserved1; + public ushort[] Stub_Reserved1 => this.Model.Stub.Header.Reserved1; #else - public ushort[]? Stub_Reserved1 => _model.Stub?.Header?.Reserved1; + public ushort[]? Stub_Reserved1 => this.Model.Stub?.Header?.Reserved1; #endif /// #if NET48 - public ushort Stub_OEMIdentifier => _model.Stub.Header.OEMIdentifier; + public ushort Stub_OEMIdentifier => this.Model.Stub.Header.OEMIdentifier; #else - public ushort? Stub_OEMIdentifier => _model.Stub?.Header?.OEMIdentifier; + public ushort? Stub_OEMIdentifier => this.Model.Stub?.Header?.OEMIdentifier; #endif /// #if NET48 - public ushort Stub_OEMInformation => _model.Stub.Header.OEMInformation; + public ushort Stub_OEMInformation => this.Model.Stub.Header.OEMInformation; #else - public ushort? Stub_OEMInformation => _model.Stub?.Header?.OEMInformation; + public ushort? Stub_OEMInformation => this.Model.Stub?.Header?.OEMInformation; #endif /// #if NET48 - public ushort[] Stub_Reserved2 => _model.Stub.Header.Reserved2; + public ushort[] Stub_Reserved2 => this.Model.Stub.Header.Reserved2; #else - public ushort[]? Stub_Reserved2 => _model.Stub?.Header?.Reserved2; + public ushort[]? Stub_Reserved2 => this.Model.Stub?.Header?.Reserved2; #endif /// #if NET48 - public uint Stub_NewExeHeaderAddr => _model.Stub.Header.NewExeHeaderAddr; + public uint Stub_NewExeHeaderAddr => this.Model.Stub.Header.NewExeHeaderAddr; #else - public uint? Stub_NewExeHeaderAddr => _model.Stub?.Header?.NewExeHeaderAddr; + public uint? Stub_NewExeHeaderAddr => this.Model.Stub?.Header?.NewExeHeaderAddr; #endif #endregion @@ -166,60 +166,60 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Signature => _model.Signature; + public string Signature => this.Model.Signature; #else - public string? Signature => _model.Signature; + public string? Signature => this.Model.Signature; #endif #region COFF File Header /// #if NET48 - public SabreTools.Models.PortableExecutable.MachineType Machine => _model.COFFFileHeader.Machine; + public SabreTools.Models.PortableExecutable.MachineType Machine => this.Model.COFFFileHeader.Machine; #else - public SabreTools.Models.PortableExecutable.MachineType? Machine => _model.COFFFileHeader?.Machine; + public SabreTools.Models.PortableExecutable.MachineType? Machine => this.Model.COFFFileHeader?.Machine; #endif /// #if NET48 - public ushort NumberOfSections => _model.COFFFileHeader.NumberOfSections; + public ushort NumberOfSections => this.Model.COFFFileHeader.NumberOfSections; #else - public ushort? NumberOfSections => _model.COFFFileHeader?.NumberOfSections; + public ushort? NumberOfSections => this.Model.COFFFileHeader?.NumberOfSections; #endif /// #if NET48 - public uint TimeDateStamp => _model.COFFFileHeader.TimeDateStamp; + public uint TimeDateStamp => this.Model.COFFFileHeader.TimeDateStamp; #else - public uint? TimeDateStamp => _model.COFFFileHeader?.TimeDateStamp; + public uint? TimeDateStamp => this.Model.COFFFileHeader?.TimeDateStamp; #endif /// #if NET48 - public uint PointerToSymbolTable => _model.COFFFileHeader.PointerToSymbolTable; + public uint PointerToSymbolTable => this.Model.COFFFileHeader.PointerToSymbolTable; #else - public uint? PointerToSymbolTable => _model.COFFFileHeader?.PointerToSymbolTable; + public uint? PointerToSymbolTable => this.Model.COFFFileHeader?.PointerToSymbolTable; #endif /// #if NET48 - public uint NumberOfSymbols => _model.COFFFileHeader.NumberOfSymbols; + public uint NumberOfSymbols => this.Model.COFFFileHeader.NumberOfSymbols; #else - public uint? NumberOfSymbols => _model.COFFFileHeader?.NumberOfSymbols; + public uint? NumberOfSymbols => this.Model.COFFFileHeader?.NumberOfSymbols; #endif /// #if NET48 - public uint SizeOfOptionalHeader => _model.COFFFileHeader.SizeOfOptionalHeader; + public uint SizeOfOptionalHeader => this.Model.COFFFileHeader.SizeOfOptionalHeader; #else - public uint? SizeOfOptionalHeader => _model.COFFFileHeader?.SizeOfOptionalHeader; + public uint? SizeOfOptionalHeader => this.Model.COFFFileHeader?.SizeOfOptionalHeader; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.Characteristics Characteristics => _model.COFFFileHeader.Characteristics; + public SabreTools.Models.PortableExecutable.Characteristics Characteristics => this.Model.COFFFileHeader.Characteristics; #else - public SabreTools.Models.PortableExecutable.Characteristics? Characteristics => _model.COFFFileHeader?.Characteristics; + public SabreTools.Models.PortableExecutable.Characteristics? Characteristics => this.Model.COFFFileHeader?.Characteristics; #endif #endregion @@ -230,63 +230,63 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber OH_Magic => _model.OptionalHeader.Magic; + public SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber OH_Magic => this.Model.OptionalHeader.Magic; #else - public SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber? OH_Magic => _model.OptionalHeader?.Magic; + public SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber? OH_Magic => this.Model.OptionalHeader?.Magic; #endif /// #if NET48 - public byte OH_MajorLinkerVersion => _model.OptionalHeader.MajorLinkerVersion; + public byte OH_MajorLinkerVersion => this.Model.OptionalHeader.MajorLinkerVersion; #else - public byte? OH_MajorLinkerVersion => _model.OptionalHeader?.MajorLinkerVersion; + public byte? OH_MajorLinkerVersion => this.Model.OptionalHeader?.MajorLinkerVersion; #endif /// #if NET48 - public byte OH_MinorLinkerVersion => _model.OptionalHeader.MinorLinkerVersion; + public byte OH_MinorLinkerVersion => this.Model.OptionalHeader.MinorLinkerVersion; #else - public byte? OH_MinorLinkerVersion => _model.OptionalHeader?.MinorLinkerVersion; + public byte? OH_MinorLinkerVersion => this.Model.OptionalHeader?.MinorLinkerVersion; #endif /// #if NET48 - public uint OH_SizeOfCode => _model.OptionalHeader.SizeOfCode; + public uint OH_SizeOfCode => this.Model.OptionalHeader.SizeOfCode; #else - public uint? OH_SizeOfCode => _model.OptionalHeader?.SizeOfCode; + public uint? OH_SizeOfCode => this.Model.OptionalHeader?.SizeOfCode; #endif /// #if NET48 - public uint OH_SizeOfInitializedData => _model.OptionalHeader.SizeOfInitializedData; + public uint OH_SizeOfInitializedData => this.Model.OptionalHeader.SizeOfInitializedData; #else - public uint? OH_SizeOfInitializedData => _model.OptionalHeader?.SizeOfInitializedData; + public uint? OH_SizeOfInitializedData => this.Model.OptionalHeader?.SizeOfInitializedData; #endif /// #if NET48 - public uint OH_SizeOfUninitializedData => _model.OptionalHeader.SizeOfUninitializedData; + public uint OH_SizeOfUninitializedData => this.Model.OptionalHeader.SizeOfUninitializedData; #else - public uint? OH_SizeOfUninitializedData => _model.OptionalHeader?.SizeOfUninitializedData; + public uint? OH_SizeOfUninitializedData => this.Model.OptionalHeader?.SizeOfUninitializedData; #endif /// #if NET48 - public uint OH_AddressOfEntryPoint => _model.OptionalHeader.AddressOfEntryPoint; + public uint OH_AddressOfEntryPoint => this.Model.OptionalHeader.AddressOfEntryPoint; #else - public uint? OH_AddressOfEntryPoint => _model.OptionalHeader?.AddressOfEntryPoint; + public uint? OH_AddressOfEntryPoint => this.Model.OptionalHeader?.AddressOfEntryPoint; #endif /// #if NET48 - public uint OH_BaseOfCode => _model.OptionalHeader.BaseOfCode; + public uint OH_BaseOfCode => this.Model.OptionalHeader.BaseOfCode; #else - public uint? OH_BaseOfCode => _model.OptionalHeader?.BaseOfCode; + public uint? OH_BaseOfCode => this.Model.OptionalHeader?.BaseOfCode; #endif /// - public uint? OH_BaseOfData => _model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 - ? (uint?)_model.OptionalHeader.BaseOfData + public uint? OH_BaseOfData => this.Model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 + ? (uint?)Model.OptionalHeader.BaseOfData : null; #endregion @@ -294,140 +294,140 @@ namespace BinaryObjectScanner.Wrappers #region Windows-Specific Fields /// - public ulong OH_ImageBase => _model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 - ? _model.OptionalHeader.ImageBase_PE32 - : _model.OptionalHeader?.ImageBase_PE32Plus ?? 0; + public ulong OH_ImageBase => this.Model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 + ? Model.OptionalHeader.ImageBase_PE32 + : Model.OptionalHeader?.ImageBase_PE32Plus ?? 0; /// #if NET48 - public uint OH_SectionAlignment => _model.OptionalHeader.SectionAlignment; + public uint OH_SectionAlignment => this.Model.OptionalHeader.SectionAlignment; #else - public uint? OH_SectionAlignment => _model.OptionalHeader?.SectionAlignment; + public uint? OH_SectionAlignment => this.Model.OptionalHeader?.SectionAlignment; #endif /// #if NET48 - public uint OH_FileAlignment => _model.OptionalHeader.FileAlignment; + public uint OH_FileAlignment => this.Model.OptionalHeader.FileAlignment; #else - public uint? OH_FileAlignment => _model.OptionalHeader?.FileAlignment; + public uint? OH_FileAlignment => this.Model.OptionalHeader?.FileAlignment; #endif /// #if NET48 - public ushort OH_MajorOperatingSystemVersion => _model.OptionalHeader.MajorOperatingSystemVersion; + public ushort OH_MajorOperatingSystemVersion => this.Model.OptionalHeader.MajorOperatingSystemVersion; #else - public ushort? OH_MajorOperatingSystemVersion => _model.OptionalHeader?.MajorOperatingSystemVersion; + public ushort? OH_MajorOperatingSystemVersion => this.Model.OptionalHeader?.MajorOperatingSystemVersion; #endif /// #if NET48 - public ushort OH_MinorOperatingSystemVersion => _model.OptionalHeader.MinorOperatingSystemVersion; + public ushort OH_MinorOperatingSystemVersion => this.Model.OptionalHeader.MinorOperatingSystemVersion; #else - public ushort? OH_MinorOperatingSystemVersion => _model.OptionalHeader?.MinorOperatingSystemVersion; + public ushort? OH_MinorOperatingSystemVersion => this.Model.OptionalHeader?.MinorOperatingSystemVersion; #endif /// #if NET48 - public ushort OH_MajorImageVersion => _model.OptionalHeader.MajorImageVersion; + public ushort OH_MajorImageVersion => this.Model.OptionalHeader.MajorImageVersion; #else - public ushort? OH_MajorImageVersion => _model.OptionalHeader?.MajorImageVersion; + public ushort? OH_MajorImageVersion => this.Model.OptionalHeader?.MajorImageVersion; #endif /// #if NET48 - public ushort OH_MinorImageVersion => _model.OptionalHeader.MinorImageVersion; + public ushort OH_MinorImageVersion => this.Model.OptionalHeader.MinorImageVersion; #else - public ushort? OH_MinorImageVersion => _model.OptionalHeader?.MinorImageVersion; + public ushort? OH_MinorImageVersion => this.Model.OptionalHeader?.MinorImageVersion; #endif /// #if NET48 - public ushort OH_MajorSubsystemVersion => _model.OptionalHeader.MajorSubsystemVersion; + public ushort OH_MajorSubsystemVersion => this.Model.OptionalHeader.MajorSubsystemVersion; #else - public ushort? OH_MajorSubsystemVersion => _model.OptionalHeader?.MajorSubsystemVersion; + public ushort? OH_MajorSubsystemVersion => this.Model.OptionalHeader?.MajorSubsystemVersion; #endif /// #if NET48 - public ushort OH_MinorSubsystemVersion => _model.OptionalHeader.MinorSubsystemVersion; + public ushort OH_MinorSubsystemVersion => this.Model.OptionalHeader.MinorSubsystemVersion; #else - public ushort? OH_MinorSubsystemVersion => _model.OptionalHeader?.MinorSubsystemVersion; + public ushort? OH_MinorSubsystemVersion => this.Model.OptionalHeader?.MinorSubsystemVersion; #endif /// #if NET48 - public uint OH_Win32VersionValue => _model.OptionalHeader.Win32VersionValue; + public uint OH_Win32VersionValue => this.Model.OptionalHeader.Win32VersionValue; #else - public uint? OH_Win32VersionValue => _model.OptionalHeader?.Win32VersionValue; + public uint? OH_Win32VersionValue => this.Model.OptionalHeader?.Win32VersionValue; #endif /// #if NET48 - public uint OH_SizeOfImage => _model.OptionalHeader.SizeOfImage; + public uint OH_SizeOfImage => this.Model.OptionalHeader.SizeOfImage; #else - public uint? OH_SizeOfImage => _model.OptionalHeader?.SizeOfImage; + public uint? OH_SizeOfImage => this.Model.OptionalHeader?.SizeOfImage; #endif /// #if NET48 - public uint OH_SizeOfHeaders => _model.OptionalHeader.SizeOfHeaders; + public uint OH_SizeOfHeaders => this.Model.OptionalHeader.SizeOfHeaders; #else - public uint? OH_SizeOfHeaders => _model.OptionalHeader?.SizeOfHeaders; + public uint? OH_SizeOfHeaders => this.Model.OptionalHeader?.SizeOfHeaders; #endif /// #if NET48 - public uint OH_CheckSum => _model.OptionalHeader.CheckSum; + public uint OH_CheckSum => this.Model.OptionalHeader.CheckSum; #else - public uint? OH_CheckSum => _model.OptionalHeader?.CheckSum; + public uint? OH_CheckSum => this.Model.OptionalHeader?.CheckSum; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.WindowsSubsystem OH_Subsystem => _model.OptionalHeader.Subsystem; + public SabreTools.Models.PortableExecutable.WindowsSubsystem OH_Subsystem => this.Model.OptionalHeader.Subsystem; #else - public SabreTools.Models.PortableExecutable.WindowsSubsystem? OH_Subsystem => _model.OptionalHeader?.Subsystem; + public SabreTools.Models.PortableExecutable.WindowsSubsystem? OH_Subsystem => this.Model.OptionalHeader?.Subsystem; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DllCharacteristics OH_DllCharacteristics => _model.OptionalHeader.DllCharacteristics; + public SabreTools.Models.PortableExecutable.DllCharacteristics OH_DllCharacteristics => this.Model.OptionalHeader.DllCharacteristics; #else - public SabreTools.Models.PortableExecutable.DllCharacteristics? OH_DllCharacteristics => _model.OptionalHeader?.DllCharacteristics; + public SabreTools.Models.PortableExecutable.DllCharacteristics? OH_DllCharacteristics => this.Model.OptionalHeader?.DllCharacteristics; #endif /// - public ulong OH_SizeOfStackReserve => _model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 - ? _model.OptionalHeader.SizeOfStackReserve_PE32 - : _model.OptionalHeader?.SizeOfStackReserve_PE32Plus ?? 0; + public ulong OH_SizeOfStackReserve => this.Model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 + ? Model.OptionalHeader.SizeOfStackReserve_PE32 + : Model.OptionalHeader?.SizeOfStackReserve_PE32Plus ?? 0; /// - public ulong OH_SizeOfStackCommit => _model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 - ? _model.OptionalHeader.SizeOfStackCommit_PE32 - : _model.OptionalHeader?.SizeOfStackCommit_PE32Plus ?? 0; + public ulong OH_SizeOfStackCommit => this.Model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 + ? Model.OptionalHeader.SizeOfStackCommit_PE32 + : Model.OptionalHeader?.SizeOfStackCommit_PE32Plus ?? 0; /// - public ulong OH_SizeOfHeapReserve => _model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 - ? _model.OptionalHeader.SizeOfHeapReserve_PE32 - : _model.OptionalHeader?.SizeOfHeapReserve_PE32Plus ?? 0; + public ulong OH_SizeOfHeapReserve => this.Model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 + ? Model.OptionalHeader.SizeOfHeapReserve_PE32 + : Model.OptionalHeader?.SizeOfHeapReserve_PE32Plus ?? 0; /// - public ulong OH_SizeOfHeapCommit => _model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 - ? _model.OptionalHeader.SizeOfHeapCommit_PE32 - : _model.OptionalHeader?.SizeOfHeapCommit_PE32Plus ?? 0; + public ulong OH_SizeOfHeapCommit => this.Model.OptionalHeader?.Magic == SabreTools.Models.PortableExecutable.OptionalHeaderMagicNumber.PE32 + ? Model.OptionalHeader.SizeOfHeapCommit_PE32 + : Model.OptionalHeader?.SizeOfHeapCommit_PE32Plus ?? 0; /// #if NET48 - public uint OH_LoaderFlags => _model.OptionalHeader.LoaderFlags; + public uint OH_LoaderFlags => this.Model.OptionalHeader.LoaderFlags; #else - public uint? OH_LoaderFlags => _model.OptionalHeader?.LoaderFlags; + public uint? OH_LoaderFlags => this.Model.OptionalHeader?.LoaderFlags; #endif /// #if NET48 - public uint OH_NumberOfRvaAndSizes => _model.OptionalHeader.NumberOfRvaAndSizes; + public uint OH_NumberOfRvaAndSizes => this.Model.OptionalHeader.NumberOfRvaAndSizes; #else - public uint? OH_NumberOfRvaAndSizes => _model.OptionalHeader?.NumberOfRvaAndSizes; + public uint? OH_NumberOfRvaAndSizes => this.Model.OptionalHeader?.NumberOfRvaAndSizes; #endif #endregion @@ -436,114 +436,114 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_ExportTable => _model.OptionalHeader.ExportTable; + public SabreTools.Models.PortableExecutable.DataDirectory OH_ExportTable => this.Model.OptionalHeader.ExportTable; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_ExportTable => _model.OptionalHeader?.ExportTable; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_ExportTable => this.Model.OptionalHeader?.ExportTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_ImportTable => _model.OptionalHeader.ImportTable; + public SabreTools.Models.PortableExecutable.DataDirectory OH_ImportTable => this.Model.OptionalHeader.ImportTable; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_ImportTable => _model.OptionalHeader?.ImportTable; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_ImportTable => this.Model.OptionalHeader?.ImportTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_ResourceTable => _model.OptionalHeader.ResourceTable; + public SabreTools.Models.PortableExecutable.DataDirectory OH_ResourceTable => this.Model.OptionalHeader.ResourceTable; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_ResourceTable => _model.OptionalHeader?.ResourceTable; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_ResourceTable => this.Model.OptionalHeader?.ResourceTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_ExceptionTable => _model.OptionalHeader.ExceptionTable; + public SabreTools.Models.PortableExecutable.DataDirectory OH_ExceptionTable => this.Model.OptionalHeader.ExceptionTable; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_ExceptionTable => _model.OptionalHeader?.ExceptionTable; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_ExceptionTable => this.Model.OptionalHeader?.ExceptionTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_CertificateTable => _model.OptionalHeader.CertificateTable; + public SabreTools.Models.PortableExecutable.DataDirectory OH_CertificateTable => this.Model.OptionalHeader.CertificateTable; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_CertificateTable => _model.OptionalHeader?.CertificateTable; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_CertificateTable => this.Model.OptionalHeader?.CertificateTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_BaseRelocationTable => _model.OptionalHeader.BaseRelocationTable; + public SabreTools.Models.PortableExecutable.DataDirectory OH_BaseRelocationTable => this.Model.OptionalHeader.BaseRelocationTable; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_BaseRelocationTable => _model.OptionalHeader?.BaseRelocationTable; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_BaseRelocationTable => this.Model.OptionalHeader?.BaseRelocationTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_Debug => _model.OptionalHeader.Debug; + public SabreTools.Models.PortableExecutable.DataDirectory OH_Debug => this.Model.OptionalHeader.Debug; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_Debug => _model.OptionalHeader?.Debug; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_Debug => this.Model.OptionalHeader?.Debug; #endif /// #if NET48 - public ulong OH_Architecture => _model.OptionalHeader.Architecture; + public ulong OH_Architecture => this.Model.OptionalHeader.Architecture; #else - public ulong? OH_Architecture => _model.OptionalHeader?.Architecture; + public ulong? OH_Architecture => this.Model.OptionalHeader?.Architecture; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_GlobalPtr => _model.OptionalHeader.GlobalPtr; + public SabreTools.Models.PortableExecutable.DataDirectory OH_GlobalPtr => this.Model.OptionalHeader.GlobalPtr; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_GlobalPtr => _model.OptionalHeader?.GlobalPtr; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_GlobalPtr => this.Model.OptionalHeader?.GlobalPtr; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_ThreadLocalStorageTable => _model.OptionalHeader.ThreadLocalStorageTable; + public SabreTools.Models.PortableExecutable.DataDirectory OH_ThreadLocalStorageTable => this.Model.OptionalHeader.ThreadLocalStorageTable; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_ThreadLocalStorageTable => _model.OptionalHeader?.ThreadLocalStorageTable; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_ThreadLocalStorageTable => this.Model.OptionalHeader?.ThreadLocalStorageTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_LoadConfigTable => _model.OptionalHeader.LoadConfigTable; + public SabreTools.Models.PortableExecutable.DataDirectory OH_LoadConfigTable => this.Model.OptionalHeader.LoadConfigTable; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_LoadConfigTable => _model.OptionalHeader?.LoadConfigTable; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_LoadConfigTable => this.Model.OptionalHeader?.LoadConfigTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_BoundImport => _model.OptionalHeader.BoundImport; + public SabreTools.Models.PortableExecutable.DataDirectory OH_BoundImport => this.Model.OptionalHeader.BoundImport; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_BoundImport => _model.OptionalHeader?.BoundImport; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_BoundImport => this.Model.OptionalHeader?.BoundImport; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_ImportAddressTable => _model.OptionalHeader.ImportAddressTable; + public SabreTools.Models.PortableExecutable.DataDirectory OH_ImportAddressTable => this.Model.OptionalHeader.ImportAddressTable; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_ImportAddressTable => _model.OptionalHeader?.ImportAddressTable; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_ImportAddressTable => this.Model.OptionalHeader?.ImportAddressTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_DelayImportDescriptor => _model.OptionalHeader.DelayImportDescriptor; + public SabreTools.Models.PortableExecutable.DataDirectory OH_DelayImportDescriptor => this.Model.OptionalHeader.DelayImportDescriptor; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_DelayImportDescriptor => _model.OptionalHeader?.DelayImportDescriptor; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_DelayImportDescriptor => this.Model.OptionalHeader?.DelayImportDescriptor; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DataDirectory OH_CLRRuntimeHeader => _model.OptionalHeader.CLRRuntimeHeader; + public SabreTools.Models.PortableExecutable.DataDirectory OH_CLRRuntimeHeader => this.Model.OptionalHeader.CLRRuntimeHeader; #else - public SabreTools.Models.PortableExecutable.DataDirectory? OH_CLRRuntimeHeader => _model.OptionalHeader?.CLRRuntimeHeader; + public SabreTools.Models.PortableExecutable.DataDirectory? OH_CLRRuntimeHeader => this.Model.OptionalHeader?.CLRRuntimeHeader; #endif /// #if NET48 - public ulong OH_Reserved => _model.OptionalHeader.Reserved; + public ulong OH_Reserved => this.Model.OptionalHeader.Reserved; #else - public ulong? OH_Reserved => _model.OptionalHeader?.Reserved; + public ulong? OH_Reserved => this.Model.OptionalHeader?.Reserved; #endif #endregion @@ -554,37 +554,37 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.PortableExecutable.SectionHeader[] SectionTable => _model.SectionTable; + public SabreTools.Models.PortableExecutable.SectionHeader[] SectionTable => this.Model.SectionTable; #else - public SabreTools.Models.PortableExecutable.SectionHeader?[]? SectionTable => _model.SectionTable; + public SabreTools.Models.PortableExecutable.SectionHeader?[]? SectionTable => this.Model.SectionTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.COFFSymbolTableEntry[] COFFSymbolTable => _model.COFFSymbolTable; + public SabreTools.Models.PortableExecutable.COFFSymbolTableEntry[] COFFSymbolTable => this.Model.COFFSymbolTable; #else - public SabreTools.Models.PortableExecutable.COFFSymbolTableEntry?[]? COFFSymbolTable => _model.COFFSymbolTable; + public SabreTools.Models.PortableExecutable.COFFSymbolTableEntry?[]? COFFSymbolTable => this.Model.COFFSymbolTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.COFFStringTable COFFStringTable => _model.COFFStringTable; + public SabreTools.Models.PortableExecutable.COFFStringTable COFFStringTable => this.Model.COFFStringTable; #else - public SabreTools.Models.PortableExecutable.COFFStringTable? COFFStringTable => _model.COFFStringTable; + public SabreTools.Models.PortableExecutable.COFFStringTable? COFFStringTable => this.Model.COFFStringTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.AttributeCertificateTableEntry[] AttributeCertificateTable => _model.AttributeCertificateTable; + public SabreTools.Models.PortableExecutable.AttributeCertificateTableEntry[] AttributeCertificateTable => this.Model.AttributeCertificateTable; #else - public SabreTools.Models.PortableExecutable.AttributeCertificateTableEntry?[]? AttributeCertificateTable => _model.AttributeCertificateTable; + public SabreTools.Models.PortableExecutable.AttributeCertificateTableEntry?[]? AttributeCertificateTable => this.Model.AttributeCertificateTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DelayLoadDirectoryTable DelayLoadDirectoryTable => _model.DelayLoadDirectoryTable; + public SabreTools.Models.PortableExecutable.DelayLoadDirectoryTable DelayLoadDirectoryTable => this.Model.DelayLoadDirectoryTable; #else - public SabreTools.Models.PortableExecutable.DelayLoadDirectoryTable? DelayLoadDirectoryTable => _model.DelayLoadDirectoryTable; + public SabreTools.Models.PortableExecutable.DelayLoadDirectoryTable? DelayLoadDirectoryTable => this.Model.DelayLoadDirectoryTable; #endif #endregion @@ -593,53 +593,53 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.PortableExecutable.BaseRelocationBlock[] BaseRelocationTable => _model.BaseRelocationTable; + public SabreTools.Models.PortableExecutable.BaseRelocationBlock[] BaseRelocationTable => this.Model.BaseRelocationTable; #else - public SabreTools.Models.PortableExecutable.BaseRelocationBlock?[]? BaseRelocationTable => _model.BaseRelocationTable; + public SabreTools.Models.PortableExecutable.BaseRelocationBlock?[]? BaseRelocationTable => this.Model.BaseRelocationTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.DebugTable DebugTable => _model.DebugTable; + public SabreTools.Models.PortableExecutable.DebugTable DebugTable => this.Model.DebugTable; #else - public SabreTools.Models.PortableExecutable.DebugTable? DebugTable => _model.DebugTable; + public SabreTools.Models.PortableExecutable.DebugTable? DebugTable => this.Model.DebugTable; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.ExportTable ExportTable => _model.ExportTable; + public SabreTools.Models.PortableExecutable.ExportTable ExportTable => this.Model.ExportTable; #else - public SabreTools.Models.PortableExecutable.ExportTable? ExportTable => _model.ExportTable; + public SabreTools.Models.PortableExecutable.ExportTable? ExportTable => this.Model.ExportTable; #endif /// #if NET48 - public string[] ExportNameTable => _model.ExportTable?.ExportNameTable?.Strings; + public string[] ExportNameTable => this.Model.ExportTable?.ExportNameTable?.Strings; #else - public string[]? ExportNameTable => _model.ExportTable?.ExportNameTable?.Strings; + public string[]? ExportNameTable => this.Model.ExportTable?.ExportNameTable?.Strings; #endif /// #if NET48 - public SabreTools.Models.PortableExecutable.ImportTable ImportTable => _model.ImportTable; + public SabreTools.Models.PortableExecutable.ImportTable ImportTable => this.Model.ImportTable; #else - public SabreTools.Models.PortableExecutable.ImportTable? ImportTable => _model.ImportTable; + public SabreTools.Models.PortableExecutable.ImportTable? ImportTable => this.Model.ImportTable; #endif /// #if NET48 - public string[] ImportHintNameTable => _model.ImportTable?.HintNameTable != null + public string[] ImportHintNameTable => this.Model.ImportTable?.HintNameTable != null #else - public string?[]? ImportHintNameTable => _model.ImportTable?.HintNameTable != null + public string?[]? ImportHintNameTable => this.Model.ImportTable?.HintNameTable != null #endif - ? _model.ImportTable.HintNameTable.Select(entry => entry?.Name).ToArray() + ? Model.ImportTable.HintNameTable.Select(entry => entry?.Name).ToArray() : null; /// #if NET48 - public SabreTools.Models.PortableExecutable.ResourceDirectoryTable ResourceDirectoryTable => _model.ResourceDirectoryTable; + public SabreTools.Models.PortableExecutable.ResourceDirectoryTable ResourceDirectoryTable => this.Model.ResourceDirectoryTable; #else - public SabreTools.Models.PortableExecutable.ResourceDirectoryTable? ResourceDirectoryTable => _model.ResourceDirectoryTable; + public SabreTools.Models.PortableExecutable.ResourceDirectoryTable? ResourceDirectoryTable => this.Model.ResourceDirectoryTable; #endif #endregion @@ -1710,17 +1710,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.PortableExecutable.Print(builder, _model); + Printing.PortableExecutable.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion #region Debug Data diff --git a/BinaryObjectScanner.Wrappers/Quantum.cs b/BinaryObjectScanner.Wrappers/Quantum.cs index 9983bcc1..0d69a715 100644 --- a/BinaryObjectScanner.Wrappers/Quantum.cs +++ b/BinaryObjectScanner.Wrappers/Quantum.cs @@ -18,44 +18,44 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Signature => _model.Header.Signature; + public string Signature => this.Model.Header.Signature; #else - public string? Signature => _model.Header?.Signature; + public string? Signature => this.Model.Header?.Signature; #endif /// #if NET48 - public byte MajorVersion => _model.Header.MajorVersion; + public byte MajorVersion => this.Model.Header.MajorVersion; #else - public byte? MajorVersion => _model.Header?.MajorVersion; + public byte? MajorVersion => this.Model.Header?.MajorVersion; #endif /// #if NET48 - public byte MinorVersion => _model.Header.MinorVersion; + public byte MinorVersion => this.Model.Header.MinorVersion; #else - public byte? MinorVersion => _model.Header?.MinorVersion; + public byte? MinorVersion => this.Model.Header?.MinorVersion; #endif /// #if NET48 - public ushort FileCount => _model.Header.FileCount; + public ushort FileCount => this.Model.Header.FileCount; #else - public ushort? FileCount => _model.Header?.FileCount; + public ushort? FileCount => this.Model.Header?.FileCount; #endif /// #if NET48 - public byte TableSize => _model.Header.TableSize; + public byte TableSize => this.Model.Header.TableSize; #else - public byte? TableSize => _model.Header?.TableSize; + public byte? TableSize => this.Model.Header?.TableSize; #endif /// #if NET48 - public byte CompressionFlags => _model.Header.CompressionFlags; + public byte CompressionFlags => this.Model.Header.CompressionFlags; #else - public byte? CompressionFlags => _model.Header?.CompressionFlags; + public byte? CompressionFlags => this.Model.Header?.CompressionFlags; #endif #endregion @@ -64,15 +64,15 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.Quantum.FileDescriptor[] FileList => _model.FileList; + public SabreTools.Models.Quantum.FileDescriptor[] FileList => this.Model.FileList; #else - public SabreTools.Models.Quantum.FileDescriptor?[]? FileList => _model.FileList; + public SabreTools.Models.Quantum.FileDescriptor?[]? FileList => this.Model.FileList; #endif #endregion /// - public long CompressedDataOffset => _model.CompressedDataOffset; + public long CompressedDataOffset => this.Model.CompressedDataOffset; #endregion @@ -278,17 +278,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.Quantum.Print(builder, _model); + Printing.Quantum.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion } } \ No newline at end of file diff --git a/BinaryObjectScanner.Wrappers/SGA.cs b/BinaryObjectScanner.Wrappers/SGA.cs index c6a53654..a9df300b 100644 --- a/BinaryObjectScanner.Wrappers/SGA.cs +++ b/BinaryObjectScanner.Wrappers/SGA.cs @@ -21,23 +21,23 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Signature => _model.Header.Signature; + public string Signature => this.Model.Header.Signature; #else - public string? Signature => _model.Header?.Signature; + public string? Signature => this.Model.Header?.Signature; #endif /// #if NET48 - public ushort MajorVersion => _model.Header.MajorVersion; + public ushort MajorVersion => this.Model.Header.MajorVersion; #else - public ushort? MajorVersion => _model.Header?.MajorVersion; + public ushort? MajorVersion => this.Model.Header?.MajorVersion; #endif /// #if NET48 - public ushort MinorVersion => _model.Header.MinorVersion; + public ushort MinorVersion => this.Model.Header.MinorVersion; #else - public ushort? MinorVersion => _model.Header?.MinorVersion; + public ushort? MinorVersion => this.Model.Header?.MinorVersion; #endif /// @@ -51,8 +51,8 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Header as SabreTools.Models.SGA.Header4)?.FileMD5; - case 5: return (_model.Header as SabreTools.Models.SGA.Header4)?.FileMD5; + case 4: return (Model.Header as SabreTools.Models.SGA.Header4)?.FileMD5; + case 5: return (Model.Header as SabreTools.Models.SGA.Header4)?.FileMD5; default: return null; }; } @@ -69,10 +69,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Header as SabreTools.Models.SGA.Header4)?.Name; - case 5: return (_model.Header as SabreTools.Models.SGA.Header4)?.Name; - case 6: return (_model.Header as SabreTools.Models.SGA.Header6)?.Name; - case 7: return (_model.Header as SabreTools.Models.SGA.Header6)?.Name; + case 4: return (Model.Header as SabreTools.Models.SGA.Header4)?.Name; + case 5: return (Model.Header as SabreTools.Models.SGA.Header4)?.Name; + case 6: return (Model.Header as SabreTools.Models.SGA.Header6)?.Name; + case 7: return (Model.Header as SabreTools.Models.SGA.Header6)?.Name; default: return null; }; } @@ -89,8 +89,8 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Header as SabreTools.Models.SGA.Header4)?.HeaderMD5; - case 5: return (_model.Header as SabreTools.Models.SGA.Header4)?.HeaderMD5; + case 4: return (Model.Header as SabreTools.Models.SGA.Header4)?.HeaderMD5; + case 5: return (Model.Header as SabreTools.Models.SGA.Header4)?.HeaderMD5; default: return null; }; } @@ -103,10 +103,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Header as SabreTools.Models.SGA.Header4)?.HeaderLength; - case 5: return (_model.Header as SabreTools.Models.SGA.Header4)?.HeaderLength; - case 6: return (_model.Header as SabreTools.Models.SGA.Header6)?.HeaderLength; - case 7: return (_model.Header as SabreTools.Models.SGA.Header6)?.HeaderLength; + case 4: return (Model.Header as SabreTools.Models.SGA.Header4)?.HeaderLength; + case 5: return (Model.Header as SabreTools.Models.SGA.Header4)?.HeaderLength; + case 6: return (Model.Header as SabreTools.Models.SGA.Header6)?.HeaderLength; + case 7: return (Model.Header as SabreTools.Models.SGA.Header6)?.HeaderLength; default: return null; }; } @@ -119,10 +119,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Header as SabreTools.Models.SGA.Header4)?.FileDataOffset; - case 5: return (_model.Header as SabreTools.Models.SGA.Header4)?.FileDataOffset; - case 6: return (_model.Header as SabreTools.Models.SGA.Header6)?.FileDataOffset; - case 7: return (_model.Header as SabreTools.Models.SGA.Header6)?.FileDataOffset; + case 4: return (Model.Header as SabreTools.Models.SGA.Header4)?.FileDataOffset; + case 5: return (Model.Header as SabreTools.Models.SGA.Header4)?.FileDataOffset; + case 6: return (Model.Header as SabreTools.Models.SGA.Header6)?.FileDataOffset; + case 7: return (Model.Header as SabreTools.Models.SGA.Header6)?.FileDataOffset; default: return null; }; } @@ -135,10 +135,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Header as SabreTools.Models.SGA.Header4)?.Dummy0; - case 5: return (_model.Header as SabreTools.Models.SGA.Header4)?.Dummy0; - case 6: return (_model.Header as SabreTools.Models.SGA.Header6)?.Dummy0; - case 7: return (_model.Header as SabreTools.Models.SGA.Header6)?.Dummy0; + case 4: return (Model.Header as SabreTools.Models.SGA.Header4)?.Dummy0; + case 5: return (Model.Header as SabreTools.Models.SGA.Header4)?.Dummy0; + case 6: return (Model.Header as SabreTools.Models.SGA.Header6)?.Dummy0; + case 7: return (Model.Header as SabreTools.Models.SGA.Header6)?.Dummy0; default: return null; }; } @@ -157,10 +157,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.SectionOffset; - case 5: return (_model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.SectionOffset; - case 6: return (_model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.SectionOffset; - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.SectionOffset; + case 4: return (Model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.SectionOffset; + case 5: return (Model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.SectionOffset; + case 6: return (Model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.SectionOffset; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.SectionOffset; default: return null; }; } @@ -173,10 +173,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.SectionCount; - case 5: return (_model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.SectionCount; - case 6: return (_model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.SectionCount; - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.SectionCount; + case 4: return (Model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.SectionCount; + case 5: return (Model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.SectionCount; + case 6: return (Model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.SectionCount; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.SectionCount; default: return null; }; } @@ -189,10 +189,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.FolderOffset; - case 5: return (_model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.FolderOffset; - case 6: return (_model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.FolderOffset; - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.FolderOffset; + case 4: return (Model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.FolderOffset; + case 5: return (Model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.FolderOffset; + case 6: return (Model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.FolderOffset; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.FolderOffset; default: return null; }; } @@ -205,10 +205,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.FolderCount; - case 5: return (_model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.FolderCount; - case 6: return (_model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.FolderCount; - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.FolderCount; + case 4: return (Model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.FolderCount; + case 5: return (Model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.FolderCount; + case 6: return (Model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.FolderCount; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.FolderCount; default: return null; }; } @@ -221,10 +221,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.FileOffset; - case 5: return (_model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.FileOffset; - case 6: return (_model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.FileOffset; - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.FileOffset; + case 4: return (Model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.FileOffset; + case 5: return (Model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.FileOffset; + case 6: return (Model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.FileOffset; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.FileOffset; default: return null; }; } @@ -237,10 +237,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.FileCount; - case 5: return (_model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.FileCount; - case 6: return (_model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.FileCount; - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.FileCount; + case 4: return (Model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.FileCount; + case 5: return (Model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.FileCount; + case 6: return (Model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.FileCount; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.FileCount; default: return null; }; } @@ -253,10 +253,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.StringTableOffset; - case 5: return (_model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.StringTableOffset; - case 6: return (_model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.StringTableOffset; - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.StringTableOffset; + case 4: return (Model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.StringTableOffset; + case 5: return (Model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.StringTableOffset; + case 6: return (Model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.StringTableOffset; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.StringTableOffset; default: return null; }; } @@ -269,10 +269,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.StringTableCount; - case 5: return (_model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.StringTableCount; - case 6: return (_model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.StringTableCount; - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.StringTableCount; + case 4: return (Model.Directory as SabreTools.Models.SGA.Directory4)?.DirectoryHeader?.StringTableCount; + case 5: return (Model.Directory as SabreTools.Models.SGA.Directory5)?.DirectoryHeader?.StringTableCount; + case 6: return (Model.Directory as SabreTools.Models.SGA.Directory6)?.DirectoryHeader?.StringTableCount; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.StringTableCount; default: return null; }; } @@ -285,7 +285,7 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.HashTableOffset; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.HashTableOffset; default: return null; }; } @@ -298,7 +298,7 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.BlockSize; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.DirectoryHeader?.BlockSize; default: return null; }; } @@ -319,10 +319,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Directory as SabreTools.Models.SGA.Directory4)?.Sections; - case 5: return (_model.Directory as SabreTools.Models.SGA.Directory5)?.Sections; - case 6: return (_model.Directory as SabreTools.Models.SGA.Directory6)?.Sections; - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.Sections; + case 4: return (Model.Directory as SabreTools.Models.SGA.Directory4)?.Sections; + case 5: return (Model.Directory as SabreTools.Models.SGA.Directory5)?.Sections; + case 6: return (Model.Directory as SabreTools.Models.SGA.Directory6)?.Sections; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.Sections; default: return null; }; } @@ -343,10 +343,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Directory as SabreTools.Models.SGA.Directory4)?.Folders; - case 5: return (_model.Directory as SabreTools.Models.SGA.Directory5)?.Folders; - case 6: return (_model.Directory as SabreTools.Models.SGA.Directory6)?.Folders; - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.Folders; + case 4: return (Model.Directory as SabreTools.Models.SGA.Directory4)?.Folders; + case 5: return (Model.Directory as SabreTools.Models.SGA.Directory5)?.Folders; + case 6: return (Model.Directory as SabreTools.Models.SGA.Directory6)?.Folders; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.Folders; default: return null; }; } @@ -367,10 +367,10 @@ namespace BinaryObjectScanner.Wrappers { switch (MajorVersion) { - case 4: return (_model.Directory as SabreTools.Models.SGA.Directory4)?.Files; - case 5: return (_model.Directory as SabreTools.Models.SGA.Directory5)?.Files; - case 6: return (_model.Directory as SabreTools.Models.SGA.Directory6)?.Files; - case 7: return (_model.Directory as SabreTools.Models.SGA.Directory7)?.Files; + case 4: return (Model.Directory as SabreTools.Models.SGA.Directory4)?.Files; + case 5: return (Model.Directory as SabreTools.Models.SGA.Directory5)?.Files; + case 6: return (Model.Directory as SabreTools.Models.SGA.Directory6)?.Files; + case 7: return (Model.Directory as SabreTools.Models.SGA.Directory7)?.Files; default: return null; }; } @@ -477,17 +477,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.SGA.Print(builder, _model); + Printing.SGA.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion #region Extraction diff --git a/BinaryObjectScanner.Wrappers/VBSP.cs b/BinaryObjectScanner.Wrappers/VBSP.cs index ab276538..b3cfa1d7 100644 --- a/BinaryObjectScanner.Wrappers/VBSP.cs +++ b/BinaryObjectScanner.Wrappers/VBSP.cs @@ -17,30 +17,30 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Signature => _model.Header.Signature; + public string Signature => this.Model.Header.Signature; #else - public string? Signature => _model.Header?.Signature; + public string? Signature => this.Model.Header?.Signature; #endif /// #if NET48 - public int Version => _model.Header.Version; + public int Version => this.Model.Header.Version; #else - public int? Version => _model.Header?.Version; + public int? Version => this.Model.Header?.Version; #endif /// #if NET48 - public SabreTools.Models.VBSP.Lump[] Lumps => _model.Header.Lumps; + public SabreTools.Models.VBSP.Lump[] Lumps => this.Model.Header.Lumps; #else - public SabreTools.Models.VBSP.Lump?[]? Lumps => _model.Header?.Lumps; + public SabreTools.Models.VBSP.Lump?[]? Lumps => this.Model.Header?.Lumps; #endif /// #if NET48 - public int MapRevision => _model.Header.MapRevision; + public int MapRevision => this.Model.Header.MapRevision; #else - public int? MapRevision => _model.Header?.MapRevision; + public int? MapRevision => this.Model.Header?.MapRevision; #endif #endregion @@ -137,17 +137,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.VBSP.Print(builder, _model); + Printing.VBSP.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion #region Extraction diff --git a/BinaryObjectScanner.Wrappers/VPK.cs b/BinaryObjectScanner.Wrappers/VPK.cs index 62f3d689..89316176 100644 --- a/BinaryObjectScanner.Wrappers/VPK.cs +++ b/BinaryObjectScanner.Wrappers/VPK.cs @@ -21,23 +21,23 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint Signature => _model.Header.Signature; + public uint Signature => this.Model.Header.Signature; #else - public uint? Signature => _model.Header?.Signature; + public uint? Signature => this.Model.Header?.Signature; #endif /// #if NET48 - public uint Version => _model.Header.Version; + public uint Version => this.Model.Header.Version; #else - public uint? Version => _model.Header?.Version; + public uint? Version => this.Model.Header?.Version; #endif /// #if NET48 - public uint DirectoryLength => _model.Header.DirectoryLength; + public uint DirectoryLength => this.Model.Header.DirectoryLength; #else - public uint? DirectoryLength => _model.Header?.DirectoryLength; + public uint? DirectoryLength => this.Model.Header?.DirectoryLength; #endif #endregion @@ -45,16 +45,16 @@ namespace BinaryObjectScanner.Wrappers #region Extended Header /// - public uint? Dummy0 => _model.ExtendedHeader?.Dummy0; + public uint? Dummy0 => this.Model.ExtendedHeader?.Dummy0; /// - public uint? ArchiveHashLength => _model.ExtendedHeader?.ArchiveHashLength; + public uint? ArchiveHashLength => this.Model.ExtendedHeader?.ArchiveHashLength; /// - public uint? ExtraLength => _model.ExtendedHeader?.ExtraLength; + public uint? ExtraLength => this.Model.ExtendedHeader?.ExtraLength; /// - public uint? Dummy1 => _model.ExtendedHeader?.Dummy1; + public uint? Dummy1 => this.Model.ExtendedHeader?.Dummy1; #endregion @@ -62,9 +62,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.VPK.ArchiveHash[] ArchiveHashes => _model.ArchiveHashes; + public SabreTools.Models.VPK.ArchiveHash[] ArchiveHashes => this.Model.ArchiveHashes; #else - public SabreTools.Models.VPK.ArchiveHash?[]? ArchiveHashes => _model.ArchiveHashes; + public SabreTools.Models.VPK.ArchiveHash?[]? ArchiveHashes => this.Model.ArchiveHashes; #endif #endregion @@ -73,9 +73,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.VPK.DirectoryItem[] DirectoryItems => _model.DirectoryItems; + public SabreTools.Models.VPK.DirectoryItem[] DirectoryItems => this.Model.DirectoryItems; #else - public SabreTools.Models.VPK.DirectoryItem?[]? DirectoryItems => _model.DirectoryItems; + public SabreTools.Models.VPK.DirectoryItem?[]? DirectoryItems => this.Model.DirectoryItems; #endif #endregion @@ -245,17 +245,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.VPK.Print(builder, _model); + Printing.VPK.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion #region Extraction diff --git a/BinaryObjectScanner.Wrappers/WAD.cs b/BinaryObjectScanner.Wrappers/WAD.cs index 75182b4a..819e2f0e 100644 --- a/BinaryObjectScanner.Wrappers/WAD.cs +++ b/BinaryObjectScanner.Wrappers/WAD.cs @@ -18,23 +18,23 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Signature => _model.Header.Signature; + public string Signature => this.Model.Header.Signature; #else - public string? Signature => _model.Header?.Signature; + public string? Signature => this.Model.Header?.Signature; #endif /// #if NET48 - public uint LumpCount => _model.Header.LumpCount; + public uint LumpCount => this.Model.Header.LumpCount; #else - public uint? LumpCount => _model.Header?.LumpCount; + public uint? LumpCount => this.Model.Header?.LumpCount; #endif /// #if NET48 - public uint LumpOffset => _model.Header.LumpOffset; + public uint LumpOffset => this.Model.Header.LumpOffset; #else - public uint? LumpOffset => _model.Header?.LumpOffset; + public uint? LumpOffset => this.Model.Header?.LumpOffset; #endif #endregion @@ -43,9 +43,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.WAD.Lump[] Lumps => _model.Lumps; + public SabreTools.Models.WAD.Lump[] Lumps => this.Model.Lumps; #else - public SabreTools.Models.WAD.Lump?[]? Lumps => _model.Lumps; + public SabreTools.Models.WAD.Lump?[]? Lumps => this.Model.Lumps; #endif #endregion @@ -54,9 +54,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.WAD.LumpInfo[] LumpInfos => _model.LumpInfos; + public SabreTools.Models.WAD.LumpInfo[] LumpInfos => this.Model.LumpInfos; #else - public SabreTools.Models.WAD.LumpInfo?[]? LumpInfos => _model.LumpInfos; + public SabreTools.Models.WAD.LumpInfo?[]? LumpInfos => this.Model.LumpInfos; #endif #endregion @@ -155,17 +155,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.WAD.Print(builder, _model); + Printing.WAD.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion #region Extraction diff --git a/BinaryObjectScanner.Wrappers/WrapperBase.cs b/BinaryObjectScanner.Wrappers/WrapperBase.cs index 50e7bf88..6e3732d4 100644 --- a/BinaryObjectScanner.Wrappers/WrapperBase.cs +++ b/BinaryObjectScanner.Wrappers/WrapperBase.cs @@ -21,13 +21,20 @@ namespace BinaryObjectScanner.Wrappers #endregion - #region Instance Variables + #region Properties /// /// Internal model /// - /// TODO: Should this have a public getter? - protected T _model; +#if NET48 + public T Model { get; private set; } +#else + public T Model { get; init; } +#endif + + #endregion + + #region Instance Variables /// /// Source of the original data @@ -99,7 +106,7 @@ namespace BinaryObjectScanner.Wrappers if (offset < 0 || offset >= data.Length) throw new ArgumentOutOfRangeException(nameof(offset)); - _model = model; + this.Model = model; _dataSource = DataSource.ByteArray; _byteArrayData = data; _byteArrayOffset = offset; @@ -121,7 +128,7 @@ namespace BinaryObjectScanner.Wrappers if (data.Length == 0 || !data.CanSeek || !data.CanRead) throw new ArgumentOutOfRangeException(nameof(data)); - _model = model; + this.Model = model; _dataSource = DataSource.Stream; _streamData = data; } @@ -404,7 +411,7 @@ namespace BinaryObjectScanner.Wrappers /// /// Export the item information as JSON /// - public abstract string ExportJSON(); + public string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(Model, _jsonSerializerOptions); #endif #endregion diff --git a/BinaryObjectScanner.Wrappers/XZP.cs b/BinaryObjectScanner.Wrappers/XZP.cs index aa5bcab0..3e8d1cd6 100644 --- a/BinaryObjectScanner.Wrappers/XZP.cs +++ b/BinaryObjectScanner.Wrappers/XZP.cs @@ -19,65 +19,65 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public string Signature => _model.Header.Signature; + public string Signature => this.Model.Header.Signature; #else - public string? Signature => _model.Header?.Signature; + public string? Signature => this.Model.Header?.Signature; #endif /// #if NET48 - public uint Version => _model.Header.Version; + public uint Version => this.Model.Header.Version; #else - public uint? Version => _model.Header?.Version; + public uint? Version => this.Model.Header?.Version; #endif /// #if NET48 - public uint PreloadDirectoryEntryCount => _model.Header.PreloadDirectoryEntryCount; + public uint PreloadDirectoryEntryCount => this.Model.Header.PreloadDirectoryEntryCount; #else - public uint? PreloadDirectoryEntryCount => _model.Header?.PreloadDirectoryEntryCount; + public uint? PreloadDirectoryEntryCount => this.Model.Header?.PreloadDirectoryEntryCount; #endif /// #if NET48 - public uint DirectoryEntryCount => _model.Header.DirectoryEntryCount; + public uint DirectoryEntryCount => this.Model.Header.DirectoryEntryCount; #else - public uint? DirectoryEntryCount => _model.Header?.DirectoryEntryCount; + public uint? DirectoryEntryCount => this.Model.Header?.DirectoryEntryCount; #endif /// #if NET48 - public uint PreloadBytes => _model.Header.PreloadBytes; + public uint PreloadBytes => this.Model.Header.PreloadBytes; #else - public uint? PreloadBytes => _model.Header?.PreloadBytes; + public uint? PreloadBytes => this.Model.Header?.PreloadBytes; #endif /// #if NET48 - public uint HeaderLength => _model.Header.HeaderLength; + public uint HeaderLength => this.Model.Header.HeaderLength; #else - public uint? HeaderLength => _model.Header?.HeaderLength; + public uint? HeaderLength => this.Model.Header?.HeaderLength; #endif /// #if NET48 - public uint DirectoryItemCount => _model.Header.DirectoryItemCount; + public uint DirectoryItemCount => this.Model.Header.DirectoryItemCount; #else - public uint? DirectoryItemCount => _model.Header?.DirectoryItemCount; + public uint? DirectoryItemCount => this.Model.Header?.DirectoryItemCount; #endif /// #if NET48 - public uint DirectoryItemOffset => _model.Header.DirectoryItemOffset; + public uint DirectoryItemOffset => this.Model.Header.DirectoryItemOffset; #else - public uint? DirectoryItemOffset => _model.Header?.DirectoryItemOffset; + public uint? DirectoryItemOffset => this.Model.Header?.DirectoryItemOffset; #endif /// #if NET48 - public uint DirectoryItemLength => _model.Header.DirectoryItemLength; + public uint DirectoryItemLength => this.Model.Header.DirectoryItemLength; #else - public uint? DirectoryItemLength => _model.Header?.DirectoryItemLength; + public uint? DirectoryItemLength => this.Model.Header?.DirectoryItemLength; #endif #endregion @@ -86,9 +86,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.XZP.DirectoryEntry[] DirectoryEntries => _model.DirectoryEntries; + public SabreTools.Models.XZP.DirectoryEntry[] DirectoryEntries => this.Model.DirectoryEntries; #else - public SabreTools.Models.XZP.DirectoryEntry?[]? DirectoryEntries => _model.DirectoryEntries; + public SabreTools.Models.XZP.DirectoryEntry?[]? DirectoryEntries => this.Model.DirectoryEntries; #endif #endregion @@ -97,9 +97,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.XZP.DirectoryEntry[] PreloadDirectoryEntries => _model.PreloadDirectoryEntries; + public SabreTools.Models.XZP.DirectoryEntry[] PreloadDirectoryEntries => this.Model.PreloadDirectoryEntries; #else - public SabreTools.Models.XZP.DirectoryEntry?[]? PreloadDirectoryEntries => _model.PreloadDirectoryEntries; + public SabreTools.Models.XZP.DirectoryEntry?[]? PreloadDirectoryEntries => this.Model.PreloadDirectoryEntries; #endif #endregion @@ -108,9 +108,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.XZP.DirectoryMapping[] PreloadDirectoryMappings => _model.PreloadDirectoryMappings; + public SabreTools.Models.XZP.DirectoryMapping[] PreloadDirectoryMappings => this.Model.PreloadDirectoryMappings; #else - public SabreTools.Models.XZP.DirectoryMapping?[]? PreloadDirectoryMappings => _model.PreloadDirectoryMappings; + public SabreTools.Models.XZP.DirectoryMapping?[]? PreloadDirectoryMappings => this.Model.PreloadDirectoryMappings; #endif #endregion @@ -119,9 +119,9 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public SabreTools.Models.XZP.DirectoryItem[] DirectoryItems => _model.DirectoryItems; + public SabreTools.Models.XZP.DirectoryItem[] DirectoryItems => this.Model.DirectoryItems; #else - public SabreTools.Models.XZP.DirectoryItem?[]? DirectoryItems => _model.DirectoryItems; + public SabreTools.Models.XZP.DirectoryItem?[]? DirectoryItems => this.Model.DirectoryItems; #endif #endregion @@ -130,16 +130,16 @@ namespace BinaryObjectScanner.Wrappers /// #if NET48 - public uint F_FileLength => _model.Footer.FileLength; + public uint F_FileLength => this.Model.Footer.FileLength; #else - public uint? F_FileLength => _model.Footer?.FileLength; + public uint? F_FileLength => this.Model.Footer?.FileLength; #endif /// #if NET48 - public string F_Signature => _model.Footer.Signature; + public string F_Signature => this.Model.Footer.Signature; #else - public string? F_Signature => _model.Footer?.Signature; + public string? F_Signature => this.Model.Footer?.Signature; #endif #endregion @@ -238,17 +238,10 @@ namespace BinaryObjectScanner.Wrappers public override StringBuilder PrettyPrint() { StringBuilder builder = new StringBuilder(); - Printing.XZP.Print(builder, _model); + Printing.XZP.Print(builder, this.Model); return builder; } -#if NET6_0_OR_GREATER - - /// - public override string ExportJSON() => System.Text.Json.JsonSerializer.Serialize(_model, _jsonSerializerOptions); - -#endif - #endregion #region Extraction