diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31df29c3e8..69444def95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -126,6 +126,7 @@ jobs: cargo clippy -p test_lib && cargo clippy -p test_matrix3x2 && cargo clippy -p test_mshtml && + cargo clippy -p test_not_dll && cargo clippy -p test_ntstatus && cargo clippy -p test_pwstr && cargo clippy -p test_return_struct && diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dcc6a8a73d..2af12cc4f1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -86,6 +86,7 @@ jobs: cargo test --target ${{ matrix.target }} -p test_lib && cargo test --target ${{ matrix.target }} -p test_matrix3x2 && cargo test --target ${{ matrix.target }} -p test_mshtml && + cargo test --target ${{ matrix.target }} -p test_not_dll && cargo test --target ${{ matrix.target }} -p test_ntstatus && cargo test --target ${{ matrix.target }} -p test_pwstr && cargo test --target ${{ matrix.target }} -p test_return_struct && diff --git a/crates/targets/aarch64_msvc/lib/windows.lib b/crates/targets/aarch64_msvc/lib/windows.lib index 64083bc4d0..3bdd396370 100644 Binary files a/crates/targets/aarch64_msvc/lib/windows.lib and b/crates/targets/aarch64_msvc/lib/windows.lib differ diff --git a/crates/targets/i686_gnu/lib/libwindows.a b/crates/targets/i686_gnu/lib/libwindows.a index 4a6967719f..ca89bcef74 100644 Binary files a/crates/targets/i686_gnu/lib/libwindows.a and b/crates/targets/i686_gnu/lib/libwindows.a differ diff --git a/crates/targets/i686_msvc/lib/windows.lib b/crates/targets/i686_msvc/lib/windows.lib index 3e2b9a9843..7ef9ba05a2 100644 Binary files a/crates/targets/i686_msvc/lib/windows.lib and b/crates/targets/i686_msvc/lib/windows.lib differ diff --git a/crates/targets/x86_64_gnu/lib/libwindows.a b/crates/targets/x86_64_gnu/lib/libwindows.a index 21699507ac..38183030e7 100644 Binary files a/crates/targets/x86_64_gnu/lib/libwindows.a and b/crates/targets/x86_64_gnu/lib/libwindows.a differ diff --git a/crates/targets/x86_64_msvc/lib/windows.lib b/crates/targets/x86_64_msvc/lib/windows.lib index addf8d8a32..db6635cac6 100644 Binary files a/crates/targets/x86_64_msvc/lib/windows.lib and b/crates/targets/x86_64_msvc/lib/windows.lib differ diff --git a/crates/tests/not_dll/Cargo.toml b/crates/tests/not_dll/Cargo.toml new file mode 100644 index 0000000000..ff293550df --- /dev/null +++ b/crates/tests/not_dll/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "test_not_dll" +version = "0.0.0" +authors = ["Microsoft"] +edition = "2018" + +[dependencies.windows] +path = "../../libs/windows" +features = [ + "Win32_Graphics_Printing", + "Win32_Foundation", + "Win32_Graphics_Gdi", +] + +[dependencies.windows-sys] +path = "../../libs/sys" +features = [ + "Win32_Graphics_Printing", + "Win32_Foundation", + "Win32_Graphics_Gdi", +] diff --git a/crates/tests/not_dll/src/lib.rs b/crates/tests/not_dll/src/lib.rs new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/crates/tests/not_dll/src/lib.rs @@ -0,0 +1 @@ + diff --git a/crates/tests/not_dll/tests/sys.rs b/crates/tests/not_dll/tests/sys.rs new file mode 100644 index 0000000000..985a9ce8f2 --- /dev/null +++ b/crates/tests/not_dll/tests/sys.rs @@ -0,0 +1,10 @@ +use windows_sys::Win32::Graphics::Printing::*; + +// Validates that the target libs resolve this function to "winspool.drv" + +#[test] +fn test() { + unsafe { + GetSpoolFileHandle(0); + } +} diff --git a/crates/tests/not_dll/tests/win.rs b/crates/tests/not_dll/tests/win.rs new file mode 100644 index 0000000000..2506f7e089 --- /dev/null +++ b/crates/tests/not_dll/tests/win.rs @@ -0,0 +1,10 @@ +use windows::{Win32::Foundation::*, Win32::Graphics::Printing::*}; + +// Validates that the target libs resolve this function to "winspool.drv" + +#[test] +fn test() { + unsafe { + GetSpoolFileHandle(HANDLE(0)); + } +}