diff --git a/LazarusSource/DiscImageManager.lpi b/LazarusSource/DiscImageManager.lpi index 7d58896..e4a08ca 100644 --- a/LazarusSource/DiscImageManager.lpi +++ b/LazarusSource/DiscImageManager.lpi @@ -20,9 +20,9 @@ - + - + diff --git a/LazarusSource/DiscImageManager.lps b/LazarusSource/DiscImageManager.lps index 40fbe69..58376c0 100644 --- a/LazarusSource/DiscImageManager.lps +++ b/LazarusSource/DiscImageManager.lps @@ -1,520 +1,521 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LazarusSource/DiscImageManager.res b/LazarusSource/DiscImageManager.res index 38a95b6..eefd5bf 100644 Binary files a/LazarusSource/DiscImageManager.res and b/LazarusSource/DiscImageManager.res differ diff --git a/LazarusSource/DiscImage_DFS.pas b/LazarusSource/DiscImage_DFS.pas index 79c21ea..1b02a3a 100644 --- a/LazarusSource/DiscImage_DFS.pas +++ b/LazarusSource/DiscImage_DFS.pas @@ -714,12 +714,22 @@ function TDiscImage.FormatDFS(minor,tracks: Byte): TDisc; WriteByte(side_size div $100,ConvertDFSSector($106,s)); WriteByte(side_size mod $100,ConvertDFSSector($107,s)); inc(disc_size[s],side_size*$100); + //Increase the data length, if needed + if FDSD then + SetDataLength(disc_size[0]+disc_size[1]); //Disc Title - UpdateDFSDiscTitle(disctitle,tracks); + UpdateDFSDiscTitle(disctitle,s); + //Watford ID + if minor>1 then + begin + for t:=0 to 7 do WriteByte($AA,ConvertDFSSector($200+t,s)); + WriteByte(side_size div $100,ConvertDFSSector($306,s)); + WriteByte(side_size mod $100,ConvertDFSSector($307,s)); + end; //Directory size inc(free_space[s],$200); //Next side - if (FFormat AND $1=1) then inc(s) else s:=2; + if(FFormat AND$1=1)then inc(s)else s:=2; until s=2; //Update the free space DFSFreeSpaceMap(Result); diff --git a/LazarusSource/MainUnit.pas b/LazarusSource/MainUnit.pas index 4082411..0d671f6 100755 --- a/LazarusSource/MainUnit.pas +++ b/LazarusSource/MainUnit.pas @@ -508,7 +508,7 @@ TMainForm = class(TForm) DesignedDPI = 96; //Application Title ApplicationTitle = 'Disc Image Manager'; - ApplicationVersion = '1.38.1'; + ApplicationVersion = '1.38.2'; //Current platform and architecture (compile time directive) {$IFDEF Darwin} platform = 'macOS'; //Apple Mac OS X diff --git a/binaries/Linux/Disc Image Manager 32 bit.zip b/binaries/Linux/Disc Image Manager 32 bit.zip index 1638912..30c5002 100644 Binary files a/binaries/Linux/Disc Image Manager 32 bit.zip and b/binaries/Linux/Disc Image Manager 32 bit.zip differ diff --git a/binaries/Linux/Disc Image Manager ARM 32 bit.zip b/binaries/Linux/Disc Image Manager ARM 32 bit.zip index d8722b4..0ae4c8a 100644 Binary files a/binaries/Linux/Disc Image Manager ARM 32 bit.zip and b/binaries/Linux/Disc Image Manager ARM 32 bit.zip differ diff --git a/binaries/Linux/Disc Image Manager.zip b/binaries/Linux/Disc Image Manager.zip index f64912b..cdc9e49 100644 Binary files a/binaries/Linux/Disc Image Manager.zip and b/binaries/Linux/Disc Image Manager.zip differ diff --git a/binaries/Windows/Disc Image Manager 32 bit.zip b/binaries/Windows/Disc Image Manager 32 bit.zip index 0e0ab84..83796c1 100644 Binary files a/binaries/Windows/Disc Image Manager 32 bit.zip and b/binaries/Windows/Disc Image Manager 32 bit.zip differ diff --git a/binaries/Windows/Disc Image Manager.zip b/binaries/Windows/Disc Image Manager.zip index b42b3ae..4913e76 100644 Binary files a/binaries/Windows/Disc Image Manager.zip and b/binaries/Windows/Disc Image Manager.zip differ diff --git a/binaries/macOS/Disc Image Manager 32 bit.dmg b/binaries/macOS/Disc Image Manager 32 bit.dmg index c1d758c..067d790 100644 Binary files a/binaries/macOS/Disc Image Manager 32 bit.dmg and b/binaries/macOS/Disc Image Manager 32 bit.dmg differ diff --git a/binaries/macOS/Disc Image Manager.dmg b/binaries/macOS/Disc Image Manager.dmg index 5d316cd..b3c1fa4 100644 Binary files a/binaries/macOS/Disc Image Manager.dmg and b/binaries/macOS/Disc Image Manager.dmg differ