Updates to Filters

Updates to boot sector hex editor

Author: Digitoxin1

DiskImageTool/DiskImage/BootSector.vb

@@ -146,8 +146,38 @@
             End Set
         End Property
 
-        Public Shared Function CheckJumpInstruction(Value() As Byte, CheckNOP As Boolean) As Boolean
-            Return (Value(0) = &HEB And (Not CheckNOP Or Value(2) = &H90)) Or Value(0) = &HE9
+        Public Function CheckJumpInstruction(CheckNOP As Boolean) As Boolean
+            Return CheckJumpInstruction(JmpBoot, CheckNOP)
+        End Function
+
+        Public Function CheckJumpInstruction(CheckNOP As Boolean, CheckDestination As Boolean) As Boolean
+            Return CheckJumpInstruction(JmpBoot, CheckNOP, CheckDestination)
+        End Function
+
+        Public Shared Function CheckJumpInstruction(Jmp() As Byte, CheckNOP As Boolean) As Boolean
+            Return CheckJumpInstruction(Jmp, CheckNOP, False)
+        End Function
+
+        Public Shared Function CheckJumpInstruction(Jmp() As Byte, CheckNOP As Boolean, CheckDestination As Boolean) As Boolean
+            Dim Result As Boolean = False
+
+            If Jmp(0) = &HEB And (Not CheckNOP Or Jmp(2) = &H90) Then
+                If CheckDestination Then
+                    Dim Offset As UShort = Jmp(1) + 2
+                    Result = (Offset < BootSectorOffsets.BootStrapSignature)
+                Else
+                    Result = True
+                End If
+            ElseIf Jmp(0) = &HE9 Then
+                If CheckDestination Then
+                    Dim Offset As UShort = BitConverter.ToUInt16(Jmp, 1) + 3
+                    Result = (Offset < BootSectorOffsets.BootStrapSignature)
+                Else
+                    Result = True
+                End If
+            End If
+
+            Return Result
         End Function
 
         Public Shared Function GenerateVolumeSerialNumber(Value As Date) As UInteger
@@ -172,13 +202,12 @@
             End If
         End Function
 
-        Public Function GetBootStrapOffset(Jmp() As Byte) As UShort
-            Dim JumpInstruction As Byte = Jmp(0)
+        Public Shared Function GetBootStrapOffset(Jmp() As Byte) As UShort
             Dim Offset As UShort
 
-            If JumpInstruction = &HEB Then
+            If Jmp(0) = &HEB Then
                 Offset = Jmp(1) + 2
-            ElseIf JumpInstruction = &HE9 Then
+            ElseIf Jmp(0) = &HE9 Then
                 Offset = BitConverter.ToUInt16(Jmp, 1) + 3
             Else
                 Offset = 0
@@ -219,10 +248,6 @@
             Return ValidExtendedBootSignature.Contains(ExtendedBootSignature)
         End Function
 
-        Public Function HasValidJumpInstruction(CheckNOP As Boolean) As Boolean
-            Return CheckJumpInstruction(JmpBoot, CheckNOP)
-        End Function
-
         Public Function IsBootSectorRegion(Offset As UInteger) As Boolean
             Return Disk.OffsetToSector(Offset) = BOOT_SECTOR
         End Function

DiskImageTool/FilterMethods.vb

@@ -6,6 +6,7 @@
         Disk_UnknownFormat
         Disk_CustomFormat
         Disk_NOBPB
+        Disk_NoBootLoader
         DIsk_CustomBootLoader
         Disk_MismatchedImageSize
         Disk_MismatchedMediaDescriptor
@@ -83,6 +84,8 @@
                     Caption = "Disk - Custom Format"
                 Case FilterTypes.Disk_NOBPB
                     Caption = "Disk - No BPB"
+                Case FilterTypes.Disk_NoBootLoader
+                    Caption = "Disk - No Boot Loader"
                 Case FilterTypes.DIsk_CustomBootLoader
                     Caption = "Disk - Custom Boot Loader"
                 Case FilterTypes.Disk_MismatchedImageSize

DiskImageTool/FloppyDB.vb

@@ -103,6 +103,17 @@ Public Class FloppyDB
         End If
     End Function
 
