fix: Update windows-rs to 0.44 (#220)

Author: mwcampbell

Cargo.lock

@@ -18,7 +18,7 @@ once_cell = "1.13.0"
 paste = "1.0"
 
 [dependencies.windows]
-version = "0.42.0"
+version = "0.44.0"
 features = [
     "implement",
     "Win32_Foundation",

platforms/windows/Cargo.toml

@@ -23,7 +23,7 @@ static WINDOW_CLASS_ATOM: Lazy<u16> = Lazy::new(|| {
     let wc = WNDCLASSW {
         hCursor: unsafe { LoadCursorW(None, IDC_ARROW) }.unwrap(),
         hInstance: unsafe { GetModuleHandleW(None) }.unwrap(),
-        lpszClassName: class_name.into(),
+        lpszClassName: class_name,
         style: CS_HREDRAW | CS_VREDRAW,
         lpfnWndProc: Some(wndproc),
         ..Default::default()

platforms/windows/examples/hello_world.rs

@@ -254,8 +254,8 @@ impl QueuedEvents {
                         UiaRaiseAutomationPropertyChangedEvent(
                             &element,
                             property_id,
-                            &old_value,
-                            &new_value,
+                            old_value,
+                            new_value,
                         )
                     }
                     .unwrap();

platforms/windows/src/adapter.rs

@@ -13,7 +13,7 @@ use windows::{
 
 use crate::{Adapter, QueuedEvents, UiaInitMarker};
 
-const PROP_NAME: &HSTRING = w!("AccessKitAdapter");
+const PROP_NAME: PCWSTR = w!("AccessKitAdapter");
 
 type LazyAdapter = Lazy<Adapter, Box<dyn FnOnce() -> Adapter>>;
 

platforms/windows/src/subclass.rs

@@ -78,7 +78,7 @@ fn is_button_named(element: &IUIAutomationElement, expected_name: &str) -> bool
     let control_type = unsafe { element.CurrentControlType() }.unwrap();
     let name = unsafe { element.CurrentName() }.unwrap();
     let name: String = name.try_into().unwrap();
-    control_type == (UIA_ButtonControlTypeId.0 as i32) && name == expected_name
+    control_type == UIA_ButtonControlTypeId && name == expected_name
 }
 
 fn is_button_1(element: &IUIAutomationElement) -> bool {

platforms/windows/src/tests/simple.rs

@@ -400,7 +400,7 @@ impl ITextRangeProvider_Impl for PlatformRange {
 
     fn FindAttribute(
         &self,
-        _id: i32,
+        _id: UIA_TEXTATTRIBUTE_ID,
         _value: &VARIANT,
         _backward: BOOL,
     ) -> Result<ITextRangeProvider> {
@@ -421,8 +421,7 @@ impl ITextRangeProvider_Impl for PlatformRange {
         Err(Error::OK)
     }
 
-    fn GetAttributeValue(&self, id: i32) -> Result<VARIANT> {
-        let id = UIA_TEXTATTRIBUTE_ID(id as _);
+    fn GetAttributeValue(&self, id: UIA_TEXTATTRIBUTE_ID) -> Result<VARIANT> {
         match id {
             UIA_IsReadOnlyAttributeId => {
                 // TBD: do we ever want to support mixed read-only/editable text?

platforms/windows/src/text.rs

@@ -130,7 +130,7 @@ impl From<bool> for VariantFactory {
         Self(
             VT_BOOL,
             VARIANT_0_0_0 {
-                boolVal: if value { VARIANT_TRUE } else { VARIANT_FALSE },
+                boolVal: VARIANT_BOOL(if value { VARIANT_TRUE } else { VARIANT_FALSE }),
             },
         )
     }
@@ -240,7 +240,7 @@ pub(crate) fn window_title(hwnd: HWND) -> Option<BSTR> {
     }
     let len = result.0 as usize;
     unsafe { buffer.set_len(len) };
-    Some(BSTR::from_wide(&buffer))
+    Some(BSTR::from_wide(&buffer).unwrap())
 }
 
 pub(crate) fn upgrade<T>(weak: &Weak<T>) -> Result<Arc<T>> {