Added version number to title bar

Added new one-click option under tools to remove modifications to the OEM Name and directory entries modified by Windows 9x.
Added Track and Side to the status bar of the hex editor.
Added Track selector to the hex editor.

Author: Digitoxin1

DiskImageTool/ApplicationEvents.vb

@@ -0,0 +1,2 @@
+Namespace My
+End Namespace

DiskImageTool/DiskImage/BootSector.vb

@@ -428,6 +428,18 @@
                 Return Result
             End If
         End Function
+
+        Public Function SectorToTrack(Sector As UInteger) As UShort
+            Return Int(Sector / SectorsPerTrack / NumberOfHeads)
+        End Function
+
+        Public Function SectorToSide(Sector As UInteger) As UShort
+            Return Int(Sector / SectorsPerTrack) Mod NumberOfHeads
+        End Function
+
+        Public Function TrackToSector(Track As UShort, Side As UShort) As UInteger
+            Return Track * NumberOfHeads * SectorsPerTrack + SectorsPerTrack * Side
+        End Function
     End Class
 
 End Namespace

DiskImageTool/DiskImageTool.vbproj

@@ -30,7 +30,7 @@
     <ProductName>DiskImageTool</ProductName>
     <PublisherName>Digitoxin</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.16.0.%2a</ApplicationVersion>
+    <ApplicationVersion>1.17.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -117,6 +117,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ApplicationEvents.vb" />
     <Compile Include="Copy Protection.vb" />
     <Compile Include="DebugScript.vb" />
     <Compile Include="DiskImage\Classes.vb" />

DiskImageTool/Forms/HexViewForm.Designer.vb

@@ -138,6 +138,9 @@
   <metadata name="ToolStripSeparator7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
+  <metadata name="ToolStripStatusGap.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <metadata name="ToolStripMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>291, 17</value>
   </metadata>
@@ -219,9 +222,9 @@
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEFSURBVDhPY6AGYJSXl18tJSUlrKiouJ8YGqQeqhcCQIKk
         YqhWCECy4T8hDFW3H6oVApBNhmEhISE+bOIwDNUKASATQYLINklKSoooKCjchfGRNQP5hF0AlWKWkZER
-        wiMPASATQYIw20AYLBG7MwvI9gbiPyAxmGYgm0gXxC77zRC72wUYbRxY5WEAZCJWBbG7/gPxO6AhauLi
+        wiMPASATQYIw20AYLBG7MwvI9gbiPyAxmGYgm0gXxC74zRC72wUYbRxY5WEAZCJWBbG7/gPxO6AhauLi
         4twwORJcADbgP0PUjpsMUVsEkWMGLA8DQBNXSkhIiMJcArcBZgAIR+/czWA8kxXoHQGQerA8QYAw4CMQ
-        vwTiPqgMkQCiMRUYG6egIiSC+B0aYDp253aGuO3aYDZZIGZnBEPcznQoDwkwMAAABTSAjXBt2k0AAAAA
+        vwTiPqgMkQCiMRUYG6egIiSC+B0aYDp253aGuO3aYDZZIGZnBEPcznQoDwkwMAAA+a+AhxsmwDYAAAAA
         SUVORK5CYII=
 </value>
   </data>
@@ -230,9 +233,9 @@
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADdSURBVDhPYxh8QEZGRhpEKyoq/kfmEwVUVFSA6mVeKikp
         mQAN6ATRID5IHKqEMFBWVjYGauIEsUE0iA+WIAaAnA3EHVAuA0PELikgfyLMO0QBqLPBLmCI3XWWIWYn
-        N5hNDEAOA7BA7K7/DLE71zAw/GcE84kBQAMQoQ42AIhjdtVDRUgEMANiV/5jiN4VCRUlAcANAGL/9d8Z
+        N5hNDEAOA7BA7K7/DLE71zAw/GcE84kBQAMQoQ42AIhjdtVDRUgEMANiF/9jiN4VCRUlAcANAGL/9d8Z
         4naYQWWIBCCN0TvvAL1wHogzgfxYqAyRIHbXTIaQY5wMUduvMaRt4oKKkgFid3UCcRSURwaI3qPFELs7
