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

ShellPkg/dh: Modify the dump of LoadedImage protocol 

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

3
ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Provides interface to advanced shell functionality for parsing both handle and protocol database. Provides interface to advanced shell functionality for parsing both handle and protocol database.
Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
(C) Copyright 2013-2016 Hewlett-Packard Development Company, L.P.<BR> (C) Copyright 2013-2016 Hewlett-Packard Development Company, L.P.<BR>
This program and the accompanying materials This program and the accompanying materials
@ -153,6 +153,7 @@
#include <Library/ShellLib.h> #include <Library/ShellLib.h>
#include <Library/SortLib.h> #include <Library/SortLib.h>
#include <Library/ShellCommandLib.h> #include <Library/ShellCommandLib.h>
#include <Library/PeCoffGetEntryPointLib.h>
#define EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION_V1 1 #define EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION_V1 1
#define EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION_V2 2 #define EFI_FIRMWARE_IMAGE_DESCRIPTOR_VERSION_V2 2

3
ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
View File

@ -1,6 +1,6 @@
## @file ## @file
# Provides interface to advanced shell functionality for parsing both handle and protocol database. # Provides interface to advanced shell functionality for parsing both handle and protocol database.
# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR> # Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved. <BR>
# (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR> # (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
# (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR> # (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
# #
@ -50,6 +50,7 @@
UefiLib UefiLib
HiiLib HiiLib
SortLib SortLib
PeCoffGetEntryPointLib
[Protocols] [Protocols]
gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES

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

@ -355,13 +355,14 @@
" 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%s%%N\r\n" " FilePath......: %%H%s%%N\r\n"
" PdbFileName...: %%H%a%%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"
" ImageSize.....: %%H%Lx%%N\r\n" " ImageSize.....: %%H%Lx%%N\r\n"
" CodeType......: %%H%s%%N\r\n" " CodeType......: %%H%s%%N\r\n"
" DataType......: %%H%s%%N\r\n" " DataType......: %%H%s%%N\r\n"
" Unload........: %%H%x%%N\r\n" " Unload........: %%H%x%%N"
#string STR_GOP_DUMP_MAIN #language en-US " Max Mode............: %%H0x%08x%%N\r\n" #string STR_GOP_DUMP_MAIN #language en-US " Max Mode............: %%H0x%08x%%N\r\n"
" Current Mode........: %%H0x%08x%%N\r\n" " Current Mode........: %%H0x%08x%%N\r\n"