Refine some code to make the code run safely.

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
index 42cb9b55ff9293c53ed920b95cf7ebf32adbb996..dda168607f3414a2cb054480e36e70f56a52cc4c 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
@@ -193,7 +193,7 @@ F2UCreateTextOpCode (
     ZeroMem (&UTextOpCode, sizeof(UTextOpCode));\r
     \r
     UTextOpCode.Header.OpCode = EFI_IFR_TEXT_OP;\r
-    UTextOpCode.Header.Length = sizeof (EFI_IFR_TEXT);\r
+    UTextOpCode.Header.Length = (UINT8) sizeof (EFI_IFR_TEXT);\r
 \r
     UTextOpCode.Statement.Help   = FwOpcode->Help;\r
 \r
@@ -229,7 +229,7 @@ F2UCreateReferenceOpCode (
 \r
   ZeroMem (&UOpcode, sizeof(UOpcode));\r
 \r
-  UOpcode.Header.Length = sizeof(UOpcode);\r
+  UOpcode.Header.Length = (UINT8) sizeof (UOpcode);\r
   UOpcode.Header.OpCode = EFI_IFR_REF_OP;\r
 \r
   UOpcode.Question.Header.Prompt = FwOpcode->Prompt;\r
@@ -269,7 +269,7 @@ F2UCreateOneOfOptionOpCode (
 \r
   ZeroMem (&UOpcode, sizeof(UOpcode));\r
 \r
-  UOpcode.Header.Length = sizeof(UOpcode);\r
+  UOpcode.Header.Length = (UINT8) sizeof (UOpcode);\r
   UOpcode.Header.OpCode = EFI_IFR_ONE_OF_OPTION_OP;\r
 \r
   UOpcode.Option        = FwOpcode->Option;\r
@@ -374,7 +374,7 @@ F2UCreateOneOfOpCode (
   ZeroMem (&UOpcode, sizeof(UOpcode));\r
   *OpcodeCount = 0;\r
 \r
-  UOpcode.Header.Length = sizeof(UOpcode);\r
+  UOpcode.Header.Length = (UINT8) sizeof (UOpcode);\r
   UOpcode.Header.OpCode = EFI_IFR_ONE_OF_OP;\r
   UOpcode.Header.Scope  = 1;\r
 \r
@@ -491,7 +491,7 @@ F2UCreateOrderedListOpCode (
   ZeroMem (&UOpcode, sizeof(UOpcode));\r
   *OpcodeCount = 0;\r
 \r
-  UOpcode.Header.Length = sizeof(UOpcode);\r
+  UOpcode.Header.Length = (UINT8) sizeof (UOpcode);\r
   UOpcode.Header.OpCode = EFI_IFR_ORDERED_LIST_OP;\r
   UOpcode.Header.Scope  = 1;\r
 \r
@@ -587,7 +587,7 @@ F2UCreateCheckBoxOpCode (
 \r
   ZeroMem (&UOpcode, sizeof(UOpcode));\r
 \r
-  UOpcode.Header.Length = sizeof(UOpcode);\r
+  UOpcode.Header.Length = (UINT8) sizeof (UOpcode);\r
   UOpcode.Header.OpCode = EFI_IFR_CHECKBOX_OP;\r
 \r
   UOpcode.Question.Header.Prompt = FwOpcode->Prompt;\r
@@ -667,7 +667,7 @@ F2UCreateNumericOpCode (
     UOpcode.Question.QuestionId    = FwOpcode->Key;\r
   }\r
 \r
-  UOpcode.Header.Length = sizeof(UOpcode);\r
+  UOpcode.Header.Length = (UINT8) sizeof (UOpcode);\r
   UOpcode.Header.OpCode = EFI_IFR_NUMERIC_OP;\r
   //\r
   // We need to create a nested default value for the UEFI Numeric Opcode.\r
@@ -786,7 +786,7 @@ F2UCreateStringOpCode (
     UOpcode.Question.QuestionId    = FwOpcode->Key;\r
   }\r
 \r
-  UOpcode.Header.Length = sizeof(UOpcode);\r
+  UOpcode.Header.Length = (UINT8) sizeof (UOpcode);\r
   UOpcode.Header.OpCode = EFI_IFR_STRING_OP;\r
 \r
   UOpcode.Question.Header.Prompt = FwOpcode->Prompt;\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrParser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrParser.c
index 26af99142ea67e5eeea2be65d5193a64724b0121..3d39a9e1b612f726c08f73042fd4e7be1cb21ac4 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrParser.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrParser.c
@@ -805,7 +805,7 @@ ParseOpCodes (
         CurrentStatement->Minimum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MinValue;\r
         CurrentStatement->Maximum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MaxValue;\r
         CurrentStatement->Step    = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.Step;\r
-        CurrentStatement->StorageWidth = sizeof (UINT8);\r
+        CurrentStatement->StorageWidth = (UINT16) sizeof (UINT8);\r
         Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
         break;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
index 21d48d72390fb9b239458cee4911838b279d0410..ea54c4bc0f419b131604c044f21d4379c3bc0f0b 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
@@ -58,7 +58,7 @@ Abstract:
 #define SetDevicePathEndNode(a)  {                       \\r
           (a)->Type = END_DEVICE_PATH_TYPE;              \\r
           (a)->SubType = END_ENTIRE_DEVICE_PATH_SUBTYPE; \\r
-          (a)->Length[0] = sizeof(EFI_DEVICE_PATH_PROTOCOL);      \\r
+          (a)->Length[0] = (UINT8) sizeof (EFI_DEVICE_PATH_PROTOCOL);      \\r
           (a)->Length[1] = 0;                            \\r
           }\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrOpCodeCreation.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrOpCodeCreation.c
index 6bf71d22be0208c2b60e437848a7470a65b23ed1..98b949d3b64a4e63d39d4e4c13d87d69336a99d5 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrOpCodeCreation.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrOpCodeCreation.c
@@ -51,7 +51,7 @@ Returns:
   EFI_IFR_SUBTITLE  Subtitle;\r
 \r
   Subtitle.Header.OpCode  = EFI_IFR_SUBTITLE_OP;\r
-  Subtitle.Header.Length  = sizeof (EFI_IFR_SUBTITLE);\r
+  Subtitle.Header.Length  = (UINT8) sizeof (EFI_IFR_SUBTITLE);\r
   Subtitle.SubTitle       = StringToken;\r
 \r
   EfiCopyMem (FormBuffer, &Subtitle, sizeof (EFI_IFR_SUBTITLE));\r
@@ -100,7 +100,7 @@ Returns:
   EFI_IFR_TEXT  Text;\r
 \r
   Text.Header.OpCode  = EFI_IFR_TEXT_OP;\r
-  Text.Header.Length  = sizeof (EFI_IFR_TEXT);\r
+  Text.Header.Length  = (UINT8) sizeof (EFI_IFR_TEXT);\r
   Text.Text           = StringToken;\r
 \r
   Text.TextTwo        = StringTokenTwo;\r
@@ -155,7 +155,7 @@ Returns:
   EFI_IFR_REF Hyperlink;\r
 \r
   Hyperlink.Header.OpCode = EFI_IFR_REF_OP;\r
-  Hyperlink.Header.Length = sizeof (EFI_IFR_REF);\r
+  Hyperlink.Header.Length = (UINT8) sizeof (EFI_IFR_REF);\r
   Hyperlink.FormId        = FormId;\r
   Hyperlink.Prompt        = StringToken;\r
   Hyperlink.Help          = StringTokenTwo;\r
@@ -228,7 +228,7 @@ Returns:
   }\r
 \r
   OneOf.Header.OpCode = EFI_IFR_ONE_OF_OP;\r
-  OneOf.Header.Length = sizeof (EFI_IFR_ONE_OF);\r
+  OneOf.Header.Length = (UINT8) sizeof (EFI_IFR_ONE_OF);\r
   OneOf.QuestionId    = QuestionId;\r
   OneOf.Width         = DataWidth;\r
   OneOf.Prompt        = PromptToken;\r
@@ -316,7 +316,7 @@ Returns:
   UINT8                 *LocalBuffer;\r
 \r
   OrderedList.Header.OpCode = EFI_IFR_ORDERED_LIST_OP;\r
-  OrderedList.Header.Length = sizeof (EFI_IFR_ORDERED_LIST);\r
+  OrderedList.Header.Length = (UINT8) sizeof (EFI_IFR_ORDERED_LIST);\r
   OrderedList.QuestionId    = QuestionId;\r
   OrderedList.MaxEntries    = MaxEntries;\r
   OrderedList.Prompt        = PromptToken;\r
@@ -406,7 +406,7 @@ Returns:
   }\r
 \r
   CheckBox.Header.OpCode  = EFI_IFR_CHECKBOX_OP;\r
-  CheckBox.Header.Length  = sizeof (EFI_IFR_CHECK_BOX);\r
+  CheckBox.Header.Length  = (UINT8) sizeof (EFI_IFR_CHECK_BOX);\r
   CheckBox.QuestionId     = QuestionId;\r
   CheckBox.Width          = DataWidth;\r
   CheckBox.Prompt         = PromptToken;\r
@@ -486,7 +486,7 @@ Returns:
   }\r
 \r
   Numeric.Header.OpCode = EFI_IFR_NUMERIC_OP;\r
-  Numeric.Header.Length = sizeof (EFI_IFR_NUMERIC);\r
+  Numeric.Header.Length = (UINT8) sizeof (EFI_IFR_NUMERIC);\r
   Numeric.QuestionId    = QuestionId;\r
   Numeric.Width         = DataWidth;\r
   Numeric.Prompt        = PromptToken;\r
@@ -555,7 +555,7 @@ Returns:
   EFI_IFR_STRING  String;\r
 \r
   String.Header.OpCode  = EFI_IFR_STRING_OP;\r
-  String.Header.Length  = sizeof (EFI_IFR_STRING);\r
+  String.Header.Length  = (UINT8) sizeof (EFI_IFR_STRING);\r
   String.QuestionId     = QuestionId;\r
   String.Width          = DataWidth;\r
   String.Prompt         = PromptToken;\r
@@ -604,7 +604,7 @@ Returns:
   EFI_IFR_BANNER  Banner;\r
 \r
   Banner.Header.OpCode  = EFI_IFR_BANNER_OP;\r
-  Banner.Header.Length  = sizeof (EFI_IFR_BANNER);\r
+  Banner.Header.Length  = (UINT8) sizeof (EFI_IFR_BANNER);\r
   EfiCopyMem (&Banner.Title, &Title, sizeof (UINT16));\r
   EfiCopyMem (&Banner.LineNumber, &LineNumber, sizeof (UINT16));\r
   Banner.Alignment = Alignment;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c
index 73f3143e5cccc8fe5e297e9d45ad4bda4ba5f57a..c46bc7d73ec21ecb1bece88632fb2ab5b0b003cd 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c
@@ -84,7 +84,7 @@ CreateEndOpCode (
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
 \r
-  End.Header.Length  = sizeof (EFI_IFR_END);\r
+  End.Header.Length  = (UINT8) sizeof (EFI_IFR_END);\r
   End.Header.OpCode  = EFI_IFR_END_OP;\r
   End.Header.Scope   = 0;\r
 \r
@@ -116,7 +116,7 @@ CreateDefaultOpCode (
   }\r
 \r
   Default.Header.OpCode = EFI_IFR_DEFAULT_OP;\r
-  Default.Header.Length = sizeof (EFI_IFR_DEFAULT);\r
+  Default.Header.Length = (UINT8) sizeof (EFI_IFR_DEFAULT);\r
   Default.Header.Scope  = 0;\r
   Default.Type          = Type;\r
   Default.DefaultId     = EFI_HII_DEFAULT_CLASS_STANDARD;\r
@@ -153,7 +153,7 @@ CreateActionOpCode (
   }\r
 \r
   Action.Header.OpCode          = EFI_IFR_ACTION_OP;\r
-  Action.Header.Length          = sizeof (EFI_IFR_ACTION);\r
+  Action.Header.Length          = (UINT8) sizeof (EFI_IFR_ACTION);\r
   Action.Header.Scope           = 0;\r
   Action.Question.QuestionId    = QuestionId;\r
   Action.Question.Header.Prompt = Prompt;\r
@@ -188,7 +188,7 @@ CreateSubTitleOpCode (
   }\r
 \r
   Subtitle.Header.OpCode    = EFI_IFR_SUBTITLE_OP;\r
-  Subtitle.Header.Length    = sizeof (EFI_IFR_SUBTITLE);\r
+  Subtitle.Header.Length    = (UINT8) sizeof (EFI_IFR_SUBTITLE);\r
   Subtitle.Header.Scope     = Scope;\r
   Subtitle.Statement.Prompt = Prompt;\r
   Subtitle.Statement.Help   = Help;\r
@@ -220,7 +220,7 @@ CreateTextOpCode (
   }\r
 \r
   Text.Header.OpCode    = EFI_IFR_TEXT_OP;\r
-  Text.Header.Length    = sizeof (EFI_IFR_TEXT);\r
+  Text.Header.Length    = (UINT8) sizeof (EFI_IFR_TEXT);\r
   Text.Header.Scope     = 0;\r
   Text.Statement.Prompt = Prompt;\r
   Text.Statement.Help   = Help;\r
@@ -257,7 +257,7 @@ CreateGotoOpCode (
   }\r
 \r
   Goto.Header.OpCode          = EFI_IFR_REF_OP;\r
-  Goto.Header.Length          = sizeof (EFI_IFR_REF);\r
+  Goto.Header.Length          = (UINT8) sizeof (EFI_IFR_REF);\r
   Goto.Header.Scope           = 0;\r
   Goto.Question.Header.Prompt = Prompt;\r
   Goto.Question.Header.Help   = Help;\r
@@ -297,7 +297,7 @@ CreateOneOfOptionOpCode (
 \r
   for (Index = 0; Index < OptionCount; Index++) {\r
     OneOfOption.Header.OpCode = EFI_IFR_ONE_OF_OPTION_OP;\r
-    OneOfOption.Header.Length = sizeof (EFI_IFR_ONE_OF_OPTION);\r
+    OneOfOption.Header.Length = (UINT8) sizeof (EFI_IFR_ONE_OF_OPTION);\r
     OneOfOption.Header.Scope  = 0;\r
 \r
     OneOfOption.Option        = OptionsList[Index].StringToken;\r
@@ -345,7 +345,7 @@ CreateOneOfOpCode (
   }\r
 \r
   OneOf.Header.OpCode                   = EFI_IFR_ONE_OF_OP;\r
-  OneOf.Header.Length                   = sizeof (EFI_IFR_ONE_OF);\r
+  OneOf.Header.Length                   = (UINT8) sizeof (EFI_IFR_ONE_OF);\r
   OneOf.Header.Scope                    = 1;\r
   OneOf.Question.Header.Prompt          = Prompt;\r
   OneOf.Question.Header.Help            = Help;\r
@@ -406,7 +406,7 @@ CreateOrderedListOpCode (
   }\r
 \r
   OrderedList.Header.OpCode                   = EFI_IFR_ORDERED_LIST_OP;\r
-  OrderedList.Header.Length                   = sizeof (EFI_IFR_ORDERED_LIST);\r
+  OrderedList.Header.Length                   = (UINT8) sizeof (EFI_IFR_ORDERED_LIST);\r
   OrderedList.Header.Scope                    = 1;\r
   OrderedList.Question.Header.Prompt          = Prompt;\r
   OrderedList.Question.Header.Help            = Help;\r
@@ -454,7 +454,7 @@ CreateCheckBoxOpCode (
   }\r
 \r
   CheckBox.Header.OpCode                   = EFI_IFR_CHECKBOX_OP;\r
-  CheckBox.Header.Length                   = sizeof (EFI_IFR_CHECKBOX);\r
+  CheckBox.Header.Length                   = (UINT8) sizeof (EFI_IFR_CHECKBOX);\r
   CheckBox.Header.Scope                    = 0;\r
   CheckBox.Question.QuestionId             = QuestionId;\r
   CheckBox.Question.VarStoreId             = VarStoreId;\r
@@ -506,7 +506,7 @@ CreateNumericOpCode (
   }\r
 \r
   Numeric.Header.OpCode                   = EFI_IFR_NUMERIC_OP;\r
-  Numeric.Header.Length                   = sizeof (EFI_IFR_NUMERIC);\r
+  Numeric.Header.Length                   = (UINT8) sizeof (EFI_IFR_NUMERIC);\r
   Numeric.Header.Scope                    = 1;\r
   Numeric.Question.QuestionId             = QuestionId;\r
   Numeric.Question.VarStoreId             = VarStoreId;\r
@@ -587,7 +587,7 @@ CreateStringOpCode (
   }\r
 \r
   String.Header.OpCode                   = EFI_IFR_STRING_OP;\r
-  String.Header.Length                   = sizeof (EFI_IFR_STRING);\r
+  String.Header.Length                   = (UINT8) sizeof (EFI_IFR_STRING);\r
   String.Header.Scope                    = 0;\r
   String.Question.Header.Prompt          = Prompt;\r
   String.Question.Header.Help            = Help;\r
@@ -624,7 +624,7 @@ CreateBannerOpCode (
   }\r
 \r
   Banner.Header.OpCode  = EFI_IFR_GUID_OP;\r
-  Banner.Header.Length  = sizeof (EFI_IFR_GUID_BANNER);\r
+  Banner.Header.Length  = (UINT8) sizeof (EFI_IFR_GUID_BANNER);\r
   Banner.Header.Scope   = 0;\r
   EfiCopyMem (&Banner.Guid, &mIfrVendorGuid, sizeof (EFI_IFR_GUID));\r
   Banner.ExtendOpCode   = EFI_IFR_EXTEND_OP_BANNER;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c
index 01bad650010edd980677e910738eb297f18afa1f..0a5739965aa84009a0ea7207f2c801b57ac93742 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c
@@ -489,6 +489,7 @@ Returns:
   EFI_HII_HANDLE  *HiiHandleBuffer;\r
   EFI_GUID        Guid;\r
 \r
+  HiiHandleBuffer = NULL;\r
   Status = GetHiiHandles (&HandleBufferLen, &HiiHandleBuffer);\r
   if (EFI_ERROR(Status)) {\r
     return Status;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivS64x64Remainder.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivS64x64Remainder.c
index 071d397369df510c9e11a23fea9cf93ffd48ff8c..a3a06a966fa7bae162e762f7942253b341ec5651 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivS64x64Remainder.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivS64x64Remainder.c
@@ -49,8 +49,8 @@ InternalMathDivRemS64x64 (
   INT64                             Quot;\r
 \r
   Quot = InternalMathDivRemU64x64 (\r
-           Dividend >= 0 ? Dividend : -Dividend,\r
-           Divisor >= 0 ? Divisor : -Divisor,\r
+           (UINT64) (Dividend >= 0 ? Dividend : -Dividend),\r
+           (UINT64) (Divisor >= 0 ? Divisor : -Divisor),\r
            (UINT64 *) Remainder\r
            );\r
   if (Remainder != NULL && Dividend < 0) {\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/MultS64x64.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/MultS64x64.c
index 7ed3d479ea8c060218acfcd86074b62d564f6c6a..62cbc8b8631e311bddef785baa7728f9d2d7acc7 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/MultS64x64.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/MultS64x64.c
@@ -45,5 +45,5 @@ MultS64x64 (
   IN      INT64                     Multiplier\r
   )\r
 {\r
-  return (INT64)MultU64x64 (Multiplicand, Multiplier);\r
+  return (INT64)MultU64x64 ((UINT64) Multiplicand, (UINT64) Multiplier);\r
 }\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/SynchronizationMsc.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/SynchronizationMsc.c
index da958c8bdab1a9588da71c15b0e104f1fb8f162f..871f25d58cb0603865b83e20a25b782b956062f2 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/SynchronizationMsc.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/SynchronizationMsc.c
@@ -353,7 +353,7 @@ InterlockedCompareExchangePointer (
 {\r
   UINT8  SizeOfValue;\r
 \r
-  SizeOfValue = sizeof (*Value);\r
+  SizeOfValue = (UINT8) sizeof (*Value);\r
 \r
   switch (SizeOfValue) {\r
     case sizeof (UINT32):\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
index f1aefeb87bd59db8adec353a031389449a5d49a9..35417810fdfbb14b9ab0c1203a238bb9c6add0b5 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
@@ -512,7 +512,7 @@ GlueReportStatusCodeEx (
   //\r
   // Fill in the extended data header\r
   //\r
-  StatusCodeData->HeaderSize = sizeof (EFI_STATUS_CODE_DATA);\r
+  StatusCodeData->HeaderSize = (UINT16) sizeof (EFI_STATUS_CODE_DATA);\r
   StatusCodeData->Size = (UINT16)ExtendedDataSize;\r
   if (ExtendedDataGuid == NULL) {\r
     ExtendedDataGuid = &gEfiStatusCodeSpecificDataGuid;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/HobLib.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/HobLib.c
index 7f360da430799dedab5a5c524ce9900a9ac66034..a7058989ae9fd3d3746b5acb5a4b3db627559038 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/HobLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiHobLib/HobLib.c
@@ -254,7 +254,7 @@ GlueBuildModuleHob (
 {\r
   EFI_HOB_MEMORY_ALLOCATION_MODULE  *Hob;\r
 \r
-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, sizeof (EFI_HOB_MEMORY_ALLOCATION_MODULE));\r
+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION_MODULE));\r
 \r
   CopyGuid (&(Hob->MemoryAllocationHeader.Name), &gEfiHobMemoryAllocModuleGuid);\r
   Hob->MemoryAllocationHeader.MemoryBaseAddress = MemoryAllocationModule;\r
@@ -295,7 +295,7 @@ BuildResourceDescriptorHob (
 {\r
   EFI_HOB_RESOURCE_DESCRIPTOR  *Hob;\r
 \r
-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, sizeof (EFI_HOB_RESOURCE_DESCRIPTOR));\r
+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_RESOURCE_DESCRIPTOR, (UINT16) sizeof (EFI_HOB_RESOURCE_DESCRIPTOR));\r
 \r
   Hob->ResourceType      = ResourceType;\r
   Hob->ResourceAttribute = ResourceAttribute;\r
@@ -402,7 +402,7 @@ BuildFvHob (
   // Check FV Signature\r
   //\r
   ASSERT (((EFI_FIRMWARE_VOLUME_HEADER*)((UINTN)BaseAddress))->Signature == EFI_FVH_SIGNATURE);\r
-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_FV, sizeof (EFI_HOB_FIRMWARE_VOLUME));\r
+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_FV, (UINT16) sizeof (EFI_HOB_FIRMWARE_VOLUME));\r
 \r
   Hob->BaseAddress = BaseAddress;\r
   Hob->Length      = Length;\r
@@ -429,7 +429,7 @@ BuildCvHob (
 {\r
   EFI_HOB_CAPSULE_VOLUME  *Hob;\r
 \r
-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_CV, sizeof (EFI_HOB_CAPSULE_VOLUME));\r
+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_CV, (UINT16) sizeof (EFI_HOB_CAPSULE_VOLUME));\r
 \r
   Hob->BaseAddress  = BaseAddress;\r
   Hob->Length       = Length;\r
@@ -456,7 +456,7 @@ BuildCpuHob (
 {\r
   EFI_HOB_CPU  *Hob;\r
 \r
-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_CPU, sizeof (EFI_HOB_CPU));\r
+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_CPU, (UINT16) sizeof (EFI_HOB_CPU));\r
 \r
   Hob->SizeOfMemorySpace = SizeOfMemorySpace;\r
   Hob->SizeOfIoSpace     = SizeOfIoSpace;\r
@@ -488,7 +488,7 @@ BuildStackHob (
 {\r
   EFI_HOB_MEMORY_ALLOCATION_STACK  *Hob;\r
 \r
-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, sizeof (EFI_HOB_MEMORY_ALLOCATION_STACK));\r
+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION_STACK));\r
 \r
   CopyGuid (&(Hob->AllocDescriptor.Name), &gEfiHobMemoryAllocStackGuid);\r
   Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;\r
@@ -524,7 +524,7 @@ BuildBspStoreHob (
 {\r
   EFI_HOB_MEMORY_ALLOCATION_BSP_STORE  *Hob;\r
 \r
-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, sizeof (EFI_HOB_MEMORY_ALLOCATION_BSP_STORE));\r
+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION_BSP_STORE));\r
 \r
   CopyGuid (&(Hob->AllocDescriptor.Name), &gEfiHobMemoryAllocBspStoreGuid);\r
   Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;\r
@@ -560,7 +560,7 @@ GlueBuildMemoryAllocationHob (
 {\r
   EFI_HOB_MEMORY_ALLOCATION  *Hob;\r
 \r
-  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, sizeof (EFI_HOB_MEMORY_ALLOCATION));\r
+  Hob = InternalPeiCreateHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION));\r
 \r
   ZeroMem (&(Hob->AllocDescriptor.Name), sizeof (EFI_GUID));\r
   Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index cea5b3c7d9ee1739aea1e59b0d170f19d13a30c7..05c42cdd5698ff09e26195a709d1cff6129e04e5 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -447,7 +447,7 @@ GlueReportStatusCodeEx (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   StatusCodeData = (EFI_STATUS_CODE_DATA  *)Buffer;\r
-  StatusCodeData->HeaderSize = sizeof (EFI_STATUS_CODE_DATA);\r
+  StatusCodeData->HeaderSize = (UINT16) sizeof (EFI_STATUS_CODE_DATA);\r
   StatusCodeData->Size = (UINT16)ExtendedDataSize;\r
   if (ExtendedDataGuid == NULL) {\r
     ExtendedDataGuid = &gEfiStatusCodeSpecificDataGuid;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeSupport.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeSupport.c
index 538c3d69e42aaa46737424866e5fb0c786479169..9cf56dbecab41d7e2f8a3131fac6d5656e7cebc0 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeSupport.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeSupport.c
@@ -319,7 +319,7 @@ InternalReportStatusCodeEx (
   //\r
   // Fill in the extended data header\r
   //\r
-  mStatusCodeData->HeaderSize = sizeof (EFI_STATUS_CODE_DATA);\r
+  mStatusCodeData->HeaderSize = (UINT16) sizeof (EFI_STATUS_CODE_DATA);\r
   mStatusCodeData->Size = (UINT16)ExtendedDataSize;\r
   if (ExtendedDataGuid == NULL) {\r
     ExtendedDataGuid = &gEfiStatusCodeSpecificDataGuid;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c
index 4f79ecd173d4eac1e1efd8769f8c2d8d59687ddd..023eda0b0e770a06641c42f026f56a352b3e49a4 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c
@@ -49,7 +49,7 @@ Returns:
 \r
 --*/\r
 {\r
-  Data->HeaderSize = sizeof (EFI_STATUS_CODE_DATA);\r
+  Data->HeaderSize = (UINT16) sizeof (EFI_STATUS_CODE_DATA);\r
   Data->Size = (UINT16)(DataSize - sizeof (EFI_STATUS_CODE_DATA));\r
   EfiCommonLibCopyMem (&Data->Type, TypeGuid, sizeof (EFI_GUID));\r
   \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.c b/EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.c
index 1692f9e56f0a431fb1245c6c0ba6b4e15c58d4c8..4672209739ef4671726f992be944682044fb5df8 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/Hob/PeiHobLib.c
@@ -52,7 +52,7 @@ Returns:
   Hob.Raw = HobStart;\r
   \r
   Hob.Header->HobType   = EFI_HOB_TYPE_END_OF_HOB_LIST;\r
-  Hob.Header->HobLength = sizeof(EFI_HOB_GENERIC_HEADER);\r
+  Hob.Header->HobLength = (UINT16) sizeof (EFI_HOB_GENERIC_HEADER);\r
 \r
   Hob.Header++;\r
   return Hob;\r
@@ -102,7 +102,7 @@ Returns:
   HandOffHob.Raw     = HobStart;\r
   Hob.Raw            = HobStart;\r
   Hob.Header->HobType   = EFI_HOB_TYPE_HANDOFF;\r
-  Hob.Header->HobLength = sizeof(EFI_HOB_HANDOFF_INFO_TABLE);\r
+  Hob.Header->HobLength = (UINT16) sizeof (EFI_HOB_HANDOFF_INFO_TABLE);\r
 \r
   Hob.HandoffInformationTable->Version        = Version;\r
   Hob.HandoffInformationTable->BootMode       = BootMode;\r
@@ -161,7 +161,7 @@ Returns:
   Hob.Raw = (VOID*)(UINTN)(HandOffHob.HandoffInformationTable->EfiEndOfHobList);\r
 \r
   Hob.Header->HobType   = EFI_HOB_TYPE_MEMORY_ALLOCATION;\r
-  Hob.Header->HobLength = sizeof(EFI_HOB_MEMORY_ALLOCATION_MODULE);\r
+  Hob.Header->HobLength = (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION_MODULE);\r
   \r
   CopyMem(&(Hob.MemoryAllocationModule->ModuleName), ModuleName, sizeof(EFI_GUID));\r
   CopyMem(&(Hob.MemoryAllocationModule->MemoryAllocationHeader.Name), &gEfiHobMemeryAllocModuleGuid, sizeof(EFI_GUID));\r
@@ -218,7 +218,7 @@ Returns:
   Hob.Raw = (VOID *)(UINTN)(HandOffHob.HandoffInformationTable->EfiEndOfHobList);\r
   \r
   Hob.Header->HobType   = EFI_HOB_TYPE_RESOURCE_DESCRIPTOR;\r
-  Hob.Header->HobLength = sizeof(EFI_HOB_RESOURCE_DESCRIPTOR);\r
+  Hob.Header->HobLength = (UINT16) sizeof (EFI_HOB_RESOURCE_DESCRIPTOR);\r
 \r
   Hob.ResourceDescriptor->ResourceType          = ResourceType;\r
   Hob.ResourceDescriptor->ResourceAttribute     = ResourceAttribute;\r
@@ -319,7 +319,7 @@ Returns:
   Hob.Raw = (VOID*)(UINTN)(HandOffHob.HandoffInformationTable->EfiEndOfHobList);  \r
 \r
   Hob.Header->HobType   = EFI_HOB_TYPE_FV;\r
-  Hob.Header->HobLength = sizeof(EFI_HOB_FIRMWARE_VOLUME);\r
+  Hob.Header->HobLength = (UINT16) sizeof (EFI_HOB_FIRMWARE_VOLUME);\r
 \r
   Hob.FirmwareVolume->BaseAddress = BaseAddress;\r
   Hob.FirmwareVolume->Length      = Length;\r
@@ -368,7 +368,7 @@ Returns:
   Hob.Raw = (VOID*)(UINTN)HandOffHob.HandoffInformationTable->EfiEndOfHobList;\r
 \r
   Hob.Header->HobType   = EFI_HOB_TYPE_CPU;\r
-  Hob.Header->HobLength = sizeof(EFI_HOB_CPU);\r
+  Hob.Header->HobLength = (UINT16) sizeof (EFI_HOB_CPU);\r
 \r
   Hob.Cpu->SizeOfMemorySpace = SizeOfMemorySpace;\r
   Hob.Cpu->SizeOfIoSpace     = SizeOfIoSpace;\r
@@ -416,7 +416,7 @@ Returns:
   Hob.Raw = (VOID*)(UINTN)HandOffHob.HandoffInformationTable->EfiEndOfHobList;\r
 \r
   Hob.Header->HobType   = EFI_HOB_TYPE_MEMORY_ALLOCATION;\r
-  Hob.Header->HobLength = sizeof(EFI_HOB_MEMORY_ALLOCATION_STACK);\r
+  Hob.Header->HobLength = (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION_STACK);\r
 \r
   CopyMem(&(Hob.MemoryAllocationStack->AllocDescriptor.Name), &gEfiHobMemeryAllocStackGuid, sizeof(EFI_GUID));\r
   (Hob.MemoryAllocationStack->AllocDescriptor).MemoryBaseAddress = BaseAddress;\r
@@ -468,7 +468,7 @@ Returns:
   HandOffHob.Raw = HobStart;\r
   Hob.Raw = (VOID *)(UINTN)HandOffHob.HandoffInformationTable->EfiEndOfHobList;\r
   Hob.Header->HobType   = EFI_HOB_TYPE_MEMORY_ALLOCATION;\r
-  Hob.Header->HobLength = sizeof(EFI_HOB_MEMORY_ALLOCATION_BSP_STORE);\r
+  Hob.Header->HobLength = (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION_BSP_STORE);\r
 \r
   (Hob.MemoryAllocationBspStore->AllocDescriptor).MemoryBaseAddress = BaseAddress;\r
   (Hob.MemoryAllocationBspStore->AllocDescriptor).MemoryLength = Length;\r
@@ -525,12 +525,12 @@ Returns:
   Hob.Raw = (VOID*)(UINTN)HandOffHob.HandoffInformationTable->EfiEndOfHobList;\r
 \r
   Hob.Header->HobType   = EFI_HOB_TYPE_MEMORY_ALLOCATION;\r
-  Hob.Header->HobLength = sizeof(EFI_HOB_MEMORY_ALLOCATION);\r
+  Hob.Header->HobLength = (UINT16) sizeof (EFI_HOB_MEMORY_ALLOCATION);\r
 \r
   if (Name != NULL) {\r
-    CopyMem(&(Hob.MemoryAllocation->AllocDescriptor.Name), &Name, sizeof(EFI_GUID));\r
+    CopyMem (&(Hob.MemoryAllocation->AllocDescriptor.Name), &Name, sizeof (EFI_GUID));\r
   } else {\r
-    ZeroMem(&Hob.MemoryAllocation->AllocDescriptor.Name, sizeof(EFI_GUID));\r
+    ZeroMem (&Hob.MemoryAllocation->AllocDescriptor.Name, sizeof (EFI_GUID));\r
   }\r
 \r
   (Hob.MemoryAllocation->AllocDescriptor).MemoryBaseAddress = BaseAddress;\r