Convert winsock calls to WSA...A

Author: seritools

library/std/src/fs/tests.rs

@@ -1762,7 +1762,7 @@ fn windows_unix_socket_exists() {
     // std doesn't currently support Unix sockets on Windows so manually create one here.
     net::init();
     unsafe {
-        let socket = c::WSASocketW(
+        let socket = c::WSASocketA(
             c::AF_UNIX as i32,
             c::SOCK_STREAM,
             0,

library/std/src/os/windows/io/socket.rs

@@ -113,17 +113,17 @@ impl BorrowedSocket<'_> {
     /// object as the existing `BorrowedSocket` instance.
     #[stable(feature = "io_safety", since = "1.63.0")]
     pub fn try_clone_to_owned(&self) -> io::Result<OwnedSocket> {
-        let mut info = unsafe { mem::zeroed::<sys::c::WSAPROTOCOL_INFOW>() };
+        let mut info = unsafe { mem::zeroed::<sys::c::WSAPROTOCOL_INFOA>() };
         let result = unsafe {
-            sys::c::WSADuplicateSocketW(
+            sys::c::WSADuplicateSocketA(
                 self.as_raw_socket() as sys::c::SOCKET,
                 sys::c::GetCurrentProcessId(),
                 &mut info,
             )
         };
         sys::net::cvt(result)?;
         let socket = unsafe {
-            sys::c::WSASocketW(
+            sys::c::WSASocketA(
                 info.iAddressFamily,
                 info.iSocketType,
                 info.iProtocol,
@@ -143,7 +143,7 @@ impl BorrowedSocket<'_> {
             }
 
             let socket = unsafe {
-                sys::c::WSASocketW(
+                sys::c::WSASocketA(
                     info.iAddressFamily,
                     info.iSocketType,
                     info.iProtocol,

library/std/src/sys/windows/c/windows_sys.lst

@@ -2113,7 +2113,6 @@ Windows.Win32.Networking.WinSock.WSABASEERR
 Windows.Win32.Networking.WinSock.WSABUF
 Windows.Win32.Networking.WinSock.WSACleanup
 Windows.Win32.Networking.WinSock.WSADATA
-Windows.Win32.Networking.WinSock.WSADuplicateSocketW
 Windows.Win32.Networking.WinSock.WSAEACCES
 Windows.Win32.Networking.WinSock.WSAEADDRINUSE
 Windows.Win32.Networking.WinSock.WSAEADDRNOTAVAIL
@@ -2169,12 +2168,10 @@ Windows.Win32.Networking.WinSock.WSAHOST_NOT_FOUND
 Windows.Win32.Networking.WinSock.WSANO_DATA
 Windows.Win32.Networking.WinSock.WSANO_RECOVERY
 Windows.Win32.Networking.WinSock.WSANOTINITIALISED
-Windows.Win32.Networking.WinSock.WSAPROTOCOL_INFOW
 Windows.Win32.Networking.WinSock.WSAPROTOCOLCHAIN
 Windows.Win32.Networking.WinSock.WSARecv
 Windows.Win32.Networking.WinSock.WSASend
 Windows.Win32.Networking.WinSock.WSASERVICE_NOT_FOUND
-Windows.Win32.Networking.WinSock.WSASocketW
 Windows.Win32.Networking.WinSock.WSASYSCALLFAILURE
 Windows.Win32.Networking.WinSock.WSASYSNOTREADY
 Windows.Win32.Networking.WinSock.WSATRY_AGAIN
@@ -2621,3 +2618,8 @@ Windows.Win32.Storage.FileSystem.INVALID_SET_FILE_POINTER
 // hashmap crypt fallback
 Windows.Win32.System.SystemInformation.GetTickCount
 Windows.Win32.System.Threading.GetCurrentThreadId
+
+// WinSock fallbacks
+Windows.Win32.Networking.WinSock.WSAPROTOCOL_INFOA
+Windows.Win32.Networking.WinSock.WSASocketA
+Windows.Win32.Networking.WinSock.WSADuplicateSocketA

library/std/src/sys/windows/c/windows_sys.rs

@@ -779,10 +779,10 @@ extern "system" {
 }
 #[link(name = "ws2_32")]
 extern "system" {
-    pub fn WSADuplicateSocketW(
+    pub fn WSADuplicateSocketA(
         s: SOCKET,
         dwprocessid: u32,
-        lpprotocolinfo: *mut WSAPROTOCOL_INFOW,
+        lpprotocolinfo: *mut WSAPROTOCOL_INFOA,
     ) -> i32;
 }
 #[link(name = "ws2_32")]
@@ -815,11 +815,11 @@ extern "system" {
 }
 #[link(name = "ws2_32")]
 extern "system" {
-    pub fn WSASocketW(
+    pub fn WSASocketA(
         af: i32,
         r#type: i32,
         protocol: i32,
-        lpprotocolinfo: *const WSAPROTOCOL_INFOW,
+        lpprotocolinfo: *const WSAPROTOCOL_INFOA,
         g: u32,
         dwflags: u32,
     ) -> SOCKET;
@@ -4356,7 +4356,7 @@ impl ::core::clone::Clone for WSAPROTOCOLCHAIN {
     }
 }
 #[repr(C)]
-pub struct WSAPROTOCOL_INFOW {
+pub struct WSAPROTOCOL_INFOA {
     pub dwServiceFlags1: u32,
     pub dwServiceFlags2: u32,
     pub dwServiceFlags3: u32,
@@ -4376,10 +4376,10 @@ pub struct WSAPROTOCOL_INFOW {
     pub iSecurityScheme: i32,
     pub dwMessageSize: u32,
     pub dwProviderReserved: u32,
-    pub szProtocol: [u16; 256],
+    pub szProtocol: [u8; 256],
 }
-impl ::core::marker::Copy for WSAPROTOCOL_INFOW {}
-impl ::core::clone::Clone for WSAPROTOCOL_INFOW {
+impl ::core::marker::Copy for WSAPROTOCOL_INFOA {}
+impl ::core::clone::Clone for WSAPROTOCOL_INFOA {
     fn clone(&self) -> Self {
         *self
     }

library/std/src/sys/windows/net.rs

@@ -106,7 +106,7 @@ impl Socket {
             SocketAddr::V6(..) => c::AF_INET6,
         };
         let socket = unsafe {
-            c::WSASocketW(
+            c::WSASocketA(
                 family,
                 ty,
                 0,
@@ -126,7 +126,7 @@ impl Socket {
             }
 
             let socket =
-                unsafe { c::WSASocketW(family, ty, 0, ptr::null_mut(), 0, c::WSA_FLAG_OVERLAPPED) };
+                unsafe { c::WSASocketA(family, ty, 0, ptr::null_mut(), 0, c::WSA_FLAG_OVERLAPPED) };
 
             if socket == c::INVALID_SOCKET {
                 return Err(last_error());