[Patch] MdeModulePkg/LogoDxe: Return error if HII Package not present

[Patch] MdeModulePkg/LogoDxe: Return error if HII Package not present

[Michael Kinney]

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 <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Andrew Fish <afish@apple.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
 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

Re: [Patch] MdeModulePkg/LogoDxe: Return error if HII Package not present

[Gao, Liming]

Mike:
  The code change is good. Reviewed-by: Liming Gao <liming.gao@intel.com>

   But, I think we still need to figure out the solution to create resource section in XCODE5.  

Thanks
Liming
>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Michael Kinney
>Sent: Friday, May 19, 2017 1:32 AM
>To: edk2-devel@lists.01.org
>Cc: Dong, Eric <eric.dong@intel.com>; Zeng, Star <star.zeng@intel.com>;
>Andrew Fish <afish@apple.com>
>Subject: [edk2] [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 <star.zeng@intel.com>
>Cc: Eric Dong <eric.dong@intel.com>
>Cc: Andrew Fish <afish@apple.com>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
>---
> 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
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel

Re: [Patch] MdeModulePkg/LogoDxe: Return error if HII Package not present

[Kinney, Michael D]

Liming,

I agree.  I have entered a feature request for XCODE5.

https://bugzilla.tianocore.org/show_bug.cgi?id=557

Mike



> -----Original Message-----
> From: Gao, Liming
> Sent: Thursday, May 18, 2017 6:30 PM
> To: Kinney, Michael D <michael.d.kinney@intel.com>; edk2-devel@lists.01.org
> Cc: Dong, Eric <eric.dong@intel.com>; Zeng, Star <star.zeng@intel.com>; Andrew Fish
> <afish@apple.com>
> Subject: RE: [edk2] [Patch] MdeModulePkg/LogoDxe: Return error if HII Package not
> present
> 
> Mike:
>   The code change is good. Reviewed-by: Liming Gao <liming.gao@intel.com>
> 
>    But, I think we still need to figure out the solution to create resource section in
> XCODE5.
> 
> Thanks
> Liming
> >-----Original Message-----
> >From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> >Michael Kinney
> >Sent: Friday, May 19, 2017 1:32 AM
> >To: edk2-devel@lists.01.org
> >Cc: Dong, Eric <eric.dong@intel.com>; Zeng, Star <star.zeng@intel.com>;
> >Andrew Fish <afish@apple.com>
> >Subject: [edk2] [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 <star.zeng@intel.com>
> >Cc: Eric Dong <eric.dong@intel.com>
> >Cc: Andrew Fish <afish@apple.com>
> >Contributed-under: TianoCore Contribution Agreement 1.0
> >Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
> >---
> > 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
> >edk2-devel@lists.01.org
> >https://lists.01.org/mailman/listinfo/edk2-devel

Re: [Patch] MdeModulePkg/LogoDxe: Return error if HII Package not present

[Zeng, Star]

Reviewed-by: Star Zeng <star.zeng@intel.com>

-----Original Message-----
From: Kinney, Michael D 
Sent: Friday, May 19, 2017 1:32 AM
To: edk2-devel@lists.01.org
Cc: Zeng, Star <star.zeng@intel.com>; Dong, Eric <eric.dong@intel.com>; Andrew Fish <afish@apple.com>
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 <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Andrew Fish <afish@apple.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
 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