Improved Filters

Added Status Bar
Bug Fixes

Author: Digitoxin1

DiskImageTool/ComboFileType.vb

@@ -0,0 +1,65 @@
+Public Enum FilterTypes
+    UnknownOEMID = 1
+    MismatchedOEMID = 2
+    HasCreated = 4
+    HasLastAccessed = 8
+    HasInvalidImage = 16
+    HasLongFileNames = 32
+    HasInvalidDirectoryEntries = 64
+    ModifiedFiles = 128
+End Enum
+
+Public Class ComboFileType
+    Private _ID As FilterTypes
+    Private _Count As Integer
+
+    Public Property Count As Integer
+        Get
+            Return _Count
+        End Get
+        Set
+            _Count = Value
+        End Set
+    End Property
+
+    Public Property ID As FilterTypes
+        Get
+            Return _ID
+        End Get
+        Set
+            _ID = Value
+        End Set
+    End Property
+    Public Sub New(ID As FilterTypes, Count As Integer)
+        _ID = ID
+        _Count = Count
+    End Sub
+    Public Overrides Function ToString() As String
+        Return GetText() & "  [" & Count & "]"
+    End Function
+
+    Private Function GetText() As String
+        Select Case ID
+            Case FilterTypes.UnknownOEMID
+                Return "Unknown OEM ID"
+            Case FilterTypes.MismatchedOEMID
+                Return "Mismatched OEM ID"
+            Case FilterTypes.HasCreated
+                Return "Has Creation Date"
+            Case FilterTypes.HasLastAccessed
+                Return "Has Last Access Date"
+            Case FilterTypes.HasInvalidImage
+                Return "Invalid Image"
+            Case FilterTypes.HasLongFileNames
+                Return "Has Long File Names"
+            Case FilterTypes.HasInvalidDirectoryEntries
+                Return "Has Invalid Directory Entries"
+            Case FilterTypes.ModifiedFiles
+                Return "Modified Files"
+            Case Else
+                Return ""
+        End Select
+    End Function
+End Class
+
+

DiskImageTool/BootSector.vb DiskImageTool/DiskImage/BootSector.vbDiskImageTool/BootSector.vb renamed to DiskImageTool/DiskImage/BootSector.vb

@@ -2,7 +2,7 @@
     Public Class BootSector
         Private Enum BootSectorOffset As UInteger
             Code = 0
-            OSName = 3
+            OEMID = 3
             BytesPerSector = 11
             SectorsPerCluster = 13
             ReservedSectors = 14
@@ -27,7 +27,7 @@
 
         Private Enum BootSectorSize As UInteger
             Code = 3
-            OSName = 8
+            OEMID = 8
             VolumeLabel = 11
             FileSystemType = 8
             BootStrapCode = 448
@@ -188,12 +188,12 @@
             End Set
         End Property
 
-        Public Property OSName() As Byte()
+        Public Property OEMID() As Byte()
             Get
-                Return _Parent.GetBytes(BootSectorOffset.OSName, BootSectorSize.OSName)
+                Return _Parent.GetBytes(BootSectorOffset.OEMID, BootSectorSize.OEMID)
             End Get
             Set
-                _Parent.SetBytes(Value, BootSectorOffset.OSName, BootSectorSize.OSName, 0)
+                _Parent.SetBytes(Value, BootSectorOffset.OEMID, BootSectorSize.OEMID, 0)
             End Set
         End Property
 

DiskImageTool/Directory.vb DiskImageTool/DiskImage/Directory.vbDiskImageTool/Directory.vb renamed to DiskImageTool/DiskImage/Directory.vb

@@ -59,7 +59,7 @@ Namespace DiskImage
             LFNFilePart3 = 4
         End Enum
 
-        Private ReadOnly InvalidChars() As Byte = {&H22, &H2B, &H2C, &H2F, &H3A, &H3B, &H3C, &H3D, &H3E, &H3F, &H5B, &H5C, &H5D, &H7C}
+        Private ReadOnly InvalidChars() As Byte = {&H22, &H2B, &H2C, &H2E, &H2F, &H3A, &H3B, &H3C, &H3D, &H3E, &H3F, &H5B, &H5C, &H5D, &H7C, &H7F}
         Private ReadOnly _FatChain As List(Of UInteger)
         Private ReadOnly _Offset As UInteger
         Private ReadOnly _Parent As Disk
@@ -294,15 +294,27 @@ Namespace DiskImage
             Return CreationDate <> 0 Or CreationTime <> 0 Or CreationMillisecond <> 0
         End Function
 
+        Public Function HasInvalidAttributes() As Boolean
+            Return (Attributes > 63)
+        End Function
+
         Public Function HasInvalidExtension() As Boolean
             Dim Result As Boolean = False
             Dim LocalExtension = Extension
+            Dim VolumeName As Boolean = IsVolumeName()
+            Dim C As Byte
 
             For Counter = 0 To UBound(LocalExtension)
-                If LocalExtension(Counter) < &H20 Then
+                C = LocalExtension(Counter)
+                If VolumeName And (C = &H0) Then
+                    Result = False
+                ElseIf C < &H20 Then
+                    Result = True
+                    Exit For
+                ElseIf Not VolumeName And C > &H60 And C < &H7B Then
                     Result = True
                     Exit For
-                ElseIf InvalidChars.Contains(LocalExtension(Counter)) Then
+                ElseIf Not VolumeName And InvalidChars.Contains(C) Then
                     Result = True
                     Exit For
                 End If