+    Public Function IsVerifiedImage(Disk As Disk) As Boolean
+        Dim Result = TitleFind(Disk)
+        If Result.TitleData IsNot Nothing Then
+            If Result.TitleData.GetStatus = FloppyDBStatus.Verified Then
+                Return True
+            End If
+        End If
+
+        Return False
+    End Function
+
     Public Function TitleCount() As Integer
         Return _TitleDictionary.Count
     End Function

DiskImageTool/Forms/BootSectorForm.vb

@@ -243,7 +243,7 @@ Public Class BootSectorForm
         ElseIf Control Is TxtHiddenSectors Then
             Return Control.Text = "0"
         ElseIf Control Is HexJumpInstruction Then
-            Return BootSector.CheckJumpInstruction(HexJumpInstruction.GetHex, True)
+            Return BootSector.CheckJumpInstruction(HexJumpInstruction.GetHex, True, True)
         Else
             Return True
         End If
@@ -281,7 +281,7 @@ Public Class BootSectorForm
             End If
             HexBox1.Height = LineCount * 13 + 4
 
-            If BootSector.HasValidJumpInstruction(False) Then
+            If BootSector.CheckJumpInstruction(False, True) Then
                 If BootStrapStart >= DataStart Then
                     Dim Start = BootStrapStart - DataStart
                     HexBox1.Highlight(Start, DataLength - Start, Color.Green, Color.White)

DiskImageTool/Forms/ImageLoadForm.Designer.vb

@@ -10,10 +10,10 @@ Public Class ImageLoadForm
     Private ReadOnly _FileFilterExt As List(Of String)
     Private ReadOnly _Files() As String
     Private ReadOnly _LoadedFileNames As Dictionary(Of String, LoadedImageData)
-    Private ReadOnly _LoadedImages As List(Of LoadedImageData)
     Private ReadOnly _Parent As MainForm
     Private _Activated As Boolean = False
     Private _Counter As Integer = 0
+    Private _ImageCount As Integer = 0
     Private _EndScan As Boolean = False
     Private _SelectedImageData As LoadedImageData = Nothing
     Private _Visible As Boolean = False
@@ -29,15 +29,8 @@ Public Class ImageLoadForm
         _LoadedFileNames = LoadedFileNames
         _FileFilterExt = FileFilterExt
         _ArchiveFilterExt = ArchiveFilterExt
-        _LoadedImages = New List(Of LoadedImageData)
     End Sub
 
-    Public ReadOnly Property LoadedImages As List(Of LoadedImageData)
-        Get
-            Return _LoadedImages
-        End Get
-    End Property
-
     Public ReadOnly Property SelectedImageData As LoadedImageData
         Get
             Return _SelectedImageData
@@ -169,8 +162,12 @@ Public Class ImageLoadForm
             End If
             If _Counter Mod 10 = 0 Then
                 LblScanning.Text = "Scanning... " & _Counter & " files"
+                lblScanning2.Text = _ImageCount & " images loaded"
+                LblScanning.Refresh()
+                lblScanning2.Refresh()
             End If
         ElseIf e.ProgressPercentage = 2 Then
+            _ImageCount += 1
             Dim ImageData As LoadedImageData = e.UserState
             _Parent.ComboImages.Items.Add(ImageData)
         End If

DiskImageTool/Forms/ImageLoadForm.vb

@@ -107,39 +107,45 @@ Module HexViews
         Dim BootStrapLength = BootSectorOffsets.BootStrapSignature - BootStrapStart
 
         Dim ForeColor As Color
-        If Disk.BootSector.HasValidJumpInstruction(False) Then
+        If Disk.BootSector.CheckJumpInstruction(False, True) Then
             ForeColor = Color.Green
         Else
             ForeColor = Color.Black
         End If
 
         HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.JmpBoot, ForeColor)
         If Disk.IsValidImage Then