-        F8qjJmBgAACgSkbAeFn9TQAAAABJRU5ErkJggg==
+        F8qjJmBgAACWika68VUiuAAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -338,4 +341,7 @@
   <metadata name="HexBox1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="StatusStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>419, 17</value>
+  </metadata>
 </root>

DiskImageTool/Forms/HexViewForm.resx

@@ -18,6 +18,7 @@ Public Class HexViewForm
     Private _IgnoreEvent As Boolean = False
     Private WithEvents NumericSector As ToolStripNumericUpDown
     Private WithEvents NumericCluster As ToolStripNumericUpDown
+    Private WithEvents ComboTrack As ToolStripComboBox
 
     Public Sub New(HexViewSectorData As HexViewSectorData, Caption As String, SectorNavigator As Boolean, ClusterNavigator As Boolean)
         ' This call is required by the designer.
@@ -42,12 +43,16 @@ Public Class HexViewForm
         CmbGroups.Visible = Not SectorNavigator And Not ClusterNavigator
 
         If ClusterNavigator Then
-            InitializeClusterNavigator()
+            InitializeTrackNavigator()
         End If
 
         If SectorNavigator Then
             InitializeSectorNavigator()
         End If
+
+        If ClusterNavigator Then
+            InitializeClusterNavigator()
+        End If
     End Sub
 
     Private Sub InitializeSectorNavigator()
@@ -56,7 +61,8 @@ Public Class HexViewForm
         }
 
         Dim LabelSector = New ToolStripLabel("Sector") With {
-            .Alignment = ToolStripItemAlignment.Right
+            .Alignment = ToolStripItemAlignment.Right,
+            .Padding = New Padding(12, 0, 0, 0)
         }
 
         ToolStripMain.Items.Add(NumericSector)
@@ -77,6 +83,24 @@ Public Class HexViewForm
         ToolStripMain.Items.Add(LabelCluster)
     End Sub
 
+    Private Sub InitializeTrackNavigator()
+        ComboTrack = New ToolStripComboBox() With {
+            .Alignment = ToolStripItemAlignment.Right,
+            .DropDownStyle = ComboBoxStyle.DropDownList,
+            .AutoSize = False,
+            .FlatStyle = FlatStyle.Popup,
+            .Size = New Drawing.Size(50, 23)
+        }
+
+        Dim LabelTrack = New ToolStripLabel("Track") With {
+            .Alignment = ToolStripItemAlignment.Right,
+            .Padding = New Padding(12, 0, 0, 0)
+        }
+
+        ToolStripMain.Items.Add(ComboTrack)
+        ToolStripMain.Items.Add(LabelTrack)
+    End Sub
+
     Public ReadOnly Property Modified As Boolean
         Get
             Return _Modified
@@ -289,6 +313,24 @@ Public Class HexViewForm
         End If
     End Sub
 
+    Private Sub JumpToTrack(TrackValue As String)
+        Dim TrackSet = TrackValue.Split(".")
+        Dim Track As UShort = TrackSet(0)
+        Dim Side As UShort = TrackSet(1)
+
+        Dim SectorStart = _CurrentHexViewData.SectorBlock.SectorStart
+        Dim SectorEnd = SectorStart + _CurrentHexViewData.SectorBlock.SectorCount - 1
+        Dim TrackStart = _HexViewSectorData.Disk.BootSector.SectorToTrack(SectorStart)
+        Dim TrackEnd = _HexViewSectorData.Disk.BootSector.SectorToTrack(SectorEnd)
+        Dim Sector = _HexViewSectorData.Disk.BootSector.TrackToSector(Track, Side)
+
+        If Track >= TrackStart And Track <= TrackEnd Then
+            Dim Offset = SectorToBytes(Sector) - HexBox1.LineInfoOffset
+            Dim Line = Offset \ HexBox1.BytesPerLine
+            HexBox1.PerformScrollToLine(Line)
+        End If
+    End Sub
+
     Private Sub PasteHex()
         Dim HexBytes = ConvertHexToBytes(Clipboard.GetText)
         Dim Offset = HexBox1.SelectionStart
