Skip to content

Commit

Permalink
Merged PR 3818548: [Git2Git] console: consolidated build break fixes …
Browse files Browse the repository at this point in the history
…from vb_release_dep_dev1

[Git2Git] Merged PR 3818517: console: consolidated build break fixes from vb_release_dep_dev1

- Merged PR 3815980: FIX BUILD BREAK - console: propagate input eventing changes to onecore interactivity

(cherry picked from commit 330615d17fc9b56ca07ab448678b8b095be1690f)

- Merged PR 3816007: FIX BUILD BREAK - console: api_ptytests must use SIZE_T for InitProcThreadAttrList

(cherry picked from commit c8d4b7a0dd35bc7a187a3cb5a5af79602d337335)

Related work items: #23573884
Retrieved from https://microsoft.visualstudio.com os OS official/rs_onecore_dep_uxp c06af1c985955b67b8b6824e264064a6244f8d34
  • Loading branch information
miniksa authored and DHowett committed Sep 27, 2019
1 parent df9bf4e commit cc46a61
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/host/ft_host/API_PtyTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class PtyTests

if (pStartupInfo)
{
size_t attrListSize{};
SIZE_T attrListSize{};

pStartupInfo->StartupInfo.cb = sizeof(STARTUPINFOEXW);

Expand Down
2 changes: 1 addition & 1 deletion src/interactivity/onecore/ConIoSrvComm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ VOID ConIoSrvComm::CleanupForHeadless(const NTSTATUS status)
ServiceLocator::LocateGlobals().ntstatusConsoleInputInitStatus = status;

// Signal that input is ready to go.
ServiceLocator::LocateGlobals().hConsoleInputInitEvent.SetEvent();
ServiceLocator::LocateGlobals().consoleInputInitializedEvent.SetEvent();

_fIsInputInitialized = true;
}
Expand Down
7 changes: 5 additions & 2 deletions src/interactivity/onecore/ConsoleInputThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,13 @@ DWORD WINAPI ConsoleInputThreadProcOneCore(LPVOID /*lpParam*/)
if (NT_SUCCESS(Status))
{
globals.getConsoleInformation().GetActiveOutputBuffer().RefreshFontWithRenderer();
}

globals.ntstatusConsoleInputInitStatus = Status;
globals.hConsoleInputInitEvent.SetEvent();
globals.ntstatusConsoleInputInitStatus = Status;
globals.consoleInputInitializedEvent.SetEvent();

if (NT_SUCCESS(Status))
{
try
{
// Start listening for input (returns on failure only).
Expand Down

0 comments on commit cc46a61

Please sign in to comment.