Merge branch 'main' into parallel-ports

Signed-off-by: Melvin Wang <melvin.mc.wang@gmail.com>

Author: wmmc88

Cargo.lock

@@ -47,7 +47,7 @@ clap-cargo = "0.14.1"
 itertools = "0.13.0"
 paste = "1.0.15"
 pretty_assertions = "1.4.1"
-proc-macro2 = "1.0.86"
+proc-macro2 = "1.0.93"
 quote = "1.0.38"
 rustversion = "1.0.19"
 serde = "1.0"

Cargo.toml

@@ -205,6 +205,8 @@ pub enum ApiSubset {
     ParallelPorts,
     /// API subset for SPB (Serial Peripheral Bus) drivers: <https://learn.microsoft.com/en-us/windows-hardware/drivers/ddi/_spb/>
     Spb,
+    /// API subset for Storage drivers: <https://learn.microsoft.com/en-us/windows-hardware/drivers/ddi/_storage/>
+    Storage,
 }
 
 impl Default for Config {
@@ -706,6 +708,37 @@ impl Config {
 
                 spb_headers
             }
+            ApiSubset::Storage => {
+                let mut storage_headers = vec![
+                    "ehstorioctl.h",
+                    "ntddcdrm.h",
+                    "ntddcdvd.h",
+                    "ntdddisk.h",
+                    "ntddmmc.h",
+                    "ntddscsi.h",
+                    "ntddstor.h",
+                    "ntddtape.h",
+                    "ntddvol.h",
+                    "ufs.h",
+                ];
+
+                if let DriverConfig::Wdm | DriverConfig::Kmdf(_) = self.driver_config {
+                    storage_headers.extend([
+                        "mountdev.h",
+                        "mountmgr.h",
+                        "ntddchgr.h",
+                        "ntdddump.h",
+                        "storduid.h",
+                        "storport.h",
+                    ]);
+                }
+
+                if let DriverConfig::Kmdf(_) = self.driver_config {
+                    storage_headers.extend(["ehstorbandmgmt.h"]);
+                }
+
+                storage_headers
+            }
         }
         .into_iter()
         .map(std::string::ToString::to_string)

crates/wdk-build/src/lib.rs

@@ -37,8 +37,9 @@ default = []
 
 gpio = []
 hid = []
-spb = []
 parallel-ports = ["gpio"]
+spb = []
+storage = []
 
 nightly = ["wdk-macros/nightly"]
 test-stubs = []

crates/wdk-sys/Cargo.toml

@@ -135,6 +135,7 @@ const BINDGEN_FILE_GENERATORS_TUPLES: &[(&str, GenerateFn)] = &[
     ("hid.rs", generate_hid),
     ("parallel_ports.rs", generate_parallel_ports),
     ("spb.rs", generate_spb),
+    ("storage.rs", generate_storage),
 ];
 
 fn initialize_tracing() -> Result<(), ParseError> {
@@ -205,6 +206,8 @@ fn generate_constants(out_path: &Path, config: &Config) -> Result<(), ConfigErro
         ApiSubset::Spb,
         #[cfg(feature = "parallel-ports")]
         ApiSubset::ParallelPorts,
+        #[cfg(feature = "storage")]
+        ApiSubset::Storage,
     ]);
     trace!(header_contents = ?header_contents);
 
@@ -233,6 +236,8 @@ fn generate_types(out_path: &Path, config: &Config) -> Result<(), ConfigError> {
         ApiSubset::Spb,
         #[cfg(feature = "parallel-ports")]
         ApiSubset::ParallelPorts,
+        #[cfg(feature = "storage")]
+        ApiSubset::Storage,
     ]);
     trace!(header_contents = ?header_contents);
 
@@ -445,6 +450,45 @@ fn generate_spb(out_path: &Path, config: &Config) -> Result<(), ConfigError> {
     }
 }
 
