change rename implementation

Qelxiros · Qelxiros · commit 1a58e0c61212 · 2025-07-08T15:43:49.000-04:00
diff --git a/library/std/src/sys/fs/windows.rs b/library/std/src/sys/fs/windows.rs
@@ -1029,7 +1029,7 @@ impl Dir {
         to_dir: &Self,
         to: Q,
     ) -> io::Result<()> {
-        run_path_with_wcstr(to.as_ref(), &|to| self.rename_native(from.as_ref(), to_dir, to, false))
+        run_path_with_utf16(to.as_ref(), &|to| self.rename_native(from.as_ref(), to_dir, to, false))
     }
 
     pub fn symlink<P: AsRef<Path>, Q: AsRef<Path>>(&self, original: P, link: Q) -> io::Result<()> {
@@ -1133,58 +1133,64 @@ impl Dir {
         if result == 0 { Err(api::get_last_error()).io_result() } else { Ok(()) }
     }
 
-    fn rename_native(&self, from: &Path, to_dir: &Self, to: &WCStr, dir: bool) -> io::Result<()> {
+    fn rename_native(&self, from: &Path, to_dir: &Self, to: &[u16], dir: bool) -> io::Result<()> {
         let mut opts = OpenOptions::new();
         opts.access_mode(c::DELETE);
         opts.custom_flags(c::FILE_FLAG_OPEN_REPARSE_POINT | c::FILE_FLAG_BACKUP_SEMANTICS);
         let handle = run_path_with_utf16(from, &|u| self.open_native(u, &opts, dir))?;
-        // Calculate the layout of the `FILE_RENAME_INFO` we pass to `SetFileInformation`
+        // Calculate the layout of the `FILE_RENAME_INFORMATION` we pass to `NtSetInformationFile`
         // This is a dynamically sized struct so we need to get the position of the last field to calculate the actual size.
         const too_long_err: io::Error =
             io::const_error!(io::ErrorKind::InvalidFilename, "Filename too long");
         let struct_size = to
-            .count_bytes()
+            .len()
             .checked_mul(2)
-            .and_then(|x| x.checked_add(offset_of!(c::FILE_RENAME_INFO, FileName)))
+            .and_then(|x| x.checked_add(offset_of!(c::FILE_RENAME_INFORMATION, FileName)))
             .ok_or(too_long_err)?;
-        let layout = Layout::from_size_align(struct_size, align_of::<c::FILE_RENAME_INFO>())
+        let layout = Layout::from_size_align(struct_size, align_of::<c::FILE_RENAME_INFORMATION>())
             .map_err(|_| too_long_err)?;
         let struct_size = u32::try_from(struct_size).map_err(|_| too_long_err)?;
-        let to_byte_len_without_nul =
-            u32::try_from((to.count_bytes() - 1) * 2).map_err(|_| too_long_err)?;
+        let to_byte_len = u32::try_from(to.len() * 2).map_err(|_| too_long_err)?;
 
         let file_rename_info;
-        // SAFETY: We allocate enough memory for a full FILE_RENAME_INFO struct and a filename.
+        // SAFETY: We allocate enough memory for a full FILE_RENAME_INFORMATION struct and the filename.
         unsafe {
-            file_rename_info = alloc(layout).cast::<c::FILE_RENAME_INFO>();
+            file_rename_info = alloc(layout).cast::<c::FILE_RENAME_INFORMATION>();
             if file_rename_info.is_null() {
                 return Err(io::ErrorKind::OutOfMemory.into());
             }
 
-            (&raw mut (*file_rename_info).Anonymous).write(c::FILE_RENAME_INFO_0 {
+            (&raw mut (*file_rename_info).Anonymous).write(c::FILE_RENAME_INFORMATION_0 {
                 Flags: c::FILE_RENAME_FLAG_REPLACE_IF_EXISTS | c::FILE_RENAME_FLAG_POSIX_SEMANTICS,
             });
 
             (&raw mut (*file_rename_info).RootDirectory).write(to_dir.handle.as_raw_handle());
             // Don't include the NULL in the size
-            (&raw mut (*file_rename_info).FileNameLength).write(to_byte_len_without_nul);
+            (&raw mut (*file_rename_info).FileNameLength).write(to_byte_len);
 
             to.as_ptr().copy_to_nonoverlapping(
                 (&raw mut (*file_rename_info).FileName).cast::<u16>(),
-                to.count_bytes(),
+                to.len(),
             );
         }
 
-        let result = unsafe {
-            c::SetFileInformationByHandle(
+        let status = unsafe {
+            c::NtSetInformationFile(
                 handle.as_raw_handle(),
-                c::FileRenameInfoEx,
+                &mut c::IO_STATUS_BLOCK::default(),
                 file_rename_info.cast::<c_void>(),
                 struct_size,
+                c::FileRenameInformation,
             )
         };
         unsafe { dealloc(file_rename_info.cast::<u8>(), layout) };
-        if result == 0 { Err(api::get_last_error()).io_result() } else { Ok(()) }
+        if c::nt_success(status) {
+            // SAFETY: nt_success guarantees that handle is no longer null
+            Ok(())
+        } else {
+            Err(WinError::new(unsafe { c::RtlNtStatusToDosError(status) }))
+        }
+        .io_result()
     }
 
     fn symlink_native(&self, original: &[u16], link: &Path, relative: bool) -> io::Result<()> {
diff --git a/library/std/src/sys/pal/windows/c/bindings.txt b/library/std/src/sys/pal/windows/c/bindings.txt
@@ -2067,6 +2067,7 @@ FILE_READ_EA
 FILE_RENAME_FLAG_POSIX_SEMANTICS
 FILE_RENAME_FLAG_REPLACE_IF_EXISTS
 FILE_RENAME_INFO
+FILE_RENAME_INFORMATION
 FILE_RESERVE_OPFILTER
 FILE_SEQUENTIAL_ONLY
 FILE_SESSION_AWARE
@@ -2112,6 +2113,8 @@ FileNormalizedNameInfo
 FileRemoteProtocolInfo
 FileRenameInfo
 FileRenameInfoEx
+FileRenameInformation
+FileRenameInformationEx
 FileStandardInfo
 FileStorageInfo
 FileStreamInfo
@@ -2292,6 +2295,7 @@ NTCREATEFILE_CREATE_DISPOSITION
 NTCREATEFILE_CREATE_OPTIONS
 NtOpenFile
 NtReadFile
+NtSetInformationFile
 NTSTATUS
 NtWriteFile
 OBJ_DONT_REPARSE
diff --git a/library/std/src/sys/pal/windows/c/windows_sys.rs b/library/std/src/sys/pal/windows/c/windows_sys.rs
@@ -73,6 +73,7 @@ windows_targets::link!("kernel32.dll" "system" fn MultiByteToWideChar(codepage :
 windows_targets::link!("ntdll.dll" "system" fn NtCreateFile(filehandle : *mut HANDLE, desiredaccess : FILE_ACCESS_RIGHTS, objectattributes : *const OBJECT_ATTRIBUTES, iostatusblock : *mut IO_STATUS_BLOCK, allocationsize : *const i64, fileattributes : FILE_FLAGS_AND_ATTRIBUTES, shareaccess : FILE_SHARE_MODE, createdisposition : NTCREATEFILE_CREATE_DISPOSITION, createoptions : NTCREATEFILE_CREATE_OPTIONS, eabuffer : *const core::ffi::c_void, ealength : u32) -> NTSTATUS);
 windows_targets::link!("ntdll.dll" "system" fn NtOpenFile(filehandle : *mut HANDLE, desiredaccess : u32, objectattributes : *const OBJECT_ATTRIBUTES, iostatusblock : *mut IO_STATUS_BLOCK, shareaccess : u32, openoptions : u32) -> NTSTATUS);
 windows_targets::link!("ntdll.dll" "system" fn NtReadFile(filehandle : HANDLE, event : HANDLE, apcroutine : PIO_APC_ROUTINE, apccontext : *const core::ffi::c_void, iostatusblock : *mut IO_STATUS_BLOCK, buffer : *mut core::ffi::c_void, length : u32, byteoffset : *const i64, key : *const u32) -> NTSTATUS);
+windows_targets::link!("ntdll.dll" "system" fn NtSetInformationFile(filehandle : HANDLE, iostatusblock : *mut IO_STATUS_BLOCK, fileinformation : *const core::ffi::c_void, length : u32, fileinformationclass : FILE_INFORMATION_CLASS) -> NTSTATUS);
 windows_targets::link!("ntdll.dll" "system" fn NtWriteFile(filehandle : HANDLE, event : HANDLE, apcroutine : PIO_APC_ROUTINE, apccontext : *const core::ffi::c_void, iostatusblock : *mut IO_STATUS_BLOCK, buffer : *const core::ffi::c_void, length : u32, byteoffset : *const i64, key : *const u32) -> NTSTATUS);
 windows_targets::link!("advapi32.dll" "system" fn OpenProcessToken(processhandle : HANDLE, desiredaccess : TOKEN_ACCESS_MASK, tokenhandle : *mut HANDLE) -> BOOL);
 windows_targets::link!("kernel32.dll" "system" fn QueryPerformanceCounter(lpperformancecount : *mut i64) -> BOOL);
@@ -2529,6 +2530,7 @@ impl Default for FILE_ID_BOTH_DIR_INFO {
         unsafe { core::mem::zeroed() }
     }
 }
+pub type FILE_INFORMATION_CLASS = i32;
 pub type FILE_INFO_BY_HANDLE_CLASS = i32;
 #[repr(C)]
 #[derive(Clone, Copy, Default)]
@@ -2582,6 +2584,30 @@ impl Default for FILE_RENAME_INFO_0 {
         unsafe { core::mem::zeroed() }
     }
 }
+#[repr(C)]
+#[derive(Clone, Copy)]
+pub struct FILE_RENAME_INFORMATION {
+    pub Anonymous: FILE_RENAME_INFORMATION_0,
+    pub RootDirectory: HANDLE,
+    pub FileNameLength: u32,
+    pub FileName: [u16; 1],
+}
+impl Default for FILE_RENAME_INFORMATION {
+    fn default() -> Self {
+        unsafe { core::mem::zeroed() }
+    }
+}
+#[repr(C)]
+#[derive(Clone, Copy)]
+pub union FILE_RENAME_INFORMATION_0 {
+    pub ReplaceIfExists: bool,
+    pub Flags: u32,
+}
+impl Default for FILE_RENAME_INFORMATION_0 {
+    fn default() -> Self {
+        unsafe { core::mem::zeroed() }
+    }
+}
 pub const FILE_RESERVE_OPFILTER: NTCREATEFILE_CREATE_OPTIONS = 1048576u32;
 pub const FILE_SEQUENTIAL_ONLY: NTCREATEFILE_CREATE_OPTIONS = 4u32;
 pub const FILE_SESSION_AWARE: NTCREATEFILE_CREATE_OPTIONS = 262144u32;
@@ -2689,6 +2715,8 @@ pub const FileNormalizedNameInfo: FILE_INFO_BY_HANDLE_CLASS = 24i32;
 pub const FileRemoteProtocolInfo: FILE_INFO_BY_HANDLE_CLASS = 13i32;
 pub const FileRenameInfo: FILE_INFO_BY_HANDLE_CLASS = 3i32;
 pub const FileRenameInfoEx: FILE_INFO_BY_HANDLE_CLASS = 22i32;
+pub const FileRenameInformation: FILE_INFORMATION_CLASS = 10i32;
+pub const FileRenameInformationEx: FILE_INFORMATION_CLASS = 65i32;
 pub const FileStandardInfo: FILE_INFO_BY_HANDLE_CLASS = 1i32;
 pub const FileStorageInfo: FILE_INFO_BY_HANDLE_CLASS = 16i32;
 pub const FileStreamInfo: FILE_INFO_BY_HANDLE_CLASS = 7i32;
