Fixed bug when saving a new disk image with an image type other than a basic sector Image

Author: Digitoxin1

DiskImageTool/DiskImageTool.vbproj

@@ -30,7 +30,7 @@
     <TargetCulture>en-US</TargetCulture>
     <ProductName>DiskImageTool</ProductName>
     <PublisherName>Digitoxin</PublisherName>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>2.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -272,6 +272,7 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="CopyProtection.vb" />
+    <Compile Include="LoadedFiles.vb" />
     <Compile Include="SummaryPanel.vb" />
     <Compile Include="Testing\DebugScript.vb" />
     <Compile Include="DiskImage\SectorData.vb" />

DiskImageTool/FloppyDiskIO.vb

@@ -55,15 +55,23 @@ Module FloppyDiskIO
                                   End Sub
 
         If Dialog.ShowDialog = DialogResult.OK Then
+            Dim Success As Boolean
             Try
-                IO.File.WriteAllBytes(Dialog.FileName, Buffer)
+                Dim FloppyImage = New BasicSectorImage(Buffer)
+                Dim Disk = New DiskImage.Disk(FloppyImage, 0)
+                Dim Response = SaveDiskImageToFile(Disk, Dialog.FileName)
+                Success = (Response = SaveImageResponse.Success)
             Catch ex As Exception
                 DebugException(ex)
-                MsgBox("An error has occurred while attempting to save the file.", MsgBoxStyle.Exclamation)
-                Return ""
+                Success = False
             End Try
 
-            Return Dialog.FileName
+            If Success Then
+                Return Dialog.FileName
+            Else
+                MsgBox("An error has occurred while attempting to save the file.", MsgBoxStyle.Exclamation)
+                Return ""
+            End If
         Else
             Return ""
         End If

DiskImageTool/Forms/ImageLoadForm.vb

@@ -7,7 +7,7 @@ Public Class ImageLoadForm
     Private Const MIN_FILE_SIZE As Long = 163840
     Private Const MAX_FILE_SIZE As Long = 3000000
     Private ReadOnly _Files() As String
-    Private ReadOnly _LoadedFileNames As Dictionary(Of String, ImageData)
+    Private ReadOnly _LoadedFiles As LoadedFiles
     Private ReadOnly _Parent As MainForm
     Private _Activated As Boolean = False
     Private _Counter As Integer = 0
@@ -16,15 +16,15 @@ Public Class ImageLoadForm
     Private _SelectedImageData As ImageData = Nothing
     Private _Visible As Boolean = False
 
-    Public Sub New(Parent As MainForm, Files() As String, LoadedFileNames As Dictionary(Of String, ImageData))
+    Public Sub New(Parent As MainForm, Files() As String, LoadedFiles As LoadedFiles)
 
         ' This call is required by the designer.
         InitializeComponent()
 
         ' Add any initialization after the InitializeComponent() call.
         _Parent = Parent
         _Files = Files
-        _LoadedFileNames = LoadedFileNames
+        _LoadedFiles = LoadedFiles
     End Sub
 
     Public ReadOnly Property SelectedImageData As ImageData
@@ -53,19 +53,17 @@ Public Class ImageLoadForm
     End Function
 
     Private Sub LoadedFileAdd(bw As BackgroundWorker, Key As String, FileName As String, Compressed As Boolean, Optional CompressedFile As String = "")
-
-        If Not _LoadedFileNames.ContainsKey(Key) Then
-            Dim ImageData = New ImageData(FileName)
-            If Compressed Then
-                ImageData.Compressed = True
-                ImageData.CompressedFile = CompressedFile
-            End If
-
-            _LoadedFileNames.Add(Key, ImageData)
+        Dim ImageData = _LoadedFiles.Add(Key, FileName, Compressed, CompressedFile)
+        If ImageData IsNot Nothing Then
             If _SelectedImageData Is Nothing Then
                 _SelectedImageData = ImageData
             End If
-            bw.ReportProgress(2, ImageData)
+
+            If bw Is Nothing Then
+                _Parent.ComboImages.Items.Add(ImageData)
+            Else
+                bw.ReportProgress(2, ImageData)
+            End If
         End If
     End Sub
 
