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

ShellPkg/ShellLib: Constructor doesn't depend on ShellParameters 

When ShellLib is linked to a driver producing DynamicCommand
protocol, ShellParameters protocol is set by
DynamicCommand.Handler().
The driver image handle doesn't have ShellParameters protocol
installed.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
This commit is contained in:
Ruiyu Ni 2017-11-24 16:01:41 +08:00
parent 646127c192
commit 3d29f8c5e3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ShellPkg/Library/UefiShellLib/UefiShellLib.c
View File

@ -215,7 +215,7 @@ ShellLibConstructorWorker (
gEfiShellParametersProtocol = NULL;
}
if (gEfiShellParametersProtocol == NULL || gEfiShellProtocol == NULL) {
if (gEfiShellProtocol == NULL) {
//
// Moved to seperate function due to complexity
//
@ -238,10 +238,14 @@ ShellLibConstructorWorker (
}
//
// only success getting 2 of either the old or new, but no 1/2 and 1/2
// Getting either EDK Shell's ShellEnvironment2 and ShellInterface protocol
// or UEFI Shell's Shell protocol.
// When ShellLib is linked to a driver producing DynamicCommand protocol,
// ShellParameters protocol is set by DynamicCommand.Handler().
//
if ((mEfiShellEnvironment2 != NULL && mEfiShellInterface != NULL) ||
(gEfiShellProtocol != NULL && gEfiShellParametersProtocol != NULL) ) {
if ((mEfiShellEnvironment2 != NULL && mEfiShellInterface != NULL) ||
(gEfiShellProtocol != NULL)
) {
if (gEfiShellProtocol != NULL) {
FileFunctionMap.GetFileInfo = gEfiShellProtocol->GetFileInfo;
FileFunctionMap.SetFileInfo = gEfiShellProtocol->SetFileInfo;