Reviewed-by: Star Zeng <[email protected]> -----Original Message----- From: Kinney, Michael D Sent: Friday, May 19, 2017 1:32 AM To: [email protected] Cc: Zeng, Star <[email protected]>; Dong, Eric <[email protected]>; Andrew Fish <[email protected]> Subject: [Patch] MdeModulePkg/LogoDxe: Return error if HII Package not present
https://bugzilla.tianocore.org/show_bug.cgi?id=554 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, then 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 of PE/COFF resource sections. Cc: Star Zeng <[email protected]> Cc: Eric Dong <[email protected]> Cc: Andrew Fish <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney <[email protected]> --- 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 313dd4a..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. -Copyright (c) 2016, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2016 - 2017, 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 @@ -133,7 +133,9 @@ InitializeLogo ( NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL ); - ASSERT_EFI_ERROR (Status); + if (EFI_ERROR (Status)) { + return Status; + } // // Publish HII package list to HII Database. -- 2.6.3.windows.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
