terminalsize

Author: youknowone

crates/vm/src/stdlib/nt.rs

@@ -203,32 +203,34 @@ pub(crate) mod module {
         fd: OptionalArg<i32>,
         vm: &VirtualMachine,
     ) -> PyResult<_os::TerminalSizeData> {
-        let (columns, lines) = {
-            let stdhandle = match fd {
-                OptionalArg::Present(0) => Console::STD_INPUT_HANDLE,
-                OptionalArg::Present(1) | OptionalArg::Missing => Console::STD_OUTPUT_HANDLE,
-                OptionalArg::Present(2) => Console::STD_ERROR_HANDLE,
-                _ => return Err(vm.new_value_error("bad file descriptor")),
-            };
-            let h = unsafe { Console::GetStdHandle(stdhandle) };
-            if h.is_null() {
-                return Err(vm.new_os_error("handle cannot be retrieved".to_owned()));
-            }
-            if h == INVALID_HANDLE_VALUE {
-                return Err(errno_err(vm));
+        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 _
             }
-            let mut csbi = MaybeUninit::uninit();
-            let ret = unsafe { Console::GetConsoleScreenBufferInfo(h, csbi.as_mut_ptr()) };
-            let csbi = unsafe { csbi.assume_init() };
-            if ret == 0 {
-                return Err(errno_err(vm));
-            }
-            let w = csbi.srWindow;
-            (
-                (w.Right - w.Left + 1) as usize,
-                (w.Bottom - w.Top + 1) as usize,
-            )
         };
+
+        if h.is_null() || h == INVALID_HANDLE_VALUE {
+            return Err(errno_err(vm));
+        }
+
+        let mut csbi = MaybeUninit::uninit();
+        let ret = unsafe { Console::GetConsoleScreenBufferInfo(h, csbi.as_mut_ptr()) };
+        if ret == 0 {
+            return Err(errno_err(vm));
+        }
+        let csbi = unsafe { csbi.assume_init() };
+        let w = csbi.srWindow;
+        let columns = (w.Right - w.Left + 1) as usize;
+        let lines = (w.Bottom - w.Top + 1) as usize;
         Ok(_os::TerminalSizeData { columns, lines })
     }