Updates to the FAT editor

Bug fixes in the Boot Sector editor

Author: Digitoxin1

DiskImageTool/DiskImageTool.vbproj

@@ -30,7 +30,7 @@
     <ProductName>DiskImageTool</ProductName>
     <PublisherName>Digitoxin</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.28.0.%2a</ApplicationVersion>
+    <ApplicationVersion>1.29.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

DiskImageTool/Forms/AboutBox.vb

@@ -14,7 +14,7 @@
         ' TODO: Customize the application's assembly information in the "Application" pane of the project 
         '    properties dialog (under the "Project" menu).
         Me.LabelProductName.Text = My.Application.Info.ProductName
-        Me.LabelVersion.Text = String.Format("Version {0}", FileVersionInfo.GetVersionInfo(Application.ExecutablePath).FileVersion)
+        Me.LabelVersion.Text = String.Format("Version {0}", GetVersionString)
         Me.LabelURL.Text = MainForm.SITE_URL
         Me.TextBoxDescription.Text = GetResource("License.txt")
     End Sub

DiskImageTool/Forms/BootSectorForm.vb

@@ -317,9 +317,6 @@ Public Class BootSectorForm
         SetValue(TxtSectorsPerFAT, BootSector.SectorsPerFAT)
         SetValue(TxtSectorsPerTrack, BootSector.SectorsPerTrack, {"8", "9", "15", "18", "21", "36"})
         SetValue(TxtNumberOfHeads, BootSector.NumberOfHeads, {"1", "2"})
-        SetValue(TxtHiddenSectors, BootSector.HiddenSectors)
-        SetValue(HexJumpInstruction, BootSector.JmpBoot, Not BootSector.HasValidJumpInstruction(True))
-        SetValue(HexBootSectorSignature, BootSector.BootStrapSignature.ToString("X4"), {BootSector.ValidBootStrapSignature.ToString("X4")})
     End Sub
 
     Private Sub PopulateExtended(BootSector As BootSector)
@@ -393,6 +390,11 @@ Public Class BootSectorForm
         PopulateBytesPerSector()
         PopulateSectorsPerCluster()
         PopulateBootRecord(_Disk.BootSector)
+
+        SetValue(TxtHiddenSectors, _Disk.BootSector.HiddenSectors)
+        SetValue(HexJumpInstruction, _Disk.BootSector.JmpBoot, Not _Disk.BootSector.HasValidJumpInstruction(True))
+        SetValue(HexBootSectorSignature, _Disk.BootSector.BootStrapSignature.ToString("X4"), {BootSector.ValidBootStrapSignature.ToString("X4")})
+
         PopulateAdditionalData(_Disk.BootSector)
 
         If _HasExtended Then

DiskImageTool/Forms/FATEditForm.vb

@@ -20,7 +20,7 @@ Public Class FATEditForm
     '    Color.Magenta
     '}
 
-    Public Sub New(Disk As DiskImage.Disk, Index As UShort)
+    Public Sub New(Disk As DiskImage.Disk, Index As UShort, DisplaySync As Boolean)
 
         ' This call is required by the designer.
         InitializeComponent()
@@ -29,10 +29,14 @@ Public Class FATEditForm
 
         Me.Text = "File Allocation Table " & Index + 1
         ChkSync.Checked = True
+        ChkSync.Visible = DisplaySync
+        If Not DisplaySync Then
+            DataGridViewFAT.Height = ChkSync.Bottom - DataGridViewFAT.Top
+        End If
         SetButtonStatus(False)
 
         PopulateContextMenu()
-        InitializeGridColumns
+        InitializeGridColumns()
 
         _ToolTip = New ToolTip()
         _Disk = Disk

DiskImageTool/Functions.vb

@@ -73,6 +73,11 @@ Module Functions
         Return NewTable
     End Function
 
+    Public Function GetVersionString() As String
+        Dim Version = FileVersionInfo.GetVersionInfo(Application.ExecutablePath)
+        Return Version.FileMajorPart & "." & Version.FileMinorPart & "." & Version.FilePrivatePart
+    End Function
+
     Public Function HexStringToBytes(ByVal HexString As String) As Byte()
         Dim b(HexString.Length / 2 - 1) As Byte
 

DiskImageTool/MainForm.vb

@@ -477,7 +477,7 @@ Public Class MainForm
         End Try
         Cursor.Current = Cursors.Default
         If DownloadVersion <> "" And DownloadURL <> "" Then
-            Dim CurrentVersion = FileVersionInfo.GetVersionInfo(Application.ExecutablePath).FileVersion
+            Dim CurrentVersion = GetVersionString()
             UpdateAvailable = Version.Parse(DownloadVersion) > Version.Parse(CurrentVersion)
         End If
 
@@ -1080,8 +1080,8 @@ Public Class MainForm
         End If
     End Sub
 
-    Private Sub FATEdit(Index As UShort)
-        Dim frmFATEdit As New FATEditForm(_Disk, Index)
+    Private Sub FATEdit(Index As UShort, DisplaySync As Boolean)
+        Dim frmFATEdit As New FATEditForm(_Disk, Index, DisplaySync)
 
         frmFATEdit.ShowDialog()
 
@@ -1906,16 +1906,21 @@ Public Class MainForm
             RemoveHandler Item.Click, AddressOf BtnEditFAT_Click
         Next
         BtnEditFAT.DropDownItems.Clear()
+        BtnEditFAT.Tag = Nothing
 
         If _Disk IsNot Nothing AndAlso _Disk.IsValidImage Then
-            For Counter = 0 To _Disk.BootSector.NumberOfFATs - 1
-                Dim Item As New ToolStripMenuItem With {
-                   .Text = "FAT &" & Counter + 1,
-                   .Tag = Counter
-                }
-                BtnEditFAT.DropDownItems.Add(Item)
-                AddHandler Item.Click, AddressOf BtnEditFAT_Click
-            Next
+            If _Disk.BootSector.NumberOfFATs = 1 OrElse _Disk.FAT.CompareTables Then
+                BtnEditFAT.Tag = -1
+            Else
+                For Counter = 0 To _Disk.BootSector.NumberOfFATs - 1
+                    Dim Item As New ToolStripMenuItem With {
+                       .Text = "FAT &" & Counter + 1,
+                       .Tag = Counter
+                    }
+                    BtnEditFAT.DropDownItems.Add(Item)
+                    AddHandler Item.Click, AddressOf BtnEditFAT_Click
+                Next
+            End If
         End If
     End Sub
 
@@ -2959,7 +2964,11 @@ Public Class MainForm
 
     Private Sub BtnEditFAT_Click(sender As Object, e As EventArgs) Handles BtnEditFAT.Click
         If sender.tag IsNot Nothing Then
-            FATEdit(sender.tag)
+            If sender.tag = -1 Then
+                FATEdit(0, False)
+            Else
+                FATEdit(sender.tag, True)
+            End If
         End If
     End Sub
 
@@ -3298,7 +3307,7 @@ Public Class MainForm
     End Sub
 
     Private Sub MainForm_Load(sender As Object, e As EventArgs) Handles Me.Load
-        _FileVersion = FileVersionInfo.GetVersionInfo(Application.ExecutablePath).FileVersion
+        _FileVersion = GetVersionString()
         Me.Text = GetWindowCaption()
 
         ParseCustomFilters()

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("1.28.0.0")>
+<Assembly: AssemblyFileVersion("1.29.0.0")>