Lots of updates

Author: Digitoxin1

DiskImageTool/62835-floppy-disk-icon.ico DiskImageTool/Assets/floppyDisk.icoDiskImageTool/62835-floppy-disk-icon.ico renamed to DiskImageTool/Assets/floppyDisk.ico

@@ -1,17 +1,17 @@
 Namespace DiskImage
     Public Class Directory
-        Private ReadOnly _FatClusterList As List(Of UShort)
+        Private ReadOnly _FatChain As List(Of UShort)
         Private ReadOnly _Parent As Disk
         Private ReadOnly _Length As UInteger
 
-        Sub New(Parent As Disk, Optional FatClusterList As List(Of UShort) = Nothing, Optional Length As UInteger = 0)
+        Sub New(Parent As Disk, Optional FatChain As List(Of UShort) = Nothing, Optional Length As UInteger = 0)
             _Parent = Parent
-            _FatClusterList = FatClusterList
+            _FatChain = FatChain
             _Length = Length
         End Sub
 
         Public Function GetContent() As Byte()
-            If _FatClusterList Is Nothing Then
+            If _FatChain Is Nothing Then
                 Return GetContentRoot()
             Else
                 Return GetContentSubDirectory()
@@ -28,7 +28,7 @@
         End Function
 
         Private Function GetContentSubDirectory() As Byte()
-            Dim Content = _Parent.GetDataFromFATClusterList(_FatClusterList)
+            Dim Content = _Parent.GetDataFromFATClusterList(_FatChain)
             If Content.Length <> _Length Then
                 Array.Resize(Of Byte)(Content, _Length)
             End If
@@ -45,13 +45,13 @@
         End Function
 
         Private Function GetDataBlocksSubDirectory() As List(Of DataBlock)
-            Return _Parent.GetDataBlocksFromFATClusterList(_FatClusterList)
+            Return _Parent.GetDataBlocksFromFATClusterList(_FatChain)
         End Function
 
         Private Function GetDirectoryLengthSubDirectory(FileCountOnly As Boolean) As UInteger
             Dim Count As UInteger = 0
 
-            For Each Cluster In _FatClusterList
+            For Each Cluster In _FatChain
                 Dim OffsetStart As UInteger = _Parent.ClusterToOffset(Cluster)
                 Dim OffsetLength As UInteger = _Parent.BootSector.BytesPerCluster
 
@@ -73,7 +73,7 @@
             Dim EntriesPerCluster As UInteger = _Parent.BootSector.BytesPerCluster / 32
             Dim ChainIndex As UInteger = (Index - 1) \ EntriesPerCluster
             Dim ClusterIndex As UInteger = (Index - 1) Mod EntriesPerCluster
-            Dim Offset As UInteger = _Parent.ClusterToOffset(_FatClusterList.Item(ChainIndex)) + ClusterIndex * 32
+            Dim Offset As UInteger = _Parent.ClusterToOffset(_FatChain.Item(ChainIndex)) + ClusterIndex * 32
 
             Return New DirectoryEntry(_Parent, Offset)
         End Function
@@ -85,31 +85,31 @@
         End Function
 
         Public Function DirectoryLength() As UInteger
-            If _FatClusterList Is Nothing Then
+            If _FatChain Is Nothing Then
                 Return GetDirectoryLengthRoot(False)
             Else
                 Return GetDirectoryLengthSubDirectory(False)
             End If
         End Function
 
         Public Function FileCount() As UInteger
-            If _FatClusterList Is Nothing Then
+            If _FatChain Is Nothing Then
                 Return GetDirectoryLengthRoot(True)
             Else
                 Return GetDirectoryLengthSubDirectory(True)
             End If
         End Function
 
         Public Function GetFile(Index As UInteger) As DirectoryEntry
-            If _FatClusterList Is Nothing Then
+            If _FatChain Is Nothing Then
                 Return GetFileRoot(Index)
             Else
                 Return GetFileSubDirectory(Index)
             End If
         End Function
 
         Public Function GetDataBlocks() As List(Of DataBlock)
-            If _FatClusterList Is Nothing Then
+            If _FatChain Is Nothing Then
                 Return New List(Of DataBlock) From {
                     GetDataBlockRoot()
                 }

DiskImageTool/DiskImage/Directory.vb

@@ -21,6 +21,24 @@ Namespace DiskImage
     End Enum
 
     Public Class DirectoryEntry
