Skip to content

Fix issue with svccommio incorrectly resetting console state in the move operator #14083

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
benhillis merged 1 commit into from
Jan 20, 2026
+30 −53
Merged

Fix issue with svccommio incorrectly resetting console state in the move operator #14083

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
57 changes: 19 additions & 38 deletions src/windows/common/svccommio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,9 @@ CATCH_LOG()

namespace wsl::windows::common {

std::optional<ConsoleInput> ConsoleInput::Create(HANDLE Handle)
ConsoleInput::ConsoleInput(HANDLE Handle, DWORD SavedMode) :
m_Handle(Handle), m_SavedMode(SavedMode), m_SavedCodePage(GetConsoleCP())
{
DWORD Mode;
if (GetFileType(Handle) == FILE_TYPE_CHAR && GetConsoleMode(Handle, &Mode))
{
return ConsoleInput(Handle, Mode);
}

return std::nullopt;
}

ConsoleInput::ConsoleInput(HANDLE Handle, DWORD SavedMode) : m_Handle(Handle), m_SavedMode(SavedMode)
{
// Save code page.
m_SavedCodePage = GetConsoleCP();

// Configure for raw input with VT support.
DWORD NewMode = m_SavedMode;
WI_SetAllFlags(NewMode, ENABLE_WINDOW_INPUT | ENABLE_VIRTUAL_TERMINAL_INPUT);
Expand All @@ -104,29 +91,9 @@ ConsoleInput::~ConsoleInput()
LOG_IF_WIN32_BOOL_FALSE(SetConsoleCP(m_SavedCodePage));
}

std::optional<ConsoleOutput> ConsoleOutput::Create()
{
wil::unique_hfile ConsoleHandle(
CreateFileW(L"CONOUT$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, 0, nullptr));

if (ConsoleHandle)
{
DWORD Mode;
if (GetConsoleMode(ConsoleHandle.get(), &Mode))
{
return ConsoleOutput(std::move(ConsoleHandle), Mode);
}
}

return std::nullopt;
}

ConsoleOutput::ConsoleOutput(wil::unique_hfile&& ConsoleHandle, DWORD SavedMode) :
m_ConsoleHandle(std::move(ConsoleHandle)), m_SavedMode(SavedMode)
m_ConsoleHandle(std::move(ConsoleHandle)), m_SavedMode(SavedMode), m_SavedCodePage(GetConsoleOutputCP())
{
// Save code page.
m_SavedCodePage = GetConsoleOutputCP();

// Configure for VT output.
DWORD NewMode = m_SavedMode;
WI_SetAllFlags(NewMode, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING | DISABLE_NEWLINE_AUTO_RETURN);
Expand All @@ -149,10 +116,24 @@ SvcCommIo::SvcCommIo()
const HANDLE ErrorHandle = GetStdHandle(STD_ERROR_HANDLE);

// Configure input console
m_ConsoleInput = ConsoleInput::Create(InputHandle);
DWORD InputMode;
if (GetFileType(InputHandle) == FILE_TYPE_CHAR && GetConsoleMode(InputHandle, &InputMode))
{
m_ConsoleInput.emplace(InputHandle, InputMode);
}

// Configure output console
m_ConsoleOutput = ConsoleOutput::Create();
wil::unique_hfile ConsoleHandle(
CreateFileW(L"CONOUT$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, 0, nullptr));

if (ConsoleHandle)
{
DWORD OutputMode;
if (GetConsoleMode(ConsoleHandle.get(), &OutputMode))
{
m_ConsoleOutput.emplace(std::move(ConsoleHandle), OutputMode);
}
}

// Initialize the standard handles structure
const bool IsConsoleInput = m_ConsoleInput.has_value();
Expand Down
26 changes: 11 additions & 15 deletions src/windows/common/svccommio.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,34 @@ namespace wsl::windows::common {
class ConsoleInput
{
public:
static std::optional<ConsoleInput> Create(HANDLE Handle);
ConsoleInput(HANDLE Handle, DWORD SavedMode);
~ConsoleInput();
ConsoleInput(const ConsoleInput&) = delete;
ConsoleInput& operator=(const ConsoleInput&) = delete;
ConsoleInput(ConsoleInput&&) = default;
ConsoleInput& operator=(ConsoleInput&&) = default;
ConsoleInput(ConsoleInput&&) = delete;
ConsoleInput& operator=(ConsoleInput&&) = delete;

private:
ConsoleInput(HANDLE Handle, DWORD SavedMode);

HANDLE m_Handle = nullptr;
DWORD m_SavedMode = 0;
UINT m_SavedCodePage = 0;
HANDLE m_Handle{};
DWORD m_SavedMode{};
UINT m_SavedCodePage{};
};

// RAII wrapper for console output configuration and restoration
class ConsoleOutput
{
public:
static std::optional<ConsoleOutput> Create();
ConsoleOutput(wil::unique_hfile&& ConsoleHandle, DWORD SavedMode);
~ConsoleOutput();
ConsoleOutput(const ConsoleOutput&) = delete;
ConsoleOutput& operator=(const ConsoleOutput&) = delete;
ConsoleOutput(ConsoleOutput&&) = default;
ConsoleOutput& operator=(ConsoleOutput&&) = default;
ConsoleOutput(ConsoleOutput&&) = delete;
ConsoleOutput& operator=(ConsoleOutput&&) = delete;

private:
ConsoleOutput(wil::unique_hfile&& ConsoleHandle, DWORD SavedMode);

wil::unique_hfile m_ConsoleHandle;
DWORD m_SavedMode = 0;
UINT m_SavedCodePage = 0;
DWORD m_SavedMode{};
UINT m_SavedCodePage{};
};

class SvcCommIo
Expand Down