microsoft/WSL
1
0
Fork 0
mirror of https://github.com/microsoft/WSL.git synced 2025-12-10 16:30:30 -06:00
Code Issues Packages Projects Releases 94 Wiki Activity

WSLA: restore console mode when wsl.exe --wsla exits

Browse Source
This commit is contained in:
Ben Hillis 2025-12-05 14:47:20 -08:00
parent 2e8479a552
commit 76f4c6c347
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/windows/common/WslClient.cpp
View File

@ -1666,23 +1666,28 @@ int WslaShell(_In_ std::wstring_view commandLine)
process.emplace(std::move(initProcess), std::move(fds)); process.emplace(std::move(initProcess), std::move(fds));
} }
// Save original console modes so they can be restored on exit.
DWORD OriginalInputMode{};
DWORD OriginalOutputMode{};
UINT OriginalOutputCP = GetConsoleOutputCP();
THROW_LAST_ERROR_IF(!::GetConsoleMode(Stdin, &OriginalInputMode));
THROW_LAST_ERROR_IF(!::GetConsoleMode(Stdout, &OriginalOutputMode));
auto restoreConsoleMode = wil::scope_exit_log(WI_DIAGNOSTICS_INFO, [&] {
SetConsoleMode(Stdin, OriginalInputMode);
SetConsoleMode(Stdout, OriginalOutputMode);
SetConsoleOutputCP(OriginalOutputCP);
});
// Configure console for interactive usage. // Configure console for interactive usage.
{ DWORD InputMode = OriginalInputMode;
DWORD OutputMode{}; WI_SetAllFlags(InputMode, (ENABLE_WINDOW_INPUT | ENABLE_VIRTUAL_TERMINAL_INPUT));
THROW_LAST_ERROR_IF(!::GetConsoleMode(Stdout, &OutputMode)); WI_ClearAllFlags(InputMode, (ENABLE_ECHO_INPUT | ENABLE_INSERT_MODE | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT));
THROW_IF_WIN32_BOOL_FALSE(::SetConsoleMode(Stdin, InputMode));
WI_SetAllFlags(OutputMode, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING | DISABLE_NEWLINE_AUTO_RETURN); DWORD OutputMode = OriginalOutputMode;
THROW_IF_WIN32_BOOL_FALSE(SetConsoleMode(Stdout, OutputMode)); WI_SetAllFlags(OutputMode, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING | DISABLE_NEWLINE_AUTO_RETURN);
} THROW_IF_WIN32_BOOL_FALSE(::SetConsoleMode(Stdout, OutputMode));
{
DWORD InputMode{};
THROW_LAST_ERROR_IF(!::GetConsoleMode(Stdin, &InputMode));
WI_SetAllFlags(InputMode, (ENABLE_WINDOW_INPUT | ENABLE_VIRTUAL_TERMINAL_INPUT));
WI_ClearAllFlags(InputMode, (ENABLE_ECHO_INPUT | ENABLE_INSERT_MODE | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT));
THROW_IF_WIN32_BOOL_FALSE(SetConsoleMode(Stdin, InputMode));
}
THROW_LAST_ERROR_IF(!::SetConsoleOutputCP(CP_UTF8)); THROW_LAST_ERROR_IF(!::SetConsoleOutputCP(CP_UTF8));