Merge branch 'geraldholdsworth:main' into feature/remove-console-mode

Author: philpem

Documentation/Changes.txt

@@ -1071,15 +1071,19 @@ Bug fixes
 * Sometimes, the '.inf' was not appended to the end of extracted file's information files, which then overwrote the original file.
 * A bug had been introduced where the directory icon for the root of a DFS disc was not getting displayed correctly.
 
-1.49.1
+1.49.3
 ---------------------
 New or improved features
 * Tightened up the hex number detection when parsing *.inf files.
 * Added a preferences option not to use RISC OS styling of the windows and controls, and to use the native OS styling instead.
 * Tightened up the error handling routines when opening data files.
+* Incorporated version 2.9.0 of DSKImage from Damien Guard.
 
 Bug fixes
 * In 1.49 the reading of a string from a data file was changed which caused spurious characters to be suffixed to filenames in some images. This was reverted, but may now have broken something else.
+* Zero length files in UEF images could cause the application to hang.
+* When writing to multi-zone ADFS images, the free space map zone checksums were not getting updated correctly.
+* Extracting files to the local system sometimes resulted in double extensions and extra spurious spaces.
 
 Platform History
 ----------------

LazarusSource/CLICommands.pas

@@ -70,24 +70,26 @@ function CompareValues(Value1, Value2: string): integer;
 function TryStrToFileBytes(const S: ansistring; out Value: integer): boolean;
 var
   Parts: array of string;
+  NumValue: integer;
 begin
   Result := False;
   Parts := S.Split(' ');
   if High(Parts) = 1 then
   begin
+    if not TryStrToInt(Parts[0], NumValue) then exit;
     if Parts[1] = 'bytes' then
     begin
-      Value := StrToInt(Parts[0]);
+      Value := NumValue;
       Result := True;
     end;
     if Parts[1] = 'KB' then
     begin
-      Value := StrToInt(Parts[0]) * 1024;
+      Value := NumValue * 1024;
       Result := True;
     end;
     if Parts[1] = 'MB' then
     begin
-      Value := StrToInt(Parts[0]) * 1024 * 1024;
+      Value := NumValue * 1024 * 1024;
       Result := True;
     end;
   end;

LazarusSource/Comparers.pas

@@ -1,25 +1,25 @@
-unit DSKFormat;
-
-{
-Copyright (c) 2002-2025 Damien Guard.  
-
-Originally from Disk Image Manager https://github.com/damieng/diskimagemanager
-Relicensed for this project under GNU GPL with permission.
-
-This source is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public Licence as published by the Free
-Software Foundation; either version 3 of the Licence, or (at your option)
-any later version.
-
-This code is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for more
-details.
-
-A copy of the GNU General Public Licence is available on the World Wide Web
-at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
-to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-Boston, MA 02110-1335, USA.
+unit DSKFormat;
+
+{
+Copyright (c) 2002-2025 Damien Guard.  
+
+Originally from Disk Image Manager https://github.com/damieng/diskimagemanager
+Relicensed for this project under GNU GPL with permission.
+
+This source is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public Licence as published by the Free
+Software Foundation; either version 3 of the Licence, or (at your option)
+any later version.
+
+This code is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for more
+details.
+
+A copy of the GNU General Public Licence is available on the World Wide Web
+at <http://www.gnu.org/copyleft/gpl.html>. You can also obtain it by writing
+to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1335, USA.
 }
 
 interface