From cc46a618ff27b8fb866be660fcad3b043681e5f8 Mon Sep 17 00:00:00 2001
From: Michael Niksa <miniksa@microsoft.com>
Date: Fri, 27 Sep 2019 18:23:24 +0000
Subject: [PATCH] Merged PR 3818548: [Git2Git] console: consolidated build
 break fixes 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
---
 src/host/ft_host/API_PtyTests.cpp                | 2 +-
 src/interactivity/onecore/ConIoSrvComm.cpp       | 2 +-
 src/interactivity/onecore/ConsoleInputThread.cpp | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/host/ft_host/API_PtyTests.cpp b/src/host/ft_host/API_PtyTests.cpp
index 1a8c75cd68f..b2526c53f95 100644
--- a/src/host/ft_host/API_PtyTests.cpp
+++ b/src/host/ft_host/API_PtyTests.cpp
@@ -183,7 +183,7 @@ class PtyTests
 
         if (pStartupInfo)
         {
-            size_t attrListSize{};
+            SIZE_T attrListSize{};
 
             pStartupInfo->StartupInfo.cb = sizeof(STARTUPINFOEXW);
 
diff --git a/src/interactivity/onecore/ConIoSrvComm.cpp b/src/interactivity/onecore/ConIoSrvComm.cpp
index abd9c47eb3d..e1a4d350d30 100644
--- a/src/interactivity/onecore/ConIoSrvComm.cpp
+++ b/src/interactivity/onecore/ConIoSrvComm.cpp
@@ -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;
     }
diff --git a/src/interactivity/onecore/ConsoleInputThread.cpp b/src/interactivity/onecore/ConsoleInputThread.cpp
index 18738bb008e..2dd14e8254c 100644
--- a/src/interactivity/onecore/ConsoleInputThread.cpp
+++ b/src/interactivity/onecore/ConsoleInputThread.cpp
@@ -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).