diff --git a/.changes/send-sync.md b/.changes/send-sync.md new file mode 100644 index 0000000..f8f264c --- /dev/null +++ b/.changes/send-sync.md @@ -0,0 +1,5 @@ +--- +"global-hotkey": "minor" +--- + +Removed `Sync` and `Send` implementation for `GlobalHotKeyManager` diff --git a/.changes/windows-sys-0.59.md b/.changes/windows-sys-0.59.md new file mode 100644 index 0000000..69e8611 --- /dev/null +++ b/.changes/windows-sys-0.59.md @@ -0,0 +1,5 @@ +--- +"global-hotkey": "patch" +--- + +Update `windows-sys` crate to `0.59` diff --git a/Cargo.toml b/Cargo.toml index ecc40ac..1a63dc4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ cocoa = "0.25" objc = "0.2" [target."cfg(target_os = \"windows\")".dependencies.windows-sys] -version = "0.52" +version = "0.59" features = [ "Win32_UI_WindowsAndMessaging", "Win32_Foundation", diff --git a/src/lib.rs b/src/lib.rs index aba71b9..abcfde0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -161,15 +161,3 @@ impl GlobalHotKeyManager { Ok(()) } } - -#[cfg(test)] -mod tests { - fn assert_send() {} - fn assert_sync() {} - - #[test] - fn is_send_sync() { - assert_send::(); - assert_sync::(); - } -} diff --git a/src/platform_impl/windows/mod.rs b/src/platform_impl/windows/mod.rs index 83f59a1..137fab4 100644 --- a/src/platform_impl/windows/mod.rs +++ b/src/platform_impl/windows/mod.rs @@ -10,7 +10,7 @@ use windows_sys::Win32::{ UI::{ Input::KeyboardAndMouse::*, WindowsAndMessaging::{ - CreateWindowExW, DefWindowProcW, DestroyWindow, RegisterClassW, CW_USEDEFAULT, HMENU, + CreateWindowExW, DefWindowProcW, DestroyWindow, RegisterClassW, CW_USEDEFAULT, WM_HOTKEY, WNDCLASSW, WS_EX_LAYERED, WS_EX_NOACTIVATE, WS_EX_TOOLWINDOW, WS_EX_TRANSPARENT, WS_OVERLAPPED, }, @@ -20,7 +20,7 @@ use windows_sys::Win32::{ use crate::{hotkey::HotKey, GlobalHotKeyEvent}; pub struct GlobalHotKeyManager { - hwnd: isize, + hwnd: HWND, } impl Drop for GlobalHotKeyManager { @@ -61,12 +61,12 @@ impl GlobalHotKeyManager { 0, CW_USEDEFAULT, 0, - HWND::default(), - HMENU::default(), + std::ptr::null_mut(), + std::ptr::null_mut(), hinstance, std::ptr::null_mut(), ); - if hwnd == 0 { + if hwnd.is_null() { return Err(crate::Error::OsError(std::io::Error::last_os_error())); }