Can now detect additional data stored in a directory

Can now detect if a copy of the boot sector is stored in a directory
Added color coding to the directory hex view
Can now view the parent directory from the file context menu
Added new tools to manage a boot sector stored in a directory

Author: Digitoxin1

DiskImageTool/Assets/bootstrap.xml

@@ -423,7 +423,7 @@
     <oemname name="LHX TWO " company="Electronic Arts" description="LHX: ATTACK CHOPPER Disk Two" />
   </bootstrap>
   <bootstrap crc32="8CD8F888">
-    <oemname name="MagicISO" company="MagicISO, Inc." description="MagicISO 4.70" />
+    <oemname name="MagicISO" company="MagicISO, Inc." description="MagicISO 4.70" note="Not imaged from Original Media" />
   </bootstrap>
   <bootstrap crc32="5B5678E2">
     <oemname name="MSC 3.1 " />

DiskImageTool/Copy Protection.vb

@@ -53,7 +53,7 @@ Module Copy_Protection
         'Origin Systems OSI-1
         If Not ProtectionFound AndAlso Disk.FAT.BadSectors.Count >= 10 Then
             If CheckBadSectors(Disk, {108, 109, 110, 111, 112, 113, 114, 115, 116, 117}) _
-                AndAlso CheckFileList(Disk, {"2400AD.EXE", "ULTIMA.COM", "ULTIMA.EXE", "ULTIMAII.EXE"}) Then
+                AndAlso CheckFileList(Disk, {"2400AD.EXE", "ULTIMA.COM", "ULTIMA.EXE", "ULTIMAII.EXE", "LORE.EXE"}) Then
 
                 ProtectionFound = True
                 ProtectionName = "Origin Systems OSI-1"

DiskImageTool/DiskImage/BootSector.vb

@@ -1,15 +1,14 @@
-Imports System.Text
-
-Namespace DiskImage
+Namespace DiskImage
 
     Public Class BootSector
         Private Const BOOT_SECTOR As UInteger = 0
+        Public Const BOOT_SECTOR_SIZE As UShort = 512
         Private ReadOnly _FileBytes As ImageByteArray
         Public Shared ReadOnly ValidBootStrapSignature As UShort = &HAA55
         Public Shared ReadOnly ValidBytesPerSector() As UShort = {512, 1024, 2048, 4096}
         Public Shared ReadOnly ValidDriveNumber() As Byte = {&H0, &H80}
         Public Shared ReadOnly ValidExtendedBootSignature() As Byte = {&H28, &H29}
-        'Private Shared ReadOnly _ValidJumpInstructuon() As Byte = {&HEB, &HE9}
+        Public Shared ReadOnly ValidJumpInstructuon() As Byte = {&HEB, &HE9}
         Public Shared ReadOnly ValidMediaDescriptor() As Byte = {&HF0, &HF8, &HF9, &HFA, &HFB, &HFC, &HFD, &HFE, &HFF}
         Public Shared ReadOnly ValidSectorsPerCluster() As Byte = {1, 2, 4, 8, 16, 32, 64, 128}
 

DiskImageTool/DiskImage/Classes.vb

@@ -1,4 +1,5 @@
 Namespace DiskImage
+
     Public Structure ExpandedDate
         Dim DateObject As Date
         Dim Day As Byte
@@ -178,4 +179,14 @@
             Return DataBytes.GetBytes(SectorBlock.Offset, SectorBlock.Size)
         End Function
     End Class
+
+    Public Class DirectoryData
+        Public Property MaxEntries As UInteger = 0
+        Public Property EntryCount As UInteger = 0
+        Public Property FileCount As UInteger = 0
+        Public Property DeletedFileCount As UInteger = 0
+        Public Property HasAdditionalData As Boolean = False
+        Public Property HasBootSector As Boolean = False
+        Public Property BootSectorOffset As UInteger = 0
+    End Class
 End Namespace

DiskImageTool/DiskImage/DirectoryEntry.vb

@@ -4,7 +4,7 @@ Namespace DiskImage
 
     Public Class DirectoryEntry
         Private Const CHAR_SPACE As Byte = 32
-        Private Const CHAR_DELETED As Byte = &HE5
+        Public Const CHAR_DELETED As Byte = &HE5
         Public Const DIRECTORY_ENTRY_SIZE As Byte = 32
         Private ReadOnly _FatChain As FATChain
         Private ReadOnly _FAT As FAT12
@@ -200,7 +200,7 @@ Namespace DiskImage
             End Get
         End Property
 
-        Public ReadOnly Property Offset As Integer
+        Public ReadOnly Property Offset As UInteger
             Get
                 Return _Offset
             End Get
