chore: development v0.1.33 - comprehensive testing complete [auto-commit]

Author: githubrobbi

Cargo.lock

@@ -32,7 +32,7 @@ members = [
 # Workspace Package Metadata (inherited by all crates)
 # ─────────────────────────────────────────────────────────────────────────────
 [workspace.package]
-version = "0.1.31"
+version = "0.1.33"
 edition = "2024"
 rust-version = "1.85"
 license = "MPL-2.0 OR LicenseRef-UFFS-Commercial"

Cargo.toml

@@ -35,11 +35,10 @@
 // These dependencies are used by the uffs-mft library, not this binary.
 // Cargo doesn't support per-binary dependencies, so we suppress the warnings
 // here.
-use std::io::stdout;
-use std::path::PathBuf;
-
 #[cfg(not(windows))]
 use core::future::Future;
+use std::io::stdout;
+use std::path::PathBuf;
 
 #[cfg(windows)]
 use anyhow::Context;
@@ -1584,8 +1583,10 @@ async fn cmd_bitmap_diag(drive: char, show_samples: bool) -> Result<()> {
     println!("   Total records (from size): {}", total_records_from_size);
     println!();
 
+
+
     // Try to get bitmap
-    println!("📋 BITMAP RETRIEVAL");
+    println!("📋 BITMAP RETRIEVAL (via get_mft_bitmap)");
     match handle.get_mft_bitmap() {
         Ok(bitmap) => {
             let bitmap_bytes = bitmap.as_bytes().len();

crates/uffs-mft/src/main.rs

@@ -347,7 +347,11 @@ impl VolumeHandle {
     /// Returns an error if the bitmap cannot be read.
     #[allow(unsafe_code)] // Required: Windows FFI for CreateFileW, GetFileSizeEx, ReadFile
     pub fn get_mft_bitmap(&self) -> Result<MftBitmap> {
-        // Open the $MFT::$BITMAP stream
+        use windows::Win32::Storage::FileSystem::{
+            FILE_BEGIN, GetFileSizeEx, ReadFile, SetFilePointerEx,
+        };
+
+        // Open the $MFT::$BITMAP stream to get retrieval pointers and size
         let bitmap_path: Vec<u16> = format!("{}:\\$MFT::$BITMAP", self.volume)
             .encode_utf16()
             .chain(core::iter::once(0))
@@ -356,11 +360,11 @@ impl VolumeHandle {
         let bitmap_handle = unsafe {
             CreateFileW(
                 PCWSTR::from_raw(bitmap_path.as_ptr()),
-                FILE_READ_ATTRIBUTES.0 | 0x0001, // FILE_READ_DATA
+                FILE_READ_ATTRIBUTES.0,
                 FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                 None,
                 OPEN_EXISTING,
-                FILE_FLAG_OPEN_REPARSE_POINT,
+                FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_NO_BUFFERING,
                 None,
             )
         };
@@ -381,35 +385,76 @@ impl VolumeHandle {
         // Get file size
         let mut file_size: i64 = 0;
         unsafe {
-            use windows::Win32::Storage::FileSystem::GetFileSizeEx;
             if GetFileSizeEx(bitmap_handle, &mut file_size).is_err() {
                 return Ok(MftBitmap::new_all_valid(
                     self.estimated_record_count() as usize
                 ));
             }
         }
 
-        // Read the bitmap
-        let mut buffer = vec![0u8; file_size as usize];
-        let mut bytes_read: u32 = 0;
-
-        unsafe {
-            use windows::Win32::Storage::FileSystem::ReadFile;
-            if ReadFile(
-                bitmap_handle,
-                Some(&mut buffer),
-                Some(&mut bytes_read),
-                None,
-            )
-            .is_err()
-            {
+        // Get retrieval pointers for the bitmap file
+        let extents = match get_retrieval_pointers(bitmap_handle) {
+            Ok(e) if !e.is_empty() => e,
+            _ => {
+                // Can't get extents, fall back to all valid
                 return Ok(MftBitmap::new_all_valid(
                     self.estimated_record_count() as usize
                 ));
             }
+        };
+
+        // Read the bitmap data from the volume at the physical cluster locations
+        let bytes_per_cluster = self.volume_data.bytes_per_cluster;
+        let mut buffer = vec![0u8; file_size as usize];
+        let mut buffer_offset = 0usize;
+
+        for extent in &extents {
+            let byte_offset = extent.lcn * i64::from(bytes_per_cluster);
+            let extent_bytes = (extent.cluster_count * u64::from(bytes_per_cluster)) as usize;
+            let bytes_to_read = extent_bytes.min(buffer.len() - buffer_offset);
+
+            if bytes_to_read == 0 {
+                break;
+            }
+
+            // Seek to the extent's physical location on the volume
+            let mut new_position = 0_i64;
+            unsafe {
+                if SetFilePointerEx(
+                    self.handle,
+                    byte_offset,
+                    Some(&mut new_position),
+                    FILE_BEGIN,
+                )
+                .is_err()
+                {
+                    return Ok(MftBitmap::new_all_valid(
+                        self.estimated_record_count() as usize
+                    ));
+                }
+            }
+
+            // Read the extent data from the volume
+            let mut bytes_read: u32 = 0;
+            unsafe {
+                if ReadFile(
+                    self.handle,
+                    Some(&mut buffer[buffer_offset..buffer_offset + bytes_to_read]),
+                    Some(&mut bytes_read),
+                    None,
+                )
+                .is_err()
+                {
+                    return Ok(MftBitmap::new_all_valid(
+                        self.estimated_record_count() as usize
+                    ));
+                }
+            }
+
+            buffer_offset += bytes_read as usize;
         }
 
-        buffer.truncate(bytes_read as usize);
+        buffer.truncate(buffer_offset);
         Ok(MftBitmap::from_bytes(buffer))
     }
 }

crates/uffs-mft/src/platform.rs

@@ -1 +1 @@
-v0.1.31
+v0.1.33