Merge pull request #8 from messense/windows-sys

Switch from winapi to windows-sys

Cargo.toml

@@ -24,14 +24,15 @@ print_bytes = { version = "0.7", optional = true }
 serde = { version = "1.0", optional = true }
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["fileapi"] }
+windows-sys = { version = "0.42", features = ["Win32_Storage_FileSystem"] }
 
 [dev-dependencies]
 bincode = "1.3"
 tempfile = "3.2"
+windows-sys = { version = "0.42", features = ["Win32_Foundation"] }
 
 [target.'cfg(not(windows))'.dev-dependencies]
 libc = "0.2"
 
 [features]
-localization = ["winapi/shellapi"]
+localization = ["windows-sys/Win32_UI_Shell", "windows-sys/Win32_UI_WindowsAndMessaging"]

src/windows/localize.rs

@@ -5,9 +5,8 @@ use std::os::windows::ffi::OsStrExt;
 use std::os::windows::ffi::OsStringExt;
 use std::path::Path;
 
-use winapi::shared::minwindef::UINT;
-use winapi::um::shellapi::SHGetFileInfoW;
-use winapi::um::shellapi::SHGFI_DISPLAYNAME;
+use windows_sys::Win32::UI::Shell::SHGetFileInfoW;
+use windows_sys::Win32::UI::Shell::SHGFI_DISPLAYNAME;
 
 pub(super) fn name(path: &Path) -> Option<OsString> {
     let mut path: Vec<_> = path.as_os_str().encode_wide().collect();
@@ -22,7 +21,7 @@ pub(super) fn name(path: &Path) -> Option<OsString> {
             path.as_ptr(),
             0,
             path_info.as_mut_ptr(),
-            mem::size_of_val(&path_info) as UINT,
+            mem::size_of_val(&path_info) as _,
             SHGFI_DISPLAYNAME,
         )
     };

src/windows/normalize.rs

@@ -11,8 +11,7 @@ use std::path::Prefix;
 use std::path::PrefixComponent;
 use std::ptr;
 
-use winapi::shared::minwindef::DWORD;
-use winapi::um::fileapi::GetFullPathNameW;
+use windows_sys::Win32::Storage::FileSystem::GetFullPathNameW;
 
 use super::BasePath;
 use super::BasePathBuf;
@@ -104,8 +103,9 @@ pub(super) fn normalize_virtually(
             break Err(io::Error::last_os_error());
         }
 
+        let _: u32 = capacity;
         // This assertion should never fail.
-        static_assert!(mem::size_of::<DWORD>() <= mem::size_of::<usize>());
+        static_assert!(mem::size_of::<u32>() <= mem::size_of::<usize>());
 
         let length = capacity as usize;
         if let Some(mut additional_capacity) =

tests/integration.rs

@@ -14,7 +14,7 @@ mod common;
 
 #[cfg(windows)]
 #[rustfmt::skip]
-use winapi::shared::winerror::ERROR_INVALID_NAME;
+use windows_sys::Win32::Foundation::ERROR_INVALID_NAME;
 #[cfg(not(windows))]
 use libc::ENOENT as ERROR_INVALID_NAME;