Migrate PAL security.rs, tp.rs, alpc.rs and disk_vhdmp from winapi to windows

Copilot · benhillis · Ben Hillis · commit 7a389f38e433 · 2025-06-25T15:40:14.000Z
Co-authored-by: benhillis &lt;17727402+benhillis@users.noreply.github.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
@@ -1374,7 +1374,7 @@ dependencies = [
  "tempfile",
  "thiserror 2.0.12",
  "vm_resource",
- "winapi",
+ "windows 0.59.0",
 ]
 
 [[package]]
diff --git a/support/pal/Cargo.toml b/support/pal/Cargo.toml
@@ -55,10 +55,12 @@ features = [
     "Wdk_Foundation",
     "Win32_Foundation",
     "Win32_Security",
+    "Win32_Security_Authorization",
     "Win32_System_IO",
     "Win32_System_Threading",
     "Win32_System_ErrorReporting",
-    "Win32_System_Memory",
+    "Win32_System_Memory", 
+    "Win32_System_SystemServices",
     "Win32_Networking_WinSock",
     "Win32_Storage_FileSystem"
 ]
diff --git a/support/pal/src/windows/alpc.rs b/support/pal/src/windows/alpc.rs
@@ -18,14 +18,14 @@ use std::os::windows::prelude::*;
 use std::ptr::NonNull;
 use std::ptr::null_mut;
 use std::time::Duration;
