Fix ICC build failures

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

3 files changed, 9 insertions, 7 deletions

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationFunction.c
index 525459dad9..55dce0a791 100644
--- 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);

   SmbiosRecord->Hdr.Handle = 0; 

   SmbiosRecord->SlotDesignation = 1;

-  SmbiosRecord->SlotType = ForType9InputData->SlotType;

-  SmbiosRecord->SlotDataBusWidth = ForType9InputData->SlotDataBusWidth;

-  SmbiosRecord->CurrentUsage = ForType9InputData->SlotUsage;

-  SmbiosRecord->SlotLength = ForType9InputData->SlotLength;

+  SmbiosRecord->SlotType = (UINT8)ForType9InputData->SlotType;

+  SmbiosRecord->SlotDataBusWidth = (UINT8)ForType9InputData->SlotDataBusWidth;

+  SmbiosRecord->CurrentUsage = (UINT8)ForType9InputData->SlotUsage;

+  SmbiosRecord->SlotLength = (UINT8)ForType9InputData->SlotLength;

   SmbiosRecord->SlotID = ForType9InputData->SlotId;

   

   //

diff --git a/Nt32Pkg/StallPei/Stall.c b/Nt32Pkg/StallPei/Stall.c
index 34e5d68d46..e4ff7420dc 100644
--- a/Nt32Pkg/StallPei/Stall.c
+++ b/Nt32Pkg/StallPei/Stall.c
@@ -104,4 +104,3 @@ Stall (
   

   return EFI_SUCCESS;

 }

-  
\ No newline at end of file
diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
index 2840d5f99f..167423dea1 100644
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
@@ -544,6 +544,7 @@ Returns:
   WIN_NT_EFI_FILE_PRIVATE           *PrivateFile;

   EFI_TPL                           OldTpl;

   CHAR16                            *TempFileName;

+  UINTN                             Size;

 

   if (This == NULL || Root == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -613,10 +614,12 @@ Returns:
   //

   // Find the first file under it

   //

+  Size  = StrSize (PrivateFile->FilePath);

+  Size += StrSize (L"\\*");

   Status = gBS->AllocatePool (

                   EfiBootServicesData,

-                  StrSize (PrivateFile->FilePath) + StrSize (L"\\*"),

-                  &TempFileName

+                  Size,

+                  (VOID **)&TempFileName

                   );

   if (EFI_ERROR (Status)) {

     goto Done;