ShellPkg: Make 'dh' support showing all spec defined protocols.

When using 'dh' to dump all protocols installed on a handle, some of
them are shown as 'UnknownDevice'.

Device patch make 'dh' support all spec defined protocols.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@hpe.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19177 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 354 insertions, 0 deletions

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index b211de7d1d..6f093ffe0e 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -1026,6 +1026,124 @@ STATIC CONST GUID_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_DISK_INFO),             &gEfiDiskInfoProtocolGuid,                        NULL},

 

 //

+// PI Spec 1.0

+//

+  {STRING_TOKEN(STR_BDS_ARCH),              &gEfiBdsArchProtocolGuid,                         NULL},

+  {STRING_TOKEN(STR_CPU_ARCH),              &gEfiCpuArchProtocolGuid,                         NULL},

+  {STRING_TOKEN(STR_MET_ARCH),              &gEfiMetronomeArchProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_MON_ARCH),              &gEfiMonotonicCounterArchProtocolGuid,            NULL},

+  {STRING_TOKEN(STR_RTC_ARCH),              &gEfiRealTimeClockArchProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_RESET_ARCH),            &gEfiResetArchProtocolGuid,                       NULL},

+  {STRING_TOKEN(STR_RT_ARCH),               &gEfiRuntimeArchProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_SEC_ARCH),              &gEfiSecurityArchProtocolGuid,                    NULL},

+  {STRING_TOKEN(STR_TIMER_ARCH),            &gEfiTimerArchProtocolGuid,                       NULL},

+  {STRING_TOKEN(STR_VAR_ARCH),              &gEfiVariableWriteArchProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_V_ARCH),                &gEfiVariableArchProtocolGuid,                    NULL},

+  {STRING_TOKEN(STR_SECP),                  &gEfiSecurityPolicyProtocolGuid,                  NULL},

+  {STRING_TOKEN(STR_WDT_ARCH),              &gEfiWatchdogTimerArchProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_SCR),                   &gEfiStatusCodeRuntimeProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_SMB_HC),                &gEfiSmbusHcProtocolGuid,                         NULL},

+  {STRING_TOKEN(STR_FV_2),                  &gEfiFirmwareVolume2ProtocolGuid,                 NULL},

+  {STRING_TOKEN(STR_FV_BLOCK),              &gEfiFirmwareVolumeBlockProtocolGuid,             NULL},

+  {STRING_TOKEN(STR_CAP_ARCH),              &gEfiCapsuleArchProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_MP_SERVICE),            &gEfiMpServiceProtocolGuid,                       NULL},

+  {STRING_TOKEN(STR_HBRAP),                 &gEfiPciHostBridgeResourceAllocationProtocolGuid, NULL},

+  {STRING_TOKEN(STR_PCIP),                  &gEfiPciPlatformProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_PCIO),                  &gEfiPciOverrideProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_PCIE),                  &gEfiPciEnumerationCompleteProtocolGuid,          NULL},

+  {STRING_TOKEN(STR_IPCID),                 &gEfiIncompatiblePciDeviceSupportProtocolGuid,    NULL},

+  {STRING_TOKEN(STR_PCIHPI),                &gEfiPciHotPlugInitProtocolGuid,                  NULL},

+  {STRING_TOKEN(STR_PCIHPR),                &gEfiPciHotPlugRequestProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_SMBIOS),                &gEfiSmbiosProtocolGuid,                          NULL},

+  {STRING_TOKEN(STR_S3_SAVE),               &gEfiS3SaveStateProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_S3_S_SMM),              &gEfiS3SmmSaveStateProtocolGuid,                  NULL},

+  {STRING_TOKEN(STR_RSC),                   &gEfiRscHandlerProtocolGuid,                      NULL},

+  {STRING_TOKEN(STR_S_RSC),                 &gEfiSmmRscHandlerProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_ACPI_SDT),              &gEfiAcpiSdtProtocolGuid,                         NULL},

+  {STRING_TOKEN(STR_SIO),                   &gEfiSioProtocolGuid,                             NULL},

+  {STRING_TOKEN(STR_S_CPU2),                &gEfiSmmCpuIo2ProtocolGuid,                       NULL},

