Sync patches r14006, r14034 and r14035 from main trunk.

1. Base on the value type to get the value for default opcode.
2. Base on the type field to generate numeric opcode.
3. Base on the type field to generate oneof opcode.

git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1@14778 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 18 insertions, 6 deletions

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index 06e8533ace..54a1319d7c 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -1,7 +1,7 @@
 /** @file

   HII Library implementation that uses DXE protocols and services.

 

-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -3009,7 +3009,7 @@ HiiCreateDefaultOpCode (
   OpCode.DefaultId = DefaultId;

   CopyMem (&OpCode.Value, &Value, mHiiDefaultTypeToWidth[Type]);

 

-  return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_DEFAULT_OP, sizeof (OpCode));

+  return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_DEFAULT_OP, OFFSET_OF(EFI_IFR_DEFAULT, Value) + mHiiDefaultTypeToWidth[Type]);

 }

 

 /**

@@ -3380,9 +3380,11 @@ HiiCreateNumericOpCode (
 {

   EFI_IFR_NUMERIC  OpCode;

   UINTN            Position;

+  UINTN            Length;

 

   ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0);

 

+  Length  = 0;

   ZeroMem (&OpCode, sizeof (OpCode));

   OpCode.Question.QuestionId             = QuestionId;

   OpCode.Question.VarStoreId             = VarStoreId;

@@ -3397,33 +3399,39 @@ HiiCreateNumericOpCode (
     OpCode.data.u8.MinValue = (UINT8)Minimum;

     OpCode.data.u8.MaxValue = (UINT8)Maximum;

     OpCode.data.u8.Step     = (UINT8)Step;

+    Length                  = 3;

     break;

 

   case EFI_IFR_NUMERIC_SIZE_2:

     OpCode.data.u16.MinValue = (UINT16)Minimum;

     OpCode.data.u16.MaxValue = (UINT16)Maximum;

     OpCode.data.u16.Step     = (UINT16)Step;

+    Length                   = 6;

     break;

 

   case EFI_IFR_NUMERIC_SIZE_4:

     OpCode.data.u32.MinValue = (UINT32)Minimum;

     OpCode.data.u32.MaxValue = (UINT32)Maximum;

     OpCode.data.u32.Step     = (UINT32)Step;

+    Length                   = 12;

     break;

 

   case EFI_IFR_NUMERIC_SIZE_8:

     OpCode.data.u64.MinValue = Minimum;

     OpCode.data.u64.MaxValue = Maximum;

     OpCode.data.u64.Step     = Step;

+    Length                   = 24;

     break;

   }

 

+  Length += OFFSET_OF (EFI_IFR_NUMERIC, data);

+

   if (DefaultsOpCodeHandle == NULL) {

-    return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, sizeof (OpCode));

+    return InternalHiiCreateOpCode (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, Length);

   }

 

   Position = InternalHiiOpCodeHandlePosition (OpCodeHandle);

-  InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, sizeof (OpCode), 0, 1);

+  InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_NUMERIC_OP, Length, 0, 1);

   InternalHiiAppendOpCodes (OpCodeHandle, DefaultsOpCodeHandle);

   HiiCreateEndOpCode (OpCodeHandle);

   return InternalHiiOpCodeHandleBuffer (OpCodeHandle) + Position;

@@ -3536,6 +3544,7 @@ HiiCreateOneOfOpCode (
 {

   EFI_IFR_ONE_OF  OpCode;

   UINTN           Position;

+  UINTN           Length;

 

   ASSERT (OptionsOpCodeHandle != NULL);

   ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0);

@@ -3549,8 +3558,11 @@ HiiCreateOneOfOpCode (
   OpCode.Question.Flags                  = QuestionFlags;

   OpCode.Flags                           = OneOfFlags;

 

+  Length  = OFFSET_OF (EFI_IFR_ONE_OF, data);

+  Length += (1 << (OneOfFlags & EFI_IFR_NUMERIC_SIZE)) * 3;

+

   Position = InternalHiiOpCodeHandlePosition (OpCodeHandle);

-  InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_ONE_OF_OP, sizeof (OpCode), 0, 1);

+  InternalHiiCreateOpCodeExtended (OpCodeHandle, &OpCode, EFI_IFR_ONE_OF_OP, Length, 0, 1);

   InternalHiiAppendOpCodes (OpCodeHandle, OptionsOpCodeHandle);

   if (DefaultsOpCodeHandle != NULL) {

     InternalHiiAppendOpCodes (OpCodeHandle, DefaultsOpCodeHandle);

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 567a8624a5..a450a18b88 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -2054,7 +2054,7 @@ ParseIfrData (
       //

       DefaultData.Type        = DefaultValueFromOpcode;

       DefaultData.DefaultId   = VarDefaultId;

-      CopyMem (&DefaultData.Value, &IfrDefault->Value, sizeof (EFI_IFR_TYPE_VALUE));

+      CopyMem (&DefaultData.Value, &IfrDefault->Value, IfrDefault->Header.Length - OFFSET_OF (EFI_IFR_DEFAULT, Value));

       

       // If the value field is expression, set the cleaned flag.

       if (IfrDefault->Type ==  EFI_IFR_TYPE_OTHER) {