From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Permerror (SPF Permanent Error: Two or more type TXT spf records found.) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=hao.a.wu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9C7B1210FB9D8 for ; Tue, 4 Sep 2018 01:21:38 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Sep 2018 01:21:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,328,1531810800"; d="scan'208";a="80690319" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga003.jf.intel.com with ESMTP; 04 Sep 2018 01:21:37 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 4 Sep 2018 01:21:33 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 4 Sep 2018 01:21:33 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.143]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.16]) with mapi id 14.03.0319.002; Tue, 4 Sep 2018 16:21:26 +0800 From: "Wu, Hao A" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Kinney, Michael D" Thread-Topic: [PATCH] Emulator/Win: Fix build failure using VS2015x86 Thread-Index: AQHUQ+1HZ0TpxojvE0uk3SPSuuu4HKTfyHGg Date: Tue, 4 Sep 2018 08:21:26 +0000 Message-ID: References: <20180904011919.91660-1-ruiyu.ni@intel.com> In-Reply-To: <20180904011919.91660-1-ruiyu.ni@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] Emulator/Win: Fix build failure using VS2015x86 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2018 08:21:38 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Hao Wu 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 >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni > Cc: Michael D Kinney > Cc: Hao A Wu > --- > EmulatorPkg/Win/Host/WinHost.c | 2 +- > EmulatorPkg/Win/Host/WinInclude.h | 15 ++++++++++++--- > 2 files changed, 13 insertions(+), 4 deletions(-) >=20 > 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 >=20 > -Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> This program and the accompanying materials > are licensed and made available under the terms and conditions of the BS= D > License > which accompanies this distribution. The full text of the license may b= e 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. > **/ >=20 > -#ifndef __WIN_NT_INCLUDE_H__ > -#define __WIN_NT_INCLUDE_H__ > +#ifndef __WIN_INCLUDE_H__ > +#define __WIN_INCLUDE_H__ >=20 > // > // Win32 include files do not compile clean with /W4, so we use the warn= ing > @@ -72,4 +72,13 @@ typedef UINT32 size_t ; > #pragma warning(default : 4201) >=20 >=20 > +// > +// 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