+  {STRING_TOKEN(STR_S_BASE2),               &gEfiSmmBase2ProtocolGuid,                        NULL},

+  {STRING_TOKEN(STR_S_ACC_2),               &gEfiSmmAccess2ProtocolGuid,                      NULL},

+  {STRING_TOKEN(STR_S_CON_2),               &gEfiSmmControl2ProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_S_CONFIG),              &gEfiSmmConfigurationProtocolGuid,                NULL},

+  {STRING_TOKEN(STR_S_RTL),                 &gEfiSmmReadyToLockProtocolGuid,                  NULL},

+  {STRING_TOKEN(STR_DS_RTL),                &gEfiDxeSmmReadyToLockProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_S_COMM),                &gEfiSmmCommunicationProtocolGuid,                NULL},

+  {STRING_TOKEN(STR_S_STAT),                &gEfiSmmStatusCodeProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_S_CPU),                 &gEfiSmmCpuProtocolGuid,                          NULL},

+  {STRING_TOKEN(STR_S_PCIRBIO),             &gEfiPciRootBridgeIoProtocolGuid,                 NULL},

+  {STRING_TOKEN(STR_S_SWD),                 &gEfiSmmSwDispatch2ProtocolGuid,                  NULL},

+  {STRING_TOKEN(STR_S_SXD),                 &gEfiSmmSxDispatch2ProtocolGuid,                  NULL},

+  {STRING_TOKEN(STR_S_PTD2),                &gEfiSmmPeriodicTimerDispatch2ProtocolGuid,       NULL},

+  {STRING_TOKEN(STR_S_UD2),                 &gEfiSmmUsbDispatch2ProtocolGuid,                 NULL},

+  {STRING_TOKEN(STR_S_GD2),                 &gEfiSmmGpiDispatch2ProtocolGuid,                 NULL},

+  {STRING_TOKEN(STR_S_SBD2),                &gEfiSmmStandbyButtonDispatch2ProtocolGuid,       NULL},

+  {STRING_TOKEN(STR_S_PBD2),                &gEfiSmmPowerButtonDispatch2ProtocolGuid,         NULL},

+  {STRING_TOKEN(STR_S_ITD2),                &gEfiSmmIoTrapDispatch2ProtocolGuid,              NULL},

+  {STRING_TOKEN(STR_PCD),                   &gEfiPcdProtocolGuid,                             NULL},

+  {STRING_TOKEN(STR_FVB2),                  &gEfiFirmwareVolumeBlock2ProtocolGuid,            NULL},

+  {STRING_TOKEN(STR_CPUIO2),                &gEfiCpuIo2ProtocolGuid,                          NULL},

+  {STRING_TOKEN(STR_LEGACY_R2),             &gEfiLegacyRegion2ProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_SAL_MIP),               &gEfiSalMcaInitPmiProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_ES_BS),                 &gEfiExtendedSalBootServiceProtocolGuid,          NULL},

+  {STRING_TOKEN(STR_ES_BIO),                &gEfiExtendedSalBaseIoServicesProtocolGuid,       NULL},

+  {STRING_TOKEN(STR_ES_STALL),              &gEfiExtendedSalStallServicesProtocolGuid,        NULL},

+  {STRING_TOKEN(STR_ES_RTC),                &gEfiExtendedSalRtcServicesProtocolGuid,          NULL},

+  {STRING_TOKEN(STR_ES_VS),                 &gEfiExtendedSalVariableServicesProtocolGuid,     NULL},

+  {STRING_TOKEN(STR_ES_MTC),                &gEfiExtendedSalMtcServicesProtocolGuid,          NULL},

+  {STRING_TOKEN(STR_ES_RESET),              &gEfiExtendedSalResetServicesProtocolGuid,        NULL},

+  {STRING_TOKEN(STR_ES_SC),                 &gEfiExtendedSalStatusCodeServicesProtocolGuid,   NULL},

+  {STRING_TOKEN(STR_ES_FBS),                &gEfiExtendedSalFvBlockServicesProtocolGuid,      NULL},

+  {STRING_TOKEN(STR_ES_MP),                 &gEfiExtendedSalMpServicesProtocolGuid,           NULL},

