Use windows-targets bumping MSRV to 1.56

Signed-off-by: Joe Richey <[email protected]>

Author: josephlr

.github/workflows/tests.yml

@@ -45,7 +45,7 @@ jobs:
       matrix:
         # os: [ubuntu-22.04, windows-2022]
         os: [windows-2022]
-        toolchain: [nightly, beta, stable, 1.36]
+        toolchain: [nightly, beta, stable, 1.56]
         # # Only Test macOS on stable to reduce macOS CI jobs
         # include:
         #   # x86_64-apple-darwin.

Cargo.toml

@@ -2,6 +2,7 @@
 name = "getrandom"
 version = "0.2.15" # Also update html_root_url in lib.rs when bumping this
 edition = "2018"
+rust-version = "1.56"
 authors = ["The Rand Project Developers"]
 license = "MIT OR Apache-2.0"
 description = "A small cross-platform library for retrieving random data from system source"
@@ -23,6 +24,9 @@ libc = { version = "0.2.154", default-features = false }
 [target.'cfg(target_os = "wasi")'.dependencies]
 wasi = { version = "0.11", default-features = false }
 
+[target.'cfg(all(windows, not(target_vendor = "win7")))'.dependencies]
+windows-targets = "0.52"
+
 [target.'cfg(all(any(target_arch = "wasm32", target_arch = "wasm64"), target_os = "unknown"))'.dependencies]
 wasm-bindgen = { version = "0.2.62", default-features = false, optional = true }
 js-sys = { version = "0.3", optional = true }

src/error.rs

@@ -53,10 +53,8 @@ impl Error {
     /// Called from an ES module on Node.js. This is unsupported, see:
     /// <https://docs.rs/getrandom#nodejs-es-module-support>.
     pub const NODE_ES_MODULE: Error = internal_error(14);
-    /// Unable to load Windows function from DLL.
-    pub const WINDOWS_LOAD_DLL: Error = internal_error(15);
     /// Calling Windows ProcessPrng failed.
-    pub const WINDOWS_PROCESS_PRNG: Error = internal_error(16);
+    pub const WINDOWS_PROCESS_PRNG: Error = internal_error(15);
 
     /// Codes below this point represent OS Errors (i.e. positive i32 values).
     /// Codes at or above this point, but below [`Error::CUSTOM_START`] are
@@ -176,7 +174,6 @@ fn internal_desc(error: Error) -> Option<&'static str> {
         Error::NODE_CRYPTO => Some("Node.js crypto CommonJS module is unavailable"),
         Error::NODE_RANDOM_FILL_SYNC => Some("Calling Node.js API crypto.randomFillSync failed"),
         Error::NODE_ES_MODULE => Some("Node.js ES modules are not directly supported, see https://docs.rs/getrandom#nodejs-es-module-support"),
-        Error::WINDOWS_LOAD_DLL => Some("Unable to load function from Windows DLL"),
         Error::WINDOWS_PROCESS_PRNG => Some("ProcessPrng: Windows system function failure"),
         _ => None,
     }

src/windows.rs

@@ -1,62 +1,13 @@
 //! Implementation for Windows
 use crate::Error;
 use core::mem::MaybeUninit;
-// use core::{
-//     ffi::c_void,
-//     mem, ptr,
-//     sync::atomic::{fence, AtomicPtr, Ordering},
-// };
 
 type BOOL = i32;
 const TRUE: BOOL = 1;
-// type HMODULE = isize;
 
-// #[link(name = "kernel32")]
-// extern "system" {
-//     fn LoadLibraryA(libfilename: *const u8) -> HMODULE;
-//     fn GetProcAddress(hmodule: HMODULE, procname: *const u8) -> *mut c_void;
-// }
-
-// type ProcessPrng = unsafe extern "system" fn(*mut u8, usize) -> BOOL;
-
-// static PROCESS_PRNG_PTR: AtomicPtr<c_void> = AtomicPtr::new(ptr::null_mut());
-
-// fn get_process_prng() -> Result<ProcessPrng, Error> {
-//     let mut p = PROCESS_PRNG_PTR.load(Ordering::Relaxed);
-//     if p.is_null() {
-//         let dll = unsafe { LoadLibraryA(b"bcryptprimitives.dll\0".as_ptr()) };
-//         if dll == 0 {
-//             return Err(Error::WINDOWS_LOAD_DLL);
-//         }
-//         p = unsafe { GetProcAddress(dll, b"ProcessPrng\0".as_ptr()) };
-//         if p.is_null() {
-//             return Err(Error::WINDOWS_LOAD_DLL);
-//         }
-//         PROCESS_PRNG_PTR.store(p, Ordering::Release);
-//     } else {
-//         fence(Ordering::Acquire);
-//     }
-//     Ok(unsafe { mem::transmute(p) })
-// }
-
-#[cfg_attr(
-    target_arch = "x86",
-    link(
-        name = "bcryptprimitives",
-        kind = "raw-dylib",
-        import_name_type = "undecorated"
-    )
-)]
-#[cfg_attr(
-    not(target_arch = "x86"),
-    link(name = "bcryptprimitives", kind = "raw-dylib")
-)]
-extern "system" {
-    fn ProcessPrng(pbdata: *mut u8, cbdata: usize) -> BOOL;
-}
+windows_targets::link!("bcryptprimitives.dll" "system" fn ProcessPrng(pbdata : *mut u8, cbdata : usize) -> BOOL);
 
 pub fn getrandom_inner(dest: &mut [MaybeUninit<u8>]) -> Result<(), Error> {
-    // let process_prng = get_process_prng()?;
     match unsafe { ProcessPrng(dest.as_mut_ptr() as *mut u8, dest.len()) } {
         TRUE => Ok(()),
         _ => Err(Error::WINDOWS_PROCESS_PRNG),