Improvements to Hex Viewer

Author: Digitoxin1

DiskImageTool/AdvancedListView.Designer.vb

@@ -0,0 +1,63 @@
+Imports System.Runtime.InteropServices
+
+Friend Class AdvancedListView
+    Inherits ListView
+
+    Public Event Scroll As EventHandler
+
+    Public Sub ScrollToGroup(key As String, height As Integer)
+        ScrollToGroup(Groups.Item(key), height)
+    End Sub
+
+    Public Sub ScrollToGroup(index As Integer, height As Integer)
+        ScrollToGroup(Groups.Item(index), height)
+    End Sub
+
+    Private Sub ScrollToGroup(lvg As ListViewGroup, height As Integer)
+        If lvg.Items.Count > 0 Then
+            ScrollV(lvg.Items(0).Position.Y, height)
+        End If
+    End Sub
+
+    Protected Sub ScrollV(scrollPos As Integer, height As Integer)
+        scrollPos -= height
+
+        Dim prevScrollPos As Integer = (Me.Items(0).Position.Y - height) * -1
+        Dim WhereToScroll As Integer = prevScrollPos + scrollPos
+
+        Call AdvancedListView.SendMessage(New HandleRef(Nothing, Me.Handle), ListViewMessages.LVM_SCROLL, CType(0, IntPtr), CType(scrollPos, IntPtr))
+
+        prevScrollPos = (Me.Items(0).Position.Y - height) * -1
+
+        If WhereToScroll <> prevScrollPos Then
+            scrollPos = WhereToScroll - prevScrollPos
+            Call AdvancedListView.SendMessage(New HandleRef(Nothing, Me.Handle), ListViewMessages.LVM_SCROLL, CType(0, IntPtr), CType(scrollPos, IntPtr))
+        End If
+    End Sub
+    Protected Overridable Sub OnScroll()
+        Dim handler As EventHandler = ScrollEvent
+        If handler IsNot Nothing Then
+            handler(Me, EventArgs.Empty)
+        End If
+    End Sub
+    Protected Overrides Sub WndProc(ByRef m As Message)
+        MyBase.WndProc(m)
+
+        If m.Msg = &H115 Or m.Msg = &H20A Then
+            OnScroll()
+        ElseIf m.Msg = &H100 Then
+            If m.WParam = 33 Or m.WParam = 34 Or m.WParam = 35 Or m.WParam = 36 Or m.WParam = 38 Or m.WParam = 40 Then
+                OnScroll()
+            End If
+        End If
+    End Sub
+
+    Private Enum ListViewMessages As UInteger
+        LVM_FIRST = &H1000
+        LVM_SCROLL = LVM_FIRST + 20
+    End Enum
+
+    <DllImport("user32.dll", CharSet:=CharSet.Auto, SetLastError:=False)>
+    Private Shared Function SendMessage(ByVal hWnd As HandleRef, ByVal Msg As UInteger, ByVal wParam As IntPtr, ByVal lParam As IntPtr) As IntPtr
+    End Function
+End Class

DiskImageTool/AdvancedListView.vb

@@ -40,13 +40,12 @@
             _Parent = Parent
         End Sub
 
-        Public Function DataRegionSize() As UInteger
-            Dim TotalNumberOfSectors = SmallNumberOfSectors
-            If TotalNumberOfSectors = 0 Then
-                TotalNumberOfSectors = LargeNumberOfSectors
-            End If
+        Public Function BytesPerCluster() As UInteger
+            Return SectorsPerCluster * BytesPerSector
+        End Function
 
-            Return TotalNumberOfSectors - (ReservedSectors + FatRegionSize() + RootDirectoryRegionSize())
+        Public Function DataRegionSize() As UInteger
+            Return SectorCount() - (ReservedSectors + FatRegionSize() + RootDirectoryRegionSize())
         End Function
 
         Public Function DataRegionStart() As UInteger
@@ -73,6 +72,14 @@
             Return FatRegionStart() + FatRegionSize()
         End Function
 
