Move from unmaintained winapi crate to windows-sys

windows-sys / windows is also used by the gdk4-win32 crate.

Author: sdroege

Cargo.lock

@@ -2,7 +2,7 @@
 
 use std::{convert::TryFrom, ops::Deref};
 
-pub use ffi::winapi;
+pub use ffi::windows;
 #[cfg(feature = "use_glib")]
 use glib::translate::*;
 
@@ -12,12 +12,12 @@ declare_surface!(Win32Surface, SurfaceType::Win32);
 
 impl Win32Surface {
     #[doc(alias = "cairo_win32_surface_create")]
-    pub fn create(hdc: winapi::HDC) -> Result<Win32Surface, Error> {
+    pub fn create(hdc: windows::HDC) -> Result<Win32Surface, Error> {
         unsafe { Self::from_raw_full(ffi::cairo_win32_surface_create(hdc)) }
     }
 
     #[doc(alias = "cairo_win32_surface_create_with_format")]
-    pub fn create_with_format(hdc: winapi::HDC, format: Format) -> Result<Win32Surface, Error> {
+    pub fn create_with_format(hdc: windows::HDC, format: Format) -> Result<Win32Surface, Error> {
         unsafe {
             Self::from_raw_full(ffi::cairo_win32_surface_create_with_format(
                 hdc,
@@ -39,7 +39,7 @@ impl Win32Surface {
 
     #[doc(alias = "cairo_win32_surface_create_with_ddb")]
     pub fn create_with_ddb(
-        hdc: winapi::HDC,
+        hdc: windows::HDC,
         format: Format,
         width: i32,
         height: i32,
@@ -55,7 +55,7 @@ impl Win32Surface {
     }
 
     #[doc(alias = "cairo_win32_printing_surface_create")]
-    pub fn printing_surface_create(hdc: winapi::HDC) -> Result<Win32Surface, Error> {
+    pub fn printing_surface_create(hdc: windows::HDC) -> Result<Win32Surface, Error> {
         unsafe { Self::from_raw_full(ffi::cairo_win32_printing_surface_create(hdc)) }
     }
 }

cairo/src/win32_surface.rs

@@ -47,7 +47,7 @@ freetype = []
 script = []
 xcb = []
 use_glib = ["glib"]
-win32-surface = ["winapi"]
+win32-surface = ["windows-sys"]
 
 [dependencies]
 libc = "0.2"
@@ -63,7 +63,7 @@ version = "2.16"
 features = ["xlib"]
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.2", features = ["windef"], optional = true }
+windows-sys = { version = "0.52", features = ["Win32_Graphics_Gdi"], optional = true }
 
 [build-dependencies]
 system-deps = "6"

cairo/sys/Cargo.toml

@@ -6,26 +6,18 @@
 #![allow(clippy::upper_case_acronyms)]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-extern crate libc;
-
-#[cfg(feature = "xlib")]
-extern crate x11;
-
-#[cfg(all(windows, feature = "win32-surface"))]
-extern crate winapi as winapi_orig;
-
 #[cfg(all(windows, feature = "win32-surface"))]
 #[cfg_attr(docsrs, doc(cfg(all(windows, feature = "win32-surface"))))]
-pub mod winapi {
-    pub use winapi_orig::shared::windef::HDC;
+pub mod windows {
+    pub use windows_sys::Win32::Graphics::Gdi::HDC;
 }
 
 #[cfg(all(docsrs, not(all(windows, feature = "win32-surface"))))]
 #[cfg_attr(
     docsrs,
     doc(cfg(all(docsrs, not(all(windows, feature = "win32-surface")))))
 )]
-pub mod winapi {
+pub mod windows {
     use libc::c_void;
 
     #[repr(C)]
@@ -1472,11 +1464,11 @@ extern "C" {
     // CAIRO WINDOWS SURFACE
     #[cfg(all(windows, feature = "win32-surface"))]
     #[cfg_attr(docsrs, doc(cfg(all(windows, feature = "win32-surface"))))]
-    pub fn cairo_win32_surface_create(hdc: winapi::HDC) -> *mut cairo_surface_t;
+    pub fn cairo_win32_surface_create(hdc: windows::HDC) -> *mut cairo_surface_t;
     #[cfg(all(windows, feature = "win32-surface"))]
     #[cfg_attr(docsrs, doc(cfg(all(windows, feature = "win32-surface"))))]
     pub fn cairo_win32_surface_create_with_format(
-        hdc: winapi::HDC,
+        hdc: windows::HDC,
         format: cairo_format_t,
     ) -> *mut cairo_surface_t;
     #[cfg(all(windows, feature = "win32-surface"))]
@@ -1489,17 +1481,17 @@ extern "C" {
     #[cfg(all(windows, feature = "win32-surface"))]
     #[cfg_attr(docsrs, doc(cfg(all(windows, feature = "win32-surface"))))]
     pub fn cairo_win32_surface_create_with_ddb(
-        hdc: winapi::HDC,
+        hdc: windows::HDC,
         format: cairo_format_t,
         width: c_int,
         height: c_int,
     ) -> *mut cairo_surface_t;
     #[cfg(all(windows, feature = "win32-surface"))]
     #[cfg_attr(docsrs, doc(cfg(all(windows, feature = "win32-surface"))))]
-    pub fn cairo_win32_printing_surface_create(hdc: winapi::HDC) -> *mut cairo_surface_t;
+    pub fn cairo_win32_printing_surface_create(hdc: windows::HDC) -> *mut cairo_surface_t;
     #[cfg(all(windows, feature = "win32-surface"))]
     #[cfg_attr(docsrs, doc(cfg(all(windows, feature = "win32-surface"))))]
-    pub fn cairo_win32_surface_get_dc(surface: *mut cairo_surface_t) -> winapi::HDC;
+    pub fn cairo_win32_surface_get_dc(surface: *mut cairo_surface_t) -> windows::HDC;
     #[cfg(all(windows, feature = "win32-surface"))]
     #[cfg_attr(docsrs, doc(cfg(all(windows, feature = "win32-surface"))))]
     pub fn cairo_win32_surface_get_image(surface: *mut cairo_surface_t) -> *mut cairo_surface_t;

cairo/sys/src/lib.rs

@@ -12,9 +12,9 @@ path = "../../glib/sys"
 package = "gobject-sys"
 path = "../../glib/gobject-sys"
 
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3.9"
-features = ["ws2def", "winsock2"]
+[target."cfg(windows)".dependencies.windows-sys]
+version = "0.52"
+features = ["Win32_Networking_WinSock"]
 
 [dev-dependencies]
 shell-words = "1.0.0"

gio/sys/Cargo.toml

@@ -10,15 +10,22 @@ pub type GSocketMsgFlags = libc::c_int;
 
 #[cfg(target_family = "windows")]
 mod windows_constants {
-    pub const G_SOCKET_FAMILY_INVALID: super::GSocketFamily = winapi::shared::ws2def::AF_UNSPEC;
-    pub const G_SOCKET_FAMILY_UNIX: super::GSocketFamily = winapi::shared::ws2def::AF_UNIX;
-    pub const G_SOCKET_FAMILY_IPV4: super::GSocketFamily = winapi::shared::ws2def::AF_INET;
-    pub const G_SOCKET_FAMILY_IPV6: super::GSocketFamily = winapi::shared::ws2def::AF_INET6;
+    pub const G_SOCKET_FAMILY_INVALID: super::GSocketFamily =
+        windows_sys::Win32::Networking::WinSock::AF_UNSPEC as super::GSocketFamily;
+    pub const G_SOCKET_FAMILY_UNIX: super::GSocketFamily =
+        windows_sys::Win32::Networking::WinSock::AF_UNIX as super::GSocketFamily;
+    pub const G_SOCKET_FAMILY_IPV4: super::GSocketFamily =
+        windows_sys::Win32::Networking::WinSock::AF_INET as super::GSocketFamily;
+    pub const G_SOCKET_FAMILY_IPV6: super::GSocketFamily =
+        windows_sys::Win32::Networking::WinSock::AF_INET6 as super::GSocketFamily;
 
     pub const G_SOCKET_MSG_NONE: super::GSocketMsgFlags = 0;
-    pub const G_SOCKET_MSG_OOB: super::GSocketMsgFlags = winapi::um::winsock2::MSG_OOB;
-    pub const G_SOCKET_MSG_PEEK: super::GSocketMsgFlags = winapi::um::winsock2::MSG_PEEK;
-    pub const G_SOCKET_MSG_DONTROUTE: super::GSocketMsgFlags = winapi::um::winsock2::MSG_DONTROUTE;
+    pub const G_SOCKET_MSG_OOB: super::GSocketMsgFlags =
+        windows_sys::Win32::Networking::WinSock::MSG_OOB;
+    pub const G_SOCKET_MSG_PEEK: super::GSocketMsgFlags =
+        windows_sys::Win32::Networking::WinSock::MSG_PEEK;
+    pub const G_SOCKET_MSG_DONTROUTE: super::GSocketMsgFlags =
+        windows_sys::Win32::Networking::WinSock::MSG_DONTROUTE;
 }
 
 #[cfg(not(target_family = "windows"))]