+  {STRING_TOKEN(STR_ES_PAL),                &gEfiExtendedSalPalServicesProtocolGuid,          NULL},

+  {STRING_TOKEN(STR_ES_BASE),               &gEfiExtendedSalBaseServicesProtocolGuid,         NULL},

+  {STRING_TOKEN(STR_ES_MCA),                &gEfiExtendedSalMcaServicesProtocolGuid,          NULL},

+  {STRING_TOKEN(STR_ES_PCI),                &gEfiExtendedSalPciServicesProtocolGuid,          NULL},

+  {STRING_TOKEN(STR_ES_CACHE),              &gEfiExtendedSalCacheServicesProtocolGuid,        NULL},

+  {STRING_TOKEN(STR_ES_MCA_LOG),            &gEfiExtendedSalMcaLogServicesProtocolGuid,       NULL},

+  {STRING_TOKEN(STR_S2ARCH),                &gEfiSecurity2ArchProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_EODXE),                 &gEfiSmmEndOfDxeProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_ISAHC),                 &gEfiIsaHcProtocolGuid,                           NULL},

+  {STRING_TOKEN(STR_ISAHC_B),               &gEfiIsaHcServiceBindingProtocolGuid,             NULL},

+  {STRING_TOKEN(STR_SIO_C),                 &gEfiSioControlProtocolGuid,                      NULL},

+  {STRING_TOKEN(STR_GET_PCD),               &gEfiGetPcdInfoProtocolGuid,                      NULL},

+  {STRING_TOKEN(STR_I2C_M),                 &gEfiI2cMasterProtocolGuid,                       NULL},

+  {STRING_TOKEN(STR_I2CIO),                 &gEfiI2cIoProtocolGuid,                           NULL},

+  {STRING_TOKEN(STR_I2CEN),                 &gEfiI2cEnumerateProtocolGuid,                    NULL},

+  {STRING_TOKEN(STR_I2C_H),                 &gEfiI2cHostProtocolGuid,                         NULL},

+  {STRING_TOKEN(STR_I2C_BCM),               &gEfiI2cBusConfigurationManagementProtocolGuid,   NULL},

+  {STRING_TOKEN(STR_TREE),                  &gEfiTrEEProtocolGuid,                            NULL},

+  {STRING_TOKEN(STR_TCG2),                  &gEfiTcg2ProtocolGuid,                            NULL},

+  {STRING_TOKEN(STR_TIMESTAMP),             &gEfiTimestampProtocolGuid,                       NULL},

+  {STRING_TOKEN(STR_RNG),                   &gEfiRngProtocolGuid,                             NULL},

+  {STRING_TOKEN(STR_NVMEPT),                &gEfiNvmExpressPassThruProtocolGuid,              NULL},

+  {STRING_TOKEN(STR_H2_SB),                 &gEfiHash2ServiceBindingProtocolGuid,             NULL},

+  {STRING_TOKEN(STR_HASH2),                 &gEfiHash2ProtocolGuid,                           NULL},

+  {STRING_TOKEN(STR_BIO_C),                 &gEfiBlockIoCryptoProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_SCR),                   &gEfiSmartCardReaderProtocolGuid,                 NULL},

+  {STRING_TOKEN(STR_SCE),                   &gEfiSmartCardEdgeProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_USB_FIO),               &gEfiUsbFunctionIoProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_BC_HC),                 &gEfiBluetoothHcProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_BC_IO_SB),              &gEfiBluetoothIoServiceBindingProtocolGuid,       NULL},

+  {STRING_TOKEN(STR_BC_IO),                 &gEfiBluetoothIoProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_BC_C),                  &gEfiBluetoothConfigProtocolGuid,                 NULL},

+  {STRING_TOKEN(STR_REG_EXP),               &gEfiRegularExpressionProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_B_MGR_P),               &gEfiBootManagerPolicyProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_CKH),                   &gEfiConfigKeywordHandlerProtocolGuid,            NULL},

+  {STRING_TOKEN(STR_WIFI),                  &gEfiWiFiProtocolGuid,                            NULL},

+  {STRING_TOKEN(STR_EAP_M),                 &gEfiEapManagement2ProtocolGuid,                  NULL},