+        Public Function SectorCount() As UInteger
+            If SmallNumberOfSectors > 0 Then
+                Return SmallNumberOfSectors
+            Else
+                Return LargeNumberOfSectors
+            End If
+        End Function
+
         Public Property BootStrapCode() As Byte()
             Get
                 Return _Parent.GetBytes(BootSectorOffset.BootStrapCode, BootSectorSize.BootStrapCode)

DiskImageTool/DiskImage/BootSector.vb

@@ -8,13 +8,22 @@
             _FatChain = FatChain
         End Sub
 
-        Private Function GetDataRoot() As DataBlock
-            Dim Result As DataBlock
+        Private Function GetDataRoot() As List(Of DataBlock)
+            Dim Result As New List(Of DataBlock)
 
-            Result.Offset = _Parent.BootSector.RootDirectoryRegionStart * _Parent.BootSector.BytesPerSector
-            Dim OffsetEnd As UInteger = _Parent.BootSector.DataRegionStart * _Parent.BootSector.BytesPerSector
+            Dim SectorStart = _Parent.BootSector.RootDirectoryRegionStart
+            Dim SectorEnd = _Parent.BootSector.DataRegionStart
 
-            Result.Data = _Parent.GetBytes(Result.Offset, OffsetEnd - Result.Offset)
+            For Sector = SectorStart To SectorEnd - 1
+                Dim Block As DataBlock
+                With Block
+                    .Cluster = 0
+                    .Sector = Sector
+                    .Offset = _Parent.SectorToOffset(Sector)
+                    .Data = _Parent.GetBytes(.Offset, _Parent.BootSector.BytesPerSector)
+                End With
+                Result.Add(Block)
+            Next
 
             Return Result
         End Function
@@ -23,15 +32,17 @@
             Dim Result As New List(Of DataBlock)
 
             For Each Cluster In _FatChain
-                Dim Block As DataBlock
-
-                Block.Offset = _Parent.BootSector.DataRegionStart + ((Cluster - 2) * _Parent.BootSector.SectorsPerCluster)
-                Block.Offset *= _Parent.BootSector.BytesPerSector
-
-                Dim Length As UInteger = _Parent.BootSector.SectorsPerCluster * _Parent.BootSector.BytesPerSector
-
-                Block.Data = _Parent.GetBytes(Block.Offset, Length)
-                Result.Add(Block)
+                Dim Sector = _Parent.ClusterToSector(Cluster)
+                For Counter = 0 To _Parent.BootSector.SectorsPerCluster - 1
+                    Dim Block As DataBlock
+                    With Block
+                        .Cluster = Cluster
+                        .Sector = Sector + Counter
+                        .Offset = _Parent.SectorToOffset(Sector + Counter)
+                        .Data = _Parent.GetBytes(.Offset, _Parent.BootSector.BytesPerSector)
+                    End With
+                    Result.Add(Block)
+                Next
             Next
 
             Return Result
@@ -41,39 +52,34 @@
             Dim Count As UInteger = 0
 
             For Each Cluster In _FatChain
-                Dim OffsetStart As UInteger = _Parent.BootSector.DataRegionStart + ((Cluster - 2) * _Parent.BootSector.SectorsPerCluster)
-                Dim OffsetEnd As UInteger = OffsetStart + _Parent.BootSector.SectorsPerCluster
+                Dim OffsetStart As UInteger = _Parent.ClusterToOffset(Cluster)
+                Dim OffsetLength As UInteger = _Parent.BootSector.BytesPerCluster
 
-                OffsetStart *= _Parent.BootSector.BytesPerSector
-                OffsetEnd *= _Parent.BootSector.BytesPerSector
 
-                Count += _Parent.GetDirectoryLength(OffsetStart, OffsetEnd, FileCountOnly)
+                Count += _Parent.GetDirectoryLength(OffsetStart, OffsetStart + OffsetLength, FileCountOnly)
             Next
 
             Return Count
         End Function
 
         Private Function GetDirectoryLengthRoot(FileCountOnly As Boolean) As UInteger
