commit f4eaaf1a6d50c761e2af9a6dd0976fb8a3bd3c08
author Ruiyu Ni <ruiyu.ni@intel.com> Fri Aug 31 16:55:36 2018 +0800
committer Ruiyu Ni <ruiyu.ni@intel.com> Mon Sep 10 10:29:35 2018 +0800
tree d26df82486e635c6f1844d928dc0783f38a43b6f
parent 289cb872edc2b826534b3ff634d25f2430bf87d5

Emulator/Win: Fix build failure using VS2015x86 or old WinSDK

When build with WinSDK <= Win10 TH2, the terminal over CMD.exe
doesn't work. Because Win10 later than TH2 starts to support VT
terminal.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

EmulatorPkg/Win/Host/WinHost.c

diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c
index 9b98d53..65e8960 100644
--- a/EmulatorPkg/Win/Host/WinHost.c
+++ b/EmulatorPkg/Win/Host/WinHost.c
@@ -673,7 +673,7 @@
   // Transfer control to the SEC Core

   //

   SwitchStack (

-    (SWITCH_STACK_ENTRY_POINT)SecCoreEntryPoint,

+    (SWITCH_STACK_ENTRY_POINT)(UINTN)SecCoreEntryPoint,

     SecCoreData,

     GetThunkPpiList (),

     TopOfStack

EmulatorPkg/Win/Host/WinThunk.c

diff --git a/EmulatorPkg/Win/Host/WinThunk.c b/EmulatorPkg/Win/Host/WinThunk.c
index 306fe75..6007db7 100644
--- a/EmulatorPkg/Win/Host/WinThunk.c
+++ b/EmulatorPkg/Win/Host/WinThunk.c
@@ -71,15 +71,23 @@
     //

     // Disable buffer (line input), echo, mouse, window

     //

-    Success = SetConsoleMode (

-                GetStdHandle (STD_INPUT_HANDLE),

-                Mode | ENABLE_VIRTUAL_TERMINAL_INPUT & ~(ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_WINDOW_INPUT)

-                );

+    Mode &= ~(ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_WINDOW_INPUT);

+

+#if defined(NTDDI_VERSION) && defined (NTDDI_WIN10_TH2) && (NTDDI_VERSION > NTDDI_WIN10_TH2)

+    //

+    // Enable virtual terminal input for Win10 above TH2

+    //

+    Mode |= ENABLE_VIRTUAL_TERMINAL_INPUT;

+#endif

+

+    Success = SetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), Mode);

   }

+

+#if defined(NTDDI_VERSION) && defined (NTDDI_WIN10_TH2) && (NTDDI_VERSION > NTDDI_WIN10_TH2)

+  //

+  // Enable terminal mode for Win10 above TH2

+  //

   if (Success) {

-    //

-    // Enable terminal mode

-    //

     Success = GetConsoleMode (GetStdHandle (STD_OUTPUT_HANDLE), &Mode);

     if (Success) {

       Success = SetConsoleMode (

@@ -88,6 +96,7 @@
       );

     }

   }

+#endif

   return Success ? EFI_SUCCESS : EFI_DEVICE_ERROR;

 }