Migrate term and guid crates from winapi to windows, remove winapi dependencies

Co-authored-by: benhillis <17727402+benhillis@users.noreply.github.com>

Author: 2 people

Cargo.lock

@@ -2694,7 +2694,6 @@ dependencies = [
  "inspect",
  "mesh_protobuf",
  "thiserror 2.0.12",
- "winapi",
  "windows 0.59.0",
  "windows-sys 0.59.0",
  "zerocopy 0.8.24",
@@ -6805,7 +6804,7 @@ dependencies = [
  "crossterm",
  "libc",
  "thiserror 2.0.12",
- "winapi",
+ "windows 0.59.0",
 ]
 
 [[package]]

support/guid/Cargo.toml

@@ -21,11 +21,5 @@ zerocopy.workspace = true
 windows-sys.workspace = true
 windows.workspace = true
 
-[target.'cfg(windows)'.dependencies.winapi]
-workspace = true
-features = [
-    "guiddef",
-]
-
 [lints]
 workspace = true

support/guid/src/lib.rs

@@ -266,24 +266,24 @@ mod windows {
     #![cfg(windows)]
     use super::Guid;
 
-    impl From<winapi::shared::guiddef::GUID> for Guid {
-        fn from(guid: winapi::shared::guiddef::GUID) -> Self {
+    impl From<windows::core::GUID> for Guid {
+        fn from(guid: windows::core::GUID) -> Self {
             Self {
-                data1: guid.Data1,
-                data2: guid.Data2,
-                data3: guid.Data3,
-                data4: guid.Data4,
+                data1: guid.data1,
+                data2: guid.data2,
+                data3: guid.data3,
+                data4: guid.data4,
             }
         }
     }
 
-    impl From<Guid> for winapi::shared::guiddef::GUID {
+    impl From<Guid> for windows::core::GUID {
         fn from(guid: Guid) -> Self {
             Self {
-                Data1: guid.data1,
-                Data2: guid.data2,
-                Data3: guid.data3,
-                Data4: guid.data4,
+                data1: guid.data1,
+                data2: guid.data2,
+                data3: guid.data3,
+                data4: guid.data4,
             }
         }
     }

support/term/Cargo.toml

@@ -6,22 +6,12 @@ name = "term"
 edition.workspace = true
 rust-version.workspace = true
 
-[target.'cfg(windows)'.dependencies.winapi]
+[target.'cfg(windows)'.dependencies.windows]
+workspace = true
 features = [
-  "consoleapi",
-  "handleapi",
-  "memoryapi",
-  "namedpipeapi",
-  "processenv",
-  "realtimeapiset",
-  "synchapi",
-  "winbase",
-  "wincon",
-  "winnls",
-  "winnt",
-  "winsock2",
+  "Win32_Foundation",
+  "Win32_System_Console"
 ]
-workspace = true
 
 [target.'cfg(unix)'.dependencies]
 libc.workspace = true

support/term/src/lib.rs

@@ -19,23 +19,25 @@ pub enum Error {
 /// Enables VT and UTF-8 output.
 #[cfg(windows)]
 pub fn enable_vt_and_utf8() {
-    use winapi::um::consoleapi;
-    use winapi::um::processenv;
-    use winapi::um::winbase;
-    use winapi::um::wincon;
-    use winapi::um::winnls;
+    use windows::Win32::Foundation::GetStdHandle;
+    use windows::Win32::Foundation::STD_OUTPUT_HANDLE;
+    use windows::Win32::System::Console::GetConsoleMode;
+    use windows::Win32::System::Console::SetConsoleMode;
+    use windows::Win32::System::Console::SetConsoleOutputCP;
+    use windows::Win32::System::Console::ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+    use windows::Win32::System::Console::CP_UTF8;
     // SAFETY: calling Windows APIs as documented.
     unsafe {
-        let conout = processenv::GetStdHandle(winbase::STD_OUTPUT_HANDLE);
+        let conout = GetStdHandle(STD_OUTPUT_HANDLE);
         let mut mode = 0;
-        if consoleapi::GetConsoleMode(conout, &mut mode) != 0 {
-            if mode & wincon::ENABLE_VIRTUAL_TERMINAL_PROCESSING == 0 {
-                consoleapi::SetConsoleMode(
+        if GetConsoleMode(conout, &mut mode) != 0 {
+            if mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING.0 == 0 {
+                SetConsoleMode(
                     conout,
-                    mode | wincon::ENABLE_VIRTUAL_TERMINAL_PROCESSING,
+                    mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING.0,
                 );
             }
-            wincon::SetConsoleOutputCP(winnls::CP_UTF8);
+            SetConsoleOutputCP(CP_UTF8);
         }
     }
 }