Keep HANDLE usize

youknowone · youknowone · commit 00571baf30bf · 2023-10-06T14:35:19.000+09:00
diff --git a/vm/src/stdlib/winapi.rs b/vm/src/stdlib/winapi.rs
@@ -83,10 +83,12 @@ mod _winapi {
         }
     }
 
+    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 = isize::try_from_object(vm, obj)?;
-            Ok(HANDLE(handle))
+            let handle = HandleInt::try_from_object(vm, obj)?;
+            Ok(HANDLE(handle as isize))
         }
     }
 
@@ -97,25 +99,31 @@ mod _winapi {
         }
     }
 
+    impl ToPyObject for HANDLE {
+        fn to_pyobject(&self, vm: &VirtualMachine) -> PyObjectRef {
+            (self.0 as HandleInt).to_pyobject(vm)
+        }
+    }
+
     #[pyfunction]
     fn CloseHandle(handle: HANDLE) -> windows::core::Result<()> {
         unsafe { Win32::Foundation::CloseHandle(handle) }
     }
 
     #[pyfunction]
-    fn GetStdHandle(std_handle: STD_HANDLE) -> windows::core::Result<isize> {
-        Ok(unsafe { Win32::System::Console::GetStdHandle(std_handle) }?.0)
+    fn GetStdHandle(std_handle: STD_HANDLE) -> windows::core::Result<HANDLE> {
+        Ok(unsafe { Win32::System::Console::GetStdHandle(std_handle) }?)
     }
 
     #[pyfunction]
-    fn CreatePipe(_pipe_attrs: PyObjectRef, size: u32) -> windows::core::Result<(isize, isize)> {
+    fn CreatePipe(_pipe_attrs: PyObjectRef, size: u32) -> windows::core::Result<(HANDLE, HANDLE)> {
         let (read, write) = unsafe {
             let mut read = std::mem::MaybeUninit::<HANDLE>::uninit();
             let mut write = std::mem::MaybeUninit::<HANDLE>::uninit();
             Win32::System::Pipes::CreatePipe(read.as_mut_ptr(), write.as_mut_ptr(), None, size)?;
             (read.assume_init(), write.assume_init())
         };
-        Ok((read.0, write.0))
+        Ok((read, write))
     }
 
     #[pyfunction]
@@ -125,7 +133,7 @@ mod _winapi {
         access: u32,
         inherit: i32,
         options: OptionalArg<u32>,
-    ) -> windows::core::Result<isize> {
+    ) -> windows::core::Result<HANDLE> {
         let target = unsafe {
             let mut target = std::mem::MaybeUninit::<HANDLE>::uninit();
             Win32::Foundation::DuplicateHandle(
@@ -139,12 +147,12 @@ mod _winapi {
             )?;
             target.assume_init()
         };
-        Ok(target.0)
+        Ok(target)
     }
 
     #[pyfunction]
-    fn GetCurrentProcess() -> isize {
-        unsafe { Win32::System::Threading::GetCurrentProcess() }.0
+    fn GetCurrentProcess() -> HANDLE {
+        unsafe { Win32::System::Threading::GetCurrentProcess() }
     }
 
     #[pyfunction]
@@ -183,7 +191,7 @@ mod _winapi {
     fn CreateProcess(
         args: CreateProcessArgs,
         vm: &VirtualMachine,
-    ) -> PyResult<(isize, isize, u32, u32)> {
+    ) -> PyResult<(HANDLE, HANDLE, u32, u32)> {
         let mut si = winbase::STARTUPINFOEXW::default();
         si.StartupInfo.cb = std::mem::size_of_val(&si) as _;
 
@@ -263,8 +271,8 @@ mod _winapi {
         };
 
         Ok((
-            procinfo.hProcess.0,
-            procinfo.hThread.0,
+            procinfo.hProcess,
+            procinfo.hThread,
             procinfo.dwProcessId,
             procinfo.dwThreadId,
         ))