-            Dim OffsetStart As UInteger = _Parent.BootSector.RootDirectoryRegionStart * _Parent.BootSector.BytesPerSector
-            Dim OffsetEnd As UInteger = _Parent.BootSector.DataRegionStart * _Parent.BootSector.BytesPerSector
+            Dim OffsetStart As UInteger = _Parent.SectorToOffset(_Parent.BootSector.RootDirectoryRegionStart)
+            Dim OffsetEnd As UInteger = _Parent.SectorToOffset(_Parent.BootSector.DataRegionStart)
 
             Return _Parent.GetDirectoryLength(OffsetStart, OffsetEnd, FileCountOnly)
         End Function
 
         Private Function GetFileSubDirectory(Index As UInteger) As DiskImage.DirectoryEntry
-            Dim EntriesPerCluster As UInteger = _Parent.BootSector.BytesPerSector * _Parent.BootSector.SectorsPerCluster / 32
+            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.BootSector.DataRegionStart + ((_FatChain.Item(ChainIndex) - 2) * _Parent.BootSector.SectorsPerCluster)
-            Offset *= _Parent.BootSector.BytesPerSector
-            Offset += ClusterIndex * 32
+            Dim Offset As UInteger = _Parent.ClusterToOffset(_FatChain.Item(ChainIndex)) + ClusterIndex * 32
 
             Return New DiskImage.DirectoryEntry(_Parent, Offset)
         End Function
 
         Private Function GetFileRoot(Index As Integer) As DiskImage.DirectoryEntry
-            Dim Offset As UInteger = _Parent.BootSector.RootDirectoryRegionStart * _Parent.BootSector.BytesPerSector
-            Offset += (Index - 1) * 32
+            Dim Offset As UInteger = _Parent.SectorToOffset(_Parent.BootSector.RootDirectoryRegionStart) + (Index - 1) * 32
 
             Return New DiskImage.DirectoryEntry(_Parent, Offset)
         End Function
@@ -104,9 +110,7 @@
 
         Public Function GetData() As List(Of DataBlock)
             If _FatChain Is Nothing Then
-                Return New List(Of DataBlock) From {
-                    GetDataRoot()
-                }
+                Return GetDataRoot()
             Else
                 Return GetDataSubDirectory()
             End If

DiskImageTool/DiskImage/Directory.vb

@@ -212,9 +212,8 @@ Namespace DiskImage
             Dim FileBytes = _Parent.Data
 
             For Each Cluster In _FatChain
-                Dim Offset As UInteger = _Parent.BootSector.DataRegionStart + ((Cluster - 2) * _Parent.BootSector.SectorsPerCluster)
-                Offset *= _Parent.BootSector.BytesPerSector
-                BytesToCopy = _Parent.BootSector.BytesPerSector * _Parent.BootSector.SectorsPerCluster
+                Dim Offset As UInteger = _Parent.ClusterToOffset(Cluster)
+                BytesToCopy = _Parent.BootSector.BytesPerCluster
                 If BytesToCopy > BytesRemaining Then
                     BytesToCopy = BytesRemaining
                 End If
@@ -353,15 +352,7 @@ Namespace DiskImage
         End Function
 
         Public Function HasInvalidFileSize() As Boolean
-            Dim SectorCount As UInteger
-
-            If _Parent.BootSector.SmallNumberOfSectors > 0 Then
-                SectorCount = _Parent.BootSector.SmallNumberOfSectors
-            Else
-                SectorCount = _Parent.BootSector.LargeNumberOfSectors
-            End If
-
-            Return FileSize > SectorCount * _Parent.BootSector.BytesPerSector
+            Return FileSize > _Parent.BootSector.SectorCount * _Parent.BootSector.BytesPerSector
         End Function
 
         Public Function HasLastAccessDate() As Boolean