From b2279e97b2b5a482bc12ac5fc7754a4c726d5a6c Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 18 Sep 2025 21:18:43 -0400 Subject: [PATCH] CHD is all big-endian --- SabreTools.Serialization/Deserializers/CHD.cs | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/SabreTools.Serialization/Deserializers/CHD.cs b/SabreTools.Serialization/Deserializers/CHD.cs index 73f28eba..d428f1df 100644 --- a/SabreTools.Serialization/Deserializers/CHD.cs +++ b/SabreTools.Serialization/Deserializers/CHD.cs @@ -150,15 +150,15 @@ namespace SabreTools.Serialization.Deserializers byte[] tag = data.ReadBytes(8); obj.Tag = Encoding.ASCII.GetString(tag); - obj.Length = data.ReadUInt32LittleEndian(); - obj.Version = data.ReadUInt32LittleEndian(); - obj.Flags = (Flags)data.ReadUInt32LittleEndian(); - obj.Compression = (CompressionType)data.ReadUInt32LittleEndian(); - obj.HunkSize = data.ReadUInt32LittleEndian(); - obj.TotalHunks = data.ReadUInt32LittleEndian(); - obj.Cylinders = data.ReadUInt32LittleEndian(); - obj.Heads = data.ReadUInt32LittleEndian(); - obj.Sectors = data.ReadUInt32LittleEndian(); + obj.Length = data.ReadUInt32BigEndian(); + obj.Version = data.ReadUInt32BigEndian(); + obj.Flags = (Flags)data.ReadUInt32BigEndian(); + obj.Compression = (CompressionType)data.ReadUInt32BigEndian(); + obj.HunkSize = data.ReadUInt32BigEndian(); + obj.TotalHunks = data.ReadUInt32BigEndian(); + obj.Cylinders = data.ReadUInt32BigEndian(); + obj.Heads = data.ReadUInt32BigEndian(); + obj.Sectors = data.ReadUInt32BigEndian(); obj.MD5 = data.ReadBytes(16); obj.ParentMD5 = data.ReadBytes(16); @@ -174,18 +174,18 @@ namespace SabreTools.Serialization.Deserializers byte[] tag = data.ReadBytes(8); obj.Tag = Encoding.ASCII.GetString(tag); - obj.Length = data.ReadUInt32LittleEndian(); - obj.Version = data.ReadUInt32LittleEndian(); - obj.Flags = (Flags)data.ReadUInt32LittleEndian(); - obj.Compression = (CompressionType)data.ReadUInt32LittleEndian(); - obj.HunkSize = data.ReadUInt32LittleEndian(); - obj.TotalHunks = data.ReadUInt32LittleEndian(); - obj.Cylinders = data.ReadUInt32LittleEndian(); - obj.Heads = data.ReadUInt32LittleEndian(); - obj.Sectors = data.ReadUInt32LittleEndian(); + obj.Length = data.ReadUInt32BigEndian(); + obj.Version = data.ReadUInt32BigEndian(); + obj.Flags = (Flags)data.ReadUInt32BigEndian(); + obj.Compression = (CompressionType)data.ReadUInt32BigEndian(); + obj.HunkSize = data.ReadUInt32BigEndian(); + obj.TotalHunks = data.ReadUInt32BigEndian(); + obj.Cylinders = data.ReadUInt32BigEndian(); + obj.Heads = data.ReadUInt32BigEndian(); + obj.Sectors = data.ReadUInt32BigEndian(); obj.MD5 = data.ReadBytes(16); obj.ParentMD5 = data.ReadBytes(16); - obj.BytesPerSector = data.ReadUInt32LittleEndian(); + obj.BytesPerSector = data.ReadUInt32BigEndian(); return obj; } @@ -199,16 +199,16 @@ namespace SabreTools.Serialization.Deserializers byte[] tag = data.ReadBytes(8); obj.Tag = Encoding.ASCII.GetString(tag); - obj.Length = data.ReadUInt32LittleEndian(); - obj.Version = data.ReadUInt32LittleEndian(); - obj.Flags = (Flags)data.ReadUInt32LittleEndian(); - obj.Compression = (CompressionType)data.ReadUInt32LittleEndian(); - obj.TotalHunks = data.ReadUInt32LittleEndian(); - obj.LogicalBytes = data.ReadUInt64LittleEndian(); - obj.MetaOffset = data.ReadUInt64LittleEndian(); + obj.Length = data.ReadUInt32BigEndian(); + obj.Version = data.ReadUInt32BigEndian(); + obj.Flags = (Flags)data.ReadUInt32BigEndian(); + obj.Compression = (CompressionType)data.ReadUInt32BigEndian(); + obj.TotalHunks = data.ReadUInt32BigEndian(); + obj.LogicalBytes = data.ReadUInt64BigEndian(); + obj.MetaOffset = data.ReadUInt64BigEndian(); obj.MD5 = data.ReadBytes(16); obj.ParentMD5 = data.ReadBytes(16); - obj.HunkBytes = data.ReadUInt32LittleEndian(); + obj.HunkBytes = data.ReadUInt32BigEndian(); obj.SHA1 = data.ReadBytes(20); obj.ParentSHA1 = data.ReadBytes(20); @@ -224,14 +224,14 @@ namespace SabreTools.Serialization.Deserializers byte[] tag = data.ReadBytes(8); obj.Tag = Encoding.ASCII.GetString(tag); - obj.Length = data.ReadUInt32LittleEndian(); - obj.Version = data.ReadUInt32LittleEndian(); - obj.Flags = (Flags)data.ReadUInt32LittleEndian(); - obj.Compression = (CompressionType)data.ReadUInt32LittleEndian(); - obj.TotalHunks = data.ReadUInt32LittleEndian(); - obj.LogicalBytes = data.ReadUInt64LittleEndian(); - obj.MetaOffset = data.ReadUInt64LittleEndian(); - obj.HunkBytes = data.ReadUInt32LittleEndian(); + obj.Length = data.ReadUInt32BigEndian(); + obj.Version = data.ReadUInt32BigEndian(); + obj.Flags = (Flags)data.ReadUInt32BigEndian(); + obj.Compression = (CompressionType)data.ReadUInt32BigEndian(); + obj.TotalHunks = data.ReadUInt32BigEndian(); + obj.LogicalBytes = data.ReadUInt64BigEndian(); + obj.MetaOffset = data.ReadUInt64BigEndian(); + obj.HunkBytes = data.ReadUInt32BigEndian(); obj.SHA1 = data.ReadBytes(20); obj.ParentSHA1 = data.ReadBytes(20); obj.RawSHA1 = data.ReadBytes(20); @@ -248,18 +248,18 @@ namespace SabreTools.Serialization.Deserializers byte[] tag = data.ReadBytes(8); obj.Tag = Encoding.ASCII.GetString(tag); - obj.Length = data.ReadUInt32LittleEndian(); - obj.Version = data.ReadUInt32LittleEndian(); + obj.Length = data.ReadUInt32BigEndian(); + obj.Version = data.ReadUInt32BigEndian(); obj.Compressors = new CodecType[4]; for (int i = 0; i < 4; i++) { - obj.Compressors[i] = (CodecType)data.ReadUInt32LittleEndian(); + obj.Compressors[i] = (CodecType)data.ReadUInt32BigEndian(); } - obj.LogicalBytes = data.ReadUInt64LittleEndian(); - obj.MapOffset = data.ReadUInt64LittleEndian(); - obj.MetaOffset = data.ReadUInt64LittleEndian(); - obj.HunkBytes = data.ReadUInt32LittleEndian(); - obj.UnitBytes = data.ReadUInt32LittleEndian(); + obj.LogicalBytes = data.ReadUInt64BigEndian(); + obj.MapOffset = data.ReadUInt64BigEndian(); + obj.MetaOffset = data.ReadUInt64BigEndian(); + obj.HunkBytes = data.ReadUInt32BigEndian(); + obj.UnitBytes = data.ReadUInt32BigEndian(); obj.RawSHA1 = data.ReadBytes(20); obj.SHA1 = data.ReadBytes(20); obj.ParentSHA1 = data.ReadBytes(20);