+  {STRING_TOKEN(STR_EAP_C),                 &gEfiEapConfigurationProtocolGuid,                NULL},

+  {STRING_TOKEN(STR_PKCS7),                 &gEfiPkcs7VerifyProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_NET_DNS4_SB),           &gEfiDns4ServiceBindingProtocolGuid,              NULL},

+  {STRING_TOKEN(STR_NET_DNS4),              &gEfiDns4ProtocolGuid,                            NULL},

+  {STRING_TOKEN(STR_NET_DNS6_SB),           &gEfiDns6ServiceBindingProtocolGuid,              NULL},

+  {STRING_TOKEN(STR_NET_DNS6),              &gEfiDns6ProtocolGuid,                            NULL},

+  {STRING_TOKEN(STR_NET_HTTP_SB),           &gEfiHttpServiceBindingProtocolGuid,              NULL},

+  {STRING_TOKEN(STR_NET_HTTP),              &gEfiHttpProtocolGuid,                            NULL},

+  {STRING_TOKEN(STR_NET_HTTP_U),            &gEfiHttpUtilitiesProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_REST),                  &gEfiRestProtocolGuid,                            NULL},

+

+//

 // UEFI Shell Spec 2.0

 //

   {STRING_TOKEN(STR_SHELL_PARAMETERS),      &gEfiShellParametersProtocolGuid,                 NULL},

@@ -1037,6 +1155,11 @@ STATIC CONST GUID_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_SHELL_DYNAMIC),         &gEfiShellDynamicCommandProtocolGuid,             NULL},

 

 //

+// Misc

+//

+  {STRING_TOKEN(STR_PCDINFOPROT),           &gGetPcdInfoProtocolGuid,                         NULL},

+

+//

 // terminator

 //

   {STRING_TOKEN(STR_UNKNOWN_DEVICE),        NULL,                                             NULL},

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index 4cd81f59ed..4a19e39450 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -175,6 +175,121 @@
   gEfiAdapterInformationProtocolGuid                      ## UNDEFINED

   gEfiShellDynamicCommandProtocolGuid                     ## UNDEFINED

   gEfiDiskInfoProtocolGuid                                ## UNDEFINED

+  gGetPcdInfoProtocolGuid                                 ## UNDEFINED

+  gEfiBdsArchProtocolGuid                                 ## UNDEFINED

+  gEfiCpuArchProtocolGuid                                 ## UNDEFINED

+  gEfiMetronomeArchProtocolGuid                           ## UNDEFINED

+  gEfiMonotonicCounterArchProtocolGuid                    ## UNDEFINED

+  gEfiRealTimeClockArchProtocolGuid                       ## UNDEFINED

+  gEfiResetArchProtocolGuid                               ## UNDEFINED

+  gEfiRuntimeArchProtocolGuid                             ## UNDEFINED

+  gEfiSecurityArchProtocolGuid                            ## UNDEFINED

+  gEfiTimerArchProtocolGuid                               ## UNDEFINED

+  gEfiVariableWriteArchProtocolGuid                       ## UNDEFINED

+  gEfiVariableArchProtocolGuid                            ## UNDEFINED

+  gEfiSecurityPolicyProtocolGuid                          ## UNDEFINED

+  gEfiWatchdogTimerArchProtocolGuid                       ## UNDEFINED

+  gEfiStatusCodeRuntimeProtocolGuid                       ## UNDEFINED

+  gEfiSmbusHcProtocolGuid                                 ## UNDEFINED

+  gEfiFirmwareVolume2ProtocolGuid                         ## UNDEFINED

+  gEfiFirmwareVolumeBlockProtocolGuid                     ## UNDEFINED

+  gEfiCapsuleArchProtocolGuid                             ## UNDEFINED

+  gEfiMpServiceProtocolGuid                               ## UNDEFINED

+  gEfiPciHostBridgeResourceAllocationProtocolGuid         ## UNDEFINED

+  gEfiPciPlatformProtocolGuid                             ## UNDEFINED

+  gEfiPciOverrideProtocolGuid                             ## UNDEFINED

+  gEfiPciEnumerationCompleteProtocolGuid                  ## UNDEFINED

+  gEfiIncompatiblePciDeviceSupportProtocolGuid            ## UNDEFINED

