Use IO package for array and stream extensions

This commit is contained in:
Matt Nadareski
2023-09-08 16:33:06 -04:00
parent 1c972a29a7
commit 1eaefb16ba
46 changed files with 63 additions and 413 deletions

View File

@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.AACS;
namespace BinaryObjectScanner.Builders
@@ -186,7 +186,7 @@ namespace BinaryObjectScanner.Builders
var subsetDifference = new SubsetDifference();
subsetDifference.Mask = data.ReadByteValue();
subsetDifference.Number = data.ReadUInt32BE();
subsetDifference.Number = data.ReadUInt32BigEndian();
subsetDifferences.Add(subsetDifference);
}
@@ -257,7 +257,7 @@ namespace BinaryObjectScanner.Builders
// Cache the current offset
long initialOffset = data.Position - 4;
record.Span = data.ReadUInt32BE();
record.Span = data.ReadUInt32BigEndian();
// Create the offset list
var offsets = new List<uint>();
@@ -265,7 +265,7 @@ namespace BinaryObjectScanner.Builders
// Try to parse the offsets
while (data.Position < initialOffset + length)
{
uint offset = data.ReadUInt32BE();
uint offset = data.ReadUInt32BigEndian();
offsets.Add(offset);
}
@@ -291,8 +291,8 @@ namespace BinaryObjectScanner.Builders
record.RecordType = type;
record.RecordLength = length;
record.MediaKeyBlockType = (MediaKeyBlockType)data.ReadUInt32BE();
record.VersionNumber = data.ReadUInt32BE();
record.MediaKeyBlockType = (MediaKeyBlockType)data.ReadUInt32BigEndian();
record.VersionNumber = data.ReadUInt32BigEndian();
return record;
}
@@ -317,7 +317,7 @@ namespace BinaryObjectScanner.Builders
// Cache the current offset
long initialOffset = data.Position - 4;
record.TotalNumberOfEntries = data.ReadUInt32BE();
record.TotalNumberOfEntries = data.ReadUInt32BigEndian();
// Create the signature blocks list
var blocks = new List<DriveRevocationSignatureBlock>();
@@ -328,13 +328,13 @@ namespace BinaryObjectScanner.Builders
{
var block = new DriveRevocationSignatureBlock();
block.NumberOfEntries = data.ReadUInt32BE();
block.NumberOfEntries = data.ReadUInt32BigEndian();
block.EntryFields = new DriveRevocationListEntry[block.NumberOfEntries];
for (int i = 0; i < block.EntryFields.Length; i++)
{
var entry = new DriveRevocationListEntry();
entry.Range = data.ReadUInt16BE();
entry.Range = data.ReadUInt16BigEndian();
entry.DriveID = data.ReadBytes(6);
block.EntryFields[i] = entry;
@@ -378,7 +378,7 @@ namespace BinaryObjectScanner.Builders
// Cache the current offset
long initialOffset = data.Position - 4;
record.TotalNumberOfEntries = data.ReadUInt32BE();
record.TotalNumberOfEntries = data.ReadUInt32BigEndian();
// Create the signature blocks list
var blocks = new List<HostRevocationSignatureBlock>();
@@ -389,13 +389,13 @@ namespace BinaryObjectScanner.Builders
{
var block = new HostRevocationSignatureBlock();
block.NumberOfEntries = data.ReadUInt32BE();
block.NumberOfEntries = data.ReadUInt32BigEndian();
block.EntryFields = new HostRevocationListEntry[block.NumberOfEntries];
for (int i = 0; i < block.EntryFields.Length; i++)
{
var entry = new HostRevocationListEntry();
entry.Range = data.ReadUInt16BE();
entry.Range = data.ReadUInt16BigEndian();
entry.HostID = data.ReadBytes(6);
block.EntryFields[i] = entry;

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.BDPlus;
using static SabreTools.Models.BDPlus.Constants;
@@ -73,7 +73,7 @@ namespace BinaryObjectScanner.Builders
return null;
svm.Unknown1 = data.ReadBytes(5);
svm.Year = data.ReadUInt16BE();
svm.Year = data.ReadUInt16BigEndian();
svm.Month = data.ReadByteValue();
if (svm.Month < 1 || svm.Month > 12)
return null;

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.BFPK;
using static SabreTools.Models.BFPK.Constants;

View File

@@ -1,7 +1,7 @@
using System.IO;
using System.Linq;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.BSP;
using static SabreTools.Models.BSP.Constants;

View File

@@ -25,6 +25,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="SabreTools.IO" Version="1.1.1" />
<PackageReference Include="SabreTools.Models" Version="1.1.0" />
</ItemGroup>

View File

@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.CFB;
using static SabreTools.Models.CFB.Constants;

View File

@@ -4,7 +4,7 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Xml.Serialization;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
namespace BinaryObjectScanner.Builders
{

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.GCF;
namespace BinaryObjectScanner.Builders

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.InstallShieldCabinet;
using static SabreTools.Models.InstallShieldCabinet.Constants;

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.LinearExecutable;
using static SabreTools.Models.LinearExecutable.Constants;

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.MSDOS;
using static SabreTools.Models.MSDOS.Constants;

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.MicrosoftCabinet;
using static SabreTools.Models.MicrosoftCabinet.Constants;

View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.MoPaQ;
using static SabreTools.Models.MoPaQ.Constants;

View File

@@ -2,6 +2,7 @@ using System;
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.N3DS;
using static SabreTools.Models.N3DS.Constants;

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.NCF;
namespace BinaryObjectScanner.Builders

View File

@@ -2,7 +2,7 @@
using System.IO;
using System.Linq;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.NewExecutable;
using static SabreTools.Models.NewExecutable.Constants;

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.Nitro;
namespace BinaryObjectScanner.Builders

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.PAK;
using static SabreTools.Models.PAK.Constants;

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.PFF;
using static SabreTools.Models.PFF.Constants;

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.PlayJ;
using static SabreTools.Models.PlayJ.Constants;

View File

@@ -4,6 +4,7 @@ using System.IO;
using System.Linq;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.PortableExecutable;
using static SabreTools.Models.PortableExecutable.Constants;

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.Quantum;
using static SabreTools.Models.Quantum.Constants;

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.SGA;
using static SabreTools.Models.SGA.Constants;

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.VBSP;
using static SabreTools.Models.VBSP.Constants;

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.VPK;
using static SabreTools.Models.VPK.Constants;

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.WAD;
using static SabreTools.Models.WAD.Constants;

View File

@@ -1,6 +1,6 @@
using System.IO;
using System.Text;
using BinaryObjectScanner.Utilities;
using SabreTools.IO;
using SabreTools.Models.XZP;
using static SabreTools.Models.XZP.Constants;