Fix ICC compiler error.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8071 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index 6c2cd91184a36fc3f22099ebb4383b5dcebb485e..997e36aeb11dea84f00a94147259591f560de8d1 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -700,7 +700,7 @@ InternalHiiLowerConfigString (
     } else if (*String == L'&') {\r
       Lower = FALSE;\r
     } else if (Lower && *String > L'A' && *String <= L'F') {\r
-      *String = *String - L'A' + L'a';\r
+      *String = (CHAR16) (*String - L'A' + L'a');\r
     }\r
   }\r
 \r
@@ -1093,6 +1093,8 @@ HiiConstructConfigAltResp (
   VA_LIST       Args;\r
   UINTN         AltCfgId;\r
   UINT16        Width;\r
+  UINT16        OffsetValue;\r
+  UINT16        WidthValue;\r
 \r
   ASSERT (Guid != NULL);\r
   ASSERT (Name != NULL);\r
@@ -1156,13 +1158,16 @@ HiiConstructConfigAltResp (
     //\r
     // Append &OFFSET=XXXX&WIDTH=YYYY\r
     //\r
+    OffsetValue = ReadUnaligned16 ((UINT16 *)Buffer);\r
+    WidthValue  = ReadUnaligned16 ((UINT16 *)(Buffer + sizeof (UINT16)));\r
     UnicodeSPrint (\r
       String, \r
       (8 + 4 + 7 + 4) * sizeof (CHAR16), \r
       L"&OFFSET=%04X&WIDTH=%04X", \r
-      ReadUnaligned16 ((UINT16 *)Buffer), \r
-      ReadUnaligned16 ((UINT16 *)(Buffer + sizeof (UINT16)))\r
-      );\r
+      OffsetValue, \r
+      WidthValue\r
+    );\r
+\r
     String += StrLen (String);\r
     Buffer += (sizeof (UINT16) + sizeof (UINT16));\r
   }\r
@@ -1491,9 +1496,10 @@ HiiGetBrowserData (
   }\r
 \r
   //\r
-  // Construct <ConfigResp>\r
+  // Construct <ConfigResp> mConfigHdrTemplate L'&' ResultsData L'\0'\r
   //\r
-  Size = (StrLen (mConfigHdrTemplate) + 1 + StrLen (ResultsData) + 1) * sizeof (CHAR16);\r
+  Size = (StrLen (mConfigHdrTemplate) + 1) * sizeof (CHAR16);\r
+  Size = Size + (StrLen (ResultsData) + 1) * sizeof (CHAR16);\r
   ConfigResp = AllocateZeroPool (Size);\r
   UnicodeSPrint (ConfigResp, Size, L"%s&%s", mConfigHdrTemplate, ResultsData);\r
   \r
@@ -1568,7 +1574,8 @@ HiiSetBrowserData (
     // Allocate and fill a buffer large enough to hold the <ConfigHdr> template \r
     // followed by <RequestElement> followed by a Null-terminator\r
     //\r
-    Size = (StrLen (mConfigHdrTemplate) + StrLen (RequestElement) + 1) * sizeof (CHAR16);\r
+    Size = StrLen (mConfigHdrTemplate) * sizeof (CHAR16);\r
+    Size = Size + (StrLen (RequestElement) + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     UnicodeSPrint (ConfigRequest, Size, L"%s%s", mConfigHdrTemplate, RequestElement);\r
   }\r
@@ -1957,7 +1964,7 @@ HiiCreateGuidOpCode (
   ASSERT (OpCodeSize >= sizeof (OpCode));\r
 \r
   ZeroMem (&OpCode, sizeof (OpCode));\r
-  CopyGuid (&OpCode.Guid, Guid);\r
+  CopyGuid ((EFI_GUID *)(VOID *)&OpCode.Guid, Guid);\r
 \r
   OpCodePointer = (EFI_IFR_GUID *)InternalHiiCreateOpCodeExtended (\r
                                     OpCodeHandle, \r