@@ -474,7 +474,7 @@ Namespace DiskImage
         End Sub
 
         Private Sub InitSubDirectory()
-            If IsDirectory() And Not IsDeleted() Then
+            If IsDirectory() AndAlso Not IsLink() AndAlso Not IsDeleted() Then
                 _SubDirectory = New SubDirectory(_FileBytes, _BootSector, _FAT, _FatChain, FileSize)
             Else
                 _SubDirectory = Nothing

DiskImageTool/DiskImage/Disk.vb

@@ -26,9 +26,7 @@ Namespace DiskImage
                 _FAT12 = New FAT12(FileBytes, _BootSector, 0, False)
                 _Directory = New RootDirectory(FileBytes, _BootSector, _FAT12)
 
-                If _BootSector.IsValidImage Then
-                    CacheDirectoryEntries(_Directory)
-                End If
+                CacheDirectoryEntries()
 
                 If Modifications IsNot Nothing Then
                     FileBytes.ApplyModifications(Modifications)
@@ -95,7 +93,7 @@ Namespace DiskImage
 
         Public Function GetVolumeLabel() As DirectoryEntry
             Dim VolumeLabel As DirectoryEntry = Nothing
-            Dim DirectoryEntryCount = _Directory.DirectoryEntryCount
+            Dim DirectoryEntryCount = _Directory.Data.EntryCount
 
             If DirectoryEntryCount > 0 Then
                 For Counter As UInteger = 0 To DirectoryEntryCount - 1
@@ -137,16 +135,25 @@ Namespace DiskImage
 
         Public Sub Reinitialize()
             _FAT12.PopulateFAT12(0, False)
+            _Directory.RefreshData()
+
             _ReinitializeRequired = False
         End Sub
         Public Sub SaveFile(FilePath As String)
             IO.File.WriteAllBytes(FilePath, FileBytes.Data)
             FileBytes.ClearChanges()
-            CacheDirectoryEntries(_Directory)
+            CacheDirectoryEntries()
+        End Sub
+
+        Private Sub CacheDirectoryEntries()
+            FileBytes.DirectoryCache.Clear()
+            If _BootSector.IsValidImage Then
+                CacheDirectoryEntries(_Directory)
+            End If
         End Sub
 
         Private Sub CacheDirectoryEntries(Directory As DiskImage.IDirectory)
-            Dim DirectoryEntryCount = Directory.DirectoryEntryCount
+            Dim DirectoryEntryCount = Directory.Data.EntryCount
 
             If DirectoryEntryCount > 0 Then
                 For Counter = 0 To DirectoryEntryCount - 1
@@ -155,7 +162,7 @@ Namespace DiskImage
                     If Not File.IsLink Then
                         FileBytes.DirectoryCache.Item(File.Offset) = File.Data
                         If File.IsDirectory And File.SubDirectory IsNot Nothing Then
-                            If File.SubDirectory.DirectoryEntryCount > 0 Then
+                            If File.SubDirectory.Data.EntryCount > 0 Then
                                 CacheDirectoryEntries(File.SubDirectory)
                             End If
                         End If

DiskImageTool/DiskImage/FAT12.vb

@@ -245,15 +245,15 @@
         End Sub
 
         Private Sub EnumDirectoryEntries(Directory As DiskImage.IDirectory)
-            Dim DirectoryEntryCount = Directory.DirectoryEntryCount
+            Dim DirectoryEntryCount = Directory.Data.EntryCount
 
             If DirectoryEntryCount > 0 Then
                 For Counter = 0 To DirectoryEntryCount - 1
                     Dim File = Directory.GetFile(Counter)
 
                     If Not File.IsLink Then
                         If File.IsDirectory And File.SubDirectory IsNot Nothing Then
-                            If File.SubDirectory.DirectoryEntryCount > 0 Then
+                            If File.SubDirectory.Data.EntryCount > 0 Then
                                 EnumDirectoryEntries(File.SubDirectory)
                             End If
                         End If

DiskImageTool/DiskImage/Functions.vb

@@ -87,7 +87,7 @@ Namespace DiskImage
         End Function
 
         Public Function BuildBootSectorFromType(Type As FloppyDiskType) As BootSector
-            Dim Data(511) As Byte
+            Dim Data(DiskImage.BootSector.BOOT_SECTOR_SIZE - 1) As Byte
             Dim FileBytes As New ImageByteArray(Data)
             Dim BootSector = New BootSector(FileBytes)
 
@@ -395,27 +395,88 @@ Namespace DiskImage
             Return Content
         End Function
 