+fn generate_storage(out_path: &Path, config: &Config) -> Result<(), ConfigError> {
+    cfg_if::cfg_if! {
+        if #[cfg(feature = "storage")] {
+            info!("Generating bindings to WDK: storage.rs");
+
+            let header_contents = config.bindgen_header_contents([
+                ApiSubset::Base,
+                ApiSubset::Wdf,
+                ApiSubset::Storage,
+            ]);
+            trace!(header_contents = ?header_contents);
+
+            let bindgen_builder = {
+                let mut builder = bindgen::Builder::wdk_default(config)?
+                    .with_codegen_config((CodegenConfig::TYPES | CodegenConfig::VARS).complement())
+                    .header_contents("storage-input.h", &header_contents);
+
+                // Only allowlist files in the storage-specific files to avoid
+                // duplicate definitions
+                for header_file in config.headers(ApiSubset::Storage) {
+                    builder = builder.allowlist_file(format!("(?i).*{header_file}.*"));
+                }
+                builder
+            };
+            trace!(bindgen_builder = ?bindgen_builder);
+
+            Ok(bindgen_builder
+                .generate()
+                .expect("Bindings should succeed to generate")
+                .write_to_file(out_path.join("storage.rs"))?)
+        } else {
+            let _ = (out_path, config); // Silence unused variable warnings when storage feature is not enabled
+
+            info!("Skipping storage.rs generation since storage feature is not enabled");
+            Ok(())
+        }
+    }
+}
+
 /// Generates a `wdf_function_count.rs` file in `OUT_DIR` which contains the
 /// definition of the function `get_wdf_function_count()`. This is required to
 /// be generated here since the size of the table is derived from either a

crates/wdk-sys/build.rs

@@ -69,6 +69,16 @@ pub mod parallel_ports;
 ))]
 pub mod spb;
 
+#[cfg(all(
+    any(
+        driver_model__driver_type = "WDM",
+        driver_model__driver_type = "KMDF",
+        driver_model__driver_type = "UMDF"
+    ),
+    feature = "storage"
+))]
+pub mod storage;
+
 #[cfg(feature = "test-stubs")]
 pub mod test_stubs;
 

crates/wdk-sys/src/lib.rs

@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation
+// License: MIT OR Apache-2.0
+
+//! Direct FFI bindings to Storage APIs from the Windows Driver Kit (WDK)
+//!
+//! This module contains all bindings to functions, constants, methods,
+//! constructors and destructors for Storage headers. Types are not included in
+//! this module, but are available in the top-level `wdk_sys` module.
+
+#[allow(
+    missing_docs,
+    reason = "most items in the WDK headers have no inline documentation, so bindgen is unable to \
+              generate documentation for their bindings"
+)]
+mod bindings {
+    #[allow(
+        clippy::wildcard_imports,
+        reason = "the underlying c code relies on all type definitions being in scope, which \
+                  results in the bindgen generated code relying on the generated types being in \
+                  scope as well"
+    )]
+    #[allow(
+        unused_imports,
+        reason = "in certain configurations of the WDK (ex. UMDF), there are no functions related \
+                  to Storage that can be generated by bindgen, so these types are unused"
+    )]
+    use crate::types::*;
+
+    include!(concat!(env!("OUT_DIR"), "/storage.rs"));
+}
+#[allow(
+    unused_imports,
+    reason = "in certain configurations of the WDK (ex. UMDF), there are no functions related to \
+              Storage that can be generated by bindgen, so the `bindings` module is empty"
+)]
+pub use bindings::*;

crates/wdk-sys/src/storage.rs

@@ -34,8 +34,9 @@ default = []
 
 gpio = ["wdk-sys/gpio"]
 hid = ["wdk-sys/hid"]
-spb = ["wdk-sys/spb"]
 parallel-ports = ["wdk-sys/parallel-ports"]
+spb = ["wdk-sys/spb"]
+storage = ["wdk-sys/storage"]
 
 nightly = ["wdk/nightly", "wdk-sys/nightly"]
 

examples/sample-kmdf-driver/Cargo.toml

@@ -32,8 +32,9 @@ default = []
 
 gpio = ["wdk-sys/gpio"]
 hid = ["wdk-sys/hid"]
-spb = ["wdk-sys/spb"]
 parallel-ports = ["wdk-sys/parallel-ports"]
+spb = ["wdk-sys/spb"]
+storage = ["wdk-sys/storage"]
 
 nightly = ["wdk/nightly", "wdk-sys/nightly"]
 

examples/sample-umdf-driver/Cargo.toml

@@ -27,14 +27,14 @@ wdk = { path = "../../crates/wdk", version = "0.3.0" }
 wdk-panic = { path = "../../crates/wdk-panic", version = "0.3.0" }
 wdk-sys = { path = "../../crates/wdk-sys", version = "0.3.0" }
 
-
 [features]
 default = []
 
 gpio = ["wdk-sys/gpio"]
 hid = ["wdk-sys/hid"]
 spb = ["wdk-sys/spb"]
 parallel-ports = ["wdk-sys/parallel-ports"]
+storage = ["wdk-sys/storage"]
 
 nightly = ["wdk/nightly", "wdk-sys/nightly"]