ShellPkg: Update Driver1 profile commands response output

Updates to Driver1 profile commands response output. 
Updating Driver1 profile commands source code to include command name as a prefix in error message.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tapan Shah <tapandshah@hp.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>


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

12 files changed, 104 insertions, 87 deletions

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
index bd4a374..321c366 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
@@ -1,6 +1,7 @@
 /** @file

   Main file for connect shell Driver1 function.

 

+  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -439,7 +440,7 @@ ShellCommandRunConnect (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"connect", ProblemParam);  

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -457,7 +458,7 @@ ShellCommandRunConnect (
       //

       // error for too many parameters

       //

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"connect");  

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else if (ShellCommandLineGetFlag(Package, L"-c")) {

       //

@@ -505,7 +506,7 @@ ShellCommandRunConnect (
         Status  = ShellConvertStringToUint64(Param1, &Intermediate, TRUE, FALSE);

         Handle1 = ConvertHandleIndexToHandle((UINTN)Intermediate);

         if (EFI_ERROR(Status)) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param1);  

           ShellStatus = SHELL_INVALID_PARAMETER;

         }

       } else {

@@ -516,7 +517,7 @@ ShellCommandRunConnect (
         Status  = ShellConvertStringToUint64(Param2, &Intermediate, TRUE, FALSE);

         Handle2 = ConvertHandleIndexToHandle((UINTN)Intermediate);

         if (EFI_ERROR(Status)) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param2);

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);  

           ShellStatus = SHELL_INVALID_PARAMETER;

         }

       } else {

@@ -525,13 +526,13 @@ ShellCommandRunConnect (
       

       if (ShellStatus == SHELL_SUCCESS) {

         if (Param1 != NULL && Handle1 == NULL){

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param1);  

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else if (Param2 != NULL && Handle2 == NULL) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param2);

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);  

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else if (Handle2 != NULL && Handle1 != NULL && EFI_ERROR(gBS->OpenProtocol(Handle2, &gEfiDriverBindingProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param2);

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);  

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           Status = ConvertAndConnectControllers(Handle1, Handle2, ShellCommandLineGetFlag(Package, L"-r"), (BOOLEAN)(Count!=0));

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
index d950c8d..4389ce0 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
@@ -1,7 +1,7 @@
 /** @file

   Main file for DevTree shell Driver1 function.

 

-  Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>

+  Copyright (c) 2014 - 2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -184,7 +184,7 @@ ShellCommandRunDevTree (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"devtree", ProblemParam);  

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -192,7 +192,7 @@ ShellCommandRunDevTree (
     }

   } else {

     if (ShellCommandLineGetCount(Package) > 2) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"devtree");  

       ShellCommandLineFreeVarList (Package);

       return (SHELL_INVALID_PARAMETER);

     }

@@ -206,7 +206,7 @@ ShellCommandRunDevTree (
 //      AsciiSPrint(Language, 10, "en-us");

     } else {

       ASSERT(Language == NULL);

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"devtree",  L"-l");  

       ShellCommandLineFreeVarList (Package);

       return (SHELL_INVALID_PARAMETER);

     }

@@ -259,7 +259,7 @@ ShellCommandRunDevTree (
     } else {

       Status = ShellConvertStringToUint64(Lang, &Intermediate, TRUE, FALSE);

       if (EFI_ERROR(Status) || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Lang);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"devtree", Lang);  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         ShellStatus = DoDevTreeForHandle(ConvertHandleIndexToHandle((UINTN)Intermediate), Language, FlagD, 0, HiiString);

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
index c596bae..f492108 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
@@ -1,7 +1,7 @@
 /** @file

   Main file for devices shell Driver1 function.

 

-  Copyright (c) 2012-2014, Hewlett-Packard Development Company, L.P.<BR>

+  Copyright (c) 2012-2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -169,7 +169,7 @@ ShellCommandRunDevices (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"devices", ProblemParam);  

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -183,7 +183,7 @@ ShellCommandRunDevices (
       //

       // error for too many parameters

       //

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"devices");  

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       //

@@ -199,7 +199,7 @@ ShellCommandRunDevices (
 //        AsciiSPrint(Language, 10, "en-us");

       } else {

         ASSERT(Language == NULL);

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"devices",  L"-l");  

         ShellCommandLineFreeVarList (Package);

         return (SHELL_INVALID_PARAMETER);

       }

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
index ca72a9f..251019b 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
@@ -1,7 +1,7 @@
 /** @file

   Main file for Dh shell Driver1 function.

 

-  Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>

+  Copyright (c) 2014 - 2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -892,7 +892,7 @@ ShellCommandRunDh (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"dh", ProblemParam);  

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -900,7 +900,7 @@ ShellCommandRunDh (
     }

   } else {

     if (ShellCommandLineGetCount(Package) > 2) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"dh");  

       ShellCommandLineFreeVarList (Package);

       return (SHELL_INVALID_PARAMETER);

     }

@@ -914,7 +914,7 @@ ShellCommandRunDh (
       AsciiSPrint(Language, 10, "en-us");

     } else {

       ASSERT(Language == NULL);

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"dh",  L"-l");  

       ShellCommandLineFreeVarList (Package);

       return (SHELL_INVALID_PARAMETER);

     }

@@ -925,10 +925,10 @@ ShellCommandRunDh (
 

     if (ShellCommandLineGetFlag(Package, L"-p")) {

       if (ShellCommandLineGetCount(Package) > 1) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"dh");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else if (ShellCommandLineGetValue(Package, L"-p") == NULL) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-p");

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"dh",  L"-p");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         //

@@ -957,7 +957,7 @@ ShellCommandRunDh (
       } else {

         Status = ShellConvertStringToUint64(Temp2, &Intermediate, TRUE, FALSE);

         if (EFI_ERROR(Status) || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Temp2);

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"dh", Temp2);  

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           //

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
index a33bed9..aa323c5 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
@@ -1,6 +1,7 @@
 /** @file

   Main file for Disconnect shell Driver1 function.

 

+  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -116,7 +117,7 @@ ShellCommandRunDisconnect (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"disconnect", ProblemParam);  

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -125,20 +126,20 @@ ShellCommandRunDisconnect (
   } else {

     if (ShellCommandLineGetFlag(Package, L"-r")){

       if (ShellCommandLineGetCount(Package) > 1){

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"disconnect");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else if (ShellCommandLineGetCount(Package) < 1) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         Status = DisconnectAll();

       }

     } else {

       if (ShellCommandLineGetCount(Package) > 4){

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"disconnect");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else if (ShellCommandLineGetCount(Package) < 2) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect");  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         //

@@ -155,17 +156,17 @@ ShellCommandRunDisconnect (
         Handle3 = Param3!=NULL?ConvertHandleIndexToHandle((UINTN)Intermediate3):NULL;

 

         if (Param1 != NULL && Handle1 == NULL) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"disconnect", Param1);  

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else if (Param2 != NULL && Handle2 == NULL) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param2);

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"disconnect", Param2);  

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else if (Param3 != NULL && Handle3 == NULL) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param3);

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"disconnect", Param3);  

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else if (Handle2 != NULL && EFI_ERROR(gBS->OpenProtocol(Handle2, &gEfiDriverBindingProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {

           ASSERT(Param2 != NULL);

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_NOT), gShellDriver1HiiHandle, ShellStrToUintn(Param2), L"driver handle");

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_NOT), gShellDriver1HiiHandle, L"disconnect", ShellStrToUintn(Param2), L"driver handle");  

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

           ASSERT(Param1 != NULL);

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
index ec3190d..f33289e 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
@@ -1,7 +1,7 @@
 /** @file

   Main file for Drivers shell Driver1 function.

 

-  Copyright (c) 2012-2014, Hewlett-Packard Development Company, L.P.<BR>

+  Copyright (c) 2012 - 2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -217,7 +217,7 @@ ShellCommandRunDrivers (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drivers", ProblemParam);  

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -225,7 +225,7 @@ ShellCommandRunDrivers (
     }

   } else {

     if (ShellCommandLineGetCount(Package) > 1) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drivers");  

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       if (ShellCommandLineGetFlag(Package, L"-l")){

@@ -235,7 +235,7 @@ ShellCommandRunDrivers (
           AsciiSPrint(Language, StrSize(Lang), "%S", Lang);

         } else {

           ASSERT(Language == NULL);

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drivers", L"-l");  

           ShellCommandLineFreeVarList (Package);

           return (SHELL_INVALID_PARAMETER);

         }

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
index 2ff330c..ea3e63a 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
@@ -1,6 +1,7 @@
 /** @file

   Main file for DrvCfg shell Driver1 function.

 

+  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -175,8 +176,9 @@ ConfigToFile(
       -1,

       -1,

       NULL,

-      STRING_TOKEN(STR_GEN_FILE_OPEN), 

-      gShellDriver1HiiHandle, 

+      STRING_TOKEN(STR_GEN_FILE_OPEN_FAIL),

+      gShellDriver1HiiHandle,

+      L"drvcfg",

       FileName, 

       Status);

     return (SHELL_DEVICE_ERROR);

@@ -197,7 +199,8 @@ ConfigToFile(
       -1, 

       NULL,

       STRING_TOKEN(STR_GEN_PROTOCOL_NF), 

-      gShellDriver1HiiHandle, 

+      gShellDriver1HiiHandle,

+      L"drvcfg",

       L"EfiHiiDatabaseProtocol", 

       &gEfiHiiDatabaseProtocolGuid);

     ShellCloseFile(&FileHandle);

@@ -211,7 +214,8 @@ ConfigToFile(
       -1, 

       NULL, 

       STRING_TOKEN(STR_GEN_HANDLE_NOT), 

-      gShellDriver1HiiHandle, 

+      gShellDriver1HiiHandle,

+      L"drvcfg",

       ConvertHandleToHandleIndex(Handle), 

       L"Device");

     ShellCloseFile(&FileHandle);

@@ -235,9 +239,9 @@ ConfigToFile(
       -1,

       NULL,

       STRING_TOKEN(STR_FILE_WRITE_FAIL), 

-      gShellDriver1HiiHandle, 

-      FileName, 

-      Status);

+      gShellDriver1HiiHandle,

+      L"drvcfg",

+      FileName);

     return (SHELL_DEVICE_ERROR);   

   }

   ShellPrintHiiEx(

@@ -287,8 +291,9 @@ ConfigFromFile(
       -1,

       -1,

       NULL,

-      STRING_TOKEN(STR_GEN_FILE_OPEN), 

+      STRING_TOKEN(STR_GEN_FILE_OPEN_FAIL),

       gShellDriver1HiiHandle, 

+      L"drvcfg",

       FileName, 

       Status);

     return (SHELL_DEVICE_ERROR);

@@ -310,6 +315,7 @@ ConfigFromFile(
       NULL,

       STRING_TOKEN(STR_GEN_PROTOCOL_NF), 

       gShellDriver1HiiHandle, 

+      L"drvcfg",

       L"EfiHiiDatabaseProtocol", 

       &gEfiHiiDatabaseProtocolGuid);

     ShellCloseFile(&FileHandle);

@@ -324,9 +330,10 @@ ConfigFromFile(
       -1, 

       NULL, 

       STRING_TOKEN(STR_FILE_READ_FAIL), 

-      gShellDriver1HiiHandle, 

-      FileName,

-      Status);

+      gShellDriver1HiiHandle,

+      L"drvcfg",

+      FileName);

+

     ShellCloseFile(&FileHandle);

     return (SHELL_DEVICE_ERROR);   

   }

@@ -337,7 +344,7 @@ ConfigFromFile(
       -1, 

       NULL, 

       STRING_TOKEN(STR_GEN_OUT_MEM), 

-      gShellDriver1HiiHandle);

+      gShellDriver1HiiHandle, L"drvcfg");

     ShellCloseFile(&FileHandle);

     return (SHELL_DEVICE_ERROR);   

   }

@@ -349,8 +356,9 @@ ConfigFromFile(
       NULL, 

       STRING_TOKEN(STR_FILE_READ_FAIL), 

       gShellDriver1HiiHandle, 

-      FileName,

-      Status);

+      L"drvcfg",

+      FileName);

+

     ShellCloseFile(&FileHandle);

     SHELL_FREE_NON_NULL(MainBuffer);

     return (SHELL_DEVICE_ERROR);   

@@ -370,7 +378,7 @@ ConfigFromFile(
         -1, 

         NULL, 

         STRING_TOKEN(STR_GEN_HANDLE_NOT), 

-        gShellDriver1HiiHandle, 

+        gShellDriver1HiiHandle, L"drvcfg",

         ConvertHandleToHandleIndex(Handle), 

         L"Device");

       ShellCloseFile(&FileHandle);

@@ -382,8 +390,9 @@ ConfigFromFile(
         -1, 

         -1, 

         NULL, 

-        STRING_TOKEN(STR_GEN_UEFI_FUNC_ERROR), 

-        gShellDriver1HiiHandle, 

+        STRING_TOKEN(STR_GEN_UEFI_FUNC_WARN),

+        gShellDriver1HiiHandle,

+        L"drvcfg",

         L"HiiDatabase->UpdatePackageList", 

         Status);

       return (SHELL_DEVICE_ERROR);   

@@ -422,8 +431,9 @@ ConfigFromFile(
                     -1, 

                     -1, 

                     NULL, 

-                    STRING_TOKEN(STR_GEN_UEFI_FUNC_ERROR), 

+                    STRING_TOKEN(STR_GEN_UEFI_FUNC_WARN),

                     gShellDriver1HiiHandle, 

+                    L"drvcfg",

                     L"HiiDatabase->UpdatePackageList", 

                     Status);

                   return (SHELL_DEVICE_ERROR);

@@ -667,8 +677,9 @@ PreHiiDrvCfg (
         -1,

         -1,

         NULL,

-        STRING_TOKEN (STR_GEN_PROBLEM_VAL),

+        STRING_TOKEN (STR_GEN_NO_VALUE),

         gShellDriver1HiiHandle,

+        L"drvcfg",

         L"-l"

         );

       ShellStatus = SHELL_INVALID_PARAMETER;

@@ -1182,7 +1193,7 @@ ShellCommandRunDrvCfg (
     Status = ShellCommandLineParse (ParamListPreHii, &Package, &ProblemParam, TRUE);

     if (EFI_ERROR(Status)) {

       if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drvcfg", ProblemParam);

         FreePool(ProblemParam);

         ShellStatus = SHELL_INVALID_PARAMETER;

         goto Done;

@@ -1197,7 +1208,7 @@ ShellCommandRunDrvCfg (
       Language = AllocateZeroPool(StrSize(Lang));

       AsciiSPrint(Language, StrSize(Lang), "%S", Lang);

     } else if (ShellCommandLineGetFlag(Package, L"-l")){

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg",  L"-l");

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto Done;

     }

@@ -1218,24 +1229,24 @@ ShellCommandRunDrvCfg (
     }

 

     if (InFromFile && EFI_ERROR(ShellFileExists(FileName))) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellDriver1HiiHandle, FileName);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellDriver1HiiHandle, L"drvcfg", FileName);  

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto Done;      

     }

     if (OutToFile && !EFI_ERROR(ShellFileExists(FileName))) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_EXIST), gShellDriver1HiiHandle, FileName);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_EXIST), gShellDriver1HiiHandle, L"drvcfg", FileName);  

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto Done;      

     }

     if (Force && ForceTypeString == NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-f");

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", L"-f");  

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto Done;

     } 

     if (Force) {

       Status = ShellConvertStringToUint64(ForceTypeString, &Intermediate, FALSE, FALSE);

       if (EFI_ERROR(Status)) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDriver1HiiHandle, L"-f");

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDriver1HiiHandle, L"drvcfg", ForceTypeString, L"-f");  

         ShellStatus = SHELL_INVALID_PARAMETER;

         goto Done;

       }

@@ -1248,7 +1259,7 @@ ShellCommandRunDrvCfg (
     if (HandleIndex1 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex1, &Intermediate, TRUE, FALSE))) {

       Handle1 = ConvertHandleIndexToHandle((UINTN)Intermediate);

       if (Handle1 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, HandleIndex1);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex1);  

         ShellStatus = SHELL_INVALID_PARAMETER;

         goto Done;

       }

@@ -1258,7 +1269,7 @@ ShellCommandRunDrvCfg (
     if (HandleIndex2 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex2, &Intermediate, TRUE, FALSE))) {

       Handle2 = ConvertHandleIndexToHandle((UINTN)Intermediate);

       if (Handle2 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, HandleIndex2);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex2);  

         ShellStatus = SHELL_INVALID_PARAMETER;

         goto Done;

       }

@@ -1268,7 +1279,7 @@ ShellCommandRunDrvCfg (
     if (HandleIndex3 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex3, &Intermediate, TRUE, FALSE))) {

       Handle3 = ConvertHandleIndexToHandle((UINTN)Intermediate);

       if (Handle3 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, HandleIndex3);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex3);  

         ShellStatus = SHELL_INVALID_PARAMETER;

         goto Done;

       }

@@ -1276,42 +1287,42 @@ ShellCommandRunDrvCfg (
 

     if ((InFromFile || OutToFile) && (FileName == NULL)) {

       if (FileName == NULL) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, InFromFile?L"-i":L"-o");

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg",  InFromFile?L"-i":L"-o");  

       } else {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_REQ), gShellDriver1HiiHandle);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_REQ), gShellDriver1HiiHandle, L"drvcfg");  

       }

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto Done;

     }

     if (!UseHii && (InFromFile || OutToFile)) {

       if (InFromFile) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"-i");

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-i");  

         ShellStatus = SHELL_INVALID_PARAMETER;

         goto Done;

       } 

       if (OutToFile) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"-o");

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-o");  

         ShellStatus = SHELL_INVALID_PARAMETER;

         goto Done;

       }

     }

     if (Validate && Force) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-v", L"-f");

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-f");  

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto Done;

     } 

     if (Validate && Set) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-v", L"-s");

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-s");  

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto Done;

     } 

     if (Set && Force) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-s", L"-f");

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-s", L"-f");  

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto Done;

     }

     if (OutToFile && InFromFile) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-i", L"-o");

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-i", L"-o");  

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto Done;

     }

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
index c3c1b57..cc52bcf 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
@@ -1,6 +1,7 @@
 /** @file

   Main file for DrvDiag shell Driver1 function.

 

+  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -99,8 +100,8 @@ DoDiagnostics (
   } else {

     DriverHandleList = GetHandleListByProtocolList(DiagGuidList);

     if (DriverHandleList == NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"gEfiDriverDiagnosticsProtocolGuid", &gEfiDriverDiagnosticsProtocolGuid);

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"gEfiDriverDiagnostics2ProtocolGuid", &gEfiDriverDiagnostics2ProtocolGuid);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnosticsProtocolGuid", &gEfiDriverDiagnosticsProtocolGuid);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellDriver1HiiHandle, L"drvdiag", L"gEfiDriverDiagnostics2ProtocolGuid", &gEfiDriverDiagnostics2ProtocolGuid);  

       return (EFI_NOT_FOUND);

     } 

     for (Walker = DriverHandleList ; Walker != NULL && *Walker != NULL ; DriverHandleListCount++, Walker++);

@@ -348,7 +349,7 @@ ShellCommandRunDrvDiag (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drvdiag", ProblemParam);  

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -366,7 +367,7 @@ ShellCommandRunDrvDiag (
       //

       // error for too many parameters

       //

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"drvdiag");  

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else if ((ShellCommandLineGetFlag(Package, L"-s"))

             || (ShellCommandLineGetFlag(Package, L"-e"))

@@ -394,7 +395,7 @@ ShellCommandRunDrvDiag (
     Lang = ShellCommandLineGetValue(Package, L"-l");

     if (ShellCommandLineGetFlag(Package, L"-l") && Lang == NULL) {

       ASSERT(Language == NULL);

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvdiag",  L"-l");  

       ShellCommandLineFreeVarList (Package);

       return (SHELL_INVALID_PARAMETER);

     } else if (Lang != NULL) {

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c
index 2922f42..939f256 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c
@@ -1,6 +1,7 @@
 /** @file

   Main file for OpenInfo shell Driver1 function.

 

+  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -176,7 +177,7 @@ ShellCommandRunOpenInfo (
   Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"openinfo", ProblemParam);  

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -187,16 +188,16 @@ ShellCommandRunOpenInfo (
       //

       // error for too many parameters

       //

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"openinfo");  

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else if (ShellCommandLineGetCount(Package) == 0) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"openinfo");  

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       Param1 = ShellCommandLineGetRawValue(Package, 1);

       Status = ShellConvertStringToUint64(Param1, &Intermediate, TRUE, FALSE);

       if (EFI_ERROR(Status) || Param1 == NULL || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL){

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"openinfo", Param1);  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         TheHandle = ConvertHandleIndexToHandle((UINTN)Intermediate);

@@ -206,7 +207,7 @@ ShellCommandRunOpenInfo (
         Status = TraverseHandleDatabase (TheHandle);

         if (!EFI_ERROR(Status)) {

         } else {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"openinfo", Param1);  

           ShellStatus = SHELL_NOT_FOUND;

         }

       }

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Reconnect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Reconnect.c
index e4747e3..724c1fc 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Reconnect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Reconnect.c
@@ -1,6 +1,7 @@
 /** @file

   Main file for Reconnect shell Driver1 function.

 

+  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -74,7 +75,7 @@ ShellCommandRunReconnect (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, "reconnect", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
index 5b9a7ad..58ae31e 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
index cb2c07b..141cbea 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
@@ -1,6 +1,7 @@
 /** @file

   Main file for Unload shell Driver1 function.

 

+  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>

   Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -86,7 +87,7 @@ ShellCommandRunUnload (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);

   if (EFI_ERROR(Status)) {

     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle,L"unload", ProblemParam);  

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -97,10 +98,10 @@ ShellCommandRunUnload (
       //

       // error for too many parameters

       //

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"unload");  

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else if (ShellCommandLineGetCount(Package) < 2) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle);

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"unload");  

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       Param1    = ShellCommandLineGetRawValue(Package, 1);

@@ -110,7 +111,7 @@ ShellCommandRunUnload (
       }

 

       if (EFI_ERROR(Status) || Param1 == NULL || TheHandle == NULL){

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"unload", Param1);  

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         ASSERT(TheHandle != NULL);