Skip to content

Commit cd1fd23

Browse files
authored
Merge pull request #2 from microsoft/melvinwang/improve-docs
Fixes to go with 0.1.0 crates.io releases
2 parents 7fcaf22 + dfebe79 commit cd1fd23

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ readme = "README.md"
1717
license = "MIT OR Apache-2.0"
1818

1919
[workspace.dependencies]
20-
wdk = { path = "crates/wdk" }
21-
wdk-alloc = { path = "crates/wdk-alloc" }
22-
wdk-build = { path = "crates/wdk-build" }
23-
wdk-macros = { path = "crates/wdk-macros" }
24-
wdk-panic = { path = "crates/wdk-panic" }
25-
wdk-sys = { path = "crates/wdk-sys" }
20+
wdk = { path = "crates/wdk", version = "0.1.0" }
21+
wdk-alloc = { path = "crates/wdk-alloc", version = "0.1.0" }
22+
wdk-build = { path = "crates/wdk-build", version = "0.1.0" }
23+
wdk-macros = { path = "crates/wdk-macros", version = "0.1.0" }
24+
wdk-panic = { path = "crates/wdk-panic", version = "0.1.0" }
25+
wdk-sys = { path = "crates/wdk-sys", version = "0.1.0" }
2626
bindgen = "0.68.1"
2727
serde = { version = "1.0", features = ["derive"] }
2828
serde_json = "1.0"

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# windows-drivers-rs
22

33

4-
This repo is a collection rust crates that enable developers to develop Windows Drivers in Rust. It is the intention to support both WDM and WDF driver development models. This repo contains the following crates:
4+
This repo is a collection of Rust crates that enable developers to develop Windows Drivers in Rust. It is the intention to support both WDM and WDF driver development models. This repo contains the following crates:
55

66
* [wdk-build](./crates/wdk-build): A library to configure a Cargo build script for binding generation and downstream linking of the WDK (Windows Developer Kit). While this crate is written to be flexible with different WDK releases and different WDF version, it is currently only tested for NI eWDK, KMDF 1.33, UMDF 2.33, and WDM Drivers. There may be missing linker options for older DDKs.
77
* [wdk-sys](./crates/wdk-sys): Direct FFI bindings to APIs available in the Windows Development Kit (WDK). This includes both autogenerated ffi bindings from `bindgen`, and also manual re-implementations of macros that bindgen fails to generate.
@@ -16,7 +16,7 @@ Note: This project is still in early stages of development and is not yet recomm
1616

1717
## <a name="supported-configs">Supported Configurations
1818

19-
This project was built with support of WDM, KMDF, and UMDF drivers in mind, as well as Win32 Services. This includes support for all versions of WDF included in WDK 22H2 and newer. Currently, the crates available on [`crates.io`](crates.io) only support KMDF v1.33, but bindings can be generated for everything else by cloning `windows-drivers-rs` and modifying the config specified in [`build.rs` of `wdk-sys`](./crates/wdk-sys/build.rs). Crates.io support for other WDK configurations is planned in the near future.
19+
This project was built with support of WDM, KMDF, and UMDF drivers in mind, as well as Win32 Services. This includes support for all versions of WDF included in WDK 22H2 and newer. Currently, the crates available on [`crates.io`](https://crates.io) only support KMDF v1.33, but bindings can be generated for everything else by cloning `windows-drivers-rs` and modifying the config specified in [`build.rs` of `wdk-sys`](./crates/wdk-sys/build.rs). Crates.io support for other WDK configurations is planned in the near future.
2020

2121
## Getting Started
2222

@@ -31,7 +31,7 @@ This project was built with support of WDM, KMDF, and UMDF drivers in mind, as w
3131

3232
## Adding windows-drivers-rs to Your Driver Package
3333

34-
The crates in this repository are available from [`crates.io`](crates.io), but take into not the current limitations outlined in [Supported Configurations](#supported-configs). If you need to support a different config, try cloning this repo and using [path dependencies](https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#specifying-path-dependencies)
34+
The crates in this repository are available from [`crates.io`](https://crates.io), but take into account the current limitations outlined in [Supported Configurations](#supported-configs). If you need to support a different config, try cloning this repo and using [path dependencies](https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#specifying-path-dependencies)
3535

3636
1. Create a new Cargo package with a lib crate:
3737

@@ -130,7 +130,7 @@ The crates in this repository are available from [`crates.io`](crates.io), but t
130130
load_script = """
131131
pwsh.exe -Command "\
132132
if ($env:CARGO_MAKE_CRATE_IS_WORKSPACE) { return };\
133-
$cargoMakeURI = ' https://raw.githubusercontent.com/microsoft/windows-drivers-rs/master/rust-driver-makefile.toml;\
133+
$cargoMakeURI = 'https://raw.githubusercontent.com/microsoft/windows-drivers-rs/main/rust-driver-makefile.toml';\
134134
New-Item -ItemType Directory .cargo-make-loadscripts -Force;\
135135
Invoke-RestMethod -Method GET -Uri $CargoMakeURI -OutFile $env:CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY/.cargo-make-loadscripts/rust-driver-makefile.toml\
136136
"

crates/wdk-macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description = "A collection of macros that help make it easier to interact with
77
repository = "https://github.com/microsoft/windows-drivers-rs"
88
readme = "README.md"
99
license = "MIT OR Apache-2.0"
10-
keywords = ["wdk", "windows", "wdf", "wdm", "ffi", "winapi"]
10+
keywords = ["wdk", "windows", "wdf", "wdm", "ffi"]
1111
categories = [
1212
"external-ffi-bindings",
1313
"development-tools::ffi",

crates/wdk-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "Direct bindings to APIs available in the Windows Development Kit
88
repository.workspace = true
99
readme.workspace = true
1010
license.workspace = true
11-
keywords = ["wdk", "windows", "wdf", "wdm", "ffi", "winapi"]
11+
keywords = ["wdk", "windows", "wdf", "wdm", "ffi"]
1212
categories = [
1313
"external-ffi-bindings",
1414
"development-tools::ffi",

crates/wdk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "Safe idiomatic bindings to APIs available in the Windows Developm
88
repository.workspace = true
99
readme.workspace = true
1010
license.workspace = true
11-
keywords = ["wdk", "windows", "wdf", "wdm", "ffi", "winapi"]
11+
keywords = ["wdk", "windows", "wdf", "wdm", "ffi"]
1212
categories = [
1313
"api-bindings",
1414
"development-tools::build-utils",

0 commit comments

Comments
 (0)