sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg/dh: Modify the dump of LoadedImage protocol

Browse Source 
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Huajing Li <huajing.li@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Huajing Li
2017-09-21 15:04:37 +08:00
committed by Ruiyu Ni
parent f6e0c4b401
commit 4f67a6148c
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
View File

@@ -232,14 +232,11 @@ LoadedImageProtocolDumpInformation(
CHAR16 *RetVal;
CHAR16 *Temp;
CHAR16 *FileName;
CHAR8 *PdbFileName;
CHAR16 *FilePath;
CHAR16 *CodeType;
CHAR16 *DataType;
if (!Verbose) {
return (CatSPrint(NULL, L"LoadedImage"));
}
Status = gBS->OpenProtocol (
TheHandle,
&gEfiLoadedImageProtocolGuid,
@@ -253,10 +250,20 @@ LoadedImageProtocolDumpInformation(
return NULL;
}
HandleParsingHiiInit();
FileName = FindLoadedImageFileName(LoadedImage);
FilePath = ConvertDevicePathToText(LoadedImage->FilePath, TRUE, TRUE);
if (!Verbose) {
if (FileName == NULL) {
FileName = FilePath;
} else {
SHELL_FREE_NON_NULL(FilePath);
}
RetVal = CatSPrint(NULL, FileName);
SHELL_FREE_NON_NULL(FileName);
return RetVal;
}
HandleParsingHiiInit();
RetVal = NULL;
if (FileName != NULL) {
Temp = HiiGetString(mHandleParsingHiiHandle, STRING_TOKEN(STR_LI_DUMP_NAME), NULL);
@@ -273,9 +280,7 @@ LoadedImageProtocolDumpInformation(
if (Temp == NULL) {
return NULL;
}
FilePath = ConvertDevicePathToText(LoadedImage->FilePath, TRUE, TRUE);
PdbFileName = PeCoffLoaderGetPdbPointer (LoadedImage->ImageBase);
DataType = ConvertMemoryType(LoadedImage->ImageDataType);
CodeType = ConvertMemoryType(LoadedImage->ImageCodeType);
@@ -287,6 +292,7 @@ LoadedImageProtocolDumpInformation(
LoadedImage->SystemTable,
LoadedImage->DeviceHandle,
FilePath,
PdbFileName,
LoadedImage->LoadOptionsSize,
LoadedImage->LoadOptions,
LoadedImage->ImageBase,