-            HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.OEMName, Color.Red)
-            HighlightedRegions.AddBPBoffset(BPBOoffsets.BytesPerSector, Color.Blue)
-            HighlightedRegions.AddBPBoffset(BPBOoffsets.SectorsPerCluster, Color.Blue)
-            HighlightedRegions.AddBPBoffset(BPBOoffsets.ReservedSectorCount, Color.Blue)
-            HighlightedRegions.AddBPBoffset(BPBOoffsets.NumberOfFATs, Color.Blue)
-            HighlightedRegions.AddBPBoffset(BPBOoffsets.RootEntryCount, Color.Blue)
-            HighlightedRegions.AddBPBoffset(BPBOoffsets.SectorCountSmall, Color.Blue)
-            HighlightedRegions.AddBPBoffset(BPBOoffsets.MediaDescriptor, Color.Blue)
-            HighlightedRegions.AddBPBoffset(BPBOoffsets.SectorsPerFAT, Color.Blue)
-            HighlightedRegions.AddBPBoffset(BPBOoffsets.SectorsPerTrack, Color.Blue)
-            HighlightedRegions.AddBPBoffset(BPBOoffsets.NumberOfHeads, Color.Blue)
-            HighlightedRegions.AddBPBoffset(BPBOoffsets.HiddenSectors, Color.Blue)
-
-            If Disk.BootSector.HasValidExtendedBootSignature And BootStrapStart >= BootSectorOffsets.FileSystemType + BootSectorSizes.FileSystemType Then
-                HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.DriveNumber, Color.Purple)
-                HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.Reserved, Color.Purple)
-                HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.ExtendedBootSignature, Color.Purple)
-                HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.VolumeSerialNumber, Color.Purple)
-                HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.VolumeLabel, Color.Purple)
-                HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.FileSystemType, Color.Purple)
+            If Disk.BootSector.CheckJumpInstruction(False) AndAlso Disk.BootSector.BPB.IsValid Then
+                If BootStrapStart < 3 Or BootStrapStart >= BootSectorOffsets.OEMName + BootSectorSizes.OEMName Then
+                    HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.OEMName, Color.Red)
+                End If
+                If BootStrapStart < 3 Or BootStrapStart >= BPBOoffsets.HiddenSectors + BPBSizes.HiddenSectors Then
+                    HighlightedRegions.AddBPBoffset(BPBOoffsets.BytesPerSector, Color.Blue)
+                    HighlightedRegions.AddBPBoffset(BPBOoffsets.SectorsPerCluster, Color.Blue)
+                    HighlightedRegions.AddBPBoffset(BPBOoffsets.ReservedSectorCount, Color.Blue)
+                    HighlightedRegions.AddBPBoffset(BPBOoffsets.NumberOfFATs, Color.Blue)
+                    HighlightedRegions.AddBPBoffset(BPBOoffsets.RootEntryCount, Color.Blue)
+                    HighlightedRegions.AddBPBoffset(BPBOoffsets.SectorCountSmall, Color.Blue)
+                    HighlightedRegions.AddBPBoffset(BPBOoffsets.MediaDescriptor, Color.Blue)
+                    HighlightedRegions.AddBPBoffset(BPBOoffsets.SectorsPerFAT, Color.Blue)
+                    HighlightedRegions.AddBPBoffset(BPBOoffsets.SectorsPerTrack, Color.Blue)
+                    HighlightedRegions.AddBPBoffset(BPBOoffsets.NumberOfHeads, Color.Blue)
+                    HighlightedRegions.AddBPBoffset(BPBOoffsets.HiddenSectors, Color.Blue)
+                End If
+
+                If Disk.BootSector.HasValidExtendedBootSignature And BootStrapStart >= BootSectorOffsets.FileSystemType + BootSectorSizes.FileSystemType Then
+                    HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.DriveNumber, Color.Purple)
+                    HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.Reserved, Color.Purple)
+                    HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.ExtendedBootSignature, Color.Purple)
+                    HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.VolumeSerialNumber, Color.Purple)
+                    HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.VolumeLabel, Color.Purple)
+                    HighlightedRegions.AddBootSectorOffset(BootSectorOffsets.FileSystemType, Color.Purple)
+                End If
             End If
         End If
 
         If BootStrapStart > 2 And BootStrapLength > 1 Then
-            If Disk.BootSector.HasValidJumpInstruction(False) Then
+            If Disk.BootSector.CheckJumpInstruction(False, True) Then
                 HighlightedRegions.AddItem(BootStrapStart, BootStrapLength, ForeColor, "Boot Strap Code")
             Else
                 HighlightedRegions.AddItem(BootStrapStart, BootStrapLength, ForeColor)