-use winapi::shared::ntstatus::STATUS_TIMEOUT;
+use windows::Win32::Foundation::STATUS_TIMEOUT;
 
 mod ntlpcapi {
     #![allow(non_snake_case, dead_code, clippy::upper_case_acronyms)]
 
     pub use ntapi::ntlpcapi::*;
-    use winapi::shared::ntdef::HANDLE;
-    use winapi::shared::ntdef::NTSTATUS;
+    use windows::Win32::Foundation::HANDLE;
+    use windows::Win32::Foundation::NTSTATUS;
 
     // These constants are not defined in ntapi.
     pub const LPC_CONNECTION_REPLY: u32 = 11;
diff --git a/support/pal/src/windows/security.rs b/support/pal/src/windows/security.rs
@@ -14,26 +14,26 @@ use std::ptr::null_mut;
 use std::str::FromStr;
 use widestring::U16CStr;
 use widestring::U16CString;
-use winapi::shared::minwindef::BOOL;
-use winapi::shared::sddl::ConvertSecurityDescriptorToStringSecurityDescriptorW;
-use winapi::shared::sddl::ConvertSidToStringSidW;
-use winapi::shared::sddl::ConvertStringSecurityDescriptorToSecurityDescriptorW;
-use winapi::shared::sddl::SDDL_REVISION_1;
-use winapi::um::securitybaseapi::DeriveCapabilitySidsFromName;
-use winapi::um::winbase::LocalFree;
-use winapi::um::winnt::DACL_SECURITY_INFORMATION;
-use winapi::um::winnt::GROUP_SECURITY_INFORMATION;
-use winapi::um::winnt::HANDLE;
-use winapi::um::winnt::LABEL_SECURITY_INFORMATION;
-use winapi::um::winnt::LPSECURITY_CAPABILITIES;
-use winapi::um::winnt::OWNER_SECURITY_INFORMATION;
-use winapi::um::winnt::PHANDLE;
-use winapi::um::winnt::PSECURITY_DESCRIPTOR;
-use winapi::um::winnt::PSID;
-use winapi::um::winnt::SACL_SECURITY_INFORMATION;
-use winapi::um::winnt::SE_GROUP_ENABLED;
-use winapi::um::winnt::SECURITY_CAPABILITIES;
-use winapi::um::winnt::SID_AND_ATTRIBUTES;
+use windows::Win32::Foundation::BOOL;
+use windows::Win32::Foundation::HANDLE;
+use windows::Win32::Foundation::LocalFree;
+use windows::Win32::Security::Authorization::ConvertSecurityDescriptorToStringSecurityDescriptorW;
+use windows::Win32::Security::Authorization::ConvertSidToStringSidW;
+use windows::Win32::Security::Authorization::ConvertStringSecurityDescriptorToSecurityDescriptorW;
+use windows::Win32::Security::DeriveCapabilitySidsFromName;
+use windows::Win32::Security::DACL_SECURITY_INFORMATION;
+use windows::Win32::Security::GROUP_SECURITY_INFORMATION;
+use windows::Win32::Security::LABEL_SECURITY_INFORMATION;
+use windows::Win32::Security::LPSECURITY_CAPABILITIES;
+use windows::Win32::Security::OWNER_SECURITY_INFORMATION;
+use windows::Win32::Security::PHANDLE;
+use windows::Win32::Security::PSECURITY_DESCRIPTOR;
+use windows::Win32::Security::PSID;
+use windows::Win32::Security::SACL_SECURITY_INFORMATION;
+use windows::Win32::Security::SE_GROUP_ENABLED;
+use windows::Win32::Security::SECURITY_CAPABILITIES;
+use windows::Win32::Security::SID_AND_ATTRIBUTES;
+use windows::Win32::Security::SDDL_REVISION_1;
 
 const MAX_SUBAUTHORITY_COUNT: usize = 15;
 
diff --git a/support/pal/src/windows/tp.rs b/support/pal/src/windows/tp.rs
@@ -9,28 +9,28 @@ use std::os::windows::prelude::*;
 use std::ptr::NonNull;
 use std::ptr::null_mut;
 use std::time::Duration;
-use winapi::shared::minwindef::FILETIME;
-use winapi::um::threadpoolapiset::CancelThreadpoolIo;
-use winapi::um::threadpoolapiset::CloseThreadpoolIo;
-use winapi::um::threadpoolapiset::CloseThreadpoolTimer;
-use winapi::um::threadpoolapiset::CloseThreadpoolWait;
-use winapi::um::threadpoolapiset::CloseThreadpoolWork;
-use winapi::um::threadpoolapiset::CreateThreadpoolIo;
-use winapi::um::threadpoolapiset::CreateThreadpoolTimer;
-use winapi::um::threadpoolapiset::CreateThreadpoolWait;
-use winapi::um::threadpoolapiset::CreateThreadpoolWork;
-use winapi::um::threadpoolapiset::PTP_WIN32_IO_CALLBACK;
-use winapi::um::threadpoolapiset::SetThreadpoolTimerEx;
-use winapi::um::threadpoolapiset::SetThreadpoolWaitEx;
-use winapi::um::threadpoolapiset::StartThreadpoolIo;
-use winapi::um::threadpoolapiset::SubmitThreadpoolWork;
-use winapi::um::winnt::PTP_TIMER_CALLBACK;
-use winapi::um::winnt::PTP_WAIT_CALLBACK;
-use winapi::um::winnt::PTP_WORK_CALLBACK;
-use winapi::um::winnt::TP_IO;
-use winapi::um::winnt::TP_TIMER;
-use winapi::um::winnt::TP_WAIT;
-use winapi::um::winnt::TP_WORK;
+use windows::Win32::Foundation::FILETIME;
+use windows::Win32::System::Threading::CancelThreadpoolIo;
+use windows::Win32::System::Threading::CloseThreadpoolIo;
+use windows::Win32::System::Threading::CloseThreadpoolTimer;
+use windows::Win32::System::Threading::CloseThreadpoolWait;
+use windows::Win32::System::Threading::CloseThreadpoolWork;
+use windows::Win32::System::Threading::CreateThreadpoolIo;
+use windows::Win32::System::Threading::CreateThreadpoolTimer;
+use windows::Win32::System::Threading::CreateThreadpoolWait;
+use windows::Win32::System::Threading::CreateThreadpoolWork;
+use windows::Win32::System::Threading::PTP_WIN32_IO_CALLBACK;
+use windows::Win32::System::Threading::SetThreadpoolTimerEx;
+use windows::Win32::System::Threading::SetThreadpoolWaitEx;
+use windows::Win32::System::Threading::StartThreadpoolIo;
+use windows::Win32::System::Threading::SubmitThreadpoolWork;
+use windows::Win32::System::Threading::PTP_TIMER_CALLBACK;
+use windows::Win32::System::Threading::PTP_WAIT_CALLBACK;
+use windows::Win32::System::Threading::PTP_WORK_CALLBACK;
+use windows::Win32::System::Threading::TP_IO;
+use windows::Win32::System::Threading::TP_TIMER;
+use windows::Win32::System::Threading::TP_WAIT;
+use windows::Win32::System::Threading::TP_WORK;
 
 /// Wrapper around a threadpool wait object (TP_WAIT).
 #[derive(Debug)]
diff --git a/vm/devices/storage/disk_vhdmp/Cargo.toml b/vm/devices/storage/disk_vhdmp/Cargo.toml
@@ -18,7 +18,7 @@ mesh.workspace = true
 
 futures.workspace = true
 thiserror.workspace = true
-winapi = { workspace = true, features = [ "handleapi", "winbase", "winnt" ] }
+windows = { workspace = true, features = [ "Win32_Foundation", "Win32_System_IO" ] }
 
 [target.'cfg(windows)'.dev-dependencies]
 disk_vhd1.workspace = true
diff --git a/vm/devices/storage/disk_vhdmp/src/lib.rs b/vm/devices/storage/disk_vhdmp/src/lib.rs
@@ -34,10 +34,10 @@ mod virtdisk {
     )]
 
     use std::os::windows::prelude::*;
-    use winapi::shared::guiddef::GUID;
-    use winapi::shared::minwindef::BOOL;
-    use winapi::um::minwinbase::OVERLAPPED;
-    use winapi::um::winnt::SECURITY_DESCRIPTOR;
+    use windows::core::GUID;
+    use windows::Win32::Foundation::BOOL;
+    use windows::Win32::System::IO::OVERLAPPED;
+    use windows::Win32::Security::SECURITY_DESCRIPTOR;
 
     #[repr(C)]
     #[derive(Copy, Clone)]

Original file line number	Diff line number	Diff line change
`@@ -1374,7 +1374,7 @@ dependencies = [`
`1374`	`1374`	`"tempfile",`
`1375`	`1375`	`"thiserror 2.0.12",`
`1376`	`1376`	`"vm_resource",`
`1377`		`- "winapi",`
	`1377`	`+ "windows 0.59.0",`
`1378`	`1378`	`]`
`1379`	`1379`
`1380`	`1380`	`[[package]]`