use _get_osfhandle

youknowone · youknowone · commit efbb6cf0707f · 2025-12-09T22:14:33.000+09:00
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
@@ -1772,8 +1772,6 @@ def test_run_with_pathlike_path_and_arguments(self):
         res = subprocess.run(args)
         self.assertEqual(res.returncode, 57)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     @unittest.skipUnless(mswindows, "Maybe test trigger a leak on Ubuntu")
     def test_run_with_an_empty_env(self):
         # gh-105436: fix subprocess.run(..., env={}) broken on Windows
diff --git a/crates/vm/src/stdlib/nt.rs b/crates/vm/src/stdlib/nt.rs
@@ -205,22 +205,10 @@ pub(crate) mod module {
     ) -> PyResult<_os::TerminalSizeData> {
         let fd = fd.unwrap_or(1); // default to stdout
 
-        // For standard streams, use GetStdHandle which returns proper console handles
-        // For other fds, use _get_osfhandle to convert
-        let h = match fd {
-            0 => unsafe { Console::GetStdHandle(Console::STD_INPUT_HANDLE) },
-            1 => unsafe { Console::GetStdHandle(Console::STD_OUTPUT_HANDLE) },
-            2 => unsafe { Console::GetStdHandle(Console::STD_ERROR_HANDLE) },
-            _ => {
-                let borrowed = unsafe { crt_fd::Borrowed::borrow_raw(fd) };
-                let handle = crt_fd::as_handle(borrowed).map_err(|e| e.to_pyexception(vm))?;
-                handle.as_raw_handle() as _
-            }
-        };
-
-        if h.is_null() || h == INVALID_HANDLE_VALUE {
-            return Err(errno_err(vm));
-        }
+        // Use _get_osfhandle for all fds
+        let borrowed = unsafe { crt_fd::Borrowed::borrow_raw(fd) };
+        let handle = crt_fd::as_handle(borrowed).map_err(|e| e.to_pyexception(vm))?;
+        let h = handle.as_raw_handle() as Foundation::HANDLE;
 
         let mut csbi = MaybeUninit::uninit();
         let ret = unsafe { Console::GetConsoleScreenBufferInfo(h, csbi.as_mut_ptr()) };