+  gEfiPciHotPlugInitProtocolGuid                          ## UNDEFINED

+  gEfiPciHotPlugRequestProtocolGuid                       ## UNDEFINED

+  gEfiSmbiosProtocolGuid                                  ## UNDEFINED

+  gEfiS3SaveStateProtocolGuid                             ## UNDEFINED

+  gEfiS3SmmSaveStateProtocolGuid                          ## UNDEFINED

+  gEfiRscHandlerProtocolGuid                              ## UNDEFINED

+  gEfiSmmRscHandlerProtocolGuid                           ## UNDEFINED

+  gEfiAcpiSdtProtocolGuid                                 ## UNDEFINED

+  gEfiSioProtocolGuid                                     ## UNDEFINED

+  gEfiSmmCpuIo2ProtocolGuid                               ## UNDEFINED

+  gEfiSmmBase2ProtocolGuid                                ## UNDEFINED

+  gEfiSmmAccess2ProtocolGuid                              ## UNDEFINED

+  gEfiSmmControl2ProtocolGuid                             ## UNDEFINED

+  gEfiSmmConfigurationProtocolGuid                        ## UNDEFINED

+  gEfiSmmReadyToLockProtocolGuid                          ## UNDEFINED

+  gEfiDxeSmmReadyToLockProtocolGuid                       ## UNDEFINED

+  gEfiSmmCommunicationProtocolGuid                        ## UNDEFINED

+  gEfiSmmStatusCodeProtocolGuid                           ## UNDEFINED

+  gEfiSmmCpuProtocolGuid                                  ## UNDEFINED

+  gEfiSmmPciRootBridgeIoProtocolGuid                      ## UNDEFINED

+  gEfiSmmSwDispatch2ProtocolGuid                          ## UNDEFINED

+  gEfiSmmSxDispatch2ProtocolGuid                          ## UNDEFINED

+  gEfiSmmPeriodicTimerDispatch2ProtocolGuid               ## UNDEFINED

+  gEfiSmmUsbDispatch2ProtocolGuid                         ## UNDEFINED

+  gEfiSmmGpiDispatch2ProtocolGuid                         ## UNDEFINED

+  gEfiSmmStandbyButtonDispatch2ProtocolGuid               ## UNDEFINED

+  gEfiSmmPowerButtonDispatch2ProtocolGuid                 ## UNDEFINED

+  gEfiSmmIoTrapDispatch2ProtocolGuid                      ## UNDEFINED

+  gEfiPcdProtocolGuid                                     ## UNDEFINED

+  gEfiFirmwareVolumeBlock2ProtocolGuid                    ## UNDEFINED

+  gEfiCpuIo2ProtocolGuid                                  ## UNDEFINED

+  gEfiLegacyRegion2ProtocolGuid                           ## UNDEFINED

+  gEfiSalMcaInitPmiProtocolGuid                           ## UNDEFINED

+  gEfiExtendedSalBootServiceProtocolGuid                  ## UNDEFINED

+  gEfiExtendedSalBaseIoServicesProtocolGuid               ## UNDEFINED

+  gEfiExtendedSalStallServicesProtocolGuid                ## UNDEFINED

+  gEfiExtendedSalRtcServicesProtocolGuid                  ## UNDEFINED

+  gEfiExtendedSalVariableServicesProtocolGuid             ## UNDEFINED

+  gEfiExtendedSalMtcServicesProtocolGuid                  ## UNDEFINED

+  gEfiExtendedSalResetServicesProtocolGuid                ## UNDEFINED

+  gEfiExtendedSalStatusCodeServicesProtocolGuid           ## UNDEFINED

+  gEfiExtendedSalFvBlockServicesProtocolGuid              ## UNDEFINED

+  gEfiExtendedSalMpServicesProtocolGuid                   ## UNDEFINED

+  gEfiExtendedSalPalServicesProtocolGuid                  ## UNDEFINED

+  gEfiExtendedSalBaseServicesProtocolGuid                 ## UNDEFINED

+  gEfiExtendedSalMcaServicesProtocolGuid                  ## UNDEFINED

+  gEfiExtendedSalPciServicesProtocolGuid                  ## UNDEFINED

+  gEfiExtendedSalCacheServicesProtocolGuid                ## UNDEFINED

