crates/vm/src/stdlib/winapi.rs (2)

680-708: Consider using Wtf8Buf for proper WTF-8/surrogate handling.

The function currently uses String::from_utf16 (line 707), but LCMapStringEx (line 630) uses Wtf8Buf::from_wide to properly handle unpaired surrogates in WTF-8. Since the input is PyStrRef which supports WTF-8, the output should preserve this capability for consistency and robustness. While Windows paths with unpaired surrogates are rare, they are technically valid.

Additionally, this function has nearly identical implementation to GetLongPathName below—consider extracting a generic helper to reduce duplication.

🔎 Proposed refactor using Wtf8Buf pattern

+    use rustpython_common::wtf8::Wtf8Buf;
+
     /// GetShortPathName - Return the short version of the provided path.
     #[pyfunction]
-    fn GetShortPathName(path: PyStrRef, vm: &VirtualMachine) -> PyResult<String> {
+    fn GetShortPathName(path: PyStrRef, vm: &VirtualMachine) -> PyResult<PyStrRef> {
         use windows_sys::Win32::Storage::FileSystem::GetShortPathNameW;
 
         let path_wide = path.as_wtf8().to_wide_with_nul();
 
         // First call to get required buffer size
         let size = unsafe { GetShortPathNameW(path_wide.as_ptr(), null_mut(), 0) };
 
         if size == 0 {
             return Err(vm.new_last_os_error());
         }
 
         // Second call to get the actual short path
         let mut buffer: Vec<u16> = vec![0; size as usize];
         let result = unsafe {
             GetShortPathNameW(path_wide.as_ptr(), buffer.as_mut_ptr(), buffer.len() as u32)
         };
 
         if result == 0 {
             return Err(vm.new_last_os_error());
         }
 
         // Truncate to actual length (excluding null terminator)
         buffer.truncate(result as usize);
-        String::from_utf16(&buffer).map_err(|e| vm.new_runtime_error(e.to_string()))
+        let result_str = Wtf8Buf::from_wide(&buffer);
+        Ok(vm.ctx.new_str(result_str))
     }

---

710-737: Consider using Wtf8Buf for proper WTF-8/surrogate handling.

The function currently uses String::from_utf16 (line 736), but LCMapStringEx (line 630) uses Wtf8Buf::from_wide to properly handle unpaired surrogates in WTF-8. Since the input is PyStrRef which supports WTF-8, the output should preserve this capability for consistency and robustness. While Windows paths with unpaired surrogates are rare, they are technically valid.

Additionally, this function has nearly identical implementation to GetShortPathName above—consider extracting a generic helper to reduce duplication.

🔎 Proposed refactor using Wtf8Buf pattern

+    use rustpython_common::wtf8::Wtf8Buf;
+
     /// GetLongPathName - Return the long version of the provided path.
     #[pyfunction]
-    fn GetLongPathName(path: PyStrRef, vm: &VirtualMachine) -> PyResult<String> {
+    fn GetLongPathName(path: PyStrRef, vm: &VirtualMachine) -> PyResult<PyStrRef> {
         use windows_sys::Win32::Storage::FileSystem::GetLongPathNameW;
 
         let path_wide = path.as_wtf8().to_wide_with_nul();
 
         // First call to get required buffer size
         let size = unsafe { GetLongPathNameW(path_wide.as_ptr(), null_mut(), 0) };
 
         if size == 0 {
             return Err(vm.new_last_os_error());
         }
 
         // Second call to get the actual long path
         let mut buffer: Vec<u16> = vec![0; size as usize];
         let result = unsafe {
             GetLongPathNameW(path_wide.as_ptr(), buffer.as_mut_ptr(), buffer.len() as u32)
         };
 
         if result == 0 {
             return Err(vm.new_last_os_error());
         }
 
         // Truncate to actual length (excluding null terminator)
         buffer.truncate(result as usize);
-        String::from_utf16(&buffer).map_err(|e| vm.new_runtime_error(e.to_string()))
+        let result_str = Wtf8Buf::from_wide(&buffer);
+        Ok(vm.ctx.new_str(result_str))
     }

Configuration used: Path: .coderabbit.yml

Review profile: CHILL

Plan: Pro