Merge pull request #152 from YgorSouza/windows-cancel-io-ex

Use CancelIoEx instead of CancelIo on windows_native
ruabmbua · Mar 2, 2024 · f37a860 · f37a860
2 parents c2b41a5 + 884544d
commit f37a860
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/windows_native/mod.rs b/src/windows_native/mod.rs
@@ -46,7 +46,7 @@ use windows_sys::Win32::Storage::FileSystem::{
     OPEN_EXISTING,
 };
 use windows_sys::Win32::System::Threading::ResetEvent;
-use windows_sys::Win32::System::IO::{CancelIo, DeviceIoControl};
+use windows_sys::Win32::System::IO::{CancelIoEx, DeviceIoControl};
 
 const STRING_BUF_LEN: usize = 128;
 
@@ -179,7 +179,7 @@ impl HidDeviceBackendBase for HidDevice {
             if res != TRUE {
                 let err = Win32Error::last();
                 if err != Win32Error::IoPending {
-                    unsafe { CancelIo(self.device_handle.as_raw()) };
+                    unsafe { CancelIoEx(self.device_handle.as_raw(), state.overlapped.as_raw()) };
                     self.read_pending.set(false);
                     return Err(err.into());
                 }
@@ -335,7 +335,16 @@ impl HidDeviceBackendWindows for HidDevice {
 impl Drop for HidDevice {
     fn drop(&mut self) {
         unsafe {
-            CancelIo(self.device_handle.as_raw());
+            for state in [
+                &mut self.read_state,
+                &mut self.write_state,
+                &mut self.feature_state,
+            ] {
+                let mut state = state.borrow_mut();
+                if CancelIoEx(self.device_handle.as_raw(), state.overlapped.as_raw()) > 0 {
+                    _ = state.overlapped.get_result(&self.device_handle, None);
+                }
+            }
         }
     }
 }