From 29bb63bcff78753923525ff5a8d2cb55fa6f1957 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Sun, 21 Jul 2024 08:08:25 -0700 Subject: [PATCH] Switch from the winapi crate to windows-sys fixes #114 --- Cargo.lock | 109 +++++++++++++++++++++++++++++++++++++++-------------- Cargo.toml | 12 +++++- src/win.rs | 33 ++++++++-------- 3 files changed, 108 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4e2df8bc..de2a17c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -23,38 +23,25 @@ version = "0.7.0" dependencies = [ "home", "rustversion", - "winapi", + "windows-sys 0.52.0", ] [[package]] -name = "winapi" -version = "0.3.9" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-targets 0.48.5", ] -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -63,13 +50,29 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -78,38 +81,86 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/Cargo.toml b/Cargo.toml index 232804b5..e387e461 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,18 @@ appveyor = { repository = "Stebalien/term" } home = "0.5.5" [target.'cfg(windows)'.dependencies] -winapi = { version = "0.3", features = ["consoleapi", "wincon", "handleapi", "fileapi"] } rustversion = "1" + +[target.'cfg(windows)'.dependencies.windows-sys] +version = "0.52.0" +features = [ + "Win32_Storage", + "Win32_Foundation", + "Win32_System_Console", + "Win32_Storage_FileSystem", + "Win32_Security", +] + [features] default=[] diff --git a/src/win.rs b/src/win.rs index 48ece2db..b9436343 100644 --- a/src/win.rs +++ b/src/win.rs @@ -17,22 +17,23 @@ use crate::Attr; use crate::Error; use crate::Result; use crate::Terminal; + use std::io; use std::io::prelude::*; use std::ops::Deref; use std::ptr; -use winapi::shared::minwindef::{DWORD, WORD}; -use winapi::um::consoleapi::{GetConsoleMode, SetConsoleMode}; -use winapi::um::fileapi::{CreateFileA, OPEN_EXISTING}; -use winapi::um::handleapi::{CloseHandle, INVALID_HANDLE_VALUE}; -use winapi::um::wincon::FillConsoleOutputAttribute; -use winapi::um::wincon::{ - FillConsoleOutputCharacterW, GetConsoleScreenBufferInfo, CONSOLE_SCREEN_BUFFER_INFO, COORD, +use windows_sys::core::PCSTR; +use windows_sys::Win32::Foundation::{ + CloseHandle, GENERIC_READ, GENERIC_WRITE, HANDLE, INVALID_HANDLE_VALUE, +}; +use windows_sys::Win32::Storage::FileSystem::{CreateFileA, FILE_SHARE_WRITE, OPEN_EXISTING}; +use windows_sys::Win32::System::Console::{ + FillConsoleOutputAttribute, FillConsoleOutputCharacterW, GetConsoleMode, + GetConsoleScreenBufferInfo, SetConsoleCursorPosition, SetConsoleMode, SetConsoleTextAttribute, + BACKGROUND_INTENSITY, CONSOLE_CHARACTER_ATTRIBUTES, CONSOLE_MODE, CONSOLE_SCREEN_BUFFER_INFO, + COORD, ENABLE_VIRTUAL_TERMINAL_PROCESSING, }; -use winapi::um::wincon::{SetConsoleCursorPosition, SetConsoleTextAttribute}; -use winapi::um::wincon::{BACKGROUND_INTENSITY, ENABLE_VIRTUAL_TERMINAL_PROCESSING}; -use winapi::um::winnt::{FILE_SHARE_WRITE, GENERIC_READ, GENERIC_WRITE, HANDLE}; /// Console info which can be used by a Terminal implementation /// which uses the Win32 Console API. @@ -122,13 +123,13 @@ fn conout() -> io::Result { let name = b"CONOUT$\0"; let handle = unsafe { CreateFileA( - name.as_ptr() as *const i8, + name.as_ptr() as PCSTR, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE, ptr::null_mut(), OPEN_EXISTING, 0, - ptr::null_mut(), + 0, ) }; if handle == INVALID_HANDLE_VALUE { @@ -138,8 +139,8 @@ fn conout() -> io::Result { } } -unsafe fn set_flag(handle: HANDLE, flag: DWORD) -> io::Result<()> { - let mut curr_mode: DWORD = 0; +unsafe fn set_flag(handle: HANDLE, flag: CONSOLE_MODE) -> io::Result<()> { + let mut curr_mode: CONSOLE_MODE = 0; if GetConsoleMode(handle, &mut curr_mode) == 0 { return Err(io::Error::last_os_error()); } @@ -231,7 +232,7 @@ impl WinConsole { fg = bg; } - let mut accum: WORD = 0; + let mut accum: CONSOLE_CHARACTER_ATTRIBUTES = 0; accum |= color_to_bits(fg); accum |= color_to_bits(bg) << 4; @@ -382,7 +383,7 @@ impl Terminal for WinConsole { let buffer_info = get_console_screen_buffer_info(*handle)?; let pos = buffer_info.dwCursorPosition; let size = buffer_info.dwSize; - let num = (size.X - pos.X) as DWORD; + let num = (size.X - pos.X) as u32; let mut written = 0; // 0x0020u16 is ' ' (space) in UTF-16 (same as ascii) if FillConsoleOutputCharacterW(*handle, 0x0020, num, pos, &mut written) == 0 {