@@ -111,34 +109,34 @@ Public Class ImageLoadForm
         End If
     End Sub
 
-    Private Function ProcessScan(bw As BackgroundWorker) As Boolean
+    Public Function ProcessScan(bw As BackgroundWorker) As Boolean
         If _Files.Count = 0 Then
             Return True
         End If
 
         For Each FilePath In _Files.OrderBy(Function(f) f)
-            If bw.CancellationPending Then
+            If bw IsNot Nothing AndAlso bw.CancellationPending Then
                 Return True
             End If
             Dim FAttributes = IO.File.GetAttributes(FilePath)
             If (FAttributes And IO.FileAttributes.Directory) > 0 Then
                 Dim DirectoryInfo As New IO.DirectoryInfo(FilePath)
                 Dim Files = DirectoryInfo.GetFiles("*.*", IO.SearchOption.AllDirectories)
                 For Each FileInfo In Files
-                    If bw.CancellationPending Then
+                    If bw IsNot Nothing AndAlso bw.CancellationPending Then
                         Return True
                     End If
                     Dim Extension = FileInfo.Extension.ToLower
                     If AllFileExtensions.Contains(Extension) OrElse ArchiveFileExtensions.Contains(Extension) Then
                         ProcessFile(bw, FileInfo.FullName, Extension)
                     End If
-                    bw.ReportProgress(1)
+                    bw?.ReportProgress(1)
                 Next
             Else
                 Dim Extension = Path.GetExtension(FilePath).ToLower
                 ProcessFile(bw, FilePath, Extension)
             End If
-            bw.ReportProgress(1)
+            bw?.ReportProgress(1)
         Next
 
         Return True

DiskImageTool/ImageFormats/ImageConversion.vb

@@ -611,17 +611,17 @@ Namespace ImageFormats
                 Case FloppyDiskFormat.Floppy1200
                     DriveSpeed.SetValue(360, 500)
                 Case FloppyDiskFormat.Floppy1440
-                    DriveSpeed.SetValue(360, 500)
+                    DriveSpeed.SetValue(300, 500)
                 Case FloppyDiskFormat.Floppy2880
                     DriveSpeed.SetValue(300, 1000)
                 Case FloppyDiskFormat.FloppyDMF1024
-                    DriveSpeed.SetValue(360, 500)
+                    DriveSpeed.SetValue(300, 500)
                 Case FloppyDiskFormat.FloppyDMF2048
-                    DriveSpeed.SetValue(360, 500)
+                    DriveSpeed.SetValue(300, 500)
                 Case FloppyDiskFormat.FloppyXDF525
                     DriveSpeed.SetValue(360, 500)
                 Case FloppyDiskFormat.FloppyXDF35
-                    DriveSpeed.SetValue(360, 500)
+                    DriveSpeed.SetValue(300, 500)
                 Case Else
                     DriveSpeed.SetValue(300, 250)
             End Select

DiskImageTool/LoadedFiles.vb

@@ -0,0 +1,29 @@
+Public Class LoadedFiles
+    Private ReadOnly _FileNames As Dictionary(Of String, ImageData)
+
+    Public Sub New()
+        _FileNames = New Dictionary(Of String, ImageData)
+    End Sub
+
+    Public ReadOnly Property FileNames As Dictionary(Of String, ImageData)
+        Get
+            Return _FileNames
+        End Get
+    End Property
+
+    Public Function Add(Key As String, FileName As String, Compressed As Boolean, Optional CompressedFile As String = "") As ImageData
+        If Not _FileNames.ContainsKey(Key) Then
+            Dim ImageData = New ImageData(FileName)
+            If Compressed Then
+                ImageData.Compressed = True
+                ImageData.CompressedFile = CompressedFile
+            End If
+
+            _FileNames.Add(Key, ImageData)
+
+            Return ImageData
+        End If
+
+        Return Nothing
+    End Function
+End Class

DiskImageTool/MainForm.vb

@@ -36,12 +36,12 @@ Public Class MainForm
     Private _DriveAEnabled As Boolean = False
     Private _DriveBEnabled As Boolean = False
     Private _ExportUnknownImages As Boolean = False