+  gEfiExtendedSalMcaLogServicesProtocolGuid               ## UNDEFINED

+  gEfiSecurity2ArchProtocolGuid                           ## UNDEFINED

+  gEfiSmmEndOfDxeProtocolGuid                             ## UNDEFINED

+  gEfiIsaHcProtocolGuid                                   ## UNDEFINED

+  gEfiIsaHcServiceBindingProtocolGuid                     ## UNDEFINED

+  gEfiSioControlProtocolGuid                              ## UNDEFINED

+  gEfiGetPcdInfoProtocolGuid                              ## UNDEFINED

+  gEfiI2cMasterProtocolGuid                               ## UNDEFINED

+  gEfiI2cIoProtocolGuid                                   ## UNDEFINED

+  gEfiI2cEnumerateProtocolGuid                            ## UNDEFINED

+  gEfiI2cHostProtocolGuid                                 ## UNDEFINED

+  gEfiI2cBusConfigurationManagementProtocolGuid           ## UNDEFINED

+  gEfiTrEEProtocolGuid                                    ## UNDEFINED

+  gEfiTcg2ProtocolGuid                                    ## UNDEFINED

+  gEfiTimestampProtocolGuid                               ## UNDEFINED

+  gEfiRngProtocolGuid                                     ## UNDEFINED

+  gEfiNvmExpressPassThruProtocolGuid                      ## UNDEFINED

+  gEfiHash2ServiceBindingProtocolGuid                     ## UNDEFINED

+  gEfiHash2ProtocolGuid                                   ## UNDEFINED

+  gEfiBlockIoCryptoProtocolGuid                           ## UNDEFINED

+  gEfiSmartCardReaderProtocolGuid                         ## UNDEFINED

+  gEfiSmartCardEdgeProtocolGuid                           ## UNDEFINED

+  gEfiUsbFunctionIoProtocolGuid                           ## UNDEFINED

+  gEfiBluetoothHcProtocolGuid                             ## UNDEFINED

+  gEfiBluetoothIoServiceBindingProtocolGuid               ## UNDEFINED

+  gEfiBluetoothIoProtocolGuid                             ## UNDEFINED

+  gEfiBluetoothConfigProtocolGuid                         ## UNDEFINED

+  gEfiRegularExpressionProtocolGuid                       ## UNDEFINED

+  gEfiBootManagerPolicyProtocolGuid                       ## UNDEFINED

+  gEfiConfigKeywordHandlerProtocolGuid                    ## UNDEFINED

+  gEfiWiFiProtocolGuid                                    ## UNDEFINED

+  gEfiEapManagement2ProtocolGuid                          ## UNDEFINED

+  gEfiEapConfigurationProtocolGuid                        ## UNDEFINED

+  gEfiPkcs7VerifyProtocolGuid                             ## UNDEFINED

+  gEfiDns4ServiceBindingProtocolGuid                      ## UNDEFINED

+  gEfiDns4ProtocolGuid                                    ## UNDEFINED

+  gEfiDns6ServiceBindingProtocolGuid                      ## UNDEFINED

+  gEfiDns6ProtocolGuid                                    ## UNDEFINED

+  gEfiHttpServiceBindingProtocolGuid                      ## UNDEFINED

+  gEfiHttpProtocolGuid                                    ## UNDEFINED

+  gEfiHttpUtilitiesProtocolGuid                           ## UNDEFINED

+  gEfiRestProtocolGuid                                    ## UNDEFINED

 

 [Guids]

   gEfiFileInfoGuid                                        ## CONSUMES ## GUID

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
index 1d142e9c98..f7d54855fb 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
@@ -218,6 +218,122 @@
 #string STR_SSC                   #language en-US "StorageSecurityCommand"

 #string STR_UCRED2                #language en-US "UserCredential2"

 

+#string STR_PCDINFOPROT           #language en-US "GetPcdInfoProtocol"

+#string STR_BDS_ARCH              #language en-US "BdsArch"

+#string STR_CPU_ARCH              #language en-US "CpuArch"

+#string STR_MET_ARCH              #language en-US "MetronomeArch"

+#string STR_MON_ARCH              #language en-US "MonotonicCounterArch"

