fix: Update windows-rs to 0.61 (#541)

Author: DataTriny

Cargo.lock

@@ -20,12 +20,11 @@ accesskit = { version = "0.18.0", path = "../../common" }
 accesskit_consumer = { version = "0.27.0", path = "../../consumer" }
 hashbrown = { version = "0.15", default-features = false, features = ["default-hasher"] }
 static_assertions = "1.1.0"
-windows-core = "0.58.0"
+windows-core = "0.61.0"
 
 [dependencies.windows]
-version = "0.58.0"
+version = "0.61.1"
 features = [
-    "implement",
     "Win32_Foundation",
     "Win32_Graphics_Gdi",
     "Win32_System_Com",

platforms/windows/Cargo.toml

@@ -197,7 +197,7 @@ impl ActionHandler for SimpleActionHandler {
             Action::Focus => {
                 unsafe {
                     PostMessageW(
-                        self.window,
+                        Some(self.window),
                         SET_FOCUS_MSG,
                         WPARAM(0),
                         LPARAM(request.target.0 as _),
@@ -208,7 +208,7 @@ impl ActionHandler for SimpleActionHandler {
             Action::Click => {
                 unsafe {
                     PostMessageW(
-                        self.window,
+                        Some(self.window),
                         CLICK_MSG,
                         WPARAM(0),
                         LPARAM(request.target.0 as _),
@@ -241,7 +241,7 @@ extern "system" fn wndproc(window: HWND, message: u32, wparam: WPARAM, lparam: L
             unsafe { DefWindowProcW(window, message, wparam, lparam) }
         }
         WM_PAINT => {
-            unsafe { ValidateRect(window, None) }.unwrap();
+            unsafe { ValidateRect(Some(window), None) }.unwrap();
             LRESULT(0)
         }
         WM_DESTROY => {
@@ -321,6 +321,7 @@ extern "system" fn wndproc(window: HWND, message: u32, wparam: WPARAM, lparam: L
 
 fn create_window(title: &str, initial_focus: NodeId) -> Result<HWND> {
     let create_params = Box::new(WindowCreateParams(initial_focus));
+    let module = HINSTANCE::from(unsafe { GetModuleHandleW(None)? });
 
     let window = unsafe {
         CreateWindowExW(
@@ -334,7 +335,7 @@ fn create_window(title: &str, initial_focus: NodeId) -> Result<HWND> {
             CW_USEDEFAULT,
             None,
             None,
-            GetModuleHandleW(None).unwrap(),
+            Some(module),
             Some(Box::into_raw(create_params) as _),
         )?
     };
@@ -355,7 +356,7 @@ fn main() -> Result<()> {
     let _ = unsafe { ShowWindow(window, SW_SHOW) };
 
     let mut message = MSG::default();
-    while unsafe { GetMessageW(&mut message, HWND::default(), 0, 0) }.into() {
+    while unsafe { GetMessageW(&mut message, None, 0, 0) }.into() {
         let _ = unsafe { TranslateMessage(&message) };
         unsafe { DispatchMessageW(&message) };
     }

platforms/windows/examples/hello_world.rs

@@ -18,7 +18,11 @@ use accesskit_consumer::{FilterResult, Node, TreeState};
 use std::sync::{atomic::Ordering, Arc, Weak};
 use windows::{
     core::*,
-    Win32::{Foundation::*, System::Com::*, UI::Accessibility::*},
+    Win32::{
+        Foundation::*,
+        System::{Com::*, Variant::*},
+        UI::Accessibility::*,
+    },
 };
 
 use crate::{
@@ -768,8 +772,7 @@ impl IRawElementProviderFragment_Impl for PlatformNode_Impl {
     fn FragmentRoot(&self) -> Result<IRawElementProviderFragmentRoot> {
         self.with_tree_state(|state| {
             if self.is_root(state) {
-                // SAFETY: We know &self is inside a full COM implementation.
-                unsafe { self.cast() }
+                Ok(self.to_interface())
             } else {
                 let root_id = state.root_id();
                 Ok(self.relative(root_id).into())
@@ -850,15 +853,14 @@ macro_rules! patterns {
     ), (
         $($extra_trait_method:item),*
     ))),+) => {
-        impl PlatformNode {
+        impl PlatformNode_Impl {
             fn pattern_provider(&self, pattern_id: UIA_PATTERN_ID) -> Result<IUnknown> {
                 self.resolve(|node| {
                     let wrapper = NodeWrapper(&node);
                     match pattern_id {
                         $($pattern_id => {
                             if wrapper.$is_supported() {
-                                // SAFETY: We know we're running inside a full COM implementation.
-                                let intermediate: $provider_interface = unsafe { self.cast() }?;
+                                let intermediate: $provider_interface = self.to_interface();
                                 return intermediate.cast();
                             }
                         })*
@@ -1031,7 +1033,7 @@ patterns! {
             Ok(std::ptr::null_mut())
         },
 
-        fn RangeFromChild(&self, _child: Option<&IRawElementProviderSimple>) -> Result<ITextRangeProvider> {
+        fn RangeFromChild(&self, _child: Ref<IRawElementProviderSimple>) -> Result<ITextRangeProvider> {
             // We don't support embedded objects in text.
             Err(not_implemented())
         },

platforms/windows/src/node.rs

@@ -97,7 +97,7 @@ impl SubclassImpl {
             SetPropW(
                 self.hwnd,
                 PROP_NAME,
-                HANDLE(self as *const SubclassImpl as _),
+                Some(HANDLE(self as *const SubclassImpl as _)),
             )
         }
         .unwrap();

platforms/windows/src/subclass.rs

@@ -91,7 +91,7 @@ extern "system" fn wndproc(window: HWND, message: u32, wparam: WPARAM, lparam: L
             unsafe { DefWindowProcW(window, message, wparam, lparam) }
         }
         WM_PAINT => {
-            unsafe { ValidateRect(window, None) }.unwrap();
+            unsafe { ValidateRect(Some(window), None) }.unwrap();
             LRESULT(0)
         }
         WM_DESTROY => {
@@ -142,6 +142,7 @@ fn create_window(
         activation_handler: Box::new(activation_handler),
         action_handler: Arc::new(ActionHandlerWrapper::new(action_handler)),
     });
+    let module = HINSTANCE::from(unsafe { GetModuleHandleW(None)? });
 
     let window = unsafe {
         CreateWindowExW(
@@ -155,7 +156,7 @@ fn create_window(
             CW_USEDEFAULT,
             None,
             None,
-            GetModuleHandleW(None).unwrap(),
+            Some(module),
             Some(Box::into_raw(create_params) as _),
         )?
     };
@@ -213,7 +214,7 @@ where
             }
 
             let mut message = MSG::default();
-            while unsafe { GetMessageW(&mut message, HWND::default(), 0, 0) }.into() {
+            while unsafe { GetMessageW(&mut message, None, 0, 0) }.into() {
                 let _ = unsafe { TranslateMessage(&message) };
                 unsafe { DispatchMessageW(&message) };
             }
@@ -230,7 +231,7 @@ where
         };
 
         let _window_guard = scopeguard::guard((), |_| {
-            unsafe { PostMessageW(window.0, WM_CLOSE, WPARAM(0), LPARAM(0)) }.unwrap()
+            unsafe { PostMessageW(Some(window.0), WM_CLOSE, WPARAM(0), LPARAM(0)) }.unwrap()
         });
 
         // We must initialize COM before creating the UIA client. The MTA option
@@ -326,7 +327,7 @@ impl FocusEventHandler {
 
 #[allow(non_snake_case)]
 impl IUIAutomationFocusChangedEventHandler_Impl for FocusEventHandler_Impl {
-    fn HandleFocusChangedEvent(&self, sender: Option<&IUIAutomationElement>) -> Result<()> {
+    fn HandleFocusChangedEvent(&self, sender: Ref<IUIAutomationElement>) -> Result<()> {
         self.received.put(sender.unwrap().clone());
         Ok(())
     }

platforms/windows/src/tests/mod.rs

@@ -12,7 +12,10 @@ use accesskit_consumer::{
 use std::sync::{Arc, RwLock, Weak};
 use windows::{
     core::*,
-    Win32::{Foundation::*, System::Com::*, UI::Accessibility::*},
+    Win32::{
+        System::{Com::*, Variant::*},
+        UI::Accessibility::*,
+    },
 };
 
 use crate::{context::Context, node::PlatformNode, util::*};
@@ -328,8 +331,8 @@ impl ITextRangeProvider_Impl for PlatformRange_Impl {
         Ok(self.this.clone().into())
     }
 
-    fn Compare(&self, other: Option<&ITextRangeProvider>) -> Result<BOOL> {
-        let other = unsafe { required_param(other)?.as_impl() };
+    fn Compare(&self, other: Ref<ITextRangeProvider>) -> Result<BOOL> {
+        let other = unsafe { required_param(&other)?.as_impl() };
         Ok((self.context.ptr_eq(&other.context)
             && *self.state.read().unwrap() == *other.state.read().unwrap())
         .into())
@@ -338,10 +341,10 @@ impl ITextRangeProvider_Impl for PlatformRange_Impl {
     fn CompareEndpoints(
         &self,
         endpoint: TextPatternRangeEndpoint,
-        other: Option<&ITextRangeProvider>,
+        other: Ref<ITextRangeProvider>,
         other_endpoint: TextPatternRangeEndpoint,
     ) -> Result<i32> {
-        let other = unsafe { required_param(other)?.as_impl() };
+        let other = unsafe { required_param(&other)?.as_impl() };
         if std::ptr::eq(other as *const _, &self.this as *const _) {
             // Comparing endpoints within the same range can be done
             // safely without upgrading the range. This allows ATs
@@ -531,10 +534,10 @@ impl ITextRangeProvider_Impl for PlatformRange_Impl {
     fn MoveEndpointByRange(
         &self,
         endpoint: TextPatternRangeEndpoint,
-        other: Option<&ITextRangeProvider>,
+        other: Ref<ITextRangeProvider>,
         other_endpoint: TextPatternRangeEndpoint,
     ) -> Result<()> {
-        let other = unsafe { required_param(other)?.as_impl() };
+        let other = unsafe { required_param(&other)?.as_impl() };
         self.require_same_context(other)?;
         // We have to obtain the tree state and ranges manually to avoid
         // lifetime issues, and work with the two locks in a specific order

platforms/windows/src/text.rs

@@ -38,7 +38,7 @@ impl Write for WideString {
 
 impl From<WideString> for BSTR {
     fn from(value: WideString) -> Self {
-        Self::from_wide(&value.0).unwrap()
+        Self::from_wide(&value.0)
     }
 }
 
@@ -199,8 +199,8 @@ pub(crate) fn invalid_arg() -> Error {
     E_INVALIDARG.into()
 }
 
-pub(crate) fn required_param<T>(param: Option<&T>) -> Result<&T> {
-    param.map_or_else(|| Err(invalid_arg()), Ok)
+pub(crate) fn required_param<'a, T: Interface>(param: &'a Ref<T>) -> Result<&'a T> {
+    param.ok().map_err(|_| invalid_arg())
 }
 
 pub(crate) fn element_not_available() -> Error {
@@ -248,7 +248,7 @@ pub(crate) fn window_title(hwnd: WindowHandle) -> Option<BSTR> {
     }
     let len = result.0 as usize;
     unsafe { buffer.set_len(len) };
-    Some(BSTR::from_wide(&buffer).unwrap())
+    Some(BSTR::from_wide(&buffer))
 }
 
 pub(crate) fn toolkit_description(state: &TreeState) -> Option<WideString> {