From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 EB7FF21A16EC1 for ; Thu, 18 May 2017 19:26:12 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 May 2017 19:26:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,361,1491289200"; d="scan'208";a="89053088" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga002.jf.intel.com with ESMTP; 18 May 2017 19:26:10 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 18 May 2017 19:26:04 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.246]) by SHSMSX104.ccr.corp.intel.com ([10.239.4.70]) with mapi id 14.03.0319.002; Fri, 19 May 2017 10:26:02 +0800 From: "Zeng, Star" To: "Kinney, Michael D" , "edk2-devel@lists.01.org" CC: "Dong, Eric" , Andrew Fish , "Zeng, Star" Thread-Topic: [Patch] MdeModulePkg/LogoDxe: Return error if HII Package not present Thread-Index: AQHSz/y8xJe6+NuXIUSpevYg3eZkc6H67m4g Date: Fri, 19 May 2017 02:26:01 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103B8C3A08@shsmsx102.ccr.corp.intel.com> References: <1495128744-24324-1-git-send-email-michael.d.kinney@intel.com> In-Reply-To: <1495128744-24324-1-git-send-email-michael.d.kinney@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] MdeModulePkg/LogoDxe: Return error if HII Package not present X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 May 2017 02:26:13 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Star Zeng -----Original Message----- From: Kinney, Michael D=20 Sent: Friday, May 19, 2017 1:32 AM To: edk2-devel@lists.01.org Cc: Zeng, Star ; Dong, Eric ; And= rew Fish Subject: [Patch] MdeModulePkg/LogoDxe: Return error if HII Package not pres= ent https://bugzilla.tianocore.org/show_bug.cgi?id=3D554 Update LogoDxe module to exit with an error instead of ASSERT_EFI_ERROR() if the HII Package with the logo image is not present. If a tool chain does not support generation of PE/COFF resource sections, t= hen this module can not produce the logo from an HII Image Package. XCODE5= is an example of a tool chain that does not currently support generation o= f PE/COFF resource sections. Cc: Star Zeng Cc: Eric Dong Cc: Andrew Fish Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney --- MdeModulePkg/Logo/Logo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Logo/Logo.c b/MdeModulePkg/Logo/Logo.c index 313d= d4a..b34724a 100644 --- a/MdeModulePkg/Logo/Logo.c +++ b/MdeModulePkg/Logo/Logo.c @@ -1,7 +1,7 @@ /** @file Logo DXE Driver, install Edkii Platform Logo protocol. =20 -Copyright (c) 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made availab= le under the terms and conditions of the BSD License which accompanies thi= s distribution. The full text of the license may be found at @@ -133,7 +13= 3,9 @@ InitializeLogo ( NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL ); - ASSERT_EFI_ERROR (Status); + if (EFI_ERROR (Status)) { + return Status; + } =20 // // Publish HII package list to HII Database. -- 2.6.3.windows.1