fix!: Update windows to 0.58 on accesskit_windows (#453)

AccessKit · Sep 24, 2024 · cda35e7 · cda35e7
1 parent 8a84abf
commit cda35e7
Show file tree

Hide file tree

Showing 13 changed files with 146 additions and 87 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/platforms/windows/Cargo.toml b/platforms/windows/Cargo.toml
@@ -16,9 +16,10 @@ accesskit = { version = "0.16.0", path = "../../common" }
 accesskit_consumer = { version = "0.24.0", path = "../../consumer" }
 paste = "1.0"
 static_assertions = "1.1.0"
+windows-core = "0.58.0"
 
 [dependencies.windows]
-version = "0.54"
+version = "0.58.0"
 features = [
     "implement",
     "Win32_Foundation",
@@ -36,4 +37,3 @@ features = [
 once_cell = "1.13.0"
 scopeguard = "1.1.0"
 winit = "0.30"
-
diff --git a/platforms/windows/examples/hello_world.rs b/platforms/windows/examples/hello_world.rs
@@ -189,6 +189,9 @@ struct SimpleActionHandler {
     window: HWND,
 }
 
+unsafe impl Send for SimpleActionHandler {}
+unsafe impl Sync for SimpleActionHandler {}
+
 impl ActionHandler for SimpleActionHandler {
     fn do_action(&mut self, request: ActionRequest) {
         match request.action {
@@ -334,9 +337,9 @@ fn create_window(title: &str, initial_focus: NodeId) -> Result<HWND> {
             None,
             GetModuleHandleW(None).unwrap(),
             Some(Box::into_raw(create_params) as _),
-        )
+        )?
     };
-    if window.0 == 0 {
+    if window.is_invalid() {
         return Err(Error::from_win32());
     }
 
@@ -350,11 +353,11 @@ fn main() -> Result<()> {
     println!("Enable Narrator with [Win]+[Ctrl]+[Enter] (or [Win]+[Enter] on older versions of Windows).");
 
     let window = create_window(WINDOW_TITLE, INITIAL_FOCUS)?;
-    unsafe { ShowWindow(window, SW_SHOW) };
+    let _ = unsafe { ShowWindow(window, SW_SHOW) };
 
     let mut message = MSG::default();
-    while unsafe { GetMessageW(&mut message, HWND(0), 0, 0) }.into() {
-        unsafe { TranslateMessage(&message) };
+    while unsafe { GetMessageW(&mut message, HWND::default(), 0, 0) }.into() {
+        let _ = unsafe { TranslateMessage(&message) };
         unsafe { DispatchMessageW(&message) };
     }
 

diff --git a/platforms/windows/src/adapter.rs b/platforms/windows/src/adapter.rs
@@ -21,6 +21,7 @@ use crate::{
     filters::filter,
     node::{NodeWrapper, PlatformNode},
     util::QueuedEvent,
+    window_handle::WindowHandle,
 };
 
 fn focus_event(context: &Arc<Context>, node_id: NodeId) -> QueuedEvent {
@@ -140,7 +141,7 @@ const PLACEHOLDER_ROOT_ID: NodeId = NodeId(0);
 
 enum State {
     Inactive {
-        hwnd: HWND,
+        hwnd: WindowHandle,
         is_window_focused: bool,
         action_handler: Arc<dyn ActionHandlerNoMut + Send + Sync>,
     },
@@ -186,7 +187,7 @@ impl Adapter {
         init_uia();
 
         let state = State::Inactive {
-            hwnd,
+            hwnd: hwnd.into(),
             is_window_focused,
             action_handler,
         };
@@ -356,15 +357,15 @@ fn normalize_objid(lparam: LPARAM) -> i32 {
 }
 
 struct WmGetObjectResult {
-    hwnd: HWND,
+    hwnd: WindowHandle,
     wparam: WPARAM,
     lparam: LPARAM,
     el: IRawElementProviderSimple,
 }
 
 impl From<WmGetObjectResult> for LRESULT {
     fn from(this: WmGetObjectResult) -> Self {
-        unsafe { UiaReturnRawElementProvider(this.hwnd, this.wparam, this.lparam, &this.el) }
+        unsafe { UiaReturnRawElementProvider(this.hwnd.0, this.wparam, this.lparam, &this.el) }
     }
 }
 

diff --git a/platforms/windows/src/context.rs b/platforms/windows/src/context.rs
@@ -6,9 +6,8 @@
 use accesskit::{ActionHandler, ActionRequest, Point};
 use accesskit_consumer::Tree;
 use std::sync::{atomic::AtomicBool, Arc, Mutex, RwLock, RwLockReadGuard};
-use windows::Win32::Foundation::*;
 
-use crate::util::*;
+use crate::{util::*, window_handle::WindowHandle};
 
 pub(crate) trait ActionHandlerNoMut {
     fn do_action(&self, request: ActionRequest);
@@ -29,15 +28,15 @@ impl<H: ActionHandler + Send> ActionHandlerNoMut for ActionHandlerWrapper<H> {
 }
 
 pub(crate) struct Context {
-    pub(crate) hwnd: HWND,
+    pub(crate) hwnd: WindowHandle,
     pub(crate) tree: RwLock<Tree>,
     pub(crate) action_handler: Arc<dyn ActionHandlerNoMut + Send + Sync>,
     pub(crate) is_placeholder: AtomicBool,
 }
 
 impl Context {
     pub(crate) fn new(
-        hwnd: HWND,
+        hwnd: WindowHandle,
         tree: Tree,
         action_handler: Arc<dyn ActionHandlerNoMut + Send + Sync>,
         is_placeholder: bool,

diff --git a/platforms/windows/src/lib.rs b/platforms/windows/src/lib.rs
@@ -8,6 +8,7 @@ mod filters;
 mod node;
 mod text;
 mod util;
+mod window_handle;
 
 mod adapter;
 pub use adapter::{Adapter, QueuedEvents};