-        Public Function GetDirectoryEntryCount(FileBytes As ByteArray, OffsetStart As UInteger, OffsetEnd As UInteger, FileCountOnly As Boolean, ExcludeDeleted As Boolean) As UInteger
-            Dim Count As UInteger = 0
-
-            Do While FileBytes.GetByte(OffsetStart) > 0
-                If Not ExcludeDeleted OrElse FileBytes.GetByte(OffsetStart) <> &HE5 Then
-                    If Not FileCountOnly Then
-                        Count += 1
-                    ElseIf FileBytes.GetByte(OffsetStart + 11) <> &HF Then 'Exclude LFN entries
-                        Dim FilePart = FileBytes.ToUInt16(OffsetStart)
-                        If FilePart <> &H202E And FilePart <> &H2E2E Then 'Exclude '.' and '..' entries
-                            Count += 1
-                        End If
+        Public Function DirectoryEntryHasData(FileBytes As ByteArray, Offset As UInteger) As Boolean
+            Dim Result As Boolean = False
+
+
+            If FileBytes.GetByte(Offset) = &HE5 Then
+                For Offset2 As UInteger = Offset + 1 To Offset + DirectoryEntry.DIRECTORY_ENTRY_SIZE - 1
+                    If FileBytes.GetByte(Offset2) <> 0 Then
+                        Result = True
+                        Exit For
+                    End If
+                Next
+            ElseIf FileBytes.GetByte(Offset) <> 0 Then
+                Result = True
+            Else
+                Dim HexF6Count As UInteger = 0
+                For Offset2 As UInteger = Offset + 1 To Offset + DirectoryEntry.DIRECTORY_ENTRY_SIZE - 1
+                    If FileBytes.GetByte(Offset2) = &HF6 Then
+                        HexF6Count += 1
+                    ElseIf FileBytes.GetByte(Offset2) <> 0 Then
+                        Result = True
+                        Exit For
+                    End If
+                Next
+                If Not Result Then
+                    If HexF6Count > 0 And HexF6Count < DirectoryEntry.DIRECTORY_ENTRY_SIZE - 2 Then
+                        Result = True
                     End If
                 End If
-                OffsetStart += 32
-                If OffsetEnd > 0 And OffsetStart >= OffsetEnd Then
-                    Exit Do
-                End If
-            Loop
+            End If
+
+            Return Result
+        End Function
+
+        Public Function GetDirectoryData(Data As DirectoryData, FileBytes As ByteArray, OffsetStart As UInteger, OffsetEnd As UInteger, EndOfDirectory As Boolean, CheckBootSector As Boolean) As Boolean
+            Dim EntryCount = (OffsetEnd - OffsetStart) \ DirectoryEntry.DIRECTORY_ENTRY_SIZE
+
+            Data.MaxEntries += EntryCount
+
+            If EntryCount > 0 Then
+                For Entry As UInteger = 0 To EntryCount - 1
+                    Dim Offset = OffsetStart + (Entry * DirectoryEntry.DIRECTORY_ENTRY_SIZE)
+                    Dim FirstByte = FileBytes.GetByte(Offset)
+                    If FirstByte = 0 Then
+                        EndOfDirectory = True
+                    End If
+                    If Not Data.HasBootSector And CheckBootSector Then
+                        If BootSector.ValidJumpInstructuon.Contains(FirstByte) Then
+                            If OffsetEnd - Offset >= BootSector.BOOT_SECTOR_SIZE Then
+                                Dim BootSectorData = FileBytes.GetBytes(Offset, DiskImage.BootSector.BOOT_SECTOR_SIZE)
+                                Dim BootSector = New BootSector(New ImageByteArray(BootSectorData))
+                                If BootSector.IsValidImage Then
+                                    Data.HasBootSector = True
+                                    Data.BootSectorOffset = Offset
+                                    EndOfDirectory = True
+                                End If
+                            End If
+                        End If
+                    End If
+                    If EndOfDirectory Then
+                        If Not Data.HasAdditionalData Then
+                            If Not Data.HasBootSector Or Offset < Data.BootSectorOffset Or Offset > Data.BootSectorOffset + DiskImage.BootSector.BOOT_SECTOR_SIZE Then
+                                If DirectoryEntryHasData(FileBytes, Offset) Then
+                                    Data.HasAdditionalData = True
+                                End If
+                            End If
+                        End If
+                    Else
+                        Data.EntryCount += 1
+                        If FileBytes.GetByte(Offset + 11) <> &HF Then 'Exclude LFN entries
+                            Dim FilePart = FileBytes.ToUInt16(Offset)
+                            If FilePart <> &H202E And FilePart <> &H2E2E Then 'Exclude '.' and '..' entries
+                                Data.FileCount += 1
+                                If FirstByte = DirectoryEntry.CHAR_DELETED Then
+                                    Data.DeletedFileCount += 1
+                                End If
+                            End If
+                        End If
+                    End If
+                Next
+            End If
 