@@ -314,15 +326,23 @@ Namespace DiskImage
         Public Function HasInvalidFilename() As Boolean
             Dim Result As Boolean = False
             Dim LocalFileName = FileName
+            Dim VolumeName As Boolean = IsVolumeName()
+            Dim C As Byte
 
-            If LocalFileName(0) = &H20 Then
+            If Not VolumeName And LocalFileName(0) = &H20 Then
                 Result = True
             Else
                 For Counter = 0 To UBound(LocalFileName)
-                    If LocalFileName(Counter) < &H20 Then
+                    C = LocalFileName(Counter)
+                    If VolumeName And (C = &H0 Or (Counter = 1 And C = &H3)) Then
+                        Result = False
+                    ElseIf C < &H20 Then
+                        Result = True
+                        Exit For
+                    ElseIf Not VolumeName And C > &H60 And C < &H7B Then
                         Result = True
                         Exit For
-                    ElseIf InvalidChars.Contains(LocalFileName(Counter)) Then
+                    ElseIf Not VolumeName And InvalidChars.Contains(C) Then
                         Result = True
                         Exit For
                     End If
@@ -333,34 +353,15 @@ Namespace DiskImage
         End Function
 
         Public Function HasInvalidFileSize() As Boolean
-            Dim Result As Boolean
-
-            Select Case _Parent.BootSector.MediaDescriptor
-                Case &HF0
-                    If _Parent.BootSector.SectorsPerTrack = 36 Then
-                        Result = (FileSize > 2949120)
-                    Else
-                        Result = (FileSize > 1474560)
-                    End If
-                Case &HF9
-                    If _Parent.BootSector.SectorsPerTrack = 15 Then
-                        Result = (FileSize > 1228800)
-                    Else
-                        Result = (FileSize > 737280)
-                    End If
-                Case &HFC
-                    Result = (FileSize > 184320)
-                Case &HFD
-                    Result = (FileSize > 368640)
-                Case &HFE
-                    Result = (FileSize > 163840)
-                Case &HFF
-                    Result = (FileSize > 327680)
-                Case Else
-                    Result = (FileSize > 2949120)
-            End Select
+            Dim SectorCount As UInteger
 
-            Return Result
+            If _Parent.BootSector.SmallNumberOfSectors > 0 Then
+                SectorCount = _Parent.BootSector.SmallNumberOfSectors
+            Else
+                SectorCount = _Parent.BootSector.LargeNumberOfSectors
+            End If
+
+            Return FileSize > SectorCount * _Parent.BootSector.BytesPerSector
         End Function
 
         Public Function HasLastAccessDate() As Boolean

DiskImageTool/DirectoryEntry.vb DiskImageTool/DiskImage/DirectoryEntry.vbDiskImageTool/DirectoryEntry.vb renamed to DiskImageTool/DiskImage/DirectoryEntry.vb

@@ -29,8 +29,8 @@
     <TargetCulture>en-US</TargetCulture>
     <ProductName>DiskImageTool</ProductName>
     <PublisherName>Digitoxin</PublisherName>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.1.0.%2a</ApplicationVersion>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>1.2.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -105,12 +105,14 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BootSector.vb" />
-    <Compile Include="ComboFileItem.vb" />
+    <Compile Include="ComboFileType.vb" />
+    <Compile Include="DiskImage\BootSector.vb" />
+    <Compile Include="OEMIDLookup.vb" />
+    <Compile Include="LoadedImageData.vb" />
     <Compile Include="CRC32.vb" />
-    <Compile Include="Directory.vb" />
-    <Compile Include="DirectoryEntry.vb" />
-    <Compile Include="Disk.vb" />
+    <Compile Include="DiskImage\Directory.vb" />
+    <Compile Include="DiskImage\DirectoryEntry.vb" />
+    <Compile Include="DiskImage\Disk.vb" />
     <Compile Include="MainForm.vb">
       <SubType>Form</SubType>
     </Compile>

DiskImageTool/Disk.vb DiskImageTool/DiskImage/Disk.vbDiskImageTool/Disk.vb renamed to DiskImageTool/DiskImage/Disk.vb

@@ -1,4 +1,4 @@
-Public Class ComboFileItem
+Public Class LoadedImageData
     Private _Path As String
     Private _File As String
     Private _Modified As Boolean
@@ -10,6 +10,26 @@
     Private _HasCreated As Boolean
     Private _HasLastAccessed As Boolean
     Private _HasLongFileNames As Boolean
+    Public Property HasInvalidDirectoryEntries As Boolean
+        Get
+            Return _HasInvalidDirectoryEntries
+        End Get
+        Set
+            _HasInvalidDirectoryEntries = Value
+        End Set
+    End Property
+
+    Private _ComboIndex As Integer
+    Private _HasInvalidDirectoryEntries As Boolean
+
+    Public Property ComboIndex As Integer
+        Get
+            Return _ComboIndex
+        End Get
+        Set
+            _ComboIndex = Value
+        End Set
+    End Property
 
     Public Property HasLongFileNames As Boolean
         Get
@@ -122,6 +142,8 @@
         _HasLastAccessed = False
         _HasLongFileNames = False
         _Disk = Nothing
+        _HasInvalidDirectoryEntries = False
+        _ComboIndex = -1
     End Sub
     Public Overrides Function ToString() As String
         Return _File & IIf(_Modified, " *", "")