Fix ReadFile/WriteFile overlapped keyword argument

youknowone · youknowone · commit 867ad8a4a3e3 · 2026-02-20T17:32:06.000+09:00
Use FromArgs structs so overlapped parameter can be passed as
a keyword argument (overlapped=True), matching the CPython API.
diff --git a/crates/vm/src/stdlib/_winapi.rs b/crates/vm/src/stdlib/_winapi.rs
@@ -1253,18 +1253,24 @@ mod _winapi {
         Ok(())
     }
 
-    /// WriteFile - Write data to a file or I/O device.
-    #[pyfunction]
-    fn WriteFile(
+    #[derive(FromArgs)]
+    struct WriteFileArgs {
+        #[pyarg(positional)]
         handle: WinHandle,
+        #[pyarg(positional)]
         buffer: crate::function::ArgBytesLike,
-        use_overlapped: OptionalArg<bool>,
-        vm: &VirtualMachine,
-    ) -> PyResult<PyObjectRef> {
+        #[pyarg(named, default = false)]
+        overlapped: bool,
+    }
+
+    /// WriteFile - Write data to a file or I/O device.
+    #[pyfunction]
+    fn WriteFile(args: WriteFileArgs, vm: &VirtualMachine) -> PyResult<PyObjectRef> {
         use windows_sys::Win32::Storage::FileSystem::WriteFile as WinWriteFile;
 
-        let use_overlapped = use_overlapped.unwrap_or(false);
-        let buf = buffer.borrow_buf();
+        let handle = args.handle;
+        let use_overlapped = args.overlapped;
+        let buf = args.buffer.borrow_buf();
         let len = core::cmp::min(buf.len(), u32::MAX as usize) as u32;
 
         if use_overlapped {
@@ -1334,17 +1340,24 @@ mod _winapi {
             .into())
     }
 
-    /// ReadFile - Read data from a file or I/O device.
-    #[pyfunction]
-    fn ReadFile(
+    #[derive(FromArgs)]
+    struct ReadFileArgs {
+        #[pyarg(positional)]
         handle: WinHandle,
+        #[pyarg(positional)]
         size: u32,
-        use_overlapped: OptionalArg<bool>,
-        vm: &VirtualMachine,
-    ) -> PyResult<PyObjectRef> {
+        #[pyarg(named, default = false)]
+        overlapped: bool,
+    }
+
+    /// ReadFile - Read data from a file or I/O device.
+    #[pyfunction]
+    fn ReadFile(args: ReadFileArgs, vm: &VirtualMachine) -> PyResult<PyObjectRef> {
         use windows_sys::Win32::Storage::FileSystem::ReadFile as WinReadFile;
 
-        let use_overlapped = use_overlapped.unwrap_or(false);
+        let handle = args.handle;
+        let size = args.size;
+        let use_overlapped = args.overlapped;
 
         if use_overlapped {
             use windows_sys::Win32::Foundation::ERROR_IO_PENDING;
