fix build error on ICC compile.

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

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index 79c12b460729af4a70555a9f796409b4519c949c..5406249f450175d7d2451cd9ede470b4a2e8dbe3 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -802,7 +802,8 @@ CallDeviceManager (
   //\r
   if (mNextShowFormId == NETWORK_DEVICE_FORM_ID) {\r
     String = HiiGetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NULL);\r
-    NewStringLen = (StrLen(String) + StrLen(mSelectedMacAddrString) + 2) * 2;\r
+    NewStringLen = StrLen(mSelectedMacAddrString);\r
+    NewStringLen += (StrLen(String) + 2) * 2;\r
     NewStringTitle = AllocatePool (NewStringLen);\r
     UnicodeSPrint (NewStringTitle, NewStringLen, L"%s %s", String, mSelectedMacAddrString);\r
     HiiSetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);    \r
@@ -827,7 +828,7 @@ CallDeviceManager (
   //\r
   // According to the next show Form id(mNextShowFormId) to decide which form need to update.\r
   //\r
-  StartLabel->Number       = LABEL_FORM_ID_OFFSET + mNextShowFormId;\r
+  StartLabel->Number       = (UINT16) (LABEL_FORM_ID_OFFSET + mNextShowFormId);\r
 \r
   //\r
   // Create Hii Extend Label OpCode as the end opcode\r
@@ -1064,7 +1065,7 @@ CallDeviceManager (
   if(mNextShowFormId - 1 < DEVICE_MANAGER_FORM_ID) {\r
     mNextShowFormId = DEVICE_MANAGER_FORM_ID;\r
   } else {\r
-    mNextShowFormId = mNextShowFormId - 1;\r
+    mNextShowFormId = (UINT16) (mNextShowFormId - 1);\r
     gCallbackKey = FRONT_PAGE_KEY_DEVICE_MANAGER;\r
   }\r
 \r