Skip to content

conpty: Make sure ConDrv is loaded before doing ConPTY things #19901

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
DHowett merged 10 commits into from
Feb 24, 2026
Merged

conpty: Make sure ConDrv is loaded before doing ConPTY things #19901

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
db7bc4a
Migrate spelling-0.0.21 changes from main
DHowett May 4, 2020
e3d56fd
When spawning a pseudoconsole, make sure the console driver is loaded
DHowett May 4, 2020
d9ca130
Migrate spelling-0.0.19 changes from main
DHowett May 4, 2020
e2a0f73
Merge remote-tracking branch 'origin/main' into dev/duhowett/load_condrv
DHowett Feb 24, 2026
0b76bbe
fix it up a bit
DHowett Feb 24, 2026
8d3ecda
fix more
DHowett Feb 24, 2026
bc4106b
simplify significantly
DHowett Feb 24, 2026
7521567
well du
DHowett Feb 24, 2026
ecd67b6
stupid code formatter
DHowett Feb 24, 2026
1dc0fb2
Suggestiones
DHowett Feb 24, 2026
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
30 changes: 29 additions & 1 deletion src/winconpty/winconpty.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
#else
#include "device.h"
#include <filesystem>

static constexpr DWORD SystemConsoleInformation = 132;

typedef struct _SYSTEM_CONSOLE_INFORMATION
{
ULONG DriverLoaded : 1;
ULONG Spare : 31;
} SYSTEM_CONSOLE_INFORMATION;

NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemInformation(SYSTEM_INFORMATION_CLASS Class, PVOID Info, ULONG Length);
#endif // __INSIDE_WINDOWS

#pragma warning(push)
Expand Down Expand Up @@ -88,6 +98,19 @@ static wchar_t* _ConsoleHostPath()
return consoleHostPath.get();
}

static void _EnsureDriverIsLoaded() noexcept
{
#ifndef __INSIDE_WINDOWS
HMODULE ntdll{ LoadLibraryExW(L"ntdll.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32) };
if (auto setSystemInformation{ GetProcAddressByFunctionDeclaration(ntdll, NtSetSystemInformation) })
{
SYSTEM_CONSOLE_INFORMATION ConsoleInformation{};
ConsoleInformation.DriverLoaded = TRUE;
std::ignore = setSystemInformation(static_cast<SYSTEM_INFORMATION_CLASS>(SystemConsoleInformation), &ConsoleInformation, sizeof(ConsoleInformation));
}
#endif // !__INSIDE_WINDOWS
}

static bool _HandleIsValid(HANDLE h) noexcept
{
return (h != INVALID_HANDLE_VALUE) && (h != nullptr);
Expand Down Expand Up @@ -116,7 +139,12 @@ HRESULT _CreatePseudoConsole(HANDLE hToken,
}

wil::unique_handle serverHandle;
RETURN_IF_NTSTATUS_FAILED(CreateServerHandle(serverHandle.addressof(), TRUE));
if (FAILED(CreateServerHandle(serverHandle.addressof(), TRUE)))
{
// Try again after loading ConDrv.
_EnsureDriverIsLoaded();
RETURN_IF_NTSTATUS_FAILED(CreateServerHandle(serverHandle.addressof(), TRUE));
}

// The hPtyReference we create here is used when the PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE attribute is processed.
// This ensures that conhost's client processes inherit the correct (= our) console handle.
Expand Down
Loading