-    Private _FileNames As Dictionary(Of String, ImageData)
     Private _FileVersion As String = ""
     Private _ListViewCheckAll As Boolean = False
     Private _ListViewClickedGroup As ListViewGroup = Nothing
     Private _ListViewHeader As ListViewHeader
     Private _ListViewWidths() As Integer
+    Private _LoadedFiles As LoadedFiles
     Private _ScanRun As Boolean = False
     Private _SubFilterDiskType As ComboFilter
     Private _SubFilterOEMName As ComboFilter
@@ -1271,7 +1271,7 @@ Public Class MainForm
 
     Private Sub FileClose(ImageData As ImageData)
         ItemFiltersRemove(ImageData)
-        _FileNames.Remove(ImageData.DisplayPath)
+        _LoadedFiles.FileNames.Remove(ImageData.DisplayPath)
 
         Dim ActiveComboBox As ComboBox = IIf(ImageFilters.FiltersApplied, ComboImagesFiltered, ComboImages)
 
@@ -1381,7 +1381,7 @@ Public Class MainForm
             Exit Sub
         End If
 
-        ProcessFileDrop(Dialog.FileNames)
+        ProcessFileDrop(Dialog.FileNames, True)
     End Sub
 
     Private Sub FiltersApply(ResetSubFilters As Boolean)
@@ -1643,7 +1643,7 @@ Public Class MainForm
         }
 
         AddHandler Dialog.FileOk, Sub(sender As Object, e As CancelEventArgs)
-                                      If Dialog.FileName <> FilePath AndAlso _FileNames.ContainsKey(Dialog.FileName) Then
+                                      If Dialog.FileName <> FilePath AndAlso _LoadedFiles.FileNames.ContainsKey(Dialog.FileName) Then
                                           Dim Msg As String = IO.Path.GetFileName(Dialog.FileName) &
                                             $"{vbCrLf}This file is currently open in {Application.ProductName}." &
                                             $"Try again with a different file name."
@@ -2257,7 +2257,7 @@ Public Class MainForm
         Dim DiskFormat = frmImageCreationForm.DiskFormat
 
         If Data IsNot Nothing Then
-            Dim FileName = FloppyDiskSaveFile(Data, DiskFormat, _FileNames)
+            Dim FileName = FloppyDiskSaveFile(Data, DiskFormat, _LoadedFiles.FileNames)
             If FileName.Length > 0 Then
                 ProcessFileDrop(FileName)
             End If
@@ -2934,10 +2934,10 @@ Public Class MainForm
         Dim Files(0) As String
         Files(0) = File
 
-        ProcessFileDrop(Files)
+        ProcessFileDrop(Files, False)
     End Sub
 
-    Private Sub ProcessFileDrop(Files() As String)
+    Private Sub ProcessFileDrop(Files() As String, ShowDialog As Boolean)
         Cursor.Current = Cursors.WaitCursor
         Dim T = Stopwatch.StartNew
 
@@ -2951,12 +2951,18 @@ Public Class MainForm
 
         ImageData.StringOffset = 0
 
-        Dim ImageLoadForm As New ImageLoadForm(Me, Files, _FileNames)
-        ImageLoadForm.ShowDialog(Me)
+        Dim ImageLoadForm As New ImageLoadForm(Me, Files, _LoadedFiles)
+        If ShowDialog Then
+            ImageLoadForm.ShowDialog(Me)
+        Else
+            ImageLoadForm.ProcessScan(Nothing)
+        End If
 
         ImageData.StringOffset = GetPathOffset()
 
         If ImageLoadForm.SelectedImageData IsNot Nothing Then
+            LabelDropMessage.Visible = False
+
             RefreshSubFilterEnabled(ComboImages)
             ComboImagesRefreshItemText()
             ImageCountUpdate()
@@ -3353,7 +3359,7 @@ Public Class MainForm
         Me.Text = GetWindowCaption()
         ImageFilters.FiltersApplied = False
         _ListViewCheckAll = False
-        _FileNames.Clear()
+        _LoadedFiles.FileNames.Clear()
         _ScanRun = False
 
         MenuOptionsCreateBackup.Checked = My.Settings.CreateBackups
