chore(deps): bump windows-rs from 0.34 to 0.35

LGUG2Z · Apr 14, 2022 · 02a3220 · 02a3220
1 parent 4b6a7c0
commit 02a3220
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 54 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/komorebi-core/Cargo.toml b/komorebi-core/Cargo.toml
@@ -15,7 +15,7 @@ strum = { version = "0.24", features = ["derive"] }
 schemars = "0.8"
 
 [dependencies.windows]
-version = "0.34"
+version = "0.35"
 features = [
     "Win32_Foundation",
 ]
diff --git a/komorebi/Cargo.toml b/komorebi/Cargo.toml
@@ -41,7 +41,7 @@ winreg = "0.10"
 schemars = "0.8"
 
 [dependencies.windows]
-version = "0.34"
+version = "0.35"
 features = [
     "Win32_Foundation",
     "Win32_Graphics_Dwm",

diff --git a/komorebi/src/windows_api.rs b/komorebi/src/windows_api.rs
@@ -124,15 +124,16 @@ pub trait ProcessWindowsCrateResult<T> {
     fn process(self) -> Result<T>;
 }
 
-macro_rules! impl_process_windows_crate_result {
+macro_rules! impl_process_windows_crate_integer_wrapper_result {
     ( $($input:ty => $deref:ty),+ $(,)? ) => (
         paste::paste! {
             $(
-                impl ProcessWindowsCrateResult<$deref> for WindowsCrateResult<$input> {
+                impl ProcessWindowsCrateResult<$deref> for $input {
                     fn process(self) -> Result<$deref> {
-                        match self {
-                            Ok(value) => Ok(value.0),
-                            Err(error) => Err(error.into()),
+                        if self.0 == 0 {
+                            Ok(self.0)
+                        } else {
+                            Err(std::io::Error::last_os_error().into())
                         }
                     }
                 }
@@ -141,7 +142,7 @@ macro_rules! impl_process_windows_crate_result {
     );
 }
 
-impl_process_windows_crate_result!(
+impl_process_windows_crate_integer_wrapper_result!(
     HWND => isize,
 );
 
@@ -296,7 +297,7 @@ impl WindowsApi {
     }
 
     pub fn foreground_window() -> Result<isize> {
-        unsafe { GetForegroundWindow() }.ok().process()
+        unsafe { GetForegroundWindow() }.process()
     }
 
     pub fn set_foreground_window(hwnd: HWND) -> Result<()> {
@@ -305,16 +306,16 @@ impl WindowsApi {
 
     #[allow(dead_code)]
     pub fn top_window() -> Result<isize> {
-        unsafe { GetTopWindow(HWND::default()) }.ok().process()
+        unsafe { GetTopWindow(HWND::default()) }.process()
     }
 
     pub fn desktop_window() -> Result<isize> {
-        unsafe { GetDesktopWindow() }.ok().process()
+        unsafe { GetDesktopWindow() }.process()
     }
 
     #[allow(dead_code)]
     pub fn next_window(hwnd: HWND) -> Result<isize> {
-        unsafe { GetWindow(hwnd, GW_HWNDNEXT) }.ok().process()
+        unsafe { GetWindow(hwnd, GW_HWNDNEXT) }.process()
     }
 
     #[allow(dead_code)]
@@ -352,7 +353,7 @@ impl WindowsApi {
     }
 
     pub fn window_from_point(point: POINT) -> Result<isize> {
-        unsafe { WindowFromPoint(point) }.ok().process()
+        unsafe { WindowFromPoint(point) }.process()
     }
 
     pub fn window_at_cursor_pos() -> Result<isize> {
@@ -401,7 +402,7 @@ impl WindowsApi {
     }
 
     pub fn set_focus(hwnd: HWND) -> Result<()> {
-        unsafe { SetFocus(hwnd) }.ok().map(|_| ()).process()
+        unsafe { SetFocus(hwnd) }.process().map(|_| ())
     }
 
     #[allow(dead_code)]
@@ -451,9 +452,7 @@ impl WindowsApi {
         inherit_handle: bool,
         process_id: u32,
     ) -> Result<HANDLE> {
-        unsafe { OpenProcess(access_rights, inherit_handle, process_id) }
-            .ok()
-            .process()
+        unsafe { OpenProcess(access_rights, inherit_handle, process_id) }.process()
     }
 
     pub fn process_handle(process_id: u32) -> Result<HANDLE> {

diff --git a/komorebic/Cargo.toml b/komorebic/Cargo.toml
@@ -27,7 +27,7 @@ serde_json = "1"
 uds_windows = "1"
 
 [dependencies.windows]
-version = "0.34"
+version = "0.35"
 features = [
     "Win32_Foundation",
     "Win32_UI_WindowsAndMessaging"