Interim Release 1.42.1

geraldholdsworth · Apr 24, 2022 · b58a324 · b58a324
1 parent e0d8417
commit b58a324
Show file tree

Hide file tree

Showing 19 changed files with 193 additions and 153 deletions.
diff --git a/Documentation/Changes.txt b/Documentation/Changes.txt
@@ -847,6 +847,18 @@ Bug fixes
 * A bug had crept in, at some earlier version, that crashed the application when the filetype was clicked on.
 * When editing the date/time stamp, clicking on a field during editing would instead commence editing the selected node on the directory tree for renaming.
 
+1.43
+----------------------
+New or improved features
+* Reports number of items in a directory in the File Details pane.
+* Added more sanity checks on ID-ing a DOS or DOS+ image.
+* Changed the order of ID-ing a format and moved DFS to the end.
+
+Bug fixes
+* When looking for a DOS partition on an ADFS hard drive, the drive was split as two separate drives. However, the DOS partition is a file held within the ADFS file structure and not a separate partition.
+* The custom filetype entry box was not positioned correctly in the filetype dialogue.
+* ADFS Filetypes and timestamps were getting reported for non ADFS formats and ADFS Old Directories.
+
 
 Platform History
 ----------------

diff --git a/Documentation/ToDo.txt b/Documentation/ToDo.txt
@@ -21,6 +21,7 @@ General
 * Open multiple images at the same time and allow interaction between them (e.g. copying files from one to another).
 * For macOS, change the settings being saved to the registry to being saved in a plist file, or within the application directory itself.
 * Ablity to add/remove/delete partitions using the command line.
+* Allow for multiple (>2) partitions - i.e. two or more DOS partitions on an ADFS structure, or ADFS/AFS/DOS hybrid.
 
 DFS
 

