replace winbase winnt to windows-sys

Author: youknowone

vm/Cargo.toml

@@ -125,13 +125,15 @@ features = [
 version = "0.52.0"
 features = [
   "Win32_Foundation",
+  "Win32_Networking_WinSock",
   "Win32_Security",
   "Win32_Storage_FileSystem",
   "Win32_System_Console",
   "Win32_System_Diagnostics_Debug",
   "Win32_System_LibraryLoader",
   "Win32_System_Memory",
   "Win32_System_Pipes",
+  "Win32_System_Registry",
   "Win32_System_SystemInformation",
   "Win32_System_SystemServices",
   "Win32_System_Threading",
@@ -141,11 +143,7 @@ features = [
 
 [target.'cfg(windows)'.dependencies.winapi]
 version = "0.3.9"
-features = [
-  "winsock2", "std", "winbase",
-  "winnt",
-  "impl-default",
-]
+features = ["std", "winnt"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen = "0.2.80"

vm/src/stdlib/msvcrt.rs

@@ -15,7 +15,7 @@ mod msvcrt {
     };
 
     #[pyattr]
-    use winapi::um::winbase::{
+    use windows_sys::Win32::System::Diagnostics::Debug::{
         SEM_FAILCRITICALERRORS, SEM_NOALIGNMENTFAULTEXCEPT, SEM_NOGPFAULTERRORBOX,
         SEM_NOOPENFILEERRORBOX,
     };

vm/src/stdlib/nt.rs

@@ -428,6 +428,6 @@ pub fn init_winsock() {
     static WSA_INIT: parking_lot::Once = parking_lot::Once::new();
     WSA_INIT.call_once(|| unsafe {
         let mut wsa_data = std::mem::MaybeUninit::uninit();
-        let _ = winapi::um::winsock2::WSAStartup(0x0101, wsa_data.as_mut_ptr());
+        let _ = windows_sys::Win32::Networking::WinSock::WSAStartup(0x0101, wsa_data.as_mut_ptr());
     })
 }

vm/src/stdlib/os.rs

@@ -1377,7 +1377,7 @@ pub(super) mod _os {
 
             let f = OpenOptions::new()
                 .write(true)
-                .custom_flags(winapi::um::winbase::FILE_FLAG_BACKUP_SEMANTICS)
+                .custom_flags(windows_sys::Win32::Storage::FileSystem::FILE_FLAG_BACKUP_SEMANTICS)
                 .open(path)
                 .map_err(|err| err.into_pyexception(vm))?;
 

vm/src/stdlib/signal.rs

@@ -19,7 +19,6 @@ pub(crate) mod _signal {
 
     cfg_if::cfg_if! {
         if #[cfg(windows)] {
-            use winapi::um::winsock2;
             type WakeupFd = libc::SOCKET;
             const INVALID_WAKEUP: WakeupFd = (-1isize) as usize;
             static WAKEUP: atomic::AtomicUsize = atomic::AtomicUsize::new(INVALID_WAKEUP);
@@ -200,14 +199,16 @@ pub(crate) mod _signal {
 
         #[cfg(windows)]
         let is_socket = if fd != INVALID_WAKEUP {
+            use windows_sys::Win32::Networking::WinSock;
+
             crate::stdlib::nt::init_winsock();
             let mut res = 0i32;
             let mut res_size = std::mem::size_of::<i32>() as i32;
             let res = unsafe {
-                winsock2::getsockopt(
+                WinSock::getsockopt(
                     fd,
-                    winsock2::SOL_SOCKET,
-                    winsock2::SO_ERROR,
+                    WinSock::SOL_SOCKET,
+                    WinSock::SO_ERROR,
                     &mut res as *mut i32 as *mut _,
                     &mut res_size,
                 )
@@ -217,7 +218,7 @@ pub(crate) mod _signal {
             if !is_socket {
                 let err = std::io::Error::last_os_error();
                 // if getsockopt failed for some other reason, throw
-                if err.raw_os_error() != Some(winsock2::WSAENOTSOCK) {
+                if err.raw_os_error() != Some(WinSock::WSAENOTSOCK) {
                     return Err(err.into_pyexception(vm));
                 }
             }
@@ -263,8 +264,14 @@ pub(crate) mod _signal {
             let sigbyte = signum as u8;
             #[cfg(windows)]
             if WAKEUP_IS_SOCKET.load(Ordering::Relaxed) {
-                let _res =
-                    unsafe { winsock2::send(wakeup_fd, &sigbyte as *const u8 as *const _, 1, 0) };
+                let _res = unsafe {
+                    windows_sys::Win32::Networking::WinSock::send(
+                        wakeup_fd,
+                        &sigbyte as *const u8 as *const _,
+                        1,
+                        0,
+                    )
+                };
                 return;
             }
             let _res = unsafe { libc::write(wakeup_fd as _, &sigbyte as *const u8 as *const _, 1) };

vm/src/stdlib/winreg.rs

@@ -38,14 +38,14 @@ mod winreg {
 
     // access rights
     #[pyattr]
-    pub use winapi::um::winnt::{
+    pub use windows_sys::Win32::System::Registry::{
         KEY_ALL_ACCESS, KEY_CREATE_LINK, KEY_CREATE_SUB_KEY, KEY_ENUMERATE_SUB_KEYS, KEY_EXECUTE,
         KEY_NOTIFY, KEY_QUERY_VALUE, KEY_READ, KEY_SET_VALUE, KEY_WOW64_32KEY, KEY_WOW64_64KEY,
         KEY_WRITE,
     };
     // value types
     #[pyattr]
-    pub use winapi::um::winnt::{
+    pub use windows_sys::Win32::System::Registry::{
         REG_BINARY, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_DWORD_LITTLE_ENDIAN, REG_EXPAND_SZ,
         REG_FULL_RESOURCE_DESCRIPTOR, REG_LINK, REG_MULTI_SZ, REG_NONE, REG_QWORD,
         REG_QWORD_LITTLE_ENDIAN, REG_RESOURCE_LIST, REG_RESOURCE_REQUIREMENTS_LIST, REG_SZ,