From b0b7565ba91db23af02453402284931e22d67575 Mon Sep 17 00:00:00 2001
From: Niyaz Nigmatullin <niyaznigmatullin@github.com>
Date: Wed, 19 Oct 2022 23:22:05 +0300
Subject: [PATCH] hostname: migrate `winapi` to `windows-sys` crate

---
 Cargo.lock                      | 2 +-
 src/uu/hostname/Cargo.toml      | 4 ++--
 src/uu/hostname/src/hostname.rs | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ff9cd8db8..a788a8744 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2498,7 +2498,7 @@ dependencies = [
  "clap 4.0.17",
  "hostname",
  "uucore",
- "winapi",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
diff --git a/src/uu/hostname/Cargo.toml b/src/uu/hostname/Cargo.toml
index 120440005..f3563be2b 100644
--- a/src/uu/hostname/Cargo.toml
+++ b/src/uu/hostname/Cargo.toml
@@ -20,11 +20,11 @@ hostname = { version = "0.3", features = ["set"] }
 uucore = { version=">=0.0.16", package="uucore", path="../../uucore", features=["wide"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-winapi = { version="0.3", features=["sysinfoapi", "winsock2"] }
+windows-sys = { version = "0.42.0", default-features = false, features = ["Win32_Networking_WinSock", "Win32_Foundation"] }
 
 [[bin]]
 name = "hostname"
 path = "src/main.rs"
 
 [package.metadata.cargo-udeps.ignore]
-normal = ["uucore_procs", "winapi"]
+normal = ["uucore_procs"]
diff --git a/src/uu/hostname/src/hostname.rs b/src/uu/hostname/src/hostname.rs
index 7aec443a9..b9699d99a 100644
--- a/src/uu/hostname/src/hostname.rs
+++ b/src/uu/hostname/src/hostname.rs
@@ -32,15 +32,14 @@ static OPT_HOST: &str = "host";
 mod wsa {
     use std::io;
 
-    use winapi::shared::minwindef::MAKEWORD;
-    use winapi::um::winsock2::{WSACleanup, WSAStartup, WSADATA};
+    use windows_sys::Win32::Networking::WinSock::{WSACleanup, WSAStartup, WSADATA};
 
     pub(super) struct WsaHandle(());
 
     pub(super) fn start() -> io::Result<WsaHandle> {
         let err = unsafe {
             let mut data = std::mem::MaybeUninit::<WSADATA>::uninit();
-            WSAStartup(MAKEWORD(2, 2), data.as_mut_ptr())
+            WSAStartup(0x0202, data.as_mut_ptr())
         };
         if err != 0 {
             Err(io::Error::from_raw_os_error(err))