diff --git a/LazarusSource/DiscImage.pas b/LazarusSource/DiscImage.pas
@@ -1,7 +1,7 @@
 unit DiscImage;
 
 {
-TDiscImage class V1.42
+TDiscImage class V1.43
 Manages retro disc images, presenting a list of files and directories to the
 parent application. Will also extract files and write new files. Almost a complete
 filing system in itself. Compatible with Acorn DFS, Acorn ADFS, UEF, Commodore
@@ -391,7 +391,7 @@   TFragment     = record        //For retrieving the ADFS E/F fragment informati
   function ID_DOSPlus: Boolean;
   function IDDOSPartition(ctr: Cardinal): Boolean;
   procedure ReadDOSPartition;
-  procedure ReadDOSHeader;
+  function ReadDOSHeader: Boolean;
   function ReadDOSDirectory(dirname:String;addr:Cardinal;var len:Cardinal):TDir;
   function DOSExtToFileType(ext: String): String;
   function ConvertDOSTimeDate(time,date: Word): TDateTime;

diff --git a/LazarusSource/DiscImageManager.lpi b/LazarusSource/DiscImageManager.lpi
@@ -22,8 +22,9 @@
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="1"/>
       <MinorVersionNr Value="42"/>
+      <RevisionNr Value="1"/>
       <Language Value="0809"/>
-      <StringTable CompanyName="GJH Software" FileDescription="Disc Image Manager for Acorn and Commodore disc formats" ProductName="Disc Image Manager" ProductVersion="1.42"/>
+      <StringTable CompanyName="GJH Software" FileDescription="Disc Image Manager for Acorn and Commodore disc formats" ProductName="Disc Image Manager" ProductVersion="1.42.1"/>
     </VersionInfo>
     <BuildModes Count="10">
       <Item1 Name="Default" Default="True"/>

diff --git a/LazarusSource/DiscImageManager.lps b/LazarusSource/DiscImageManager.lps
@@ -19,9 +19,10 @@
         <ComponentName Value="MainForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="5917"/>
-        <CursorPos X="19" Y="5924"/>
+        <TopLine Value="524"/>
+        <CursorPos X="33" Y="530"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -30,8 +31,8 @@
         <Filename Value="DiscImage.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="11"/>
-        <TopLine Value="471"/>
-        <CursorPos X="12" Y="473"/>
+        <TopLine Value="151"/>
+        <CursorPos X="12" Y="170"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -78,7 +79,6 @@
         <Filename Value="DiscImageUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="22"/>
-        <TopLine Value="74"/>
         <CursorPos X="21" Y="4"/>
         <UsageCount Value="205"/>
         <Loaded Value="True"/>
@@ -132,7 +132,6 @@
       <Unit11>
         <Filename Value="Spark.pas"/>
         <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="15"/>
         <TopLine Value="1488"/>
         <CursorPos X="76" Y="1509"/>
@@ -267,8 +266,8 @@
       <Unit22>
         <Filename Value="DiscImage_ADFS.pas"/>
         <EditorIndex Value="17"/>
-        <TopLine Value="4359"/>
-        <CursorPos X="77" Y="3077"/>
+        <TopLine Value="564"/>
+        <CursorPos X="61" Y="576"/>
         <UsageCount Value="102"/>
         <Loaded Value="True"/>
       </Unit22>
@@ -312,7 +311,7 @@
       <Unit28>
         <Filename Value="DiscImage_CFS.pas"/>
         <EditorIndex Value="16"/>
-        <TopLine Value="521"/>
+        <TopLine Value="518"/>
         <CursorPos X="40" Y="411"/>
         <UsageCount Value="114"/>
         <Loaded Value="True"/>
@@ -326,8 +325,8 @@
       <Unit30>
         <Filename Value="DiscImage_Spark.pas"/>
         <EditorIndex Value="14"/>
-        <TopLine Value="195"/>
-        <CursorPos X="18" Y="172"/>
+        <TopLine Value="78"/>
+        <CursorPos X="2" Y="40"/>
         <UsageCount Value="100"/>
         <Loaded Value="True"/>
       </Unit30>
@@ -341,23 +340,24 @@
       <Unit32>
         <Filename Value="DiscImage_DOSPlus.pas"/>
         <EditorIndex Value="18"/>
-        <TopLine Value="2071"/>
-        <CursorPos X="39" Y="1051"/>
+        <TopLine Value="75"/>
+        <CursorPos X="71" Y="85"/>
         <UsageCount Value="120"/>
         <Loaded Value="True"/>
       </Unit32>
       <Unit33>
         <Filename Value="DiscImage_Private.pas"/>
         <EditorIndex Value="12"/>
-        <CursorPos X="80"/>
+        <TopLine Value="422"/>
+        <CursorPos X="2" Y="429"/>
         <UsageCount Value="119"/>
         <Loaded Value="True"/>
       </Unit33>
       <Unit34>
         <Filename Value="DiscImage_Published.pas"/>
         <EditorIndex Value="13"/>
-        <TopLine Value="1505"/>
-        <CursorPos X="69" Y="865"/>
+        <TopLine Value="148"/>
+        <CursorPos X="38" Y="164"/>
         <UsageCount Value="119"/>
         <Loaded Value="True"/>
       </Unit34>
@@ -370,126 +370,126 @@
         <Loaded Value="True"/>
       </Unit35>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="27">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="1374" Column="17" TopLine="1370"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="251" Column="25" TopLine="236"/>
       </Position1>
       <Position2>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="84" Column="13" TopLine="84"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="94" TopLine="73"/>
       </Position2>
       <Position3>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="792" Column="54" TopLine="784"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="88" TopLine="73"/>
       </Position3>
       <Position4>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="95" Column="13" TopLine="83"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="90" TopLine="73"/>
       </Position4>
       <Position5>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="1377" Column="10" TopLine="1370"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="209" TopLine="195"/>
       </Position5>
       <Position6>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="84" Column="13" TopLine="73"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="211" TopLine="195"/>
       </Position6>
       <Position7>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="792" Column="55" TopLine="766"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="216" TopLine="208"/>
       </Position7>
       <Position8>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="98" Column="13" TopLine="83"/>
+        <Filename Value="DiscImage_Private.pas"/>
+        <Caret Line="430" TopLine="417"/>
       </Position8>
       <Position9>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="1477" Column="5" TopLine="1462"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="216" TopLine="208"/>
       </Position9>
       <Position10>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="84" Column="13" TopLine="84"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="94" TopLine="81"/>
       </Position10>
       <Position11>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="927" Column="56" TopLine="915"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="216" TopLine="203"/>
       </Position11>
       <Position12>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="95" Column="18" TopLine="94"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="224" TopLine="203"/>
       </Position12>
       <Position13>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="1505" Column="13" TopLine="1484"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="244" TopLine="225"/>
       </Position13>
       <Position14>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="84" Column="15" TopLine="67"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="233" TopLine="225"/>
       </Position14>
       <Position15>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="927" Column="56" TopLine="918"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="256" TopLine="247"/>
       </Position15>
       <Position16>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="85" Column="13" TopLine="71"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="246" TopLine="233"/>
       </Position16>
       <Position17>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="943" Column="2" TopLine="923"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="247" TopLine="233"/>
       </Position17>
       <Position18>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="85" Column="13" TopLine="74"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="248" Column="10" TopLine="233"/>
       </Position18>
       <Position19>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="943" Column="2" TopLine="923"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="246" TopLine="233"/>
       </Position19>
       <Position20>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="99" Column="13" TopLine="94"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="247" TopLine="233"/>
       </Position20>
       <Position21>
-        <Filename Value="MainUnit.pas"/>
-        <Caret Line="298" Column="14" TopLine="287"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="248" TopLine="233"/>
       </Position21>
       <Position22>
-        <Filename Value="MainUnit.pas"/>
-        <Caret Line="5922" TopLine="5914"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="256" TopLine="235"/>
       </Position22>
       <Position23>
-        <Filename Value="MainUnit.pas"/>
-        <Caret Line="5926" Column="23" TopLine="5913"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="246" TopLine="235"/>
       </Position23>
       <Position24>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="1493" Column="2" TopLine="1486"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="256" TopLine="235"/>
       </Position24>
       <Position25>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="84" Column="13" TopLine="84"/>
+        <Filename Value="DiscImage.pas"/>
+        <Caret Line="456" Column="12" TopLine="449"/>
       </Position25>
       <Position26>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="807" Column="37" TopLine="800"/>
+        <Filename Value="DiscImage_Published.pas"/>
+        <Caret Line="127" Column="2" TopLine="121"/>
       </Position26>
       <Position27>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="96" Column="13" TopLine="71"/>
+        <Filename Value="DiscImage.pas"/>
+        <Caret Line="457" Column="12" TopLine="443"/>
       </Position27>
       <Position28>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="1503" Column="17" TopLine="1486"/>
+        <Filename Value="DiscImage_Published.pas"/>
+        <Caret Line="164" Column="42" TopLine="148"/>
       </Position28>
       <Position29>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="85" Column="13" TopLine="80"/>
+        <Filename Value="DiscImage_DOSPlus.pas"/>
+        <Caret Line="93" TopLine="84"/>
       </Position29>
       <Position30>
-        <Filename Value="Spark.pas"/>
-        <Caret Line="943" Column="2" TopLine="941"/>
+        <Filename Value="DiscImage.pas"/>
+        <Caret Line="170" Column="12" TopLine="151"/>
       </Position30>
     </JumpHistory>
     <RunParams>
@@ -499,32 +499,4 @@
       </Modes>
     </RunParams>
   </ProjectSession>
-  <Debugging>
-    <Watches>
-      <Item>
-        <Expression Value="CL"/>
-        <DisplayStyle Value="wdfHex"/>
-      </Item>
-      <Item>
-        <Expression Value="EoCL"/>
-        <DisplayStyle Value="wdfHex"/>
-      </Item>
-      <Item>
-        <Expression Value="hdrsize"/>
-        <DisplayStyle Value="wdfHex"/>
-      </Item>
-      <Item>
-        <Expression Value="CLptr"/>
-        <DisplayStyle Value="wdfHex"/>
-      </Item>
-      <Item>
-        <Expression Value="ptr"/>
-        <DisplayStyle Value="wdfHex"/>
-      </Item>
-      <Item>
-        <Expression Value="CLsize"/>
-        <DisplayStyle Value="wdfHex"/>
-      </Item>
-    </Watches>
-  </Debugging>
 </CONFIG>
diff --git a/LazarusSource/DiscImageManager.res b/LazarusSource/DiscImageManager.res
diff --git a/LazarusSource/DiscImageUtils.pas b/LazarusSource/DiscImageUtils.pas
@@ -1,7 +1,7 @@
 unit DiscImageUtils;
 
 {
-DiscImageUtils V1.42 - part of TDiscImage class
+DiscImageUtils V1.43 - part of TDiscImage class
 
 Copyright (C) 2018-2022 Gerald Holdsworth [email protected]