tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refine error handle code, avoid assert when load this module twice. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19625 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong 2016-01-08 05:21:55 +00:00 committed by ydong10
parent 0507449955
commit 20fe162556
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
File explorer related functions. File explorer related functions.
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under This program and the accompanying materials are licensed and made available under
the terms and conditions of the BSD License that accompanies this distribution. the terms and conditions of the BSD License that accompanies this distribution.
The full text of the license may be found at The full text of the license may be found at
@ -1442,7 +1442,12 @@ FileExplorerLibConstructor (
&gFileExplorerPrivate.FeConfigAccess, &gFileExplorerPrivate.FeConfigAccess,
NULL NULL
); );
ASSERT_EFI_ERROR (Status); if (Status == EFI_ALREADY_STARTED) {
return EFI_SUCCESS;
}
if (EFI_ERROR (Status)) {
return Status;
}
// //
// Post our File Explorer VFR binary to the HII database. // Post our File Explorer VFR binary to the HII database.
@ -1486,17 +1491,19 @@ FileExplorerLibDestructor (
ASSERT (gHiiVendorDevicePath != NULL); ASSERT (gHiiVendorDevicePath != NULL);
Status = gBS->UninstallMultipleProtocolInterfaces ( if (gFileExplorerPrivate.FeDriverHandle != NULL) {
gFileExplorerPrivate.FeDriverHandle, Status = gBS->UninstallMultipleProtocolInterfaces (
&gEfiDevicePathProtocolGuid, gFileExplorerPrivate.FeDriverHandle,
gHiiVendorDevicePath, &gEfiDevicePathProtocolGuid,
&gEfiHiiConfigAccessProtocolGuid, gHiiVendorDevicePath,
&gFileExplorerPrivate.FeConfigAccess, &gEfiHiiConfigAccessProtocolGuid,
NULL &gFileExplorerPrivate.FeConfigAccess,
); NULL
ASSERT_EFI_ERROR (Status); );
ASSERT_EFI_ERROR (Status);
HiiRemovePackages (gFileExplorerPrivate.FeHiiHandle);
HiiRemovePackages (gFileExplorerPrivate.FeHiiHandle);
}
FreePool (gHiiVendorDevicePath); FreePool (gHiiVendorDevicePath);

7
MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
View File

@ -1,7 +1,7 @@
## @file ## @file
# library defines a set of interfaces for how to do file explorer. # library defines a set of interfaces for how to do file explorer.
# #
# Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials are licensed and made available under # This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution. # the terms and conditions of the BSD License that accompanies this distribution.
# The full text of the license may be found at # The full text of the license may be found at
@ -57,4 +57,7 @@
gEfiLoadFileProtocolGuid ## CONSUMES gEfiLoadFileProtocolGuid ## CONSUMES
gEfiHiiConfigAccessProtocolGuid ## CONSUMES gEfiHiiConfigAccessProtocolGuid ## CONSUMES
gEfiFormBrowser2ProtocolGuid ## CONSUMES gEfiFormBrowser2ProtocolGuid ## CONSUMES
gEfiDevicePathToTextProtocolGuid ## CONSUMES gEfiDevicePathToTextProtocolGuid ## CONSUMES
[Depex.common.DXE_DRIVER, Depex.common.DXE_RUNTIME_DRIVER, Depex.common.DXE_SAL_DRIVER, Depex.common.DXE_SMM_DRIVER]
gEfiFormBrowser2ProtocolGuid AND gEfiHiiDatabaseProtocolGuid