From b643bc7f07fbb104791aa34fd7b2d9e25c234fdb Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 29 Dec 2025 17:08:03 +0000 Subject: [PATCH] [AaruFormat] Update sector handling to use uint instead of ushort for negative and overflow sectors --- Aaru.Images/AaruFormat/Metadata.cs | 8 ++++---- Aaru.Images/AaruFormat/Open.cs | 14 ++++++-------- Aaru.Images/AaruFormat/Write.cs | 14 ++++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Aaru.Images/AaruFormat/Metadata.cs b/Aaru.Images/AaruFormat/Metadata.cs index 176d8e6b1..4bb587d16 100644 --- a/Aaru.Images/AaruFormat/Metadata.cs +++ b/Aaru.Images/AaruFormat/Metadata.cs @@ -251,15 +251,15 @@ public sealed partial class AaruFormat [UnmanagedCallConv(CallConvs = [typeof(CallConvStdcall)])] private static partial Status aaruf_get_readable_media_tags(IntPtr context, byte[] buffer, ref nuint length); - // AARU_EXPORT int32_t AARU_CALL aaruf_get_negative_sectors(const void *context, uint16_t *sectors); + // AARU_EXPORT int32_t AARU_CALL aaruf_get_negative_sectors(const void *context, uint32_t *sectors); [LibraryImport("libaaruformat", EntryPoint = "aaruf_get_negative_sectors", SetLastError = true)] [UnmanagedCallConv(CallConvs = [typeof(CallConvStdcall)])] - private static partial Status aaruf_get_negative_sectors(IntPtr context, ref ushort sectors); + private static partial Status aaruf_get_negative_sectors(IntPtr context, ref uint sectors); - // AARU_EXPORT int32_t AARU_CALL aaruf_get_overflow_sectors(const void *context, uint16_t *sectors); + // AARU_EXPORT int32_t AARU_CALL aaruf_get_overflow_sectors(const void *context, uint32_t *sectors); [LibraryImport("libaaruformat", EntryPoint = "aaruf_get_overflow_sectors", SetLastError = true)] [UnmanagedCallConv(CallConvs = [typeof(CallConvStdcall)])] - private static partial Status aaruf_get_overflow_sectors(IntPtr context, ref ushort sectors); + private static partial Status aaruf_get_overflow_sectors(IntPtr context, ref uint sectors); #region IWritableOpticalImage Members diff --git a/Aaru.Images/AaruFormat/Open.cs b/Aaru.Images/AaruFormat/Open.cs index 9ff769cd7..5e070f92f 100644 --- a/Aaru.Images/AaruFormat/Open.cs +++ b/Aaru.Images/AaruFormat/Open.cs @@ -64,9 +64,8 @@ public sealed partial class AaruFormat // Convert array of booleans to List of enums for(nuint i = 0; i < sizet_length; i++) - { - if(sectorTagsBuffer[i] != 0) _imageInfo.ReadableSectorTags.Add((SectorTagType)i); - } + if(sectorTagsBuffer[i] != 0) + _imageInfo.ReadableSectorTags.Add((SectorTagType)i); sizet_length = 0; ret = aaruf_get_readable_media_tags(_context, null, ref sizet_length); @@ -80,9 +79,8 @@ public sealed partial class AaruFormat // Convert array of booleans to List of enums for(nuint i = 0; i < sizet_length; i++) - { - if(mediaTagsBuffer[i] != 0) _imageInfo.ReadableMediaTags.Add((MediaTagType)i); - } + if(mediaTagsBuffer[i] != 0) + _imageInfo.ReadableMediaTags.Add((MediaTagType)i); ret = aaruf_get_media_sequence(_context, out int sequence, out int lastSequence); @@ -243,12 +241,12 @@ public sealed partial class AaruFormat SetMetadataFromTags(); - ushort negativeSectors = 0; + uint negativeSectors = 0; ret = aaruf_get_negative_sectors(_context, ref negativeSectors); if(ret == Status.Ok) _imageInfo.NegativeSectors = negativeSectors; - ushort overflowSectors = 0; + uint overflowSectors = 0; ret = aaruf_get_overflow_sectors(_context, ref overflowSectors); if(ret == Status.Ok) _imageInfo.OverflowSectors = overflowSectors; diff --git a/Aaru.Images/AaruFormat/Write.cs b/Aaru.Images/AaruFormat/Write.cs index 999ab2539..e9b570137 100644 --- a/Aaru.Images/AaruFormat/Write.cs +++ b/Aaru.Images/AaruFormat/Write.cs @@ -288,8 +288,9 @@ public sealed partial class AaruFormat // Convert array of booleans to List of enums for(nuint i = 0; i < sizet_length; i++) - if(sectorTagsBuffer[i] != 0) - _imageInfo.ReadableSectorTags.Add((SectorTagType)i); + { + if(sectorTagsBuffer[i] != 0) _imageInfo.ReadableSectorTags.Add((SectorTagType)i); + } sizet_length = 0; ret = aaruf_get_readable_media_tags(_context, null, ref sizet_length); @@ -313,8 +314,9 @@ public sealed partial class AaruFormat // Convert array of booleans to List of enums for(nuint i = 0; i < sizet_length; i++) - if(mediaTagsBuffer[i] != 0) - _imageInfo.ReadableMediaTags.Add((MediaTagType)i); + { + if(mediaTagsBuffer[i] != 0) _imageInfo.ReadableMediaTags.Add((MediaTagType)i); + } ret = aaruf_get_media_sequence(_context, out int sequence, out int lastSequence); @@ -475,12 +477,12 @@ public sealed partial class AaruFormat SetMetadataFromTags(); - ushort infoNegativeSectors = 0; + uint infoNegativeSectors = 0; ret = aaruf_get_negative_sectors(_context, ref infoNegativeSectors); if(ret == Status.Ok) _imageInfo.NegativeSectors = infoNegativeSectors; - ushort infoOverflowSectors = 0; + uint infoOverflowSectors = 0; ret = aaruf_get_overflow_sectors(_context, ref infoOverflowSectors); if(ret == Status.Ok) _imageInfo.OverflowSectors = infoOverflowSectors;