gio: Use OwnedSocket / BorrowedSocket for Windows APIs on GSocket

gio/src/socket.rs

@@ -3,7 +3,9 @@
 #[cfg(unix)]
 use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
 #[cfg(windows)]
-use std::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket};
+use std::os::windows::io::{
+    AsRawSocket, AsSocket, BorrowedSocket, FromRawSocket, IntoRawSocket, OwnedSocket, RawSocket,
+};
 #[cfg(feature = "v2_60")]
 use std::time::Duration;
 use std::{cell::RefCell, marker::PhantomData, mem::transmute, pin::Pin, ptr};
@@ -27,22 +29,24 @@ impl Socket {
             if error.is_null() {
                 Ok(from_glib_full(ret))
             } else {
-                libc::close(fd);
+                let _ = OwnedFd::from_raw_fd(fd);
                 Err(from_glib_full(error))
             }
         }
     }
     #[cfg(windows)]
     #[cfg_attr(docsrs, doc(cfg(windows)))]
-    #[allow(clippy::missing_safety_doc)]
-    pub unsafe fn from_socket(socket: impl IntoRawSocket) -> Result<Socket, glib::Error> {
+    pub fn from_socket(socket: OwnedSocket) -> Result<Socket, glib::Error> {
         let socket = socket.into_raw_socket();
         let mut error = ptr::null_mut();
-        let ret = ffi::g_socket_new_from_fd(socket as i32, &mut error);
-        if error.is_null() {
-            Ok(from_glib_full(ret))
-        } else {
-            Err(from_glib_full(error))
+        unsafe {
+            let ret = ffi::g_socket_new_from_fd(socket as i32, &mut error);
+            if error.is_null() {
+                Ok(from_glib_full(ret))
+            } else {
+                let _ = OwnedSocket::from_raw_socket(socket);
+                Err(from_glib_full(error))
+            }
         }
     }
 }
@@ -74,6 +78,17 @@ impl AsRawSocket for Socket {
     }
 }
 
+#[cfg(windows)]
+#[cfg_attr(docsrs, doc(cfg(windows)))]
+impl AsSocket for Socket {
+    fn as_socket(&self) -> BorrowedSocket<'_> {
+        unsafe {
+            let raw_socket = self.as_raw_socket();
+            BorrowedSocket::borrow_raw(raw_socket)
+        }
+    }
+}
+
 #[doc(alias = "GInputVector")]
 #[repr(transparent)]
 #[derive(Debug)]
@@ -646,18 +661,16 @@ pub trait SocketExtManual: IsA<Socket> + Sized {
     #[cfg_attr(docsrs, doc(cfg(unix)))]
     #[doc(alias = "get_fd")]
     #[doc(alias = "g_socket_get_fd")]
-    fn fd<T: FromRawFd>(&self) -> T {
-        unsafe { FromRawFd::from_raw_fd(ffi::g_socket_get_fd(self.as_ref().to_glib_none().0)) }
+    fn fd(&self) -> BorrowedFd<'_> {
+        self.as_ref().as_fd()
     }
 
     #[cfg(windows)]
     #[cfg_attr(docsrs, doc(cfg(windows)))]
     #[doc(alias = "get_socket")]
     #[doc(alias = "g_socket_get_fd")]
-    fn socket<T: FromRawSocket>(&self) -> T {
-        unsafe {
-            FromRawSocket::from_raw_socket(ffi::g_socket_get_fd(self.as_ref().to_glib_none().0) as _)
-        }
+    fn socket(&self) -> BorrowedSocket<'_> {
+        self.as_ref().as_socket()
     }
 
     #[doc(alias = "g_socket_create_source")]