use _get_osfhandle

youknowone · youknowone · commit 4992e7e04075 · 2025-12-09T20:53:35.000+09:00
diff --git a/crates/vm/src/stdlib/nt.rs b/crates/vm/src/stdlib/nt.rs
@@ -205,20 +205,12 @@ 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 _
-            }
-        };
+        // 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;
 
-        if h.is_null() || h == INVALID_HANDLE_VALUE {
+        if h == INVALID_HANDLE_VALUE {
             return Err(errno_err(vm));
         }
 
