Upload FastSeekWpf/Core/MftReader.cs

FastSeekWpf/Core/MftReader.cs

@@ -33,22 +33,14 @@ public class MftReader : IDisposable
         if (_volumeHandle == new IntPtr(-1))
         {
             int err = Marshal.GetLastWin32Error();
-            throw new IOException($"Failed to open volume {drive.DevicePath}: {Win32Error(err)}");
+            throw new IOException($"Failed to open volume {drive.DevicePath}: {Win32Error(err)} (code={err})");
         }
     }
 
-    // ------------------------------------------------------------------
-    //  Primary: direct $MFT file read
-    // ------------------------------------------------------------------
-
     public ScanResult? ScanDirect()
     {
         int? recordSize = ReadMftRecordSize();
-        if (!recordSize.HasValue)
-        {
-            Logger.Log($"[{Drive.Letter}] ReadMftRecordSize failed — cannot do direct scan");
-            return null;
-        }
+        if (!recordSize.HasValue) return null;
 
         string mftPath = $"{_drive.Root}$MFT";
         Logger.Log($"[{Drive.Letter}] Opening $MFT file: {mftPath}");
@@ -69,8 +61,6 @@ public class MftReader : IDisposable
             return null;
         }
 
-        Logger.Log($"[{Drive.Letter}] $MFT opened OK, handle=0x{mftHandle:X}");
-
         try
         {
             var records = new List<CompactRecord>();
@@ -107,7 +97,6 @@ public class MftReader : IDisposable
                     {
                         ParseFileRecord(buffer.AsSpan(offset, recordSize.Value), mftIndex, records, nameData);
                     }
-
                     mftIndex++;
                     offset += recordSize.Value;
                 }
@@ -130,13 +119,37 @@ public class MftReader : IDisposable
         }
     }
 
-    // ------------------------------------------------------------------
-    //  Fallback: FSCTL_ENUM_USN_DATA
-    // ------------------------------------------------------------------
-
     public ScanResult Scan()
     {
+        // Diagnostic: test FSCTL_QUERY_USN_JOURNAL first
+        Logger.Log($"[{Drive.Letter}] Diagnostic: testing FSCTL_QUERY_USN_JOURNAL...");
+        IntPtr journalBuf = Marshal.AllocHGlobal(Marshal.SizeOf<USN_JOURNAL_DATA_V0>());
+        try
+        {
+            bool ok = Win32Api.DeviceIoControl(
+                _volumeHandle, Win32Api.FSCTL_QUERY_USN_JOURNAL,
+                IntPtr.Zero, 0,
+                journalBuf, (uint)Marshal.SizeOf<USN_JOURNAL_DATA_V0>(),
+                out uint bytesReturned, IntPtr.Zero);
+            if (ok)
+            {
+                var journalData = Marshal.PtrToStructure<USN_JOURNAL_DATA_V0>(journalBuf);
+                Logger.Log($"[{Drive.Letter}] USN journal OK: ID={journalData.UsnJournalID}, NextUsn={journalData.NextUsn}, Active=YES");
+            }
+            else
+            {
+                int err = Marshal.GetLastWin32Error();
+                Logger.Log($"[{Drive.Letter}] FSCTL_QUERY_USN_JOURNAL failed: {Win32Error(err)} (code={err})");
+            }
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(journalBuf);
+        }
+
         Logger.Log($"[{Drive.Letter}] Starting FSCTL_ENUM_USN_DATA fallback...");
+        Logger.Log($"[{Drive.Letter}] MFT_ENUM_DATA_V0 size = {Marshal.SizeOf<MFT_ENUM_DATA_V0>()} bytes");
+        Logger.Log($"[{Drive.Letter}] USN_RECORD_V2 size = {Marshal.SizeOf<USN_RECORD_V2>()} bytes");
 
         var records = new List<CompactRecord>();
         var nameData = new List<char>();
@@ -150,8 +163,6 @@ public class MftReader : IDisposable
         };
 
         int enumDataSize = Marshal.SizeOf<MFT_ENUM_DATA_V0>();
-        Logger.Log($"[{Drive.Letter}] MFT_ENUM_DATA_V0 size = {enumDataSize} bytes");
-
         IntPtr enumDataPtr = Marshal.AllocHGlobal(enumDataSize);
         Marshal.StructureToPtr(enumData, enumDataPtr, false);
 
@@ -181,10 +192,14 @@ public class MftReader : IDisposable
                         }
                         if (error == 122) // ERROR_INSUFFICIENT_BUFFER
                         {
-                            Logger.Log($"[{Drive.Letter}] FSCTL_ENUM_USN_DATA: buffer too small ({buffer.Length}), retrying with larger buffer");
+                            Logger.Log($"[{Drive.Letter}] FSCTL_ENUM_USN_DATA: buffer too small ({buffer.Length}), retrying");
                             buffer = new byte[buffer.Length * 2];
                             continue;
                         }
+                        if (error == 1) // ERROR_INVALID_FUNCTION
+                        {
+                            Logger.Log($"[{Drive.Letter}] FSCTL_ENUM_USN_DATA: ERROR_INVALID_FUNCTION — struct/IOCTL mismatch or journal not active");
+                        }
                         Logger.Log($"[{Drive.Letter}] FSCTL_ENUM_USN_DATA failed (iter {iterations}): {Win32Error(error)} (code={error})");
                         break;
                     }
@@ -245,10 +260,6 @@ public class MftReader : IDisposable
         return new ScanResult(records, nameData);
     }
 
-    // ------------------------------------------------------------------
-    //  NTFS helpers
-    // ------------------------------------------------------------------
-
     private int? ReadMftRecordSize()
     {
         Logger.Log($"[{Drive.Letter}] Reading boot sector from volume...");
@@ -265,7 +276,7 @@ public class MftReader : IDisposable
 
         if (boot[3] != 'N' || boot[4] != 'T' || boot[5] != 'F' || boot[6] != 'S')
         {
-            Logger.Log($"[{Drive.Letter}] Not NTFS (missing signature at offset 3)");
+            Logger.Log($"[{Drive.Letter}] Not NTFS (missing signature at offset 3): bytes={boot[3]},{boot[4]},{boot[5]},{boot[6]}");
             return null;
         }