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

ShellPkg/HandleParsingLib: Show LoadedImageProtocol file path as text

Browse Source 
This patch adds support for displaying a text representation of the file
path associated with a LoadedImageProtocol. This is a behavior that was
present in the old shell but has been lost in the new shell.

For example, using 'dh -v' in the old shell:

    FilePath......: FvFile(F3331DE6-4A55-44E4-B767-7453F7A1A021)
    FilePath......: \EFI\BOOT\BOOTX64.EFI

vs. the new shell:

    FilePath......: 3A539018
    FilePath......: 3A728718

This seems like useful information for the shell to display.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Westfahl <jeff.westfahl@ni.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
(cherry picked from commit c15323ae2e)
This commit is contained in:
Jeff Westfahl
2017-05-05 05:53:02 +08:00
committed by Ruiyu Ni
parent d30c0e3f5a
commit 9107fb6f55
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,7 @@ LoadedImageProtocolDumpInformation(
EFI_STATUS Status; EFI_STATUS Status;
CHAR16 *RetVal; CHAR16 *RetVal;
CHAR16 *Temp; CHAR16 *Temp;
CHAR16 *FilePath;
CHAR16 *CodeType; CHAR16 *CodeType;
CHAR16 *DataType; CHAR16 *DataType;
@ -197,6 +198,8 @@ LoadedImageProtocolDumpInformation(
return NULL; return NULL;
} }
FilePath = ConvertDevicePathToText(LoadedImage->FilePath, TRUE, TRUE);
DataType = ConvertMemoryType(LoadedImage->ImageDataType); DataType = ConvertMemoryType(LoadedImage->ImageDataType);
CodeType = ConvertMemoryType(LoadedImage->ImageCodeType); CodeType = ConvertMemoryType(LoadedImage->ImageCodeType);
@ -207,7 +210,7 @@ LoadedImageProtocolDumpInformation(
LoadedImage->ParentHandle, LoadedImage->ParentHandle,
LoadedImage->SystemTable, LoadedImage->SystemTable,
LoadedImage->DeviceHandle, LoadedImage->DeviceHandle,
LoadedImage->FilePath, FilePath,
LoadedImage->LoadOptionsSize, LoadedImage->LoadOptionsSize,
LoadedImage->LoadOptions, LoadedImage->LoadOptions,
LoadedImage->ImageBase, LoadedImage->ImageBase,
@ -219,6 +222,7 @@ LoadedImageProtocolDumpInformation(
SHELL_FREE_NON_NULL(Temp); SHELL_FREE_NON_NULL(Temp);
SHELL_FREE_NON_NULL(FilePath);
SHELL_FREE_NON_NULL(CodeType); SHELL_FREE_NON_NULL(CodeType);
SHELL_FREE_NON_NULL(DataType); SHELL_FREE_NON_NULL(DataType);

2
ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
View File

@ -352,7 +352,7 @@
" ParentHandle..: %%H%x%%N\r\n" " ParentHandle..: %%H%x%%N\r\n"
" SystemTable...: %%H%x%%N\r\n" " SystemTable...: %%H%x%%N\r\n"
" DeviceHandle..: %%H%x%%N\r\n" " DeviceHandle..: %%H%x%%N\r\n"
" FilePath......: %%H%x%%N\r\n" " FilePath......: %%H%s%%N\r\n"
" OptionsSize...: %%H%x%%N\r\n" " OptionsSize...: %%H%x%%N\r\n"
" LoadOptions...: %%H%x%%N\r\n" " LoadOptions...: %%H%x%%N\r\n"
" ImageBase.....: %%H%x%%N\r\n" " ImageBase.....: %%H%x%%N\r\n"