+        Private Shared ReadOnly CP437LookupTable As Integer() = New Integer(255) {
+            0, 9786, 9787, 9829, 9830, 9827, 9824, 8226, 9688, 9675, 9689, 9794, 9792, 9834, 9835, 9788,
+            9658, 9668, 8597, 8252, 182, 167, 9644, 8616, 8593, 8595, 8594, 8592, 8735, 8596, 9650, 9660,
+            32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+            48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+            64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+            80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+            96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+            112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 8962,
+            199, 252, 233, 226, 228, 224, 229, 231, 234, 235, 232, 239, 238, 236, 196, 197,
+            201, 230, 198, 244, 246, 242, 251, 249, 255, 214, 220, 162, 163, 165, 8359, 402,
+            225, 237, 243, 250, 241, 209, 170, 186, 191, 8976, 172, 189, 188, 161, 171, 187,
+            9617, 9618, 9619, 9474, 9508, 9569, 9570, 9558, 9557, 9571, 9553, 9559, 9565, 9564, 9563, 9488,
+            9492, 9524, 9516, 9500, 9472, 9532, 9566, 9567, 9562, 9556, 9577, 9574, 9568, 9552, 9580, 9575,
+            9576, 9572, 9573, 9561, 9560, 9554, 9555, 9579, 9578, 9496, 9484, 9608, 9604, 9612, 9616, 9600,
+            945, 223, 915, 960, 931, 963, 181, 964, 934, 920, 937, 948, 8734, 966, 949, 8745,
+            8801, 177, 8805, 8804, 8992, 8993, 247, 8776, 176, 8729, 183, 8730, 8319, 178, 9632, 160
+        }
         Private Const DIRECTORY_ENTRY_SIZE As Byte = 32
         Private Const CHAR_SPACE As Byte = 32
         Public Enum AttributeFlags
@@ -61,26 +79,43 @@ Namespace DiskImage
             LFNFilePart3 = 4
         End Enum
 
-        Private ReadOnly _FatClusterList As List(Of UShort)
         Private _Data() As Byte
         Private ReadOnly _Offset As UInteger
+        Private ReadOnly _FatChain As FATChain
         Private WithEvents Parent As Disk
         Private _SubDirectory As Directory
 
         Sub New(Parent As Disk, Offset As UInteger)
             Me.Parent = Parent
             _Offset = Offset
+
             LoadData()
 
-            If IsDeleted() Then
-                _FatClusterList = New List(Of UShort)
+            If _Parent.FATChains.ContainsKey(Offset) Then
+                _FatChain = _Parent.FATChains.Item(Offset)
             Else
-                _FatClusterList = GetFATClusterList()
+                If IsDeleted() Then
+                    _FatChain = _Parent.InitFATChain(Offset, 0)
+                ElseIf IsDirectory() AndAlso {".", ".."}.Contains(GetFullFileName) Then
+                    _FatChain = _Parent.InitFATChain(Offset, 0)
+                Else
+                    _FatChain = _Parent.InitFATChain(Offset, StartingCluster)
+                End If
             End If
 
             InitSubDirectory()
         End Sub
 
+        Public Shared Function CP437ToUnicode(b() As Byte) As String
+            Dim b2(b.Length - 1) As UShort
+            For counter = 0 To b.Length - 1
+                b2(counter) = CP437LookupTable(b(counter))
+            Next
+            ReDim b(b2.Length * 2 - 1)
+            Buffer.BlockCopy(b2, 0, b, 0, b.Length)
+            Return Encoding.Unicode.GetString(b)
+        End Function
+
         Public Shared Function DateToFATDate(D As Date) As UShort
             Dim FATDate As UShort = D.Year - 1980
 
@@ -224,11 +259,11 @@ Namespace DiskImage
         End Function
 
         Public Function GetDataBlocks() As List(Of DataBlock)
-            Return Parent.GetDataBlocksFromFATClusterList(_FatClusterList)
+            Return Parent.GetDataBlocksFromFATClusterList(_FatChain.Chain)
         End Function
 
         Public Function GetContent() As Byte()
-            Dim Content = Parent.GetDataFromFATClusterList(_FatClusterList)
+            Dim Content = Parent.GetDataFromFATClusterList(_FatChain.Chain)
 
             If Content.Length <> FileSize Then
                 Array.Resize(Of Byte)(Content, FileSize)
@@ -237,39 +272,16 @@ Namespace DiskImage
             Return Content
         End Function
 
-        Private Function GetFATClusterList() As List(Of UShort)
-            Dim FATClusterList = New List(Of UShort)
-            Dim Cluster As UShort = StartingCluster
-            Dim AssignedClusters As New Hashtable
-            Do
-                If Cluster > 1 And Cluster <= UBound(Parent.FAT12) Then
-                    If AssignedClusters.ContainsKey(Cluster) Then
-                        Exit Do
-                    End If
-                    AssignedClusters.Add(Cluster, Cluster)
-                    FATClusterList.Add(Cluster)
-                    If Not Parent.FileAllocation.ContainsKey(Cluster) Then
-                        Parent.FileAllocation.Add(Cluster, _Offset)
-                    End If
-                    Cluster = Parent.FAT12(Cluster)
-                Else
-                    Cluster = 0
-                End If
-            Loop Until Cluster < &H2 Or Cluster > &HFEF
-
-            Return FATClusterList
-        End Function
-
         Public Function GetFileExtension() As String
