Update to window v0.51

robmikh · Aug 14, 2023 · 6e0f9b0 · 6e0f9b0
1 parent 2e2396e
commit 6e0f9b0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 rand = "0.8.5"
 
 [dependencies.windows]
-version = "0.48.0"
+version = "0.51.0"
 features = [
     "Foundation_Collections",
     "Foundation_Numerics",

diff --git a/src/window.rs b/src/window.rs
@@ -34,7 +34,7 @@ impl Window {
         REGISTER_WINDOW_CLASS.call_once(|| {
             let class = WNDCLASSW {
                 hCursor: unsafe { LoadCursorW(None, IDC_ARROW).ok().unwrap() },
-                hInstance: instance,
+                hInstance: instance.into(),
                 lpszClassName: WINDOW_CLASS_NAME,
                 lpfnWndProc: Some(Self::wnd_proc),
                 ..Default::default()
@@ -53,7 +53,7 @@ impl Window {
                 bottom: height as i32,
             };
             unsafe {
-                AdjustWindowRectEx(&mut rect, window_style, false, window_ex_style).ok()?;
+                AdjustWindowRectEx(&mut rect, window_style, false, window_ex_style)?;
             }
             (rect.right - rect.left, rect.bottom - rect.top)
         };
@@ -161,7 +161,7 @@ impl Window {
 fn get_window_size(window_handle: HWND) -> Result<SizeInt32> {
     unsafe {
         let mut rect = RECT::default();
-        GetClientRect(window_handle, &mut rect).ok()?;
+        GetClientRect(window_handle, &mut rect)?;
         let width = rect.right - rect.left;
         let height = rect.bottom - rect.top;
         Ok(SizeInt32 {