EXPERIMENT: use new windows-bindgen

Author: ChrisDenton

library/std/src/os/windows/process.rs

@@ -502,7 +502,8 @@ impl<'a> Drop for ProcThreadAttributeList<'a> {
     ///
     /// [1]: <https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-deleteprocthreadattributelist>
     fn drop(&mut self) {
-        let lp_attribute_list = self.attribute_list.as_mut_ptr().cast::<c_void>();
+        let lp_attribute_list =
+            self.attribute_list.as_mut_ptr().cast::<sys::c::_PROC_THREAD_ATTRIBUTE_LIST>();
         unsafe { sys::c::DeleteProcThreadAttributeList(lp_attribute_list) }
     }
 }
@@ -672,7 +673,7 @@ impl<'a> ProcThreadAttributeListBuilder<'a> {
         // `InitializeProcThreadAttributeList` to properly initialize the list.
         sys::cvt(unsafe {
             sys::c::InitializeProcThreadAttributeList(
-                attribute_list.as_mut_ptr().cast::<c_void>(),
+                attribute_list.as_mut_ptr().cast::<sys::c::_PROC_THREAD_ATTRIBUTE_LIST>(),
                 attribute_count,
                 0,
                 &mut required_size,
@@ -686,7 +687,7 @@ impl<'a> ProcThreadAttributeListBuilder<'a> {
         for (&attribute, value) in self.attributes.iter().take(attribute_count as usize) {
             sys::cvt(unsafe {
                 sys::c::UpdateProcThreadAttribute(
-                    attribute_list.as_mut_ptr().cast::<c_void>(),
+                    attribute_list.as_mut_ptr().cast::<sys::c::_PROC_THREAD_ATTRIBUTE_LIST>(),
                     0,
                     attribute,
                     value.ptr,

library/std/src/sys/fs/windows.rs

@@ -406,7 +406,7 @@ impl File {
         self.fsync()
     }
 
-    fn acquire_lock(&self, flags: c::LOCK_FILE_FLAGS) -> io::Result<()> {
+    fn acquire_lock(&self, flags: u32) -> io::Result<()> {
         unsafe {
             let mut overlapped: c::OVERLAPPED = mem::zeroed();
             let event = c::CreateEventW(ptr::null_mut(), c::FALSE, c::FALSE, ptr::null());
@@ -1169,7 +1169,7 @@ impl FilePermissions {
     }
 
     pub fn file_attributes(&self) -> u32 {
-        self.attrs as u32
+        self.attrs
     }
 }
 

library/std/src/sys/fs/windows/dir.rs

@@ -30,7 +30,7 @@ fn to_u16s_without_nul(path: &Path) -> io::Result<Vec<u16>> {
 unsafe fn nt_create_file(
     opts: &OpenOptions,
     object_attributes: &c::OBJECT_ATTRIBUTES,
-    create_options: c::NTCREATEFILE_CREATE_OPTIONS,
+    create_options: u32,
 ) -> io::Result<Handle> {
     let mut handle = ptr::null_mut();
     let mut io_status = c::IO_STATUS_BLOCK::PENDING;
@@ -116,7 +116,8 @@ impl Dir {
         let name = UnicodeStrRef::from_slice(path);
         let object_attributes = c::OBJECT_ATTRIBUTES {
             RootDirectory: self.handle.as_raw_handle(),
-            ObjectName: name.as_ptr(),
+            // Note: the ptr is only mutable for API reasons, it's never actually written to.
+            ObjectName: name.as_ptr().cast_mut(),
             ..c::OBJECT_ATTRIBUTES::with_length()
         };
         let create_opt = if dir { c::FILE_DIRECTORY_FILE } else { c::FILE_NON_DIRECTORY_FILE };

library/std/src/sys/fs/windows/remove_dir_all.rs

@@ -91,7 +91,7 @@ fn open_link_no_reparse(
 
     let result = unsafe {
         let mut object = c::OBJECT_ATTRIBUTES {
-            ObjectName: path.as_ptr(),
+            ObjectName: path.as_ptr().cast_mut(),
             RootDirectory: parent.as_raw_handle(),
             Attributes: ATTRIBUTES.load(Ordering::Relaxed),
             ..c::OBJECT_ATTRIBUTES::with_length()

library/std/src/sys/io/error/windows.rs

@@ -40,7 +40,6 @@ pub fn decode_error_kind(errno: i32) -> io::ErrorKind {
         | c::ERROR_RESOURCE_CALL_TIMED_OUT
         | c::ERROR_CTX_MODEM_RESPONSE_TIMEOUT
         | c::ERROR_CTX_CLIENT_QUERY_TIMEOUT
-        | c::FRS_ERR_SYSVOL_POPULATE_TIMEOUT
         | c::ERROR_DS_TIMELIMIT_EXCEEDED
         | c::DNS_ERROR_RECORD_TIMED_OUT
         | c::ERROR_IPSEC_IKE_TIMED_OUT

library/std/src/sys/io/error/windows/tests.rs

@@ -4,7 +4,7 @@ use crate::sys::pal::c;
 // tests `error_string` above
 #[test]
 fn ntstatus_error() {
-    const STATUS_UNSUCCESSFUL: u32 = 0xc000_0001;
+    const STATUS_UNSUCCESSFUL: i32 = 0xc000_0001_u32 as i32;
     assert!(
         !Error::from_raw_os_error((STATUS_UNSUCCESSFUL | c::FACILITY_NT_BIT) as _)
             .to_string()

library/std/src/sys/net/connection/socket/windows.rs

@@ -88,7 +88,7 @@ pub(super) mod netc {
     }
 
     pub unsafe fn send(socket: SOCKET, buf: *const c_void, len: c_int, flags: c_int) -> c_int {
-        unsafe { c::send(socket, buf.cast::<u8>(), len, flags) }
+        unsafe { c::send(socket, buf.cast::<i8>(), len, flags) }
     }
     pub unsafe fn sendto(
         socket: SOCKET,
@@ -98,7 +98,7 @@ pub(super) mod netc {
         addr: *const SOCKADDR,
         addrlen: c_int,
     ) -> c_int {
-        unsafe { c::sendto(socket, buf.cast::<u8>(), len, flags, addr, addrlen) }
+        unsafe { c::sendto(socket, buf.cast::<i8>(), len, flags, addr, addrlen) }
     }
     pub unsafe fn getaddrinfo(
         node: *const c_char,