[PATCH] Emulator/Win: Fix build failure using VS2015x86

[PATCH] Emulator/Win: Fix build failure using VS2015x86

[Ruiyu Ni]

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>
Cc: Hao A Wu <hao.a.wu@intel.com>
---
 EmulatorPkg/Win/Host/WinHost.c    |  2 +-
 EmulatorPkg/Win/Host/WinInclude.h | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c
index 9b98d5330f..65e8960eff 100644
--- a/EmulatorPkg/Win/Host/WinHost.c
+++ b/EmulatorPkg/Win/Host/WinHost.c
@@ -673,7 +673,7 @@ Returns:
   // Transfer control to the SEC Core
   //
   SwitchStack (
-    (SWITCH_STACK_ENTRY_POINT)SecCoreEntryPoint,
+    (SWITCH_STACK_ENTRY_POINT)(UINTN)SecCoreEntryPoint,
     SecCoreData,
     GetThunkPpiList (),
     TopOfStack
diff --git a/EmulatorPkg/Win/Host/WinInclude.h b/EmulatorPkg/Win/Host/WinInclude.h
index ae90b1ed30..39a5427dae 100644
--- a/EmulatorPkg/Win/Host/WinInclude.h
+++ b/EmulatorPkg/Win/Host/WinInclude.h
@@ -1,7 +1,7 @@
 /**@file
   Public include file for the WinNt Library
 
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -11,8 +11,8 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
-#ifndef __WIN_NT_INCLUDE_H__
-#define __WIN_NT_INCLUDE_H__
+#ifndef __WIN_INCLUDE_H__
+#define __WIN_INCLUDE_H__
 
 //
 // Win32 include files do not compile clean with /W4, so we use the warning
@@ -72,4 +72,13 @@ typedef UINT32 size_t ;
 #pragma warning(default : 4201)
 
 
+//
+// Define the three macros here in-case the WinSDK is too old.
+//
+#ifndef ENABLE_VIRTUAL_TERMINAL_INPUT
+#define ENABLE_VIRTUAL_TERMINAL_INPUT       0x0200
+#define ENABLE_VIRTUAL_TERMINAL_PROCESSING  0x0004
+#define DISABLE_NEWLINE_AUTO_RETURN         0x0008
+#endif
+
 #endif
-- 
2.16.1.windows.1

Re: [PATCH] Emulator/Win: Fix build failure using VS2015x86

[Wu, Hao A]

Reviewed-by: Hao Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu


> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Tuesday, September 04, 2018 9:19 AM
> To: edk2-devel@lists.01.org
> Cc: Kinney, Michael D; Wu, Hao A
> Subject: [PATCH] Emulator/Win: Fix build failure using VS2015x86
> 
> 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>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> ---
>  EmulatorPkg/Win/Host/WinHost.c    |  2 +-
>  EmulatorPkg/Win/Host/WinInclude.h | 15 ++++++++++++---
>  2 files changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/EmulatorPkg/Win/Host/WinHost.c
> b/EmulatorPkg/Win/Host/WinHost.c
> index 9b98d5330f..65e8960eff 100644
> --- a/EmulatorPkg/Win/Host/WinHost.c
> +++ b/EmulatorPkg/Win/Host/WinHost.c
> @@ -673,7 +673,7 @@ Returns:
>    // Transfer control to the SEC Core
>    //
>    SwitchStack (
> -    (SWITCH_STACK_ENTRY_POINT)SecCoreEntryPoint,
> +    (SWITCH_STACK_ENTRY_POINT)(UINTN)SecCoreEntryPoint,
>      SecCoreData,
>      GetThunkPpiList (),
>      TopOfStack
> diff --git a/EmulatorPkg/Win/Host/WinInclude.h
> b/EmulatorPkg/Win/Host/WinInclude.h
> index ae90b1ed30..39a5427dae 100644
> --- a/EmulatorPkg/Win/Host/WinInclude.h
> +++ b/EmulatorPkg/Win/Host/WinInclude.h
> @@ -1,7 +1,7 @@
>  /**@file
>    Public include file for the WinNt Library
> 
> -Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
>  This program and the accompanying materials
>  are licensed and made available under the terms and conditions of the BSD
> License
>  which accompanies this distribution.  The full text of the license may be found
> at
> @@ -11,8 +11,8 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE
> ON AN "AS IS" BASIS,
>  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS
> OR IMPLIED.
>  **/
> 
> -#ifndef __WIN_NT_INCLUDE_H__
> -#define __WIN_NT_INCLUDE_H__
> +#ifndef __WIN_INCLUDE_H__
> +#define __WIN_INCLUDE_H__
> 
>  //
>  // Win32 include files do not compile clean with /W4, so we use the warning
> @@ -72,4 +72,13 @@ typedef UINT32 size_t ;
>  #pragma warning(default : 4201)
> 
> 
> +//
> +// Define the three macros here in-case the WinSDK is too old.
> +//
> +#ifndef ENABLE_VIRTUAL_TERMINAL_INPUT
> +#define ENABLE_VIRTUAL_TERMINAL_INPUT       0x0200
> +#define ENABLE_VIRTUAL_TERMINAL_PROCESSING  0x0004
> +#define DISABLE_NEWLINE_AUTO_RETURN         0x0008
> +#endif
> +
>  #endif
> --
> 2.16.1.windows.1