Fix windows inode to use u128

Author: youknowone

crates/vm/src/stdlib/os.rs

@@ -508,10 +508,10 @@ pub(super) mod _os {
         mode: OutputMode,
         stat: OnceCell<PyObjectRef>,
         lstat: OnceCell<PyObjectRef>,
-        #[cfg(unix)]
+        #[cfg(not(windows))]
         ino: AtomicCell<u64>,
-        #[cfg(not(unix))]
-        ino: AtomicCell<Option<u64>>,
+        #[cfg(windows)]
+        ino: AtomicCell<Option<u128>>,
     }
 
     #[pyclass(with(Representable, Unconstructible))]
@@ -608,9 +608,9 @@ pub(super) mod _os {
             Ok(stat.clone())
         }
 
-        #[cfg(not(unix))]
+        #[cfg(windows)]
         #[pymethod]
-        fn inode(&self, vm: &VirtualMachine) -> PyResult<u64> {
+        fn inode(&self, vm: &VirtualMachine) -> PyResult<u128> {
             match self.ino.load() {
                 Some(ino) => Ok(ino),
                 None => {
@@ -625,14 +625,19 @@ pub(super) mod _os {
                     )
                     .map_err(|e| e.into_pyexception(vm))?
                     .ok_or_else(|| crate::exceptions::cstring_error(vm))?;
+                    // On Windows, combine st_ino and st_ino_high into 128-bit value
+                    #[cfg(windows)]
+                    let ino: u128 = stat.st_ino as u128 | ((stat.st_ino_high as u128) << 64);
+                    #[cfg(not(windows))]
+                    let ino: u128 = stat.st_ino as u128;
                     // Err(T) means other thread set `ino` at the mean time which is safe to ignore
-                    let _ = self.ino.compare_exchange(None, Some(stat.st_ino));
-                    Ok(stat.st_ino)
+                    let _ = self.ino.compare_exchange(None, Some(ino));
+                    Ok(ino)
                 }
             }
         }
 
-        #[cfg(unix)]
+        #[cfg(not(windows))]
         #[pymethod]
         fn inode(&self, _vm: &VirtualMachine) -> PyResult<u64> {
             Ok(self.ino.load())
@@ -882,9 +887,16 @@ pub(super) mod _os {
             #[cfg(not(windows))]
             let st_file_attributes = 0;
 
+            // On Windows, combine st_ino and st_ino_high into a 128-bit value
+            // like _pystat_l128_from_l64_l64
+            #[cfg(windows)]
+            let st_ino: u128 = stat.st_ino as u128 | ((stat.st_ino_high as u128) << 64);
+            #[cfg(not(windows))]
+            let st_ino: u64 = stat.st_ino;
+
             Self {
                 st_mode: vm.ctx.new_pyref(stat.st_mode),
-                st_ino: vm.ctx.new_pyref(stat.st_ino),
+                st_ino: vm.ctx.new_pyref(st_ino),
                 st_dev: vm.ctx.new_pyref(stat.st_dev),
                 st_nlink: vm.ctx.new_pyref(stat.st_nlink),
                 st_uid: vm.ctx.new_pyref(stat.st_uid),

crates/vm/src/windows.rs

@@ -515,8 +515,11 @@ fn win32_xstat_impl(path: &OsStr, traverse: bool) -> std::io::Result<StatStruct>
             {
                 let mut result =
                     crate::common::fileutils::windows::stat_basic_info_to_stat(&stat_info);
-                result.update_st_mode_from_path(path, stat_info.FileAttributes);
-                return Ok(result);
+                // If st_ino is 0, fall through to slow path to get proper file ID
+                if result.st_ino != 0 || result.st_ino_high != 0 {
+                    result.update_st_mode_from_path(path, stat_info.FileAttributes);
+                    return Ok(result);
+                }
             }
         }
         Err(e) => {