Update to windows-sys 0.48. (#308)

bytecodealliance · Apr 6, 2023 · 62f96e2 · 62f96e2
1 parent 99a2a9e
commit 62f96e2
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,7 +40,7 @@ rustix = { version = "0.37.0", features = ["fs"] }
 nt_version = "0.1.3"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.45.0"
+version = "0.48.0"
 features = [
     "Win32_Storage_FileSystem",
     "Win32_Foundation",

diff --git a/cap-directories/Cargo.toml b/cap-directories/Cargo.toml
@@ -20,7 +20,7 @@ directories-next = "2.0.0"
 rustix = { version = "0.37.0" }
 
 [target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.45.0"
+version = "0.48.0"
 features = [
     "Win32_Foundation",
 ]
diff --git a/cap-fs-ext/Cargo.toml b/cap-fs-ext/Cargo.toml
@@ -33,7 +33,7 @@ std = ["cap-std"]
 #async_std_arf_strings = ["cap-async-std/arf_strings", "async_std_fs_utf8", "arf-strings"]
 
 [target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.45.0"
+version = "0.48.0"
 features = [
     "Win32_Storage_FileSystem",
 ]

diff --git a/cap-primitives/Cargo.toml b/cap-primitives/Cargo.toml
@@ -31,12 +31,11 @@ rustix = { version = "0.37.0", features = ["fs", "process", "procfs", "termios",
 winx = "0.35.0"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.45.0"
+version = "0.48.0"
 features = [
     "Win32_Foundation",
     "Win32_Security",
     "Win32_Storage_FileSystem",
     "Win32_System_Kernel",
-    "Win32_System_SystemServices",
     "Win32_System_WindowsProgramming",
 ]
diff --git a/cap-primitives/src/windows/fs/create_file_at_w.rs b/cap-primitives/src/windows/fs/create_file_at_w.rs
@@ -6,15 +6,16 @@ use std::os::windows::io::HandleOrInvalid;
 use std::ptr::null_mut;
 use windows_sys::Win32::Foundation::{
     RtlNtStatusToDosError, SetLastError, ERROR_ALREADY_EXISTS, ERROR_FILE_EXISTS,
-    ERROR_INVALID_NAME, ERROR_INVALID_PARAMETER, ERROR_NOT_SUPPORTED, HANDLE, INVALID_HANDLE_VALUE,
-    STATUS_OBJECT_NAME_COLLISION, STATUS_PENDING, STATUS_SUCCESS, SUCCESS, UNICODE_STRING,
+    ERROR_INVALID_NAME, ERROR_INVALID_PARAMETER, ERROR_NOT_SUPPORTED, GENERIC_ALL, GENERIC_READ,
+    GENERIC_WRITE, HANDLE, INVALID_HANDLE_VALUE, STATUS_OBJECT_NAME_COLLISION, STATUS_PENDING,
+    STATUS_SUCCESS, SUCCESS, UNICODE_STRING,
 };
 use windows_sys::Win32::Security::{
     SECURITY_ATTRIBUTES, SECURITY_DYNAMIC_TRACKING, SECURITY_QUALITY_OF_SERVICE,
     SECURITY_STATIC_TRACKING,
 };
 use windows_sys::Win32::Storage::FileSystem::{
-    NtCreateFile, CREATE_ALWAYS, CREATE_NEW, DELETE, FILE_ACCESS_FLAGS, FILE_ATTRIBUTE_ARCHIVE,
+    NtCreateFile, CREATE_ALWAYS, CREATE_NEW, DELETE, FILE_ATTRIBUTE_ARCHIVE,
     FILE_ATTRIBUTE_COMPRESSED, FILE_ATTRIBUTE_DEVICE, FILE_ATTRIBUTE_DIRECTORY, FILE_ATTRIBUTE_EA,
     FILE_ATTRIBUTE_ENCRYPTED, FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_INTEGRITY_STREAM,
     FILE_ATTRIBUTE_NORMAL, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED, FILE_ATTRIBUTE_NO_SCRUB_DATA,
@@ -31,7 +32,6 @@ use windows_sys::Win32::Storage::FileSystem::{
     SECURITY_EFFECTIVE_ONLY, SECURITY_SQOS_PRESENT, SYNCHRONIZE, TRUNCATE_EXISTING,
 };
 use windows_sys::Win32::System::Kernel::{OBJ_CASE_INSENSITIVE, OBJ_INHERIT};
-use windows_sys::Win32::System::SystemServices::{GENERIC_ALL, GENERIC_READ, GENERIC_WRITE};
 use windows_sys::Win32::System::WindowsProgramming::{
     FILE_DELETE_ON_CLOSE, FILE_NON_DIRECTORY_FILE, FILE_NO_INTERMEDIATE_BUFFERING, FILE_OPENED,
     FILE_OPEN_FOR_BACKUP_INTENT, FILE_OPEN_NO_RECALL, FILE_OPEN_REMOTE_INSTANCE,
@@ -74,7 +74,7 @@ const FILE_ATTRIBUTE_VALID_FLAGS: FILE_FLAGS_AND_ATTRIBUTES = FILE_ATTRIBUTE_EA
 pub unsafe fn CreateFileAtW(
     dir: HANDLE,
     lpfilename: &[u16],
-    dwdesiredaccess: FILE_ACCESS_FLAGS,
+    dwdesiredaccess: u32,
     dwsharemode: FILE_SHARE_MODE,
     lpsecurityattributes: *const SECURITY_ATTRIBUTES,
     dwcreationdisposition: FILE_CREATION_DISPOSITION,

diff --git a/cap-primitives/src/windows/fs/open_options_ext.rs b/cap-primitives/src/windows/fs/open_options_ext.rs
@@ -3,14 +3,13 @@
 use crate::fs::OpenOptions;
 use std::io;
 use std::ptr::null_mut;
-use windows_sys::Win32::Foundation::ERROR_INVALID_PARAMETER;
+use windows_sys::Win32::Foundation::{ERROR_INVALID_PARAMETER, GENERIC_READ, GENERIC_WRITE};
 use windows_sys::Win32::Security::SECURITY_ATTRIBUTES;
 use windows_sys::Win32::Storage::FileSystem::{
     CREATE_ALWAYS, CREATE_NEW, FILE_FLAG_OPEN_REPARSE_POINT, FILE_GENERIC_WRITE, FILE_SHARE_DELETE,
     FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_WRITE_DATA, OPEN_ALWAYS, OPEN_EXISTING,
     SECURITY_SQOS_PRESENT, TRUNCATE_EXISTING,
 };
-use windows_sys::Win32::System::SystemServices::{GENERIC_READ, GENERIC_WRITE};
 
 #[derive(Debug, Clone)]
 pub(crate) struct OpenOptionsExt {

diff --git a/cap-primitives/src/windows/fs/reopen_impl.rs b/cap-primitives/src/windows/fs/reopen_impl.rs
@@ -1,12 +1,12 @@
 use crate::fs::{get_access_mode, get_flags_and_attributes, OpenOptions};
 use io_lifetimes::AsHandle;
 use std::{fs, io};
+use windows_sys::Win32::Foundation::{GENERIC_READ, GENERIC_WRITE};
 use windows_sys::Win32::Storage::FileSystem::{
     FILE_FLAG_DELETE_ON_CLOSE, FILE_FLAG_WRITE_THROUGH, FILE_GENERIC_READ, FILE_GENERIC_WRITE,
     SECURITY_CONTEXT_TRACKING, SECURITY_DELEGATION, SECURITY_EFFECTIVE_ONLY,
     SECURITY_IDENTIFICATION, SECURITY_IMPERSONATION,
 };
-use windows_sys::Win32::System::SystemServices::{GENERIC_READ, GENERIC_WRITE};
 use winx::file::{AccessMode, Flags, ShareMode};
 
 /// Implementation of `reopen`.

diff --git a/cap-tempfile/Cargo.toml b/cap-tempfile/Cargo.toml
@@ -24,7 +24,7 @@ rand = "0.8.1"
 rustix = { version = "0.37.0", features = ["procfs"] }
 
 [target.'cfg(windows)'.dev-dependencies.windows-sys]
-version = "0.45.0"
+version = "0.48.0"
 features = [
     "Win32_Foundation",
 ]