Update windows_win lib

DoumanAsh · Jan 13, 2024 · cb147f7 · cb147f7
1 parent f4400b1
commit cb147f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,14 +13,7 @@ readme = "README.md"
 edition = "2018"
 
 [target.'cfg(windows)'.dependencies]
-windows-win = "2"
-
-[target.'cfg(windows)'.dependencies.winapi]
-version = "0.3"
-default-features = false
-features = [
-    "winuser"
-]
+windows-win = "3"
 
 [target.'cfg(all(unix, not(any(target_os="macos", target_os="ios", target_os="android", target_os="emscripten"))))'.dependencies]
 x11-clipboard = "0.8"

diff --git a/src/master/win32.rs b/src/master/win32.rs
@@ -6,9 +6,8 @@ use windows_win::{
     Messages
 };
 
-use winapi::shared::windef::HWND;
-
-use winapi::um::winuser::{
+use windows_win::sys::{
+    HWND,
     AddClipboardFormatListener,
     RemoveClipboardFormatListener,
     PostMessageW,
@@ -81,7 +80,10 @@ impl<H: ClipboardHandler> Master<H> {
     #[inline(always)]
     ///Creates new instance.
     pub fn new(handler: H) -> io::Result<Self> {
-        let window = Window::from_builder(raw::window::Builder::new().class_name("STATIC").parent_message())?;
+        let window = match Window::from_builder(raw::window::Builder::new().class_name("STATIC").parent_message()) {
+            Ok(window) => window,
+            Err(error) => return Err(io::Error::from_raw_os_error(error.raw_code())),
+        };
 
         Ok(Self {
             handler,
@@ -126,7 +128,7 @@ impl<H: ClipboardHandler> Master<H> {
                     _ => panic!("Unexpected message"),
                 },
                 Err(error) => {
-                    match self.handler.on_clipboard_error(error) {
+                    match self.handler.on_clipboard_error(io::Error::from_raw_os_error(error.raw_code())) {
                         CallbackResult::Next => (),
                         CallbackResult::Stop => break,
                         CallbackResult::StopWithError(error) => {