Bug fixes

Author: Digitoxin1

DiskImageTool/DiskImage/Functions.vb

@@ -395,16 +395,18 @@ Namespace DiskImage
             Return Content
         End Function
 
-        Public Function GetDirectoryEntryCount(FileBytes As ByteArray, OffsetStart As UInteger, OffsetEnd As UInteger, FileCountOnly As Boolean) As UInteger
+        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 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
+                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
                     End If
                 End If
                 OffsetStart += 32

DiskImageTool/DiskImage/IDirectory.vb

@@ -2,7 +2,7 @@
     Public Interface IDirectory
         ReadOnly Property SectorChain As List(Of UInteger)
         Function DirectoryEntryCount() As UInteger
-        Function FileCount() 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

DiskImageTool/DiskImage/RootDirectory.vb

@@ -25,11 +25,11 @@
         End Property
 
         Public Function DirectoryEntryCount() As UInteger Implements IDirectory.DirectoryEntryCount
-            Return GetDirectoryEntryCount(False)
+            Return GetDirectoryEntryCount(False, False)
         End Function
 
-        Public Function FileCount() As UInteger Implements IDirectory.FileCount
-            Return GetDirectoryEntryCount(True)
+        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
@@ -48,7 +48,7 @@
         End Function
 
         Public Function HasFile(Filename As String) As Boolean Implements IDirectory.HasFile
-            Dim Count = GetDirectoryEntryCount(False)
+            Dim Count = GetDirectoryEntryCount(False, False)
             If Count > 0 Then
                 For Counter As UInteger = 0 To Count - 1
                     Dim File = GetFile(Counter)
@@ -63,11 +63,11 @@
             Return False
         End Function
 
-        Private Function GetDirectoryEntryCount(FileCountOnly As Boolean) As UInteger
+        Private Function GetDirectoryEntryCount(FileCountOnly As Boolean, ExcludeDeleted As Boolean) As UInteger
             Dim OffsetStart As UInteger = SectorToBytes(_BootSector.RootDirectoryRegionStart)
             Dim OffsetEnd As UInteger = SectorToBytes(_BootSector.DataRegionStart)
 
-            Return Functions.GetDirectoryEntryCount(_FileBytes, OffsetStart, OffsetEnd, FileCountOnly)
+            Return Functions.GetDirectoryEntryCount(_FileBytes, OffsetStart, OffsetEnd, FileCountOnly, ExcludeDeleted)
         End Function
     End Class
 End Namespace

DiskImageTool/DiskImage/SubDirectory.vb

@@ -23,11 +23,11 @@
         End Property
 
         Public Function DirectoryEntryCount() As UInteger Implements IDirectory.DirectoryEntryCount
-            Return GetDirectoryEntryCount(False)
+            Return GetDirectoryEntryCount(False, False)
         End Function
 
-        Public Function FileCount() As UInteger Implements IDirectory.FileCount
-            Return GetDirectoryEntryCount(True)
+        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
@@ -50,7 +50,7 @@
         End Function
 
         Public Function HasFile(Filename As String) As Boolean Implements IDirectory.HasFile
-            Dim Count = GetDirectoryEntryCount(False)
+            Dim Count = GetDirectoryEntryCount(False, False)
             For Counter As UInteger = 0 To Count - 1
                 Dim File = GetFile(Counter)
                 If Not File.IsDeleted And Not File.IsVolumeName And Not File.IsDirectory Then
@@ -63,14 +63,14 @@
             Return False
         End Function
 
-        Private Function GetDirectoryEntryCount(FileCountOnly As Boolean) As UInteger
+        Private Function GetDirectoryEntryCount(FileCountOnly As Boolean, ExcludeDeleted As Boolean) As UInteger
             Dim Count As UInteger = 0
 
             For Each Cluster In _FatChain.Clusters
                 Dim OffsetStart As UInteger = _BootSector.ClusterToOffset(Cluster)
                 Dim OffsetLength As UInteger = _BootSector.BytesPerCluster
 
-                Count += Functions.GetDirectoryEntryCount(_FileBytes, OffsetStart, OffsetStart + OffsetLength, FileCountOnly)
+                Count += Functions.GetDirectoryEntryCount(_FileBytes, OffsetStart, OffsetStart + OffsetLength, FileCountOnly, ExcludeDeleted)
             Next
 
             Return Count

DiskImageTool/Forms/FATEditForm.vb

@@ -465,9 +465,6 @@ Public Class FATEditForm
 
         _FAT.TableEntry(Cluster) = Value
         _FAT.ProcessFAT12(True)
-        For Each key In _FAT.FATChains.Keys
-            Debug.Print(key)
-        Next
 
         RefreshGrid()
         PictureBoxFAT.Invalidate()