Merge pull request #1796 from gtk-rs/dependabot/cargo/windows-0.58.0

build(deps): bump windows from 0.56.0 to 0.58.0

gdk4-win32/Cargo.toml

@@ -19,6 +19,7 @@ version = "4"
 
 [features]
 v4_4 = ["gdk4-win32-sys/v4_4", "gdk/v4_4"]
+v4_8 = ["v4_4", "gdk4-win32-sys/v4_8", "gdk/v4_8"]
 egl = ["khronos-egl"]
 win32 = ["windows"]
 
@@ -29,7 +30,7 @@ gio.workspace = true
 glib.workspace = true
 libc.workspace = true
 khronos-egl = {version = "6.0", optional = true}
-windows = { version = "0.56", features = [
+windows = { version = "0.58", features = [
     "Win32_Foundation",
     "Win32_UI_WindowsAndMessaging",
 ], optional = true }

gdk4-win32/src/lib.rs

@@ -4,6 +4,8 @@
 #![allow(deprecated)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
+use std::ffi::c_void;
+
 pub use gdk;
 pub use gdk4_win32_sys as ffi;
 pub use gio;
@@ -29,31 +31,31 @@ pub use win32_display::Win32DisplayFilterHandle;
 mod win32_hcursor;
 mod win32_surface;
 
-#[cfg(not(feature = "win32"))]
-pub struct HANDLE(pub isize);
-#[cfg(not(feature = "win32"))]
-pub struct HCURSOR(pub isize);
-#[cfg(not(feature = "win32"))]
-pub struct HICON(pub isize);
-#[cfg(not(feature = "win32"))]
-pub struct HWND(pub isize);
+#[cfg(not(all(feature = "win32", windows)))]
+pub struct HANDLE(pub *mut c_void);
+#[cfg(not(all(feature = "win32", windows)))]
+pub struct HCURSOR(pub *mut c_void);
+#[cfg(not(all(feature = "win32", windows)))]
+pub struct HICON(pub *mut c_void);
+#[cfg(not(all(feature = "win32", windows)))]
+pub struct HWND(pub *mut c_void);
 
-#[cfg(not(feature = "win32"))]
+#[cfg(not(all(feature = "win32", windows)))]
 #[repr(transparent)]
 pub struct WPARAM(pub usize);
-#[cfg(not(feature = "win32"))]
+#[cfg(not(all(feature = "win32", windows)))]
 #[repr(transparent)]
 pub struct LPARAM(pub isize);
 
-#[cfg(not(feature = "win32"))]
+#[cfg(not(all(feature = "win32", windows)))]
 #[repr(C)]
 pub struct POINT {
     pub x: i32,
     pub y: i32,
 }
 
 #[allow(non_snake_case)]
-#[cfg(not(feature = "win32"))]
+#[cfg(not(all(feature = "win32", windows)))]
 #[repr(C)]
 pub struct MSG {
     pub hwnd: HWND,
@@ -64,7 +66,7 @@ pub struct MSG {
     pub pt: POINT,
 }
 
-#[cfg(feature = "win32")]
+#[cfg(all(feature = "win32", windows))]
 pub use windows::Win32::Foundation::{HANDLE, HWND};
-#[cfg(feature = "win32")]
+#[cfg(all(feature = "win32", windows))]
 pub use windows::Win32::UI::WindowsAndMessaging::{HCURSOR, HICON, MSG};

gdk4-win32/src/win32_hcursor.rs

@@ -1,6 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use std::ptr::NonNull;
+use std::{ffi::c_void, ptr::NonNull};
 
 use glib::{translate::*, types::Pointee};
 
@@ -17,14 +17,14 @@ impl Win32HCursor {
         unsafe {
             from_glib_full(ffi::gdk_win32_hcursor_new(
                 display.as_ref().to_glib_none().0,
-                handle.0,
+                handle.0 as isize,
                 destroyable.into_glib(),
             ))
         }
     }
 
     pub fn handle(&self) -> HCURSOR {
         let ptr: NonNull<Pointee> = ObjectExt::property(self, "handle");
-        HCURSOR(ptr.as_ptr() as _)
+        HCURSOR(ptr.as_ptr() as *mut c_void)
     }
 }

gdk4-win32/src/win32_surface.rs

@@ -1,5 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+use std::ffi::c_void;
+
 use glib::translate::*;
 
 use crate::{ffi, prelude::*, Win32Surface, HWND};
@@ -14,22 +16,25 @@ impl Win32Surface {
         unsafe {
             from_glib_none(ffi::gdk_win32_surface_lookup_for_display(
                 display.as_ref().to_glib_none().0,
-                anid.0,
+                anid.0 as isize,
             ))
         }
     }
 
     #[doc(alias = "gdk_win32_surface_get_handle")]
     #[doc(alias = "get_handle")]
     pub fn handle(&self) -> HWND {
-        HWND(unsafe { ffi::gdk_win32_surface_get_handle(self.to_glib_none().0) })
+        HWND(unsafe { ffi::gdk_win32_surface_get_handle(self.to_glib_none().0) } as *mut c_void)
     }
 
     #[cfg_attr(feature = "v4_8", deprecated = "Since 4.8")]
     #[doc(alias = "gdk_win32_surface_get_impl_hwnd")]
     #[doc(alias = "get_impl_hwnd")]
     pub fn impl_hwnd(surface: &impl IsA<gdk::Surface>) -> HWND {
         assert_initialized_main_thread!();
-        HWND(unsafe { ffi::gdk_win32_surface_get_impl_hwnd(surface.as_ref().to_glib_none().0) })
+        HWND(
+            unsafe { ffi::gdk_win32_surface_get_impl_hwnd(surface.as_ref().to_glib_none().0) }
+                as *mut c_void,
+        )
     }
 }