Remove the meaningless compare code.

[mirror_edk2.git] / MdeModulePkg / Library / UefiHiiLib / HiiLib.c

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index 7a2415e9e5e65e60d3ff3533a0208a7e62e8bf54..0e7ddee35a92d3e475f566b5da9ede98217d06af 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   HII Library implementation that uses DXE protocols and services.\r
 \r
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -794,7 +794,6 @@ InternalHiiGetBufferFromString (
 \r
   default:\r
     return EFI_INVALID_PARAMETER;\r
-    break;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -947,6 +946,7 @@ InternalHiiValidateCurrentSetting (
   UINT16                       Offset;\r
   UINT16                       Width;\r
   UINT64                       VarValue;\r
+  EFI_IFR_TYPE_VALUE           TmpValue;\r
   LIST_ENTRY                   *Link;\r
   UINT8                        *VarBuffer;\r
   UINTN                        MaxBufferSize;\r
@@ -1511,7 +1511,10 @@ InternalHiiValidateCurrentSetting (
             //\r
             // Check current value is the value of one of option.\r
             //\r
-            if (VarValue == IfrOneOfOption->Value.u64) {\r
+            ASSERT (IfrOneOfOption->Type <= EFI_IFR_TYPE_NUM_SIZE_64);\r
+            ZeroMem (&TmpValue, sizeof (EFI_IFR_TYPE_VALUE));\r
+            CopyMem (&TmpValue, &IfrOneOfOption->Value, IfrOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
+            if (VarValue == TmpValue.u64) {\r
               //\r
               // The value is one of option value.\r
               // Set OpCode to Zero, don't need check again.\r
@@ -2629,7 +2632,7 @@ HiiCreateOneOfOptionOpCode (
   OpCode.Type   = Type;\r
   CopyMem (&OpCode.Value, &Value, mHiiDefaultTypeToWidth[Type]);\r
 \r
-  return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_ONE_OF_OPTION_OP, sizeof (OpCode));\r
+  return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_ONE_OF_OPTION_OP, OFFSET_OF(EFI_IFR_ONE_OF_OPTION, Value) + mHiiDefaultTypeToWidth[Type]);\r
 }\r
 \r
 /**\r
@@ -2665,7 +2668,7 @@ HiiCreateDefaultOpCode (
   OpCode.DefaultId = DefaultId;\r
   CopyMem (&OpCode.Value, &Value, mHiiDefaultTypeToWidth[Type]);\r
 \r
-  return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_DEFAULT_OP, sizeof (OpCode));\r
+  return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_DEFAULT_OP, OFFSET_OF(EFI_IFR_DEFAULT, Value) + mHiiDefaultTypeToWidth[Type]);\r
 }\r
 \r
 /**\r
@@ -2960,9 +2963,11 @@ HiiCreateNumericOpCode (
 {\r
   EFI_IFR_NUMERIC  OpCode;\r
   UINTN            Position;\r
+  UINTN            Length;\r
 \r
   ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);\r
 \r
+  Length  = 0;\r
   ZeroMem (&OpCode, sizeof (OpCode));\r
   OpCode.Question.QuestionId             = QuestionId;\r
   OpCode.Question.VarStoreId             = VarStoreId;\r
@@ -2977,33 +2982,39 @@ HiiCreateNumericOpCode (
     OpCode.data.u8.MinValue = (UINT8)Minimum;\r
     OpCode.data.u8.MaxValue = (UINT8)Maximum;\r
     OpCode.data.u8.Step     = (UINT8)Step;\r
+    Length                  = 3;\r
     break;\r
 \r
   case EFI_IFR_NUMERIC_SIZE_2:\r
     OpCode.data.u16.MinValue = (UINT16)Minimum;\r
     OpCode.data.u16.MaxValue = (UINT16)Maximum;\r
     OpCode.data.u16.Step     = (UINT16)Step;\r
+    Length                   = 6;\r
     break;\r
 \r
   case EFI_IFR_NUMERIC_SIZE_4:\r
     OpCode.data.u32.MinValue = (UINT32)Minimum;\r
     OpCode.data.u32.MaxValue = (UINT32)Maximum;\r
     OpCode.data.u32.Step     = (UINT32)Step;\r
+    Length                   = 12;\r
     break;\r
 \r
   case EFI_IFR_NUMERIC_SIZE_8:\r
     OpCode.data.u64.MinValue = Minimum;\r
     OpCode.data.u64.MaxValue = Maximum;\r
     OpCode.data.u64.Step     = Step;\r
+    Length                   = 24;\r
     break;\r
   }\r
 \r
+  Length += OFFSET_OF (EFI_IFR_NUMERIC, data);\r
+\r
   if (DefaultsOpCodeHandle == NULL) {\r
-    return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, sizeof (OpCode));\r
+    return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, Length);\r
   }\r
 \r
   Position = InternalHiiOpCodeHandlePosition (OpCodeHandle);\r
-  InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, sizeof (OpCode), 0, 1);\r
+  InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, Length, 0, 1);\r
   InternalHiiAppendOpCodes (OpCodeHandle, DefaultsOpCodeHandle);\r
   HiiCreateEndOpCode (OpCodeHandle);\r
   return InternalHiiOpCodeHandleBuffer (OpCodeHandle) + Position;\r
@@ -3116,6 +3127,7 @@ HiiCreateOneOfOpCode (
 {\r
   EFI_IFR_ONE_OF  OpCode;\r
   UINTN           Position;\r
+  UINTN           Length;\r
 \r
   ASSERT (OptionsOpCodeHandle != NULL);\r
   ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);\r
@@ -3129,8 +3141,11 @@ HiiCreateOneOfOpCode (
   OpCode.Question.Flags                  = QuestionFlags;\r
   OpCode.Flags                           = OneOfFlags;\r
 \r
+  Length  = OFFSET_OF (EFI_IFR_ONE_OF, data);\r
+  Length += (1 << (OneOfFlags & EFI_IFR_NUMERIC_SIZE)) * 3;\r
+\r
   Position = InternalHiiOpCodeHandlePosition (OpCodeHandle);\r
-  InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_ONE_OF_OP, sizeof (OpCode), 0, 1);\r
+  InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_ONE_OF_OP, Length, 0, 1);\r
   InternalHiiAppendOpCodes (OpCodeHandle, OptionsOpCodeHandle);\r
   if (DefaultsOpCodeHandle != NULL) {\r
     InternalHiiAppendOpCodes (OpCodeHandle, DefaultsOpCodeHandle);\r