+#string STR_RTC_ARCH              #language en-US "RealTimeClockArch"

+#string STR_RESET_ARCH            #language en-US "ResetArch"

+#string STR_RT_ARCH               #language en-US "RuntimeArch"

+#string STR_SEC_ARCH              #language en-US "SecurityArch"

+#string STR_TIMER_ARCH            #language en-US "TimerArch"

+#string STR_VAR_ARCH              #language en-US "VariableWriteArch"

+#string STR_V_ARCH                #language en-US "VariableArch"

+#string STR_SECP                  #language en-US "SecurityPolicy"

+#string STR_WDT_ARCH              #language en-US "WatchdogTimerArch"

+#string STR_SCR                   #language en-US "StatusCodeRuntime"

+#string STR_SMB_HC                #language en-US "SmbusHc"

+#string STR_FV_2                  #language en-US "FirmwareVolume2"

+#string STR_FV_BLOCK              #language en-US "FirmwareVolumeBlock"

+#string STR_CAP_ARCH              #language en-US "CapsuleArch"

+#string STR_MP_SERVICE            #language en-US "MpService"

+#string STR_HBRAP                 #language en-US "PciHostBridgeResourceAllocation"

+#string STR_PCIP                  #language en-US "PciPlatform"

+#string STR_PCIO                  #language en-US "PciOverride"

+#string STR_PCIE                  #language en-US "PciEnumerationComplete"

+#string STR_IPCID                 #language en-US "IncompatiblePciDeviceSupport"

+#string STR_PCIHPI                #language en-US "PciHotPlugInit"

+#string STR_PCIHPR                #language en-US "PciHotPlugRequest"

+#string STR_SMBIOS                #language en-US "Smbios"

+#string STR_S3_SAVE               #language en-US "S3SaveState"

+#string STR_S3_S_SMM              #language en-US "S3SmmSaveState"

+#string STR_RSC                   #language en-US "RscHandler"

+#string STR_S_RSC                 #language en-US "SmmRscHandler"

+#string STR_ACPI_SDT              #language en-US "AcpiSdt"

+#string STR_SIO                   #language en-US "Sio"

+#string STR_S_CPU2                #language en-US "SmmCpuIo2"

+#string STR_S_BASE2               #language en-US "SmmBase2"

+#string STR_S_ACC_2               #language en-US "SmmAccess2"

+#string STR_S_CON_2               #language en-US "SmmControl2"

+#string STR_S_CONFIG              #language en-US "SmmConfig"

+#string STR_S_RTL                 #language en-US "SmmReadyToLock"

+#string STR_DS_RTL                #language en-US "DxeSmmReadyToLock"

+#string STR_S_COMM                #language en-US "SmmCommunication"

+#string STR_S_STAT                #language en-US "SmmStatusCode"

+#string STR_S_CPU                 #language en-US "SmmCpu"

+#string STR_S_PCIRBIO             #language en-US "SmmPCIRootBridgeIO"

+#string STR_S_SWD                 #language en-US "SmmSwDispatch2"

+#string STR_S_SXD                 #language en-US "SmmSxDispatch2"

+#string STR_S_PTD2                #language en-US "SmmPeriodicTimerDispatch2"

+#string STR_S_UD2                 #language en-US "SmmUsbDispatch2"

+#string STR_S_GD2                 #language en-US "SmmGpiDispatch2"

+#string STR_S_SBD2                #language en-US "SmmStandbyButtonDispatch2"

+#string STR_S_PBD2                #language en-US "SmmPowerButtonDispatch2"

+#string STR_S_ITD2                #language en-US "SmmIoTrapDispatch2"

+#string STR_PCD                   #language en-US "Pcd"

+#string STR_FVB2                  #language en-US "FirmwareVolumeBlock2"

+#string STR_CPUIO2                #language en-US "CpuIo2"

+#string STR_LEGACY_R2             #language en-US "LegacyRegion2"

+#string STR_SAL_MIP               #language en-US "SalMcaInitPmi"

+#string STR_ES_BS                 #language en-US "ExtendedSalBootService"

+#string STR_ES_BIO                #language en-US "ExtendedSalBaseIoServices"

+#string STR_ES_STALL              #language en-US "ExtendedSalStallServices"

