A few windows fix (#7458)

youknowone · Copilot · commit b26f0139d580 · 2026-03-25T06:49:44.000Z
* Disallow instantiation of sys.getwindowsversion type

Add slot_new to PyWindowsVersion that raises TypeError,
matching sys.flags behavior.

* Remove incorrect WSAHOS errno constant

WSAHOS was hardcoded as an alias for WSAHOST_NOT_FOUND, but
CPython guards it with #ifdef WSAHOS which doesn't exist in
modern Windows SDK headers.

* Fix mmap resize to raise OSError instead of SystemError

* Fix CreateProcess with empty environment on Windows

Empty env dict produced a single null terminator, but
CreateProcessW requires a double null for a valid empty
environment block.

* Revert mmap resize error to SystemError and fix errno.rs formatting

mmap resize raises SystemError (not OSError) when mremap is unavailable,
matching CPython behavior. test_mmap catches SystemError to skip unsupported
resize operations.

* Fix named mmap resize to raise OSError and unmark test_sleep expectedFailure

Named mmap resize on Windows should raise OSError (not SystemError).
Remove expectedFailure mark from TimeEINTRTest.test_sleep as it now passes.

* Use expectedFailureIf for TimeEINTRTest.test_sleep on Linux

test_sleep passes on macOS but fails on Linux due to timing.

* Remove expectedFailure for TimeEINTRTest.test_sleep

test_sleep now passes on all platforms.
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
@@ -867,7 +867,6 @@ def test_resize_fails_if_mapping_held_elsewhere(self):
         finally:
             f.close()
 
-    @unittest.expectedFailure  # TODO: RUSTPYTHON
     @unittest.skipUnless(os.name == 'nt', 'requires Windows')
     def test_resize_succeeds_with_error_for_second_named_mapping(self):
         """If a more than one mapping exists of the same name, none of them can
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
@@ -1903,7 +1903,6 @@ def test_run_with_pathlike_path_and_arguments(self):
         res = subprocess.run(args)
         self.assertEqual(res.returncode, 57)
 
-    @unittest.skipIf(mswindows, "TODO: RUSTPYTHON; empty env block fails nondeterministically")
     @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/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -878,7 +878,6 @@ def test_sys_flags_no_instantiation(self):
     def test_sys_version_info_no_instantiation(self):
         self.assert_raise_on_new_sys_type(sys.version_info)
 
-    @unittest.expectedFailure  # TODO: RUSTPYTHON; TypeError not raised for getwindowsversion instantiation
     def test_sys_getwindowsversion_no_instantiation(self):
         # Skip if not being run on Windows.
         test.support.get_attribute(sys, "getwindowsversion")
diff --git a/crates/stdlib/src/mmap.rs b/crates/stdlib/src/mmap.rs
@@ -1204,7 +1204,7 @@ mod mmap {
 
             // Check if this is a Named mmap - these cannot be resized
             if let Some(MmapObj::Named(_)) = mmap_guard.as_ref() {
-                return Err(vm.new_system_error("mmap: cannot resize a named memory mapping"));
+                return Err(vm.new_os_error("mmap: cannot resize a named memory mapping"));
             }
 
             let is_anonymous = handle == INVALID_HANDLE_VALUE as isize;
diff --git a/crates/vm/src/stdlib/_winapi.rs b/crates/vm/src/stdlib/_winapi.rs
@@ -445,6 +445,11 @@ mod _winapi {
         for (_, entry) in entries {
             out.push(entry);
         }
+        // Each entry ends with \0, so one more \0 terminates the block.
+        // For empty env, we need \0\0 as a valid empty environment block.
+        if out.is_empty() {
+            out.push_str("\0");
+        }
         out.push_str("\0");
         Ok(out.into_vec())
     }
diff --git a/crates/vm/src/stdlib/errno.rs b/crates/vm/src/stdlib/errno.rs
@@ -39,12 +39,11 @@ pub mod errors {
             WSAENOMORE, WSAENOPROTOOPT, WSAENOTCONN, WSAENOTEMPTY, WSAENOTSOCK, WSAEOPNOTSUPP,
             WSAEPFNOSUPPORT, WSAEPROCLIM, WSAEPROTONOSUPPORT, WSAEPROTOTYPE,
             WSAEPROVIDERFAILEDINIT, WSAEREFUSED, WSAEREMOTE, WSAESHUTDOWN, WSAESOCKTNOSUPPORT,
-            WSAESTALE, WSAETIMEDOUT, WSAETOOMANYREFS, WSAEUSERS, WSAEWOULDBLOCK, WSAHOST_NOT_FOUND,
-            WSAID_ACCEPTEX, WSAID_CONNECTEX, WSAID_DISCONNECTEX, WSAID_GETACCEPTEXSOCKADDRS,
-            WSAID_TRANSMITFILE, WSAID_TRANSMITPACKETS, WSAID_WSAPOLL, WSAID_WSARECVMSG, WSANO_DATA,
-            WSANO_RECOVERY, WSANOTINITIALISED, WSAPROTOCOL_LEN, WSASERVICE_NOT_FOUND,
-            WSASYS_STATUS_LEN, WSASYSCALLFAILURE, WSASYSNOTREADY, WSATRY_AGAIN, WSATYPE_NOT_FOUND,
-            WSAVERNOTSUPPORTED,
+            WSAESTALE, WSAETIMEDOUT, WSAETOOMANYREFS, WSAEUSERS, WSAEWOULDBLOCK, WSAID_ACCEPTEX,
+            WSAID_CONNECTEX, WSAID_DISCONNECTEX, WSAID_GETACCEPTEXSOCKADDRS, WSAID_TRANSMITFILE,
+            WSAID_TRANSMITPACKETS, WSAID_WSAPOLL, WSAID_WSARECVMSG, WSANO_DATA, WSANO_RECOVERY,
+            WSANOTINITIALISED, WSAPROTOCOL_LEN, WSASERVICE_NOT_FOUND, WSASYS_STATUS_LEN,
+            WSASYSCALLFAILURE, WSASYSNOTREADY, WSATRY_AGAIN, WSATYPE_NOT_FOUND, WSAVERNOTSUPPORTED,
         },
     };
     #[cfg(windows)]
@@ -64,8 +63,6 @@ pub mod errors {
         ETIMEDOUT, ETOOMANYREFS, EUSERS, EWOULDBLOCK,
         // TODO: EBADF should be here once winerrs are translated to errnos but it messes up some things atm
     }
-    #[cfg(windows)]
-    pub const WSAHOS: i32 = WSAHOST_NOT_FOUND;
 }
 
 #[cfg(any(unix, windows, target_os = "wasi"))]
@@ -566,7 +563,7 @@ const ERROR_CODES: &[(&str, i32)] = &[
     e!(cfg(windows), WSAEDISCON),
     e!(cfg(windows), WSAEINTR),
     e!(cfg(windows), WSAEPROTOTYPE),
-    e!(cfg(windows), WSAHOS),
+    // TODO: e!(cfg(windows), WSAHOS),
     e!(cfg(windows), WSAEADDRINUSE),
     e!(cfg(windows), WSAEADDRNOTAVAIL),
     e!(cfg(windows), WSAEALREADY),
diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs
@@ -1807,7 +1807,12 @@ mod sys {
 
     #[cfg(windows)]
     #[pyclass(with(PyStructSequence))]
-    impl PyWindowsVersion {}
+    impl PyWindowsVersion {
+        #[pyslot]
+        fn slot_new(_cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult {
+            Err(vm.new_type_error("cannot create 'sys.getwindowsversion' instances"))
+        }
+    }
 
     #[derive(Debug)]
     #[pystruct_sequence_data(try_from_object)]

Original file line number	Diff line number	Diff line change
`@@ -1204,7 +1204,7 @@ mod mmap {`
`1204`	`1204`
`1205`	`1205`	`// Check if this is a Named mmap - these cannot be resized`
`1206`	`1206`	`if let Some(MmapObj::Named(_)) = mmap_guard.as_ref() {`
`1207`		`- return Err(vm.new_system_error("mmap: cannot resize a named memory mapping"));`
	`1207`	`+ return Err(vm.new_os_error("mmap: cannot resize a named memory mapping"));`
`1208`	`1208`	`}`
`1209`	`1209`
`1210`	`1210`	`let is_anonymous = handle == INVALID_HANDLE_VALUE as isize;`
Original file line number	Diff line number	Diff line change
`@@ -445,6 +445,11 @@ mod _winapi {`
`445`	`445`	`for (_, entry) in entries {`
`446`	`446`	`out.push(entry);`
`447`	`447`	`}`
	`448`	`+ // Each entry ends with \0, so one more \0 terminates the block.`
	`449`	`+ // For empty env, we need \0\0 as a valid empty environment block.`
	`450`	`+ if out.is_empty() {`
	`451`	`+ out.push_str("\0");`
	`452`	`+ }`
`448`	`453`	`out.push_str("\0");`
`449`	`454`	`Ok(out.into_vec())`
`450`	`455`	`}`