@@ -3589,18 +3595,18 @@ Public Class MainForm
 
     Private Sub SetNewFilePath(ImageData As ImageData, NewFilePath As String)
         If ImageData.SourceFile <> NewFilePath Then
-            _FileNames.Remove(ImageData.DisplayPath)
+            _LoadedFiles.FileNames.Remove(ImageData.DisplayPath)
 
             ImageData.SourceFile = NewFilePath
             ImageData.Compressed = False
             ImageData.CompressedFile = ""
             ImageData.ReadOnly = IsFileReadOnly(NewFilePath)
 
-            If _FileNames.ContainsKey(ImageData.DisplayPath) Then
-                FileClose(_FileNames.Item(ImageData.DisplayPath))
+            If _LoadedFiles.FileNames.ContainsKey(ImageData.DisplayPath) Then
+                FileClose(_LoadedFiles.FileNames.Item(ImageData.DisplayPath))
             End If
 
-            _FileNames.Add(ImageData.DisplayPath, ImageData)
+            _LoadedFiles.FileNames.Add(ImageData.DisplayPath, ImageData)
 
             ComboImagesRefreshPaths()
         End If
@@ -3911,14 +3917,14 @@ Public Class MainForm
     End Sub
 
     Private Sub BtnReadFloppyA_Click(sender As Object, e As EventArgs) Handles MenuDiskReadFloppyA.Click
-        Dim FileName = FloppyDiskRead(Me, FloppyDriveEnum.FloppyDriveA, _FileNames)
+        Dim FileName = FloppyDiskRead(Me, FloppyDriveEnum.FloppyDriveA, _LoadedFiles.FileNames)
         If FileName.Length > 0 Then
             ProcessFileDrop(FileName)
         End If
     End Sub
 
     Private Sub BtnReadFloppyB_Click(sender As Object, e As EventArgs) Handles MenuDiskReadFloppyB.Click
-        Dim FileName = FloppyDiskRead(Me, FloppyDriveEnum.FloppyDriveB, _FileNames)
+        Dim FileName = FloppyDiskRead(Me, FloppyDriveEnum.FloppyDriveB, _LoadedFiles.FileNames)
         If FileName.Length > 0 Then
             ProcessFileDrop(FileName)
         End If
@@ -4133,7 +4139,7 @@ Public Class MainForm
 
     Private Sub File_DragDrop(sender As Object, e As DragEventArgs) Handles ComboImages.DragDrop, ComboImagesFiltered.DragDrop, LabelDropMessage.DragDrop, ListViewFiles.DragDrop, ListViewHashes.DragDrop, ListViewSummary.DragDrop
         Dim Files As String() = e.Data.GetData(DataFormats.FileDrop)
-        ProcessFileDrop(Files)
+        ProcessFileDrop(Files, True)
     End Sub
 
     Private Sub File_DragEnter(sender As Object, e As DragEventArgs) Handles ComboImages.DragEnter, ComboImagesFiltered.DragEnter, LabelDropMessage.DragEnter, ListViewFiles.DragEnter, ListViewHashes.DragEnter, ListViewSummary.DragEnter
@@ -4286,7 +4292,7 @@ Public Class MainForm
         ListViewSummary.AutoResizeColumnsContstrained(ColumnHeaderAutoResizeStyle.None)
         ImageFilters = New Filters.ImageFilters(ContextMenuFilters)
         SubFiltersInitialize()
-        _FileNames = New Dictionary(Of String, ImageData)
+        _LoadedFiles = New LoadedFiles
         _BootStrapDB = New BootstrapDB
         _TitleDB = New FloppyDB
         Debounce = New Timer With {
@@ -4312,7 +4318,7 @@ Public Class MainForm
         Dim Args = Environment.GetCommandLineArgs.Skip(1).ToArray
 
         If Args.Length > 0 Then
-            ProcessFileDrop(Args)
+            ProcessFileDrop(Args, True)
         End If
 
         If My.Settings.CheckUpdateOnStartup Then

DiskImageTool/My Project/AssemblyInfo.vb

@@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")>
 
 <Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("2.9.0.0")>
+<Assembly: AssemblyFileVersion("2.9.0.1")>