Skip to content

term: migrate from winapi to windows-sys #2786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justus-camp-microsoft merged 1 commit into from
Feb 24, 2026
Merged

term: migrate from winapi to windows-sys #2786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7357,7 +7357,7 @@ dependencies = [
"crossterm",
"libc",
"thiserror 2.0.16",
"winapi",
"windows-sys 0.61.0",
]

[[package]]
Expand Down
18 changes: 4 additions & 14 deletions support/term/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,12 @@ name = "term"
edition.workspace = true
rust-version.workspace = true

[target.'cfg(windows)'.dependencies.winapi]
[target.'cfg(windows)'.dependencies.windows-sys]
workspace = true
features = [
"consoleapi",
"handleapi",
"memoryapi",
"namedpipeapi",
"processenv",
"realtimeapiset",
"synchapi",
"winbase",
"wincon",
"winnls",
"winnt",
"winsock2",
"Win32_Globalization",
"Win32_System_Console",
]
workspace = true

[target.'cfg(unix)'.dependencies]
libc.workspace = true
Expand Down
25 changes: 12 additions & 13 deletions support/term/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,22 @@ 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_sys::Win32::Globalization::CP_UTF8;
use windows_sys::Win32::System::Console::ENABLE_VIRTUAL_TERMINAL_PROCESSING;
use windows_sys::Win32::System::Console::GetConsoleMode;
use windows_sys::Win32::System::Console::GetStdHandle;
use windows_sys::Win32::System::Console::STD_OUTPUT_HANDLE;
use windows_sys::Win32::System::Console::SetConsoleMode;
use windows_sys::Win32::System::Console::SetConsoleOutputCP;
// 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(
conout,
mode | wincon::ENABLE_VIRTUAL_TERMINAL_PROCESSING,
);
if GetConsoleMode(conout, &mut mode) != 0 {
if mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING == 0 {
SetConsoleMode(conout, mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
}
wincon::SetConsoleOutputCP(winnls::CP_UTF8);
SetConsoleOutputCP(CP_UTF8);
}
}
}
Expand Down