Remove windows-sys dependency

Use the windows api directly with raw-dylib

Author: finfet

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "passterm"
-version = "2.0.2"
+version = "2.0.3"
 edition = "2021"
 authors = [
 	"Kyle Schreiber <[email protected]>",
@@ -17,9 +17,6 @@ categories = ["command-line-interface"]
 [dependencies]
 zeroize = { version = "1.7", optional = true }
 
-[target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.52.0", features = ["Win32_Foundation", "Win32_System_Console", "Win32_Storage_FileSystem", "Win32_Security"] }
-
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
 

src/lib.rs

@@ -13,6 +13,9 @@
 
 mod tty;
 
+#[cfg(target_family = "windows")]
+mod win32;
+
 pub use crate::tty::Stream;
 use std::error::Error;
 use std::io::Read;
@@ -186,14 +189,15 @@ fn find_lf(input: &[u8]) -> Option<usize> {
 #[cfg(target_family = "windows")]
 mod windows {
     use crate::{find_crlf, print_stream, strip_newline, PromptError, Stream};
-
-    use windows_sys::Win32::Foundation::{
-        CloseHandle, BOOL, FALSE, GENERIC_READ, GENERIC_WRITE, HANDLE, INVALID_HANDLE_VALUE,
+    use crate::win32::{
+        CreateFileA, GetFileType, CloseHandle,
+        GetConsoleMode, GetStdHandle, ReadConsoleW,
+        SetConsoleMode, WriteConsoleW
     };
-    use windows_sys::Win32::Storage::FileSystem::{CreateFileA, GetFileType, OPEN_EXISTING};
-    use windows_sys::Win32::System::Console::{
-        GetConsoleMode, GetStdHandle, ReadConsoleW, SetConsoleMode, WriteConsoleW, CONSOLE_MODE,
-        ENABLE_ECHO_INPUT, STD_INPUT_HANDLE,
+    use crate::win32::{
+        HANDLE, BOOL, FALSE, OPEN_EXISTING,
+        GENERIC_READ, GENERIC_WRITE, INVALID_HANDLE_VALUE,
+        ENABLE_ECHO_INPUT, STD_INPUT_HANDLE
     };
 
     struct HandleCloser(HANDLE);
@@ -205,9 +209,9 @@ mod windows {
     }
 
     fn set_echo(echo: bool, handle: HANDLE) -> Result<(), PromptError> {
-        let mut mode: CONSOLE_MODE = 0;
+        let mut mode: u32 = 0;
         unsafe {
-            if GetConsoleMode(handle, &mut mode as *mut CONSOLE_MODE) == FALSE {
+            if GetConsoleMode(handle, &mut mode) == FALSE {
                 return Err(PromptError::IOError(std::io::Error::last_os_error()));
             }
         }
@@ -272,7 +276,7 @@ mod windows {
             // the file type comes back as FILE_TYPE_PIPE 0x03. This means
             // that we can't tell if we're in a pipe or a console, so echo
             // won't be disabled at all.
-            GetFileType(handle) == windows_sys::Win32::Storage::FileSystem::FILE_TYPE_CHAR
+            GetFileType(handle) == crate::win32::FILE_TYPE_CHAR
         };
 
         // Disable terminal echo if we're in a console, if we're not,

src/tty.rs

@@ -18,11 +18,11 @@ pub use crate::tty::unix::isatty;
 #[cfg(target_family = "windows")]
 mod windows {
     use crate::tty::Stream;
-    use windows_sys::Win32::Foundation::{HANDLE, INVALID_HANDLE_VALUE};
-    use windows_sys::Win32::Storage::FileSystem::GetFileType;
-    use windows_sys::Win32::System::Console::{
-        GetStdHandle, STD_ERROR_HANDLE, STD_HANDLE, STD_INPUT_HANDLE, STD_OUTPUT_HANDLE,
+    use crate::win32::{
+        HANDLE, INVALID_HANDLE_VALUE, STD_ERROR_HANDLE,
+        STD_INPUT_HANDLE, STD_OUTPUT_HANDLE
     };
+    use crate::win32::{GetFileType, GetStdHandle};
 
     /// Returns true if the given stream is a tty.
     #[allow(clippy::let_and_return)]
@@ -46,13 +46,13 @@ mod windows {
 
         let is_atty = unsafe {
             // Consoles will show as FILE_TYPE_CHAR (0x02)
-            GetFileType(handle) == windows_sys::Win32::Storage::FileSystem::FILE_TYPE_CHAR
+            GetFileType(handle) == crate::win32::FILE_TYPE_CHAR
         };
 
         is_atty
     }
 
-    unsafe fn get_handle(input_handle: STD_HANDLE) -> Result<HANDLE, ()> {
+    unsafe fn get_handle(input_handle: u32) -> Result<HANDLE, ()> {
         let handle = GetStdHandle(input_handle);
         if handle == INVALID_HANDLE_VALUE {
             return Err(());

src/win32.rs

@@ -0,0 +1,31 @@
+#![allow(non_snake_case, dead_code)]
+
+use std::ffi::c_void;
+
+pub type HANDLE = isize;
+pub type PCSTR = *const u8;
+pub type BOOL = i32;
+
+pub const FALSE: BOOL = 0i32;
+pub const TRUE: BOOL = 1i32;
+pub const OPEN_EXISTING: u32 = 3;
+pub const GENERIC_READ: u32 = 0x80000000;
+pub const GENERIC_WRITE: u32 = 0x40000000;
+pub const INVALID_HANDLE_VALUE: HANDLE = -1isize;
+pub const ENABLE_ECHO_INPUT: u32 = 4;
+pub const STD_ERROR_HANDLE: u32 = 0xfffffff4;
+pub const STD_INPUT_HANDLE: u32 = 0xfffffff6;
+pub const STD_OUTPUT_HANDLE: u32 = 0xfffffff5;
+pub const FILE_TYPE_CHAR: u32 = 2u32;
+
+#[link(name = "kernel32", kind = "raw-dylib")]
+extern "system" {
+    pub fn CloseHandle(hobject: HANDLE) -> BOOL;
+    pub fn CreateFileA(lpfilename: PCSTR, dwdesiredaccess: u32, dwsharemode: u32, lpsecurityattributes: *const c_void, dwcreationdisposition: u32, dwflagsandattributes: u32, htemplatefile: HANDLE) -> HANDLE;
+    pub fn GetFileType(hfile: HANDLE) -> u32;
+    pub fn GetConsoleMode(hconsolehandle: HANDLE, lpmode: *mut u32) -> BOOL;
+    pub fn GetStdHandle(nstdhandle: u32) -> HANDLE;
+    pub fn ReadConsoleW(hconsoleinput: HANDLE, lpbuffer: *mut c_void, nnumberofcharstoread: u32, lpnumberofcharsread: *mut u32, pinputcontrol: *const c_void) -> BOOL;
+    pub fn SetConsoleMode(hconsolehandle: HANDLE, dwmode: u32) -> BOOL;
+    pub fn WriteConsoleW(hconsoleoutput: HANDLE, lpbuffer: *const c_void, nnumberofcharstowrite: u32, lpnumberofcharswritten: *mut u32, lpreserved: *const c_void) -> BOOL;
+}