From nobody Mon May 13 21:06:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+107137+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+107137+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1689987992; cv=none; d=zohomail.com; s=zohoarc; b=SRJGmHtwWRuRWTp/kyErBWeBJ/xZicYspBhOkRWQnDDhA9DqCU8BqSc+O9tJBjvWsoUhIyUxgoJtcbizXkZ4nKaTMYxToWI+47pLJguUv4Q4VEgDVXLmGkhQk5+y8OzT+Q6kuZoF5EJLqfb5rFLyUMdD7ObBxlVensfrAQSJjuc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689987992; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=dMZEj4g8NJ59fyYjmsZFj6drfr8nZD5BBrXlAdlkVmw=; b=OLh3sLX3BlqMwOe91JDlJB2qST688IV25Z2sRlaTkEQa/zzdwH1Bo76+QRV2Rc8JxIDpER1JaOlmfJBnkEeQ+zV9ivshpRO+XYdE3Jt6EULkSuATpNpsfL3LRQ0c3fhaaKm9GkleXLo0ez7nMHdJtWBlxbZD50bG/g5qW0oe9os= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+107137+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1689987992685586.7893097827446; Fri, 21 Jul 2023 18:06:32 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=lLlwLYAuFTXHHIKTXXM3kS7ryPdZz90iAOeHvLu9/80=; c=relaxed/simple; d=groups.io; h=X-Received:X-Received:X-IronPort-AV:X-IronPort-AV:X-Received:X-ExtLoop1:X-IronPort-AV:X-IronPort-AV:X-Received:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:X-Gm-Message-State:Content-Transfer-Encoding; s=20140610; t=1689987992; v=1; b=OFhPpf2dnyF+nGwmrSl3/ZgbUR67bOa3d5XoId2uBVnnHEAEEI524dhj9Uid/Wf5nSxiy6Cx WIQIFOdjYYOPzx1bX5ddjfN8t88B3qpT0IgxV7Jo86MAvsZQICPPU8p+kpWjU6XnkZQ0K1dQk8J RdRrVB6yLXMgKaEwyzskeBj4= X-Received: by 127.0.0.2 with SMTP id fI10YY1788612x6VgogpZfYW; Fri, 21 Jul 2023 18:06:32 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.21945.1689987991377979673 for ; Fri, 21 Jul 2023 18:06:31 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="364608412" X-IronPort-AV: E=Sophos;i="6.01,223,1684825200"; d="scan'208";a="364608412" X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 18:06:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="675222545" X-IronPort-AV: E=Sophos;i="6.01,223,1684825200"; d="scan'208";a="675222545" X-Received: from mdkinney-mobl.amr.corp.intel.com ([10.212.157.51]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 18:06:30 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Rebecca Cran , Andrew Fish , Ray Ni Subject: [edk2-devel] [Patch 1/2] EmulatorPkg/Win/Host: Fix RUNTIME_FUNCTION redefinition error Date: Fri, 21 Jul 2023 18:06:21 -0700 Message-Id: <20230722010622.1708-2-michael.d.kinney@intel.com> In-Reply-To: <20230722010622.1708-1-michael.d.kinney@intel.com> References: <20230722010622.1708-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Vv2SbEHSJrqnZfyerbNCAocvx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1689987993608100004 Content-Type: text/plain; charset="utf-8" Update WinInclude.h to prevent error due to redefinition of RUNTIME_FUNCTION using same technique that has been used in the past for structure types such as LIST_ENTRY. Cc: Gerd Hoffmann Cc: Rebecca Cran Cc: Andrew Fish Cc: Ray Ni Signed-off-by: Michael D Kinney Reviewed-by: Liming Gao Reviewed-by: Ray Ni Reviewed-by: Rebecca Cran --- EmulatorPkg/Win/Host/WinInclude.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/EmulatorPkg/Win/Host/WinInclude.h b/EmulatorPkg/Win/Host/WinIn= clude.h index c2b6cfa3d658..877d2b0ed016 100644 --- a/EmulatorPkg/Win/Host/WinInclude.h +++ b/EmulatorPkg/Win/Host/WinInclude.h @@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 // // Win32 include files do not compile clean with /W4, so we use the warning -// pragma to suppress the warnings for Win32 only. This way our code can s= til +// pragma to suppress the warnings for Win32 only. This way our code can s= till // compile at /W4 (highest warning level) with /WX (warnings cause build // errors). // @@ -19,9 +19,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #pragma warning(disable : 4028) #pragma warning(disable : 4133) =20 -#define GUID _WINNT_DUP_GUID_____ -#define _LIST_ENTRY _WINNT_DUP_LIST_ENTRY_FORWARD -#define LIST_ENTRY _WINNT_DUP_LIST_ENTRY +#define GUID _WINNT_DUP_GUID_____ +#define _LIST_ENTRY _WINNT_DUP_LIST_ENTRY_FORWARD +#define LIST_ENTRY _WINNT_DUP_LIST_ENTRY +#define RUNTIME_FUNCTION _WINNT_DUP_RUNTIME_FUNCTION #if defined (MDE_CPU_IA32) && (_MSC_VER < 1800) #define InterlockedIncrement _WINNT_DUP_InterlockedIncrement #define InterlockedDecrement _WINNT_DUP_InterlockedDecrement @@ -45,6 +46,7 @@ typedef UINT32 size_t; #undef GUID #undef _LIST_ENTRY #undef LIST_ENTRY +#undef RUNTIME_FUNCTION #undef InterlockedIncrement #undef InterlockedDecrement #undef InterlockedCompareExchange64 --=20 2.40.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107137): https://edk2.groups.io/g/devel/message/107137 Mute This Topic: https://groups.io/mt/100288521/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon May 13 21:06:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+107138+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+107138+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1689987993; cv=none; d=zohomail.com; s=zohoarc; b=MZMXeOLTSiymeonEk73IAvSOiRHVmm8U2XV2bw16fUgJl9pmwhsvBAKiXlsYM4eZMv0TbzfyPZaSYzLN/9YTiSPYppGMp05xh4nqY8dU+o9RAgpdRsYlSjDKtkzjKKB3mTdON6MST+dQrIe60g15JQv6w8Yl1P443lWjpIBjQmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689987993; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=q8MrBrPa+Y9zTd97P2Ov8XyHEnSg5Ksb25ZLNSZBBPs=; b=aXmzXgrT3BRnWFHX9j9ZLO890ZCv+UxS4lZoWT8UEGpHKYej+NmCFnlpJjZvoXm3nbinBNzYsOscxQFqk1z+ISKGgI59xkFscLsYcUaTB+EfiB8IODBcG4byobFCwaV9Ppeo399V/y9GGQ4ApAVyDnNOBf1q95qmlzEVw3d4SoM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+107138+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 168998799370850.063748777399496; Fri, 21 Jul 2023 18:06:33 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=qTwCpDg0RQsJfz88tcvlqzeHHrANOvhjgoX0dwailco=; c=relaxed/simple; d=groups.io; h=X-Received:X-Received:X-IronPort-AV:X-IronPort-AV:X-Received:X-ExtLoop1:X-IronPort-AV:X-IronPort-AV:X-Received:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:X-Gm-Message-State:Content-Transfer-Encoding; s=20140610; t=1689987993; v=1; b=n5rQrt3jutbBn2OHR+odXlR0wiG/e+Ctxusw2+22WbLiIIqdYgkpKiNN9cS0GS459WNCrEP9 k1z6F/D4E10BAc55UukeCd9n3Ocv7HJ2gBgUYM8aLFneOloXRyq0DNzZTMqq6At4it0d2NyxF4D fxpmV0kkAKv6OkL9l5Q4Cppo= X-Received: by 127.0.0.2 with SMTP id HWcsYY1788612xfJD5QEu9w8; Fri, 21 Jul 2023 18:06:33 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.21945.1689987991377979673 for ; Fri, 21 Jul 2023 18:06:32 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="364608425" X-IronPort-AV: E=Sophos;i="6.01,223,1684825200"; d="scan'208";a="364608425" X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 18:06:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="675222556" X-IronPort-AV: E=Sophos;i="6.01,223,1684825200"; d="scan'208";a="675222556" X-Received: from mdkinney-mobl.amr.corp.intel.com ([10.212.157.51]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 18:06:31 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Rebecca Cran , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [Patch 2/2] MdePkg/Include/IndustryStandard: Remove VS20xx workaround Date: Fri, 21 Jul 2023 18:06:22 -0700 Message-Id: <20230722010622.1708-3-michael.d.kinney@intel.com> In-Reply-To: <20230722010622.1708-1-michael.d.kinney@intel.com> References: <20230722010622.1708-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: jMfoLErc1cwmCxbWT5FaH5hsx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1689987994032100009 Content-Type: text/plain; charset="utf-8" Remove workaround for the redefinition of the type RUNTIME_FUNCTION that is generated when building with VS20xx tool chains and using windows include files. The correct location for this fix is in the EmulatorPkg in the WinInclude.h file that addresses all the name collisions between edk2 types and windows types. The commit that added the workaround is: https://github.com/tianocore/edk2/commit/ff52068d9261b9391d75b83a2a4e40e040= f3b6eb Cc: Gerd Hoffmann Cc: Rebecca Cran Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Michael D Kinney Reviewed-by: Liming Gao Reviewed-by: Rebecca Cran --- MdePkg/Include/IndustryStandard/PeImage.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/MdePkg/Include/IndustryStandard/PeImage.h b/MdePkg/Include/Ind= ustryStandard/PeImage.h index 47037049348c..4840b8dd8a9e 100644 --- a/MdePkg/Include/IndustryStandard/PeImage.h +++ b/MdePkg/Include/IndustryStandard/PeImage.h @@ -678,9 +678,6 @@ typedef struct { // } EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY; =20 -// avoid conflict with windows header files -#ifndef RUNTIME_FUNCTION_INDIRECT - // // .pdata entries for X64 // @@ -690,8 +687,6 @@ typedef struct { UINT32 UnwindInfoAddress; } RUNTIME_FUNCTION; =20 -#endif - typedef struct { UINT8 Version : 3; UINT8 Flags : 5; --=20 2.40.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107138): https://edk2.groups.io/g/devel/message/107138 Mute This Topic: https://groups.io/mt/100288522/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-