Fix ICC build failures

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

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
index 525459dad9aaf97bbc34c5c5968cc951c319a080..55dce0a79166c56622be31630143f88fe67909db 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
@@ -70,10 +70,10 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemSlotDesignation)
   SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE9);\r
   SmbiosRecord->Hdr.Handle = 0; \r
   SmbiosRecord->SlotDesignation = 1;\r
-  SmbiosRecord->SlotType = ForType9InputData->SlotType;\r
-  SmbiosRecord->SlotDataBusWidth = ForType9InputData->SlotDataBusWidth;\r
-  SmbiosRecord->CurrentUsage = ForType9InputData->SlotUsage;\r
-  SmbiosRecord->SlotLength = ForType9InputData->SlotLength;\r
+  SmbiosRecord->SlotType = (UINT8)ForType9InputData->SlotType;\r
+  SmbiosRecord->SlotDataBusWidth = (UINT8)ForType9InputData->SlotDataBusWidth;\r
+  SmbiosRecord->CurrentUsage = (UINT8)ForType9InputData->SlotUsage;\r
+  SmbiosRecord->SlotLength = (UINT8)ForType9InputData->SlotLength;\r
   SmbiosRecord->SlotID = ForType9InputData->SlotId;\r
   \r
   //\r

diff --git a/Nt32Pkg/StallPei/Stall.c b/Nt32Pkg/StallPei/Stall.c
index 34e5d68d4650dcdd730a935cf14e6cc69475732b..e4ff7420dc54327dbb4b503d465ceda16216a83a 100644 (file)
--- a/Nt32Pkg/StallPei/Stall.c
+++ b/Nt32Pkg/StallPei/Stall.c
@@ -104,4 +104,3 @@ Stall (
   \r
   return EFI_SUCCESS;\r
 }\r
-  
\ No newline at end of file

diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
index 2840d5f99f83babb4f6a75c0dbf98850e53f1667..167423dea1c0352907da639eb41f88047ab50dd9 100644 (file)
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
@@ -544,6 +544,7 @@ Returns:
   WIN_NT_EFI_FILE_PRIVATE           *PrivateFile;\r
   EFI_TPL                           OldTpl;\r
   CHAR16                            *TempFileName;\r
+  UINTN                             Size;\r
 \r
   if (This == NULL || Root == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -613,10 +614,12 @@ Returns:
   //\r
   // Find the first file under it\r
   //\r
+  Size  = StrSize (PrivateFile->FilePath);\r
+  Size += StrSize (L"\\*");\r
   Status = gBS->AllocatePool (\r
                   EfiBootServicesData,\r
-                  StrSize (PrivateFile->FilePath) + StrSize (L"\\*"),\r
-                  &TempFileName\r
+                  Size,\r
+                  (VOID **)&TempFileName\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r