ShellPkg: Fix build failure in VS2015.

[mirror_edk2.git] / ShellPkg / Library / UefiShellDriver1CommandsLib / DrvCfg.c

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
index a2b520e1d18823a78507ce0e5471abff81e122bf..27b8873f839e44de4e4e50d845c06ea04dabe5f0 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
@@ -1,7 +1,8 @@
 /** @file\r
   Main file for DrvCfg shell Driver1 function.\r
 \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -175,8 +176,9 @@ ConfigToFile(
       -1,\r
       -1,\r
       NULL,\r
-      STRING_TOKEN(STR_GEN_FILE_OPEN), \r
-      gShellDriver1HiiHandle, \r
+      STRING_TOKEN(STR_GEN_FILE_OPEN_FAIL),\r
+      gShellDriver1HiiHandle,\r
+      L"drvcfg",\r
       FileName, \r
       Status);\r
     return (SHELL_DEVICE_ERROR);\r
@@ -197,13 +199,15 @@ ConfigToFile(
       -1, \r
       NULL,\r
       STRING_TOKEN(STR_GEN_PROTOCOL_NF), \r
-      gShellDriver1HiiHandle, \r
+      gShellDriver1HiiHandle,\r
+      L"drvcfg",\r
       L"EfiHiiDatabaseProtocol", \r
       &gEfiHiiDatabaseProtocolGuid);\r
     ShellCloseFile(&FileHandle);\r
     return (SHELL_NOT_FOUND);\r
   }\r
 \r
+  HiiHandle = NULL;\r
   Status = ConvertHandleToHiiHandle(Handle, &HiiHandle, HiiDatabase);\r
   if (EFI_ERROR(Status)) {\r
     ShellPrintHiiEx(\r
@@ -211,7 +215,8 @@ ConfigToFile(
       -1, \r
       NULL, \r
       STRING_TOKEN(STR_GEN_HANDLE_NOT), \r
-      gShellDriver1HiiHandle, \r
+      gShellDriver1HiiHandle,\r
+      L"drvcfg",\r
       ConvertHandleToHandleIndex(Handle), \r
       L"Device");\r
     ShellCloseFile(&FileHandle);\r
@@ -235,9 +240,9 @@ ConfigToFile(
       -1,\r
       NULL,\r
       STRING_TOKEN(STR_FILE_WRITE_FAIL), \r
-      gShellDriver1HiiHandle, \r
-      FileName, \r
-      Status);\r
+      gShellDriver1HiiHandle,\r
+      L"drvcfg",\r
+      FileName);\r
     return (SHELL_DEVICE_ERROR);   \r
   }\r
   ShellPrintHiiEx(\r
@@ -287,8 +292,9 @@ ConfigFromFile(
       -1,\r
       -1,\r
       NULL,\r
-      STRING_TOKEN(STR_GEN_FILE_OPEN), \r
+      STRING_TOKEN(STR_GEN_FILE_OPEN_FAIL),\r
       gShellDriver1HiiHandle, \r
+      L"drvcfg",\r
       FileName, \r
       Status);\r
     return (SHELL_DEVICE_ERROR);\r
@@ -310,6 +316,7 @@ ConfigFromFile(
       NULL,\r
       STRING_TOKEN(STR_GEN_PROTOCOL_NF), \r
       gShellDriver1HiiHandle, \r
+      L"drvcfg",\r
       L"EfiHiiDatabaseProtocol", \r
       &gEfiHiiDatabaseProtocolGuid);\r
     ShellCloseFile(&FileHandle);\r
@@ -324,9 +331,10 @@ ConfigFromFile(
       -1, \r
       NULL, \r
       STRING_TOKEN(STR_FILE_READ_FAIL), \r
-      gShellDriver1HiiHandle, \r
-      FileName,\r
-      Status);\r
+      gShellDriver1HiiHandle,\r
+      L"drvcfg",\r
+      FileName);\r
+\r
     ShellCloseFile(&FileHandle);\r
     return (SHELL_DEVICE_ERROR);   \r
   }\r
@@ -337,7 +345,7 @@ ConfigFromFile(
       -1, \r
       NULL, \r
       STRING_TOKEN(STR_GEN_OUT_MEM), \r
-      gShellDriver1HiiHandle);\r
+      gShellDriver1HiiHandle, L"drvcfg");\r
     ShellCloseFile(&FileHandle);\r
     return (SHELL_DEVICE_ERROR);   \r
   }\r
@@ -349,8 +357,9 @@ ConfigFromFile(
       NULL, \r
       STRING_TOKEN(STR_FILE_READ_FAIL), \r
       gShellDriver1HiiHandle, \r
-      FileName,\r
-      Status);\r
+      L"drvcfg",\r
+      FileName);\r
+\r
     ShellCloseFile(&FileHandle);\r
     SHELL_FREE_NON_NULL(MainBuffer);\r
     return (SHELL_DEVICE_ERROR);   \r
@@ -370,7 +379,7 @@ ConfigFromFile(
         -1, \r
         NULL, \r
         STRING_TOKEN(STR_GEN_HANDLE_NOT), \r
-        gShellDriver1HiiHandle, \r
+        gShellDriver1HiiHandle, L"drvcfg",\r
         ConvertHandleToHandleIndex(Handle), \r
         L"Device");\r
       ShellCloseFile(&FileHandle);\r
@@ -382,8 +391,9 @@ ConfigFromFile(
         -1, \r
         -1, \r
         NULL, \r
-        STRING_TOKEN(STR_GEN_UEFI_FUNC_ERROR), \r
-        gShellDriver1HiiHandle, \r
+        STRING_TOKEN(STR_GEN_UEFI_FUNC_WARN),\r
+        gShellDriver1HiiHandle,\r
+        L"drvcfg",\r
         L"HiiDatabase->UpdatePackageList", \r
         Status);\r
       return (SHELL_DEVICE_ERROR);   \r
@@ -406,7 +416,7 @@ ConfigFromFile(
                 //\r
                 // print out an error.\r
                 //\r
-                TempDevPathString = gDevPathToText->ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)), TRUE, TRUE);\r
+                TempDevPathString = ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)), TRUE, TRUE);\r
                 ShellPrintHiiEx(\r
                   -1, \r
                   -1, \r
@@ -422,8 +432,9 @@ ConfigFromFile(
                     -1, \r
                     -1, \r
                     NULL, \r
-                    STRING_TOKEN(STR_GEN_UEFI_FUNC_ERROR), \r
+                    STRING_TOKEN(STR_GEN_UEFI_FUNC_WARN),\r
                     gShellDriver1HiiHandle, \r
+                    L"drvcfg",\r
                     L"HiiDatabase->UpdatePackageList", \r
                     Status);\r
                   return (SHELL_DEVICE_ERROR);\r
@@ -514,7 +525,6 @@ ShellCmdDriverConfigurationProcessActionRequired (
 \r
   default:\r
     return (EFI_INVALID_PARAMETER);\r
-    break;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -668,8 +678,9 @@ PreHiiDrvCfg (
         -1,\r
         -1,\r
         NULL,\r
-        STRING_TOKEN (STR_GEN_PROBLEM_VAL),\r
+        STRING_TOKEN (STR_GEN_NO_VALUE),\r
         gShellDriver1HiiHandle,\r
+        L"drvcfg",\r
         L"-l"\r
         );\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
@@ -1095,7 +1106,7 @@ PrintConfigInfoOnAll(
   }\r
 \r
   if (!Found) {\r
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE), gShellDriver1HiiHandle);\r
+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DRVCFG_NONE_FOUND), gShellDriver1HiiHandle);\r
     return (SHELL_SUCCESS);\r
   }\r
 \r
@@ -1183,7 +1194,7 @@ ShellCommandRunDrvCfg (
     Status = ShellCommandLineParse (ParamListPreHii, &Package, &ProblemParam, TRUE);\r
     if (EFI_ERROR(Status)) {\r
       if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"drvcfg", ProblemParam);\r
         FreePool(ProblemParam);\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto Done;\r
@@ -1198,7 +1209,7 @@ ShellCommandRunDrvCfg (
       Language = AllocateZeroPool(StrSize(Lang));\r
       AsciiSPrint(Language, StrSize(Lang), "%S", Lang);\r
     } else if (ShellCommandLineGetFlag(Package, L"-l")){\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg",  L"-l");\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto Done;\r
     }\r
@@ -1219,24 +1230,24 @@ ShellCommandRunDrvCfg (
     }\r
 \r
     if (InFromFile && EFI_ERROR(ShellFileExists(FileName))) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellDriver1HiiHandle, FileName);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FIND_FAIL), gShellDriver1HiiHandle, L"drvcfg", FileName);  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto Done;      \r
     }\r
     if (OutToFile && !EFI_ERROR(ShellFileExists(FileName))) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_EXIST), gShellDriver1HiiHandle, FileName);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_EXIST), gShellDriver1HiiHandle, L"drvcfg", FileName);  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto Done;      \r
     }\r
     if (Force && ForceTypeString == NULL) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-f");\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg", L"-f");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto Done;\r
     } \r
     if (Force) {\r
       Status = ShellConvertStringToUint64(ForceTypeString, &Intermediate, FALSE, FALSE);\r
       if (EFI_ERROR(Status)) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDriver1HiiHandle, L"-f");\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDriver1HiiHandle, L"drvcfg", ForceTypeString, L"-f");  \r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto Done;\r
       }\r
@@ -1249,7 +1260,7 @@ ShellCommandRunDrvCfg (
     if (HandleIndex1 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex1, &Intermediate, TRUE, FALSE))) {\r
       Handle1 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
       if (Handle1 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, HandleIndex1);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex1);  \r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto Done;\r
       }\r
@@ -1259,7 +1270,7 @@ ShellCommandRunDrvCfg (
     if (HandleIndex2 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex2, &Intermediate, TRUE, FALSE))) {\r
       Handle2 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
       if (Handle2 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, HandleIndex2);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex2);  \r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto Done;\r
       }\r
@@ -1269,7 +1280,7 @@ ShellCommandRunDrvCfg (
     if (HandleIndex3 != NULL && !EFI_ERROR(ShellConvertStringToUint64(HandleIndex3, &Intermediate, TRUE, FALSE))) {\r
       Handle3 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
       if (Handle3 == NULL || (UINT64)(UINTN)Intermediate != Intermediate) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, HandleIndex3);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"drvcfg", HandleIndex3);  \r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto Done;\r
       }\r
@@ -1277,42 +1288,42 @@ ShellCommandRunDrvCfg (
 \r
     if ((InFromFile || OutToFile) && (FileName == NULL)) {\r
       if (FileName == NULL) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, InFromFile?L"-i":L"-o");\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"drvcfg",  InFromFile?L"-i":L"-o");  \r
       } else {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_REQ), gShellDriver1HiiHandle);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_REQ), gShellDriver1HiiHandle, L"drvcfg");  \r
       }\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto Done;\r
     }\r
     if (!UseHii && (InFromFile || OutToFile)) {\r
       if (InFromFile) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"-i");\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-i");  \r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto Done;\r
       } \r
       if (OutToFile) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"-o");\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDriver1HiiHandle, L"drvcfg", L"-o");  \r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto Done;\r
       }\r
     }\r
     if (Validate && Force) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-v", L"-f");\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-f");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto Done;\r
     } \r
     if (Validate && Set) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-v", L"-s");\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-v", L"-s");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto Done;\r
     } \r
     if (Set && Force) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-s", L"-f");\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-s", L"-f");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto Done;\r
     }\r
     if (OutToFile && InFromFile) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONF), gShellDriver1HiiHandle, L"-i", L"-o");\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CONFLICT), gShellDriver1HiiHandle, L"drvcfg", L"-i", L"-o");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto Done;\r
     }\r