+#string STR_ES_RTC                #language en-US "ExtendedSalRtcServices"

+#string STR_ES_VS                 #language en-US "ExtendedSalVariableServices"

+#string STR_ES_MTC                #language en-US "ExtendedSalMtcServices"

+#string STR_ES_RESET              #language en-US "ExtendedSalResetServices"

+#string STR_ES_SC                 #language en-US "ExtendedSalStatusCodeServices"

+#string STR_ES_FBS                #language en-US "ExtendedSalFvBlockServices"

+#string STR_ES_MP                 #language en-US "ExtendedSalMpServices"

+#string STR_ES_PAL                #language en-US "ExtendedSalPalServices"

+#string STR_ES_BASE               #language en-US "ExtendedSalBaseServices"

+#string STR_ES_MCA                #language en-US "ExtendedSalMcaServices"

+#string STR_ES_PCI                #language en-US "ExtendedSalPciServices"

+#string STR_ES_CACHE              #language en-US "ExtendedSalCacheServices"

+#string STR_ES_MCA_LOG            #language en-US "ExtendedSalMcaLogServices"

+#string STR_S2ARCH                #language en-US "Security2Arch"

+#string STR_EODXE                 #language en-US "SmmEndOfDxe"

+#string STR_ISAHC                 #language en-US "IsaHc"

+#string STR_ISAHC_B               #language en-US "IsaHcServiceBinding"

+#string STR_SIO_C                 #language en-US "SioControl"

+#string STR_GET_PCD               #language en-US "GetPcdInfo"

+#string STR_I2C_M                 #language en-US "I2cMaster"

+#string STR_I2CIO                 #language en-US "I2cIo"

+#string STR_I2CEN                 #language en-US "I2cEnumerate"

+#string STR_I2C_H                 #language en-US "I2cHost"

+#string STR_I2C_BCM               #language en-US "I2cBusConfigurationManagement"

+#string STR_TREE                  #language en-US "TrEE"

+#string STR_TCG2                  #language en-US "Tcg2"

+#string STR_TIMESTAMP             #language en-US "Timestamp"

+#string STR_RNG                   #language en-US "Rng"

+#string STR_NVMEPT                #language en-US "NvmExpressPassThru"

+#string STR_H2_SB                 #language en-US "Hash2ServiceBinding"

+#string STR_HASH2                 #language en-US "Hash2"

+#string STR_BIO_C                 #language en-US "BlockIoCrypto"

+#string STR_SCR                   #language en-US "SmartCardReader"

+#string STR_SCE                   #language en-US "SmartCardEdge"

+#string STR_USB_FIO               #language en-US "UsbFunctionIo"

+#string STR_BC_HC                 #language en-US "BluetoothHc"

+#string STR_BC_IO_SB              #language en-US "BluetoothIoServiceBinding"

+#string STR_BC_IO                 #language en-US "BluetoothIo"

+#string STR_BC_C                  #language en-US "BluetoothConfig"

+#string STR_REG_EXP               #language en-US "RegularExpression"

+#string STR_B_MGR_P               #language en-US "BootManagerPolicy"

+#string STR_CKH                   #language en-US "ConfigKeywordHandler"

+#string STR_WIFI                  #language en-US "WiFi"

+#string STR_EAP_M                 #language en-US "EapManagement2"

+#string STR_EAP_C                 #language en-US "EapConfiguration"

+#string STR_PKCS7                 #language en-US "Pkcs7Verify"

+#string STR_NET_DNS4_SB           #language en-US "Dns4ServiceBinding"

+#string STR_NET_DNS4              #language en-US "Dns4"

+#string STR_NET_DNS6_SB           #language en-US "Dns6ServiceBinding"

+#string STR_NET_DNS6              #language en-US "Dns6"

+#string STR_NET_HTTP_SB           #language en-US "HttpServiceBinding"

+#string STR_NET_HTTP              #language en-US "Http"

+#string STR_NET_HTTP_U            #language en-US "HttpUtilities"

+#string STR_REST                  #language en-US "Rest"

+

 #string STR_IDE_CONT_INIT         #language en-US "IdeControllerInit"

 #string STR_DISK_INFO             #language en-US "DiskInfo"