-            Return Encoding.UTF8.GetString(Extension).TrimEnd(" ")
+            Return CP437ToUnicode(Extension).TrimEnd(" ")
         End Function
 
         Public Function GetFileName() As String
-            Return Encoding.UTF8.GetString(FileName).TrimEnd(" ")
+            Return CP437ToUnicode(FileName).TrimEnd(" ")
         End Function
 
         Public Function GetVolumeName() As String
-            Return Encoding.UTF8.GetString(FileName) & Encoding.UTF8.GetString(Extension).TrimEnd(" ")
+            Return CP437ToUnicode(FileName) & CP437ToUnicode(Extension).TrimEnd(" ")
         End Function
 
         Public Function GetFullFileName() As String
@@ -328,13 +340,17 @@ Namespace DiskImage
             Return FileSize > Parent.BootSector.ImageSize
         End Function
 
+        Public Function HasInvalidStartingCluster() As Boolean
+            Return StartingCluster = 1 Or StartingCluster > _Parent.BootSector.NumberOfFATEntries + 1
+        End Function
+
         Public Function HasIncorrectFileSize() As Boolean
             If IsDirectory() Then
                 Return False
             End If
 
             Dim AllocatedSize As UInteger = Math.Ceiling(FileSize / _Parent.BootSector.BytesPerCluster) * _Parent.BootSector.BytesPerCluster
-            Dim AllocatedSizeFromFAT As UInteger = _FatClusterList.Count * _Parent.BootSector.BytesPerCluster
+            Dim AllocatedSizeFromFAT As UInteger = _FatChain.Chain.Count * _Parent.BootSector.BytesPerCluster
 
             Return AllocatedSize <> AllocatedSizeFromFAT
         End Function
@@ -345,7 +361,7 @@ Namespace DiskImage
 
         Private Sub InitSubDirectory()
             If IsDirectory() And Not IsDeleted() Then
-                _SubDirectory = New Directory(Parent, _FatClusterList, FileSize)
+                _SubDirectory = New Directory(Parent, _FatChain.Chain, FileSize)
             Else
                 _SubDirectory = Nothing
             End If
@@ -355,6 +371,10 @@ Namespace DiskImage
             Return (Attributes And AttributeFlags.ArchiveFlag) > 0
         End Function
 
+        Public Function IsCrossLinked() As Boolean
+            Return _FatChain.CrossLinks.Count > 0
+        End Function
+
         Public Function IsDeleted() As Boolean
             Return FileName(0) = &HE5
         End Function
@@ -374,8 +394,8 @@ Namespace DiskImage
         Public Function IsModified() As Boolean
             Dim HasModification As Boolean = Parent.HasModification(_Offset)
             If Not HasModification Then
-                If _FatClusterList.Count > 0 Then
-                    Dim ClusterOffset = _Parent.ClusterToOffset(_FatClusterList(0))
+                If _FatChain.Chain.Count > 0 Then
+                    Dim ClusterOffset = _Parent.ClusterToOffset(_FatChain.Chain(0))
                     HasModification = Parent.HasModification(ClusterOffset)
                 End If
             End If
@@ -453,6 +473,12 @@ Namespace DiskImage
             End Set
         End Property
 
+        Public ReadOnly Property CrossLinks() As List(Of UInteger)
+            Get
+                Return _FatChain.CrossLinks
+            End Get
+        End Property
+
         Public Property Extension() As Byte()
             Get
                 Return GetBytes(DirectoryEntryOffset.Extension, DirectoryEntrySize.Extension)
@@ -462,9 +488,9 @@ Namespace DiskImage
             End Set
         End Property
 
-        Public ReadOnly Property FatClusterList As List(Of UShort)
+        Public ReadOnly Property FATChain As List(Of UShort)
             Get
-                Return _FatClusterList
+                Return _FatChain.Chain
             End Get
         End Property
 
@@ -486,6 +512,12 @@ Namespace DiskImage
             End Set
         End Property
 
+        Public ReadOnly Property HasCircularChain As Boolean
+            Get
+                Return _FatChain.HasCircularChain
+            End Get
+        End Property
+
         Public Property LastAccessDate() As UShort
             Get
                 Return GetBytesShort(DirectoryEntryOffset.LastAccessDate)