@@ -467,6 +509,8 @@ Public Class HexViewForm
             ToolStripStatusLength.Visible = False
             ToolStripStatusSector.Visible = False
             ToolStripStatusCluster.Visible = False
+            ToolStripStatusTrack.Visible = False
+            ToolStripStatusSide.Visible = False
             ToolStripStatusFile.Visible = False
             ToolStripStatusDescription.Visible = False
             BtnSelectSector.Text = "Select &Sector"
@@ -520,6 +564,20 @@ Public Class HexViewForm
                     End If
                 End If
 
+                If Disk.IsValidImage Then
+                    ToolStripStatusTrack.Visible = Not OutOfRange
+                    ToolStripStatusTrack.Text = "Track: " & Disk.BootSector.SectorToTrack(Sector)
+
+                    ToolStripStatusSide.Visible = Not OutOfRange
+                    ToolStripStatusSide.Text = "Side: " & Disk.BootSector.SectorToSide(Sector)
+                Else
+                    ToolStripStatusTrack.Visible = False
+                    ToolStripStatusTrack.Text = ""
+
+                    ToolStripStatusSide.Visible = False
+                    ToolStripStatusSide.Text = ""
+                End If
+
                 If FileName.Length = 0 Then
                     ToolStripStatusFile.Visible = False
                     ToolStripStatusFile.Text = ""
@@ -605,6 +663,8 @@ Public Class HexViewForm
         Dim SectorStart As UInteger = 0
         Dim SectorEnd As UInteger = 0
 
+        _IgnoreEvent = True
+
         If _CurrentHexViewData.SectorBlock.Size > 0 Then
             If _SectorNavigator Or _ClusterNavigator Then
                 SectorStart = _CurrentHexViewData.SectorBlock.SectorStart
@@ -621,8 +681,21 @@ Public Class HexViewForm
                 NumericCluster.Minimum = _HexViewSectorData.Disk.BootSector.SectorToCluster(SectorStart)
                 NumericCluster.Maximum = _HexViewSectorData.Disk.BootSector.SectorToCluster(SectorEnd)
                 NumericCluster.Enabled = True
+
+                ComboTrack.Items.Clear()
+                Dim TrackStart = _HexViewSectorData.Disk.BootSector.SectorToTrack(SectorStart)
+                Dim TrackEnd = _HexViewSectorData.Disk.BootSector.SectorToTrack(SectorEnd)
+                For i = TrackStart To TrackEnd
+                    For j = 0 To _HexViewSectorData.Disk.BootSector.NumberOfHeads - 1
+                        ComboTrack.Items.Add(i & "." & j)
+                    Next
+                Next
+                ComboTrack.SelectedIndex = 0
+                ComboTrack.Enabled = True
             End If
         End If
+
+        _IgnoreEvent = False
     End Sub
 
     Private Sub RefresSelectorValues()
@@ -647,6 +720,13 @@ Public Class HexViewForm
             If Cluster <> NumericCluster.Value Then
                 NumericCluster.Value = Cluster
             End If
+
+            Dim Track = _CurrentHexViewData.Disk.BootSector.SectorToTrack(Sector)
+            Dim Side = _CurrentHexViewData.Disk.BootSector.SectorToSide(Sector)
+            Dim Value = Track.ToString & "." & Side.ToString
+            If Value <> ComboTrack.Text Then
+                ComboTrack.Text = Value
+            End If
         End If
 
         _IgnoreEvent = False
@@ -810,11 +890,21 @@ Public Class HexViewForm
     End Sub
 
     Private Sub NumericSector_KeyDown(sender As Object, e As KeyEventArgs) Handles NumericSector.KeyDown, NumericCluster.KeyDown
-        Debug.Print(e.KeyCode)
         If e.KeyCode = Keys.Return Then
             e.SuppressKeyPress = True
         End If
     End Sub
+
+    Private Sub ComboTrack_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboTrack.SelectedIndexChanged
+        If _IgnoreEvent Then
+            Exit Sub
+        End If
+
+        If _ClusterNavigator Then
+            JumpToTrack(ComboTrack.Text)
+        End If
+    End Sub
+
 #End Region
 
     Private Class HexChange