-            Return Count
+            Return EndOfDirectory
         End Function
 
         Public Function GetObjectSize(o As Object) As Integer

DiskImageTool/DiskImage/IDirectory.vb

@@ -1,10 +1,10 @@
 Namespace DiskImage
     Public Interface IDirectory
+        ReadOnly Property Data As DirectoryData
         ReadOnly Property SectorChain As List(Of UInteger)
-        Function DirectoryEntryCount() As UInteger
-        Function FileCount(ExcludeDeleted As Boolean) As UInteger
         Function GetContent() As Byte()
         Function GetFile(Index As UInteger) As DirectoryEntry
         Function HasFile(Filename As String) As Boolean
+        Sub RefreshData()
     End Interface
 End Namespace

DiskImageTool/DiskImage/RootDirectory.vb

@@ -5,13 +5,25 @@
         Private ReadOnly _BootSector As BootSector
         Private ReadOnly _FAT As FAT12
         Private ReadOnly _FileBytes As ImageByteArray
+        Private _DirectoryData As DirectoryData
 
         Sub New(FileBytes As ImageByteArray, BootSector As BootSector, FAT As FAT12)
             _BootSector = BootSector
             _FAT = FAT
             _FileBytes = FileBytes
+            If BootSector.IsValidImage Then
+                _DirectoryData = GetDirectoryData()
+            Else
+                _DirectoryData = New DirectoryData
+            End If
         End Sub
 
+        Public ReadOnly Property Data As DirectoryData Implements IDirectory.Data
+            Get
+                Return _DirectoryData
+            End Get
+        End Property
+
         Public ReadOnly Property SectorChain As List(Of UInteger) Implements IDirectory.SectorChain
             Get
                 Dim Chain = New List(Of UInteger)
@@ -24,14 +36,6 @@
             End Get
         End Property
 
-        Public Function DirectoryEntryCount() As UInteger Implements IDirectory.DirectoryEntryCount
-            Return GetDirectoryEntryCount(False, False)
-        End Function
-
-        Public Function FileCount(ExcludeDeleted As Boolean) As UInteger Implements IDirectory.FileCount
-            Return GetDirectoryEntryCount(True, ExcludeDeleted)
-        End Function
-
         Public Function GetContent() As Byte() Implements IDirectory.GetContent
             Dim SectorStart = _BootSector.RootDirectoryRegionStart
             Dim SectorEnd = _BootSector.DataRegionStart
@@ -42,13 +46,13 @@
         End Function
 
         Public Function GetFile(Index As UInteger) As DirectoryEntry Implements IDirectory.GetFile
-            Dim Offset As UInteger = SectorToBytes(_BootSector.RootDirectoryRegionStart) + Index * 32
+            Dim Offset As UInteger = SectorToBytes(_BootSector.RootDirectoryRegionStart) + Index * DirectoryEntry.DIRECTORY_ENTRY_SIZE
 
             Return New DirectoryEntry(_FileBytes, _BootSector, _FAT, Offset)
         End Function
 
         Public Function HasFile(Filename As String) As Boolean Implements IDirectory.HasFile
-            Dim Count = GetDirectoryEntryCount(False, False)
+            Dim Count = _DirectoryData.EntryCount
             If Count > 0 Then
                 For Counter As UInteger = 0 To Count - 1
                     Dim File = GetFile(Counter)
@@ -63,11 +67,22 @@
             Return False
         End Function
 
-        Private Function GetDirectoryEntryCount(FileCountOnly As Boolean, ExcludeDeleted As Boolean) As UInteger
+        Public Sub RefreshData() Implements IDirectory.RefreshData
+            If _BootSector.IsValidImage Then
+                _DirectoryData = GetDirectoryData()
+            Else
+                _DirectoryData = New DirectoryData
+            End If
+        End Sub
+
+        Private Function GetDirectoryData() As DirectoryData
             Dim OffsetStart As UInteger = SectorToBytes(_BootSector.RootDirectoryRegionStart)
             Dim OffsetEnd As UInteger = SectorToBytes(_BootSector.DataRegionStart)
+            Dim Data As New DirectoryData
+
+            Functions.GetDirectoryData(Data, _FileBytes, OffsetStart, OffsetEnd, False, True)
 
-            Return Functions.GetDirectoryEntryCount(_FileBytes, OffsetStart, OffsetEnd, FileCountOnly, ExcludeDeleted)
+            Return Data
         End Function
     End Class
 End Namespace