aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for negative sectors to read and write sector calls in images.

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-23 03:07:43 +01:00
parent 0c19fe1b11
commit 69738f5f1a
289 changed files with 2676 additions and 1352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Filesystems/AppleMFS/File.cs
View File

@@ -93,12 +93,14 @@ public sealed partial class AppleMFS
? _device.ReadSectorsTag((ulong)((nextBlock - 2) * _sectorsPerBlock) +
_volMdb.drAlBlSt +
_partitionStart,
false,
(uint)_sectorsPerBlock,
SectorTagType.AppleSonyTag,
out byte[] sectors)
: _device.ReadSectors((ulong)((nextBlock - 2) * _sectorsPerBlock) +
_volMdb.drAlBlSt +
_partitionStart,
false,
(uint)_sectorsPerBlock,
out sectors,
out _);

6
Aaru.Filesystems/AppleMFS/Info.cs
View File

@@ -48,7 +48,7 @@ public sealed partial class AppleMFS
{
if(2 + partition.Start >= partition.End) return false;
ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] mdbSector, out _);
ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, false, out byte[] mdbSector, out _);
if(errno != ErrorNumber.NoError) return false;
@@ -69,11 +69,11 @@ public sealed partial class AppleMFS
var mdb = new MasterDirectoryBlock();
ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] mdbSector, out _);
ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, false, out byte[] mdbSector, out _);
if(errno != ErrorNumber.NoError) return;
errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bbSector, out _);
errno = imagePlugin.ReadSector(0 + partition.Start, false, out byte[] bbSector, out _);
if(errno != ErrorNumber.NoError) return;

18
Aaru.Filesystems/AppleMFS/Super.cs
View File

@@ -59,11 +59,11 @@ public sealed partial class AppleMFS
_volMdb = new MasterDirectoryBlock();
ErrorNumber errno = _device.ReadSector(2 + _partitionStart, out _mdbBlocks, out _);
ErrorNumber errno = _device.ReadSector(2 + _partitionStart, false, out _mdbBlocks, out _);
if(errno != ErrorNumber.NoError) return errno;
errno = _device.ReadSector(0 + _partitionStart, out _bootBlocks, out _);
errno = _device.ReadSector(0 + _partitionStart, false, out _bootBlocks, out _);
if(errno != ErrorNumber.NoError) return errno;
@@ -88,7 +88,11 @@ public sealed partial class AppleMFS
Array.Copy(_mdbBlocks, 0x024, variableSize, 0, _volMdb.drVNSiz + 1);
_volMdb.drVN = StringHandlers.PascalToString(variableSize, _encoding);
errno = _device.ReadSectors(_volMdb.drDirSt + _partitionStart, _volMdb.drBlLen, out _directoryBlocks, out _);
errno = _device.ReadSectors(_volMdb.drDirSt + _partitionStart,
false,
_volMdb.drBlLen,
out _directoryBlocks,
out _);
if(errno != ErrorNumber.NoError) return errno;
@@ -98,7 +102,7 @@ public sealed partial class AppleMFS
int sectorsInWholeMdb = bytesInWholeMdb / (int)_device.Info.SectorSize +
bytesInWholeMdb % (int)_device.Info.SectorSize;
errno = _device.ReadSectors(_partitionStart + 2, (uint)sectorsInWholeMdb, out byte[] wholeMdb, out _);
errno = _device.ReadSectors(_partitionStart + 2, false, (uint)sectorsInWholeMdb, out byte[] wholeMdb, out _);
if(errno != ErrorNumber.NoError) return errno;
@@ -143,15 +147,17 @@ public sealed partial class AppleMFS
if(_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSonyTag))
{
_device.ReadSectorTag(2 + _partitionStart, SectorTagType.AppleSonyTag, out _mdbTags);
_device.ReadSectorTag(0 + _partitionStart, SectorTagType.AppleSonyTag, out _bootTags);
_device.ReadSectorTag(2 + _partitionStart, false, SectorTagType.AppleSonyTag, out _mdbTags);
_device.ReadSectorTag(0 + _partitionStart, false, SectorTagType.AppleSonyTag, out _bootTags);
_device.ReadSectorsTag(_volMdb.drDirSt + _partitionStart,
false,
_volMdb.drBlLen,
SectorTagType.AppleSonyTag,
out _directoryTags);
_device.ReadSectorsTag(_partitionStart + 2,
false,
(uint)sectorsInWholeMdb,
SectorTagType.AppleSonyTag,
out _bitmapTags);