Ensure full file extraction with header

Author: damieng

Source/DiskImageManager.lpi

@@ -31,7 +31,7 @@
       <MajorVersionNr Value="2"/>
       <MinorVersionNr Value="5"/>
       <RevisionNr Value="1"/>
-      <BuildNr Value="105"/>
+      <BuildNr Value="106"/>
       <StringTable CompanyName="Envy Technologies" InternalName="Disk Image Manager" LegalCopyright="Copyright 2002-2023 Damien Guard." OriginalFilename="DiskImageManager.exe" ProductName="Disk Image Manager"/>
     </VersionInfo>
     <BuildModes Count="2">

Source/DiskImageManager.res

@@ -58,6 +58,7 @@   TDSKFile = class(TObject)
     HeaderType: string;
     Checksum: boolean;
     Size: integer;
+    HeaderSize: integer;
     Meta: string;
 
     function GetData(WithHeader: boolean): TDiskByteArray;
@@ -198,6 +199,7 @@ function TDSKFileSystem.ReadFileEntry(Data: array of byte; Offset: integer): TDS
     ReadOnly := Data[Offset + READONLY_OFFSET] > 127;
     System := Data[Offset + SYSTEM_OFFSET] > 127;
     Archived := Data[Offset + ARCHIVED_OFFSET] > 127;
+    HeaderSize := 0;
 
     Extent := Data[Offset + EXTENT_LOW];
     AllocOffset := Offset + ALLOCATION_OFFSET;
@@ -250,6 +252,7 @@ procedure TDSKFileSystem.TryAMSDOSHeader(Data: array of byte; DiskFile: TDSKFile
   DiskFile.Checksum := True;
   DiskFile.HeaderType := 'AMSDOS';
   DiskFile.Size := Data[64] + (Data[65] << 8) + (Data[66] << 16);
+  DiskFile.HeaderSize := 128;
 
   LoadAddr := Data[21] + (Data[22] << 8);
   ExecAddr := Data[26] + (Data[27] << 8);
@@ -286,6 +289,7 @@ procedure TDSKFileSystem.TryPlus3DOSHeader(Data: array of byte; DiskFile: TDSKFi
   DiskFile.Checksum := CalcChecksum = Data[127];
   DiskFile.HeaderType := Sig;
   DiskFile.Size := Data[11] + (Data[12] << 8) + (Data[13] << 16) + (Data[14] << 24);
+  DiskFile.HeaderSize := 128;
 
   Length := Data[16] + (Data[17] << 8);
   Param1 := Data[18] + (Data[19] << 8);
@@ -322,7 +326,7 @@ destructor TDSKFile.Destroy;
   inherited Destroy;
 end;
 
-function TDSKFile.GetData(WithHeader:boolean): TDiskByteArray;
+function TDSKFile.GetData(WithHeader: boolean): TDiskByteArray;
 var
   Block, BytesLeft, TargetIdx, BlockSize, SectorsLeft, SectorsPerBlock: integer;
   Disk: TDSKDisk;
@@ -332,7 +336,7 @@ function TDSKFile.GetData(WithHeader:boolean): TDiskByteArray;
   FileData := nil;
   SetLength(FileData, Size);
 
-  BytesLeft := Size;
+  BytesLeft := Size + HeaderSize;
   TargetIdx := 0;
   Disk := FParentFileSystem.FParentDisk;
   BlockSize := Disk.Specification.GetBlockSize();
@@ -366,9 +370,9 @@ function TDSKFile.GetData(WithHeader:boolean): TDiskByteArray;
 
   // Strip any headers
   if (not WithHeader) and ((HeaderType = 'PLUS3DOS') or (HeaderType = 'AMSDOS')) then
-    Result := Copy(FileData, 128, Size - 128)
+    Result := Copy(FileData, HeaderSize, Size - HeaderSize)
   else
-    Result := FileData;
+    Result := Copy(FileData, Size);
 end;
 
 end.