rustpython_vm::windows

youknowone · youknowone · commit 4a61eba58e5e · 2023-10-07T03:02:56.000+09:00
diff --git a/vm/src/lib.rs b/vm/src/lib.rs
@@ -79,6 +79,8 @@ pub mod utils;
 pub mod version;
 pub mod vm;
 pub mod warn;
+#[cfg(windows)]
+pub mod windows;
 
 pub use self::compiler::parser::source_code;
 pub use self::convert::{TryFromBorrowedObject, TryFromObject};
diff --git a/vm/src/stdlib/winapi.rs b/vm/src/stdlib/winapi.rs
@@ -6,9 +6,10 @@ mod _winapi {
     use crate::{
         builtins::PyStrRef,
         common::windows::ToWideString,
-        convert::{ToPyException, ToPyObject, ToPyResult},
+        convert::{ToPyException, ToPyResult},
         function::{ArgMapping, ArgSequence, OptionalArg},
         stdlib::os::errno_err,
+        windows::WindowsSysResult,
         PyObjectRef, PyResult, TryFromObject, VirtualMachine,
     };
     use std::ptr::{null, null_mut};
@@ -56,67 +57,6 @@ mod _winapi {
         UI::WindowsAndMessaging::SW_HIDE,
     };
 
-    trait WindowsSysResultValue {
-        type Ok: ToPyObject;
-        fn is_err(&self) -> bool;
-        fn into_ok(self) -> Self::Ok;
-    }
-
-    impl WindowsSysResultValue for RAW_HANDLE {
-        type Ok = HANDLE;
-        fn is_err(&self) -> bool {
-            *self == windows_sys::Win32::Foundation::INVALID_HANDLE_VALUE
-        }
-        fn into_ok(self) -> Self::Ok {
-            HANDLE(self)
-        }
-    }
-
-    impl WindowsSysResultValue for BOOL {
-        type Ok = ();
-        fn is_err(&self) -> bool {
-            *self == 0
-        }
-        fn into_ok(self) -> Self::Ok {}
-    }
-
-    struct WindowsSysResult<T>(T);
-
-    impl<T: WindowsSysResultValue> WindowsSysResult<T> {
-        fn is_err(&self) -> bool {
-            self.0.is_err()
-        }
-        fn into_pyresult(self, vm: &VirtualMachine) -> PyResult<T::Ok> {
-            if self.is_err() {
-                Err(errno_err(vm))
-            } else {
-                Ok(self.0.into_ok())
-            }
-        }
-    }
-
-    impl<T: WindowsSysResultValue> ToPyResult for WindowsSysResult<T> {
-        fn to_pyresult(self, vm: &VirtualMachine) -> PyResult {
-            let ok = self.into_pyresult(vm)?;
-            Ok(ok.to_pyobject(vm))
-        }
-    }
-
-    type HandleInt = usize; // TODO: change to isize when fully ported to windows-rs
-
-    impl TryFromObject for HANDLE {
-        fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
-            let handle = HandleInt::try_from_object(vm, obj)?;
-            Ok(HANDLE(handle as isize))
-        }
-    }
-
-    impl ToPyObject for HANDLE {
-        fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef {
-            (self.0 as HandleInt).to_pyobject(vm)
-        }
-    }
-
     #[pyfunction]
     fn CloseHandle(handle: HANDLE) -> WindowsSysResult<BOOL> {
         WindowsSysResult(unsafe { windows_sys::Win32::Foundation::CloseHandle(handle.0) })
diff --git a/vm/src/windows.rs b/vm/src/windows.rs
@@ -0,0 +1,68 @@
+use crate::{
+    convert::{ToPyObject, ToPyResult},
+    stdlib::os::errno_err,
+    PyObjectRef, PyResult, TryFromObject, VirtualMachine,
+};
+use windows::Win32::Foundation::HANDLE;
+use windows_sys::Win32::Foundation::{BOOL, HANDLE as RAW_HANDLE};
+
+pub(crate) trait WindowsSysResultValue {
+    type Ok: ToPyObject;
+    fn is_err(&self) -> bool;
+    fn into_ok(self) -> Self::Ok;
+}
+
+impl WindowsSysResultValue for RAW_HANDLE {
+    type Ok = HANDLE;
+    fn is_err(&self) -> bool {
+        *self == windows_sys::Win32::Foundation::INVALID_HANDLE_VALUE
+    }
+    fn into_ok(self) -> Self::Ok {
+        HANDLE(self)
+    }
+}
+
+impl WindowsSysResultValue for BOOL {
+    type Ok = ();
+    fn is_err(&self) -> bool {
+        *self == 0
+    }
+    fn into_ok(self) -> Self::Ok {}
+}
+
+pub(crate) struct WindowsSysResult<T>(pub T);
+
+impl<T: WindowsSysResultValue> WindowsSysResult<T> {
+    pub fn is_err(&self) -> bool {
+        self.0.is_err()
+    }
+    pub fn into_pyresult(self, vm: &VirtualMachine) -> PyResult<T::Ok> {
+        if self.is_err() {
+            Err(errno_err(vm))
+        } else {
+            Ok(self.0.into_ok())
+        }
+    }
+}
+
+impl<T: WindowsSysResultValue> ToPyResult for WindowsSysResult<T> {
+    fn to_pyresult(self, vm: &VirtualMachine) -> PyResult {
+        let ok = self.into_pyresult(vm)?;
+        Ok(ok.to_pyobject(vm))
+    }
+}
+
+type HandleInt = usize; // TODO: change to isize when fully ported to windows-rs
+
+impl TryFromObject for HANDLE {
+    fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
+        let handle = HandleInt::try_from_object(vm, obj)?;
+        Ok(HANDLE(handle as isize))
+    }
+}
+
+impl ToPyObject for HANDLE {
+    fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef {
+        (self.0 as HandleInt).to_pyobject(vm)
+    }
+}
