summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>2008-01-16 10:36:30 +0000
committerqhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>2008-01-16 10:36:30 +0000
commitdd36ba3f533571550f798f492b0a96ce1c5f3c74 (patch)
tree0701047ed1a2c08ef839aa7500d7fdd6928d416a
parentf3246ea4fd0ca39c58bfa24bdcccd7fe24fc0e08 (diff)
downloadedk2-dd36ba3f533571550f798f492b0a96ce1c5f3c74.zip
edk2-dd36ba3f533571550f798f492b0a96ce1c5f3c74.tar.gz
edk2-dd36ba3f533571550f798f492b0a96ce1c5f3c74.tar.bz2
ICC cleanup for IA32 & x64
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UefiHiiEnable4354@4567 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--MdeModulePkg/Universal/UefiHiiDatabaseDxe/Image.c4
-rw-r--r--MdeModulePkg/Universal/UefiSetupBrowserDxe/IfrParse.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/MdeModulePkg/Universal/UefiHiiDatabaseDxe/Image.c b/MdeModulePkg/Universal/UefiHiiDatabaseDxe/Image.c
index 778a82a..06d783a 100644
--- a/MdeModulePkg/Universal/UefiHiiDatabaseDxe/Image.c
+++ b/MdeModulePkg/Universal/UefiHiiDatabaseDxe/Image.c
@@ -374,7 +374,7 @@ Output4bitPixel (
Palette = AllocateZeroPool (PaletteSize);
ASSERT (Palette != NULL);
CopyMem (Palette, PaletteInfo, PaletteSize);
- PaletteNum = Palette->PaletteSize / sizeof (EFI_HII_RGB_PIXEL);
+ PaletteNum = (UINT16)(Palette->PaletteSize / sizeof (EFI_HII_RGB_PIXEL));
ZeroMem (PaletteValue, sizeof (PaletteValue));
CopyRgbToGopPixel (PaletteValue, Palette->PaletteValue, PaletteNum);
@@ -446,7 +446,7 @@ Output8bitPixel (
Palette = AllocateZeroPool (PaletteSize);
ASSERT (Palette != NULL);
CopyMem (Palette, PaletteInfo, PaletteSize);
- PaletteNum = Palette->PaletteSize / sizeof (EFI_HII_RGB_PIXEL);
+ PaletteNum = (UINT16)(Palette->PaletteSize / sizeof (EFI_HII_RGB_PIXEL));
ZeroMem (PaletteValue, sizeof (PaletteValue));
CopyRgbToGopPixel (PaletteValue, Palette->PaletteValue, PaletteNum);
SafeFreePool (Palette);
diff --git a/MdeModulePkg/Universal/UefiSetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/UefiSetupBrowserDxe/IfrParse.c
index a5251f0..0187a99 100644
--- a/MdeModulePkg/Universal/UefiSetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/UefiSetupBrowserDxe/IfrParse.c
@@ -1198,7 +1198,7 @@ ParseOpCodes (
CurrentStatement->Flags = ((EFI_IFR_ORDERED_LIST *) OpCodeData)->Flags;
CurrentStatement->MaxContainers = ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers;
- CurrentStatement->StorageWidth = CurrentStatement->MaxContainers * sizeof (UINT8);
+ CurrentStatement->StorageWidth = (UINT16)(CurrentStatement->MaxContainers * sizeof (UINT8));
InitializeRequestElement (FormSet, CurrentStatement);
//
@@ -1234,7 +1234,7 @@ ParseOpCodes (
//
CurrentStatement->Minimum = ((EFI_IFR_STRING *) OpCodeData)->MinSize;
CurrentStatement->Maximum = ((EFI_IFR_STRING *) OpCodeData)->MaxSize;
- CurrentStatement->StorageWidth = ((UINT16) CurrentStatement->Maximum) * sizeof (UINT16);
+ CurrentStatement->StorageWidth = (UINT16)(CurrentStatement->Maximum * sizeof (UINT16));
CurrentStatement->Flags = ((EFI_IFR_STRING *) OpCodeData)->Flags;
CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_STRING;
@@ -1253,7 +1253,7 @@ ParseOpCodes (
//
CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_PASSWORD *) OpCodeData)->MinSize, sizeof (UINT16));
CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_PASSWORD *) OpCodeData)->MaxSize, sizeof (UINT16));
- CurrentStatement->StorageWidth = ((UINT16) CurrentStatement->Maximum) * sizeof (UINT16);
+ CurrentStatement->StorageWidth = (UINT16)(CurrentStatement->Maximum * sizeof (UINT16));
CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_STRING;
CurrentStatement->BufferValue = AllocateZeroPool (CurrentStatement->StorageWidth);