[patch 0/2] Fix Emulator ASSERT issue when re-enter setup

[patch 0/2] Fix Emulator ASSERT issue when re-enter setup

[Dandan Bi]

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

Currently Emulator meets ASSERT when enter setup->Continue->enter setup.
When re-enter setup, in the Constructor functions of some Libs linked
by UiApp, the handle is not NULL which cause InstallMultipleProtocolInterfaces
failure then ASSERT. So here set handle to NULL after uninstalling
protocols on it in Libs Destructor function to avoid this issue.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Dandan Bi (2):
  MdeModulePkg/BMMUiLib: Set Handle to NULL after uninstall protocol
  MdeModulePkg/FileExplorer: Set Handle to NULL after uninstall protocol

 .../Library/BootMaintenanceManagerUiLib/BootMaintenance.c      | 3 ++-
 MdeModulePkg/Library/FileExplorerLib/FileExplorer.c            | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

-- 
2.18.0.windows.1

[patch 1/2] MdeModulePkg/BMMUiLib: Set Handle to NULL after uninstall protocol

[Dandan Bi]

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

Currently Emulator meets ASSERT when enter setup->Continue->enter setup.
When re-enter setup, the BmmDriverHandle in BMMUiLib Constructor
is not NULL which cause InstallMultipleProtocolInterfaces failure,
then ASSERT. So here set BmmDriverHandle to NULL after uninstalling
protocols on it in Destructor function to avoid this issue.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 .../Library/BootMaintenanceManagerUiLib/BootMaintenance.c      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
index 2167d3a5e8..28592f9f47 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
@@ -1,9 +1,9 @@
 /** @file
 The functions for Boot Maintainence Main menu.
 
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #include "BootMaintenanceManager.h"
@@ -1761,9 +1761,10 @@ BootMaintenanceManagerUiLibDestructor (
          &mBmmCallbackInfo->BmmConfigAccess,
          NULL
          );
 
   FreePool (mBmmCallbackInfo->LoadContext);
+  mBmmCallbackInfo->BmmDriverHandle = NULL;
 
   return EFI_SUCCESS;
 }
 
-- 
2.18.0.windows.1

[patch 2/2] MdeModulePkg/FileExplorer: Set Handle to NULL after uninstall protocol

[Dandan Bi]

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

Currently Emulator meets ASSERT when enter setup->Continue->enter setup.
When re-enter setup, the FeDriverHandle in FileExplorerLib Constructor
is not NULL which cause InstallMultipleProtocolInterfaces failure,
then ASSERT. So here set FeDriverHandle to NULL after uninstalling
protocols on it in the Destructor function to avoid this issue.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 MdeModulePkg/Library/FileExplorerLib/FileExplorer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
index 27f12fcbf9..58e4910259 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
+++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
@@ -1,9 +1,9 @@
 /** @file
 File explorer related functions.
 
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 
@@ -1641,10 +1641,11 @@ FileExplorerLibDestructor (
                     NULL
                     );
     ASSERT_EFI_ERROR (Status);
 
     HiiRemovePackages (gFileExplorerPrivate.FeHiiHandle);
+    gFileExplorerPrivate.FeDriverHandle = NULL;
   }
 
   FreePool (gHiiVendorDevicePath);
 
   return EFI_SUCCESS;
-- 
2.18.0.windows.1

Re: [edk2-devel] [patch 1/2] MdeModulePkg/BMMUiLib: Set Handle to NULL after uninstall protocol

[Dong, Eric]

Reviewed-by: Eric Dong <eric.dong@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Dandan Bi
> Sent: Tuesday, April 23, 2019 3:01 PM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>
> Subject: [edk2-devel] [patch 1/2] MdeModulePkg/BMMUiLib: Set Handle to
> NULL after uninstall protocol
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1728
> 
> Currently Emulator meets ASSERT when enter setup->Continue->enter
> setup.
> When re-enter setup, the BmmDriverHandle in BMMUiLib Constructor is not
> NULL which cause InstallMultipleProtocolInterfaces failure, then ASSERT. So
> here set BmmDriverHandle to NULL after uninstalling protocols on it in
> Destructor function to avoid this issue.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Signed-off-by: Dandan Bi <dandan.bi@intel.com>
> ---
>  .../Library/BootMaintenanceManagerUiLib/BootMaintenance.c      | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git
> a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanc
> e.c
> b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanc
> e.c
> index 2167d3a5e8..28592f9f47 100644
> ---
> a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanc
> e.c
> +++
> b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanc
> e.c
> @@ -1,9 +1,9 @@
>  /** @file
>  The functions for Boot Maintainence Main menu.
> 
> -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
>  #include "BootMaintenanceManager.h"
> @@ -1761,9 +1761,10 @@ BootMaintenanceManagerUiLibDestructor (
>           &mBmmCallbackInfo->BmmConfigAccess,
>           NULL
>           );
> 
>    FreePool (mBmmCallbackInfo->LoadContext);
> +  mBmmCallbackInfo->BmmDriverHandle = NULL;
> 
>    return EFI_SUCCESS;
>  }
> 
> --
> 2.18.0.windows.1
> 
> 
> 

Re: [patch 2/2] MdeModulePkg/FileExplorer: Set Handle to NULL after uninstall protocol

[Dong, Eric]

Reviewed-by: Eric Dong <eric.dong@intel.com>

> -----Original Message-----
> From: Bi, Dandan
> Sent: Tuesday, April 23, 2019 3:01 PM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>
> Subject: [patch 2/2] MdeModulePkg/FileExplorer: Set Handle to NULL after
> uninstall protocol
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1728
> 
> Currently Emulator meets ASSERT when enter setup->Continue->enter
> setup.
> When re-enter setup, the FeDriverHandle in FileExplorerLib Constructor is
> not NULL which cause InstallMultipleProtocolInterfaces failure, then ASSERT.
> So here set FeDriverHandle to NULL after uninstalling protocols on it in the
> Destructor function to avoid this issue.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Signed-off-by: Dandan Bi <dandan.bi@intel.com>
> ---
>  MdeModulePkg/Library/FileExplorerLib/FileExplorer.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
> b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
> index 27f12fcbf9..58e4910259 100644
> --- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
> +++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
> @@ -1,9 +1,9 @@
>  /** @file
>  File explorer related functions.
> 
> -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 
> @@ -1641,10 +1641,11 @@ FileExplorerLibDestructor (
>                      NULL
>                      );
>      ASSERT_EFI_ERROR (Status);
> 
>      HiiRemovePackages (gFileExplorerPrivate.FeHiiHandle);
> +    gFileExplorerPrivate.FeDriverHandle = NULL;
>    }
> 
>    FreePool (gHiiVendorDevicePath);
> 
>    return EFI_SUCCESS;
> --
> 2.18.0.windows.1