microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-11 04:38:24 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

Disable WIN32IM on shutdown (#19229)

Browse Source 
Closes #19153

## Validation Steps Performed
I tried reproducing the issue on Windows 10 and couldn't.
I'm not sure what I did wrong. But I tested it under a
debugger with VtPipeTerm and it wrote the sequences to stdout.
This commit is contained in:
Leonard Hecker 2025-08-08 19:48:52 +02:00 committed by GitHub
parent 514da89b63
commit 5b41f14660
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/host/VtIo.cpp
View File

@ -230,6 +230,28 @@ bool VtIo::IsUsingVt() const
return S_OK;
}
void VtIo::Shutdown() noexcept
{
if (_state != State::Running)
{
return;
}
// The reverse of what we did in StartIfNeeded.
try
{
Writer writer{ this };
writer.WriteUTF8(
"\x1b[?1004l" // Focus Event Mode
"\x1b[?9001l" // Win32 Input Mode
);
writer.Submit();
}
CATCH_LOG();
}
void VtIo::RequestCursorPositionFromTerminal()
{
if (_lookingForCursorPosition)

2
src/host/VtIo.hpp
View File

@ -57,9 +57,9 @@ namespace Microsoft::Console::VirtualTerminal
static wchar_t SanitizeUCS2(wchar_t ch);
[[nodiscard]] HRESULT Initialize(const ConsoleArguments* const pArgs);
bool IsUsingVt() const;
[[nodiscard]] HRESULT StartIfNeeded();
void Shutdown() noexcept;
void RequestCursorPositionFromTerminal();
void SetDeviceAttributes(til::enumset<DeviceAttribute, uint64_t> attributes) noexcept;

16
src/interactivity/base/ServiceLocator.cpp
View File

@ -67,13 +67,11 @@ void ServiceLocator::RundownAndExit(const HRESULT hr)
Sleep(INFINITE);
}
// MSFT:40226902 - HOTFIX shutdown on OneCore, by leaking the renderer, thereby
// reducing the change for existing race conditions to turn into deadlocks.
#ifndef NDEBUG
// By locking the console, we ensure no background tasks are accessing the
// classes we're going to destruct down below (for instance: CursorBlinker).
s_globals.getConsoleInformation().LockConsole();
#endif
gci.GetVtIo()->Shutdown();
// A History Lesson from MSFT: 13576341:
// We introduced RundownAndExit to give services that hold onto important handles
@ -92,13 +90,6 @@ void ServiceLocator::RundownAndExit(const HRESULT hr)
// TODO: MSFT: 14397093 - Expand graceful rundown beyond just the Hot Bug input services case.
// MSFT:40226902 - HOTFIX shutdown on OneCore, by leaking the renderer, thereby
// reducing the change for existing race conditions to turn into deadlocks.
#ifndef NDEBUG
delete s_globals.pRender;
s_globals.pRender = nullptr;
#endif
if (s_oneCoreTeardownFunction)
{
s_oneCoreTeardownFunction();
@ -107,6 +98,9 @@ void ServiceLocator::RundownAndExit(const HRESULT hr)
// MSFT:40226902 - HOTFIX shutdown on OneCore, by leaking the renderer, thereby
// reducing the change for existing race conditions to turn into deadlocks.
#ifndef NDEBUG
delete s_globals.pRender;
s_globals.pRender = nullptr;
s_consoleWindow.reset(nullptr);
#endif

2
src/tools/vtpipeterm/main.cpp
View File

@ -89,7 +89,7 @@ static int run(int argc, const wchar_t* argv[])
auto viewportSize = getViewportSize();
HPCON hPC = nullptr;
THROW_IF_FAILED(ConptyCreatePseudoConsole(viewportSize, pipe.client.get(), pipe.client.get(), 0, &hPC));
THROW_IF_FAILED(ConptyCreatePseudoConsole(viewportSize, pipe.client.get(), pipe.client.get(), PSEUDOCONSOLE_INHERIT_CURSOR, &hPC));
pipe.client.reset();
PROCESS_INFORMATION pi;