And pushed. Reviewed-by: Jaben Carsey <jaben.car...@intel.com> > -----Original Message----- > From: Tapan Shah [mailto:tapands...@hpe.com] > Sent: Wednesday, October 05, 2016 1:58 PM > To: edk2-devel@lists.01.org > Cc: Carsey, Jaben <jaben.car...@intel.com>; Tapan Shah > <tapands...@hpe.com> > Subject: [PATCH] ShellPkg: Move UnicodeCollation2 Protcol locate out of > UefiShellLib constructor > Importance: High > > Move gEfiUnicodeCollation2ProtocolGuid protocol outside of UefiShellLib > constructor > function. > Locate gEfiUnicodeCollation2ProtocolGuid protocol in > ShellOpenFileByName() which > consumes this protocol API. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Tapan Shah <tapands...@hpe.com> > --- > ShellPkg/Library/UefiShellLib/UefiShellLib.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c > b/ShellPkg/Library/UefiShellLib/UefiShellLib.c > index e47d535..53f54e1 100644 > --- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c > +++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c > @@ -292,18 +292,12 @@ ShellLibConstructor ( > IN EFI_SYSTEM_TABLE *SystemTable > ) > { > - EFI_STATUS Status; > - > mEfiShellEnvironment2 = NULL; > gEfiShellProtocol = NULL; > gEfiShellParametersProtocol = NULL; > mEfiShellInterface = NULL; > mEfiShellEnvironment2Handle = NULL; > - > - if (mUnicodeCollationProtocol == NULL) { > - Status = gBS->LocateProtocol (&gEfiUnicodeCollation2ProtocolGuid, NULL, > (VOID**)&mUnicodeCollationProtocol); > - ASSERT_EFI_ERROR (Status); > - } > + mUnicodeCollationProtocol = NULL; > > // > // verify that auto initialize is not set false > @@ -730,6 +724,14 @@ ShellOpenFileByName( > FileHandle, > OpenMode); > > + if (mUnicodeCollationProtocol == NULL) { > + Status = gBS->LocateProtocol (&gEfiUnicodeCollation2ProtocolGuid, > NULL, (VOID**)&mUnicodeCollationProtocol); > + if (EFI_ERROR (Status)) { > + gEfiShellProtocol->CloseFile (*FileHandle); > + return Status; > + } > + } > + > if ((mUnicodeCollationProtocol->StriColl (mUnicodeCollationProtocol, > (CHAR16*)FileName, L"NUL") != 0) && > (mUnicodeCollationProtocol->StriColl (mUnicodeCollationProtocol, > (CHAR16*)FileName, L"NULL") != 0) && > !EFI_ERROR(Status) && ((OpenMode & EFI_FILE_MODE_CREATE) != 0)){ > -- > 1.9.5.msysgit.0
_______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
