windows: Wrap HANDLE to

windows 0.58 changed HANDLE from int to void pointer, now it wouldn't
compile anymore because we need it to implement Send. So just implement
a wrapper around it.

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

framework_lib/src/chromium_ec/windows.rs

@@ -14,8 +14,14 @@ use windows::{
 use crate::chromium_ec::EC_MEMMAP_SIZE;
 use crate::chromium_ec::{EcError, EcResponseStatus, EcResult};
 
+// Create a wrapper around HANDLE to mark it as Send.
+// I'm not sure, but I think it's safe to do that for this type of HANDL.
+#[derive(Copy, Clone)]
+struct DevHandle(HANDLE);
+unsafe impl Send for DevHandle {}
+
 lazy_static! {
-    static ref DEVICE: Arc<Mutex<Option<HANDLE>>> = Arc::new(Mutex::new(None));
+    static ref DEVICE: Arc<Mutex<Option<DevHandle>>> = Arc::new(Mutex::new(None));
 }
 
 fn init() {
@@ -26,7 +32,7 @@ fn init() {
 
     let path = w!(r"\\.\GLOBALROOT\Device\CrosEC");
     unsafe {
-        *device = Some(
+        *device = Some(DevHandle(
             CreateFileW(
                 path,
                 FILE_GENERIC_READ.0 | FILE_GENERIC_WRITE.0,
@@ -37,7 +43,7 @@ fn init() {
                 None,
             )
             .unwrap(),
-        );
+        ));
     }
 }
 
@@ -61,7 +67,7 @@ pub fn read_memory(offset: u16, length: u16) -> EcResult<Vec<u8>> {
             return EcResult::Err(EcError::DeviceError("No EC device".to_string()));
         };
         DeviceIoControl(
-            device,
+            device.0,
             IOCTL_CROSEC_RDMEM,
             Some(const_ptr),
             ptr_size,
@@ -104,15 +110,16 @@ pub fn send_command(command: u16, command_version: u8, data: &[u8]) -> EcResult<
             return EcResult::Err(EcError::DeviceError("No EC device".to_string()));
         };
         DeviceIoControl(
-            device,
+            device.0,
             IOCTL_CROSEC_XCMD,
             Some(const_ptr),
             size.try_into().unwrap(),
             Some(mut_ptr),
             size.try_into().unwrap(),
             Some(&mut returned as *mut u32),
             None,
-        );
+        )
+        .unwrap();
     }
 
     match FromPrimitive::from_u32(cmd.result) {