Migrate PAL main windows.rs from winapi to windows crate

Co-authored-by: benhillis <17727402+benhillis@users.noreply.github.com>

Author: 2 people

support/pal/Cargo.toml

@@ -54,7 +54,13 @@ workspace = true
 features = [
     "Wdk_Foundation",
     "Win32_Foundation",
-    "Win32_Security"
+    "Win32_Security",
+    "Win32_System_IO",
+    "Win32_System_Threading",
+    "Win32_System_ErrorReporting",
+    "Win32_System_Memory",
+    "Win32_Networking_WinSock",
+    "Win32_Storage_FileSystem"
 ]
 
 [target.'cfg(unix)'.dependencies]

support/pal/src/windows.rs

@@ -17,7 +17,6 @@ pub mod security;
 pub mod tp;
 
 use self::security::SecurityDescriptor;
-use handleapi::INVALID_HANDLE_VALUE;
 use ntapi::ntioapi::FILE_COMPLETION_INFORMATION;
 use ntapi::ntioapi::FileReplaceCompletionInformation;
 use ntapi::ntioapi::IO_STATUS_BLOCK;
@@ -34,7 +33,6 @@ use ntrtl::RtlAllocateHeap;
 use ntrtl::RtlDosPathNameToNtPathName_U_WithStatus;
 use ntrtl::RtlFreeUnicodeString;
 use ntrtl::RtlNtStatusToDosErrorNoTeb;
-use processthreadsapi::GetExitCodeProcess;
 use std::cell::UnsafeCell;
 use std::ffi::OsStr;
 use std::ffi::c_void;
@@ -55,32 +53,33 @@ use std::sync::atomic::Ordering;
 use std::time::Duration;
 use widestring::U16CString;
 use widestring::Utf16Str;
-use winapi::shared::ntdef;
-use winapi::shared::ntdef::NTSTATUS;
-use winapi::shared::ntstatus;
-use winapi::shared::ntstatus::STATUS_PENDING;
-use winapi::shared::winerror::ERROR_BAD_PATHNAME;
-use winapi::shared::ws2def;
-use winapi::um::errhandlingapi::GetErrorMode;
-use winapi::um::errhandlingapi::SetErrorMode;
-use winapi::um::handleapi;
-use winapi::um::handleapi::CloseHandle;
-use winapi::um::heapapi::GetProcessHeap;
-use winapi::um::ioapiset::CreateIoCompletionPort;
-use winapi::um::ioapiset::GetQueuedCompletionStatusEx;
-use winapi::um::ioapiset::PostQueuedCompletionStatus;
-use winapi::um::minwinbase::OVERLAPPED;
-use winapi::um::minwinbase::OVERLAPPED_ENTRY;
-use winapi::um::processenv::SetStdHandle;
-use winapi::um::processthreadsapi;
-use winapi::um::processthreadsapi::TerminateProcess;
-use winapi::um::synchapi;
-use winapi::um::winbase::INFINITE;
-use winapi::um::winbase::SEM_FAILCRITICALERRORS;
-use winapi::um::winbase::STD_OUTPUT_HANDLE;
-use winapi::um::winbase::SetFileCompletionNotificationModes;
-use winapi::um::winnt;
-use winapi::um::winsock2;
+use windows::Win32::Foundation::CloseHandle;
+use windows::Win32::Foundation::DuplicateHandle;
+use windows::Win32::Foundation::DUPLICATE_SAME_ACCESS;
+use windows::Win32::Foundation::ERROR_BAD_PATHNAME;
+use windows::Win32::Foundation::INVALID_HANDLE_VALUE;
+use windows::Win32::Foundation::NTSTATUS;
+use windows::Win32::Foundation::STATUS_PENDING;
+use windows::Win32::Foundation::INFINITE;
+use windows::Win32::System::ErrorReporting::GetErrorMode;
+use windows::Win32::System::ErrorReporting::SetErrorMode;
+use windows::Win32::System::ErrorReporting::SEM_FAILCRITICALERRORS;
+use windows::Win32::System::IO::CreateIoCompletionPort;
+use windows::Win32::System::IO::GetQueuedCompletionStatusEx;
+use windows::Win32::System::IO::PostQueuedCompletionStatus;
+use windows::Win32::System::IO::OVERLAPPED;
+use windows::Win32::System::IO::OVERLAPPED_ENTRY;
+use windows::Win32::System::Memory::GetProcessHeap;
+use windows::Win32::System::Threading::GetCurrentProcess;
+use windows::Win32::System::Threading::GetExitCodeProcess;
+use windows::Win32::System::Threading::GetProcessId;
+use windows::Win32::System::Threading::SetStdHandle;
+use windows::Win32::System::Threading::TerminateProcess;
+use windows::Win32::System::Threading::STD_OUTPUT_HANDLE;
+use windows::Win32::System::Threading::WaitForSingleObject;
+use windows::Win32::Storage::FileSystem::SetFileCompletionNotificationModes;
+use windows::Win32::Networking::WinSock::IOC_IN;
+use windows::Win32::Networking::WinSock::IOC_VENDOR;
 
 #[repr(transparent)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -99,11 +98,11 @@ impl BorrowedHandleExt for BorrowedHandle<'_> {
         let options = if access.is_some() {
             0
         } else {
-            winnt::DUPLICATE_SAME_ACCESS
+            DUPLICATE_SAME_ACCESS
         };
         unsafe {
-            let process = processthreadsapi::GetCurrentProcess();
-            if handleapi::DuplicateHandle(
+            let process = GetCurrentProcess();
+            if DuplicateHandle(
                 process,
                 self.as_raw_handle(),
                 process,
@@ -134,8 +133,8 @@ pub trait OwnedSocketExt: Sized {
     fn from_handle(handle: OwnedHandle) -> Result<Self>;
 }
 
-const SIO_SOCKET_TRANSFER_BEGIN: u32 = ws2def::IOC_IN | ws2def::IOC_VENDOR | 301;
-const SIO_SOCKET_TRANSFER_END: u32 = ws2def::IOC_IN | ws2def::IOC_VENDOR | 302;
+const SIO_SOCKET_TRANSFER_BEGIN: u32 = IOC_IN | IOC_VENDOR | 301;
+const SIO_SOCKET_TRANSFER_END: u32 = IOC_IN | IOC_VENDOR | 302;
 
 /// Ensures WSAStartup has been called for the process.
 fn init_winsock() {
@@ -209,7 +208,7 @@ struct WaitObject(OwnedHandle);
 
 impl WaitObject {
     fn wait(&self) {
-        assert!(unsafe { synchapi::WaitForSingleObject(self.0.as_raw_handle(), INFINITE) } == 0);
+        assert!(unsafe { WaitForSingleObject(self.0.as_raw_handle(), INFINITE) } == 0);
     }
 }
 
@@ -233,7 +232,7 @@ impl Process {
 
     pub fn id(&self) -> u32 {
         unsafe {
-            let pid = processthreadsapi::GetProcessId(self.as_handle().as_raw_handle());
+            let pid = GetProcessId(self.as_handle().as_raw_handle());
             assert_ne!(pid, 0);
             pid
         }