Update the code to follow UEFI spec, process date/time/ref value type as buffer type...

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15690 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c b/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
index 1ab38b1df2e5fd8fbabfcba8874ebb8a97149f3b..65d2a749951de3edc9352f85e67cec1927bd8b6f 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
@@ -2,7 +2,7 @@
 Implementation for handling the User Interface option processing.\r
 \r
 \r
-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2014, 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
@@ -98,6 +98,107 @@ HiiValueToUINT64 (
   return RetVal;\r
 }\r
 \r
+/**\r
+  Check whether this value type can be transfer to EFI_IFR_TYPE_BUFFER type.\r
+  \r
+  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to \r
+  EFI_IFR_TYPE_BUFFER when do the value compare.\r
+\r
+  @param  Value                  Expression value to compare on.\r
+\r
+  @retval TRUE                   This value type can be transter to EFI_IFR_TYPE_BUFFER type.\r
+  @retval FALSE                  This value type can't be transter to EFI_IFR_TYPE_BUFFER type.\r
+\r
+**/\r
+BOOLEAN\r
+IsTypeInBuffer (\r
+  IN  EFI_HII_VALUE   *Value\r
+  )\r
+{\r
+  switch (Value->Type) {\r
+  case EFI_IFR_TYPE_BUFFER:\r
+  case EFI_IFR_TYPE_DATE:\r
+  case EFI_IFR_TYPE_TIME:\r
+  case EFI_IFR_TYPE_REF:\r
+    return TRUE;\r
+\r
+  default:\r
+    return FALSE;\r
+  }\r
+}\r
+\r
+/**\r
+  Check whether this value type can be transfer to EFI_IFR_TYPE_UINT64\r
+\r
+  @param  Value                  Expression value to compare on.\r
+\r
+  @retval TRUE                   This value type can be transter to EFI_IFR_TYPE_BUFFER type.\r
+  @retval FALSE                  This value type can't be transter to EFI_IFR_TYPE_BUFFER type.\r
+\r
+**/\r
+BOOLEAN\r
+IsTypeInUINT64 (\r
+  IN  EFI_HII_VALUE   *Value\r
+  )\r
+{\r
+  switch (Value->Type) {\r
+  case EFI_IFR_TYPE_NUM_SIZE_8:\r
+  case EFI_IFR_TYPE_NUM_SIZE_16:\r
+  case EFI_IFR_TYPE_NUM_SIZE_32:\r
+  case EFI_IFR_TYPE_NUM_SIZE_64:\r
+  case EFI_IFR_TYPE_BOOLEAN:\r
+    return TRUE;\r
+\r
+  default:\r
+    return FALSE;\r
+  }\r
+}\r
+\r
+/**\r
+  Return the buffer length and buffer pointer for this value.\r
+  \r
+  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to \r
+  EFI_IFR_TYPE_BUFFER when do the value compare.\r
+\r
+  @param  Value                  Expression value to compare on.\r
+  @param  Buf                    Return the buffer pointer.\r
+  @param  BufLen                 Return the buffer length.\r
+\r
+**/\r
+VOID\r
+GetBufAndLenForValue (\r
+  IN  EFI_HII_VALUE   *Value,\r
+  OUT UINT8           **Buf,\r
+  OUT UINT16          *BufLen\r
+  )\r
+{\r
+  switch (Value->Type) {\r
+  case EFI_IFR_TYPE_BUFFER:\r
+    *Buf    = Value->Buffer;\r
+    *BufLen = Value->BufferLen;\r
+    break;\r
+\r
+  case EFI_IFR_TYPE_DATE:\r
+    *Buf    = (UINT8 *) (&Value->Value.date);\r
+    *BufLen = (UINT16) sizeof (EFI_HII_DATE);\r
+    break;\r
+\r
+  case EFI_IFR_TYPE_TIME:\r
+    *Buf    = (UINT8 *) (&Value->Value.time);\r
+    *BufLen = (UINT16) sizeof (EFI_HII_TIME);\r
+    break;\r
+\r
+  case EFI_IFR_TYPE_REF:\r
+    *Buf    = (UINT8 *) (&Value->Value.ref);\r
+    *BufLen = (UINT16) sizeof (EFI_HII_REF);\r
+    break;\r
+\r
+  default:\r
+    *Buf    = NULL;\r
+    *BufLen = 0;\r
+  }\r
+}\r
+\r
 /**\r
   Compare two Hii value.\r
 \r
@@ -125,21 +226,12 @@ CompareHiiValue (
   CHAR16  *Str1;\r
   CHAR16  *Str2;\r
   UINTN   Len;\r
+  UINT8   *Buf1;\r
+  UINT16  Buf1Len;\r
+  UINT8   *Buf2;\r
+  UINT16  Buf2Len;\r
 \r
-  if (Value1->Type >= EFI_IFR_TYPE_OTHER || Value2->Type >= EFI_IFR_TYPE_OTHER ) {\r
-    if (Value1->Type != EFI_IFR_TYPE_BUFFER && Value2->Type != EFI_IFR_TYPE_BUFFER) {\r
-      return EFI_UNSUPPORTED;\r
-    }\r
-  }\r
-\r
-  if (Value1->Type == EFI_IFR_TYPE_STRING || Value2->Type == EFI_IFR_TYPE_STRING ) {\r
-    if (Value1->Type != Value2->Type) {\r
-      //\r
-      // Both Operator should be type of String\r
-      //\r
-      return EFI_UNSUPPORTED;\r
-    }\r
-\r
+  if (Value1->Type == EFI_IFR_TYPE_STRING && Value2->Type == EFI_IFR_TYPE_STRING) {\r
     if (Value1->Value.string == 0 || Value2->Value.string == 0) {\r
       //\r
       // StringId 0 is reserved\r
@@ -174,22 +266,21 @@ CompareHiiValue (
     return EFI_SUCCESS;\r
   }\r
 \r
-  if (Value1->Type == EFI_IFR_TYPE_BUFFER || Value2->Type == EFI_IFR_TYPE_BUFFER ) {\r
-    if (Value1->Type != Value2->Type) {\r
-      //\r
-      // Both Operator should be type of Buffer.\r
-      //\r
-      return EFI_UNSUPPORTED;\r
-    }\r
-    Len = Value1->BufferLen > Value2->BufferLen ? Value2->BufferLen : Value1->BufferLen;\r
-    *Result = CompareMem (Value1->Buffer, Value2->Buffer, Len);\r
-    if ((*Result == 0) && (Value1->BufferLen != Value2->BufferLen))\r
-    {\r
+  //\r
+  // Take types(date, time, ref, buffer) as buffer\r
+  //\r
+  if (IsTypeInBuffer(Value1) && IsTypeInBuffer(Value2)) {\r
+    GetBufAndLenForValue(Value1, &Buf1, &Buf1Len);\r
+    GetBufAndLenForValue(Value2, &Buf2, &Buf2Len);\r
+\r
+    Len = Buf1Len > Buf2Len ? Buf2Len : Buf1Len;\r
+    *Result = CompareMem (Buf1, Buf2, Len);\r
+    if ((*Result == 0) && (Buf1Len != Buf2Len)) {\r
       //\r
       // In this case, means base on samll number buffer, the data is same\r
       // So which value has more data, which value is bigger.\r
       //\r
-      *Result = Value1->BufferLen > Value2->BufferLen ? 1 : -1;\r
+      *Result = Buf1Len > Buf2Len ? 1 : -1;\r
     }\r
     return EFI_SUCCESS;\r
   }  \r
@@ -197,16 +288,19 @@ CompareHiiValue (
   //\r
   // Take remain types(integer, boolean, date/time) as integer\r
   //\r
-  Temp64 = HiiValueToUINT64(Value1) - HiiValueToUINT64(Value2);\r
-  if (Temp64 > 0) {\r
-    *Result = 1;\r
-  } else if (Temp64 < 0) {\r
-    *Result = -1;\r
-  } else {\r
-    *Result = 0;\r
+  if (IsTypeInUINT64(Value1) && IsTypeInUINT64(Value2)) {\r
+    Temp64 = HiiValueToUINT64(Value1) - HiiValueToUINT64(Value2);\r
+    if (Temp64 > 0) {\r
+      *Result = 1;\r
+    } else if (Temp64 < 0) {\r
+      *Result = -1;\r
+    } else {\r
+      *Result = 0;\r
+    }\r
+    return EFI_SUCCESS;\r
   }\r
 \r
-  return EFI_SUCCESS;\r
+  return EFI_UNSUPPORTED;\r
 }\r
 \r
 /**\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index 13c5c912a25f9f01bddfa81ac9a7c10aea58728a..1077b06669adbbb7d94319649560f89ba8d9eb36 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
@@ -1,7 +1,7 @@
 /** @file\r
 Utility functions for expression evaluation.\r
 \r
-Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2014, 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
@@ -988,6 +988,129 @@ IfrStrToUpper (
   }\r
 }\r
 \r
+/**\r
+  Check whether this value type can be transfer to EFI_IFR_TYPE_BUFFER type.\r
+\r
+  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to \r
+  EFI_IFR_TYPE_BUFFER when do the value compare.\r
+\r
+  @param  Value                  Expression value to compare on.\r
+\r
+  @retval TRUE                   This value type can be transter to EFI_IFR_TYPE_BUFFER type.\r
+  @retval FALSE                  This value type can't be transter to EFI_IFR_TYPE_BUFFER type.\r
+\r
+**/\r
+BOOLEAN\r
+IsTypeInBuffer (\r
+  IN  EFI_HII_VALUE   *Value\r
+  )\r
+{\r
+  switch (Value->Type) {\r
+  case EFI_IFR_TYPE_BUFFER:\r
+  case EFI_IFR_TYPE_DATE:\r
+  case EFI_IFR_TYPE_TIME:\r
+  case EFI_IFR_TYPE_REF:\r
+    return TRUE;\r
+\r
+  default:\r
+    return FALSE;\r
+  }\r
+}\r
+\r
+/**\r
+  Check whether this value type can be transfer to EFI_IFR_TYPE_UINT64\r
+\r
+  @param  Value                  Expression value to compare on.\r
+\r
+  @retval TRUE                   This value type can be transter to EFI_IFR_TYPE_BUFFER type.\r
+  @retval FALSE                  This value type can't be transter to EFI_IFR_TYPE_BUFFER type.\r
+\r
+**/\r
+BOOLEAN\r
+IsTypeInUINT64 (\r
+  IN  EFI_HII_VALUE   *Value\r
+  )\r
+{\r
+  switch (Value->Type) {\r
+  case EFI_IFR_TYPE_NUM_SIZE_8:\r
+  case EFI_IFR_TYPE_NUM_SIZE_16:\r
+  case EFI_IFR_TYPE_NUM_SIZE_32:\r
+  case EFI_IFR_TYPE_NUM_SIZE_64:\r
+  case EFI_IFR_TYPE_BOOLEAN:\r
+    return TRUE;\r
+\r
+  default:\r
+    return FALSE;\r
+  }\r
+}\r
+\r
+/**\r
+  Return the buffer length for this value.\r
+\r
+  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to \r
+  EFI_IFR_TYPE_BUFFER when do the value compare.\r
+\r
+  @param   Value                  Expression value to compare on.\r
+  \r
+  @retval  BufLen                 Return the buffer length.\r
+\r
+**/\r
+UINT16\r
+GetLengthForValue (\r
+  IN  EFI_HII_VALUE   *Value\r
+  )\r
+{\r
+  switch (Value->Type) {\r
+  case EFI_IFR_TYPE_BUFFER:\r
+    return Value->BufferLen;\r
+\r
+  case EFI_IFR_TYPE_DATE:\r
+    return (UINT16) sizeof (EFI_HII_DATE);\r
+\r
+  case EFI_IFR_TYPE_TIME:\r
+    return (UINT16) sizeof (EFI_HII_TIME);\r
+\r
+  case EFI_IFR_TYPE_REF:\r
+    return (UINT16) sizeof (EFI_HII_REF);\r
+\r
+  default:\r
+    return 0;\r
+  }\r
+}\r
+\r
+/**\r
+  Return the buffer pointer for this value.\r
+\r
+  EFI_IFR_TYPE_REF, EFI_IFR_TYPE_DATE and EFI_IFR_TYPE_TIME are converted to \r
+  EFI_IFR_TYPE_BUFFER when do the value compare.\r
+\r
+  @param  Value                  Expression value to compare on.\r
+\r
+  @retval Buf                    Return the buffer pointer.\r
+\r
+**/\r
+UINT8 *\r
+GetBufferForValue (\r
+  IN  EFI_HII_VALUE   *Value\r
+  )\r
+{\r
+  switch (Value->Type) {\r
+  case EFI_IFR_TYPE_BUFFER:\r
+    return Value->Buffer;\r
+\r
+  case EFI_IFR_TYPE_DATE:\r
+    return (UINT8 *) (&Value->Value.date);\r
+\r
+  case EFI_IFR_TYPE_TIME:\r
+    return (UINT8 *) (&Value->Value.time);\r
+\r
+  case EFI_IFR_TYPE_REF:\r
+    return (UINT8 *) (&Value->Value.ref);\r
+\r
+  default:\r
+    return NULL;\r
+  }\r
+}\r
 \r
 /**\r
   Evaluate opcode EFI_IFR_TO_STRING.\r
@@ -1013,6 +1136,8 @@ IfrToString (
   CHAR16         *PrintFormat;\r
   CHAR16         Buffer[MAXIMUM_VALUE_CHARACTERS];\r
   UINT8          *TmpBuf;\r
+  UINT8          *SrcBuf;\r
+  UINTN          SrcLen;\r
   UINTN          BufferSize;\r
 \r
   Status = PopExpression (&Value);\r
@@ -1057,24 +1182,37 @@ IfrToString (
     break;\r
     \r
   case EFI_IFR_TYPE_BUFFER:\r
+  case EFI_IFR_TYPE_DATE:\r
+  case EFI_IFR_TYPE_TIME:\r
+  case EFI_IFR_TYPE_REF:\r
     //\r
     // + 3 is base on the unicode format, the length may be odd number, \r
     // so need 1 byte to align, also need 2 bytes for L'\0'.\r
     //\r
-    TmpBuf = AllocateZeroPool (Value.BufferLen + 3);\r
+    if (Value.Type == EFI_IFR_TYPE_BUFFER) {\r
+      SrcLen = Value.BufferLen;\r
+      SrcBuf = Value.Buffer;\r
+    } else {\r
+      SrcBuf = GetBufferForValue(&Value);\r
+      SrcLen = GetLengthForValue(&Value);\r
+    }\r
+\r
+    TmpBuf = AllocateZeroPool (SrcLen + 3);\r
     ASSERT (TmpBuf != NULL);\r
     if (Format == EFI_IFR_STRING_ASCII) {\r
-      CopyMem (TmpBuf, Value.Buffer, Value.BufferLen);\r
+      CopyMem (TmpBuf, SrcBuf, SrcLen);\r
       PrintFormat = L"%a"; \r
     } else {\r
       // Format == EFI_IFR_STRING_UNICODE\r
-      CopyMem (TmpBuf, Value.Buffer, Value.BufferLen * sizeof (CHAR16));\r
+      CopyMem (TmpBuf, SrcBuf, SrcLen * sizeof (CHAR16));\r
       PrintFormat = L"%s";  \r
     }\r
-    UnicodeSPrint (Buffer, sizeof (Buffer), PrintFormat, Value.Buffer);  \r
+    UnicodeSPrint (Buffer, sizeof (Buffer), PrintFormat, TmpBuf);\r
     String = Buffer; \r
     FreePool (TmpBuf);\r
-    FreePool (Value.Buffer);\r
+    if (Value.Type == EFI_IFR_TYPE_BUFFER) {\r
+      FreePool (Value.Buffer);\r
+    }\r
     break;\r
     \r
   default:\r
@@ -1114,7 +1252,7 @@ IfrToUint (
     return Status;\r
   }\r
 \r
-  if (Value.Type >= EFI_IFR_TYPE_OTHER && Value.Type != EFI_IFR_TYPE_BUFFER) {\r
+  if (Value.Type >= EFI_IFR_TYPE_OTHER && !IsTypeInBuffer(&Value)) {\r
     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
     return EFI_SUCCESS;\r
   }\r
@@ -1140,14 +1278,18 @@ IfrToUint (
       Result->Value.u64 = StrDecimalToUint64 (String);\r
     }\r
     FreePool (String);\r
-  } else if (Value.Type == EFI_IFR_TYPE_BUFFER) {\r
-    if (Value.BufferLen > 8) {\r
-      FreePool (Value.Buffer);\r
+  } else if (IsTypeInBuffer(&Value)) {\r
+    if (GetLengthForValue (&Value) > 8) {\r
+      if (Value.Type == EFI_IFR_TYPE_BUFFER) {\r
+        FreePool (Value.Buffer);\r
+      }\r
       Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
       return EFI_SUCCESS;\r
     }\r
-    Result->Value.u64 = *(UINT64*) Value.Buffer;\r
-    FreePool (Value.Buffer);\r
+    Result->Value.u64 = *(UINT64*) GetBufferForValue (&Value);\r
+    if (Value.Type == EFI_IFR_TYPE_BUFFER) {\r
+      FreePool (Value.Buffer);\r
+    }\r
   } else {\r
     CopyMem (Result, &Value, sizeof (EFI_HII_VALUE));\r
   }\r
@@ -1179,6 +1321,8 @@ IfrCatenate (
   UINTN          Index;\r
   CHAR16         *StringPtr;\r
   UINTN          Size;\r
+  UINT16         Length0;\r
+  UINT16         Length1;\r
 \r
   //\r
   // String[0] - The second string\r
@@ -1201,7 +1345,7 @@ IfrCatenate (
   }\r
 \r
   for (Index = 0; Index < 2; Index++) {\r
-    if (Value[Index].Type != EFI_IFR_TYPE_STRING && Value[Index].Type != EFI_IFR_TYPE_BUFFER) {\r
+    if (Value[Index].Type != EFI_IFR_TYPE_STRING && !IsTypeInBuffer(&Value[Index])) {\r
       Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
       Status = EFI_SUCCESS;\r
       goto Done;\r
@@ -1227,13 +1371,15 @@ IfrCatenate (
     Result->Value.string = NewString (StringPtr, FormSet->HiiHandle);\r
   } else {\r
     Result->Type = EFI_IFR_TYPE_BUFFER;\r
-    Result->BufferLen = (UINT16) (Value[0].BufferLen + Value[1].BufferLen);\r
+    Length0 = GetLengthForValue(&Value[0]);\r
+    Length1 = GetLengthForValue(&Value[1]);\r
+    Result->BufferLen = (UINT16) (Length0 + Length1);\r
 \r
     Result->Buffer = AllocateZeroPool (Result->BufferLen);\r
     ASSERT (Result->Buffer != NULL);\r
 \r
-    CopyMem (Result->Buffer, Value[0].Buffer, Value[0].BufferLen);\r
-    CopyMem (&Result->Buffer[Value[0].BufferLen], Value[1].Buffer, Value[1].BufferLen);\r
+    CopyMem (Result->Buffer, GetBufferForValue(&Value[0]), Length0);\r
+    CopyMem (&Result->Buffer[Length0], GetBufferForValue(&Value[1]), Length1);\r
   }\r
 Done:\r
   if (Value[0].Buffer != NULL) {\r
@@ -1447,6 +1593,7 @@ IfrMid (
   UINTN          Length;\r
   CHAR16         *SubString;\r
   UINT16         BufferLen;\r
+  UINT8          *Buffer;\r
 \r
   ZeroMem (Value, sizeof (Value));\r
 \r
@@ -1477,7 +1624,7 @@ IfrMid (
   }\r
   Base = (UINTN) Value[1].Value.u64;\r
 \r
-  if (Value[2].Type != EFI_IFR_TYPE_STRING && Value[2].Type != EFI_IFR_TYPE_BUFFER) {\r
+  if (Value[2].Type != EFI_IFR_TYPE_STRING && !IsTypeInBuffer(&Value[2])) {\r
     Result->Type = EFI_IFR_TYPE_UNDEFINED;\r
     return EFI_SUCCESS;\r
   }\r
@@ -1501,8 +1648,9 @@ IfrMid (
 \r
     FreePool (String);\r
   } else {\r
-    BufferLen = Value[2].BufferLen;\r
-    \r
+    BufferLen = GetLengthForValue (&Value[2]);\r
+    Buffer = GetBufferForValue (&Value[2]);\r
+\r
     Result->Type = EFI_IFR_TYPE_BUFFER;\r
     if (Length == 0 || Base >= BufferLen) {\r
       Result->BufferLen = 0;\r
@@ -1511,10 +1659,12 @@ IfrMid (
       Result->BufferLen = (UINT16)((BufferLen - Base) < Length ? (BufferLen - Base) : Length);    \r
       Result->Buffer = AllocateZeroPool (Result->BufferLen);\r
       ASSERT (Result->Buffer != NULL);\r
-      CopyMem (Result->Buffer, &Value[2].Buffer[Base], Result->BufferLen);\r
+      CopyMem (Result->Buffer, &Buffer[Base], Result->BufferLen);\r
     }\r
 \r
-    FreePool (Value[2].Buffer);\r
+    if (Value[2].Type == EFI_IFR_TYPE_BUFFER) {\r
+      FreePool (Value[2].Buffer);\r
+    }\r
   }\r
   \r
   return Status;\r
@@ -1876,21 +2026,12 @@ CompareHiiValue (
   CHAR16  *Str1;\r
   CHAR16  *Str2;\r
   UINTN   Len;\r
+  UINT8   *Buf1;\r
+  UINT16  Buf1Len;\r
+  UINT8   *Buf2;\r
+  UINT16  Buf2Len;\r
 \r
-  if (Value1->Type >= EFI_IFR_TYPE_OTHER || Value2->Type >= EFI_IFR_TYPE_OTHER ) {\r
-    if (Value1->Type != EFI_IFR_TYPE_BUFFER && Value2->Type != EFI_IFR_TYPE_BUFFER) {\r
-      return EFI_UNSUPPORTED;\r
-    }\r
-  }\r
-\r
-  if (Value1->Type == EFI_IFR_TYPE_STRING || Value2->Type == EFI_IFR_TYPE_STRING ) {\r
-    if (Value1->Type != Value2->Type) {\r
-      //\r
-      // Both Operator should be type of String\r
-      //\r
-      return EFI_UNSUPPORTED;\r
-    }\r
-\r
+  if (Value1->Type == EFI_IFR_TYPE_STRING && Value2->Type == EFI_IFR_TYPE_STRING) {\r
     if (Value1->Value.string == 0 || Value2->Value.string == 0) {\r
       //\r
       // StringId 0 is reserved\r
@@ -1925,39 +2066,44 @@ CompareHiiValue (
     return EFI_SUCCESS;\r
   }\r
 \r
-  if (Value1->Type == EFI_IFR_TYPE_BUFFER || Value2->Type == EFI_IFR_TYPE_BUFFER ) {\r
-    if (Value1->Type != Value2->Type) {\r
-      //\r
-      // Both Operator should be type of Buffer.\r
-      //\r
-      return EFI_UNSUPPORTED;\r
-    }\r
-    Len = Value1->BufferLen > Value2->BufferLen ? Value2->BufferLen : Value1->BufferLen;\r
-    *Result = CompareMem (Value1->Buffer, Value2->Buffer, Len);\r
-    if ((*Result == 0) && (Value1->BufferLen != Value2->BufferLen))\r
-    {\r
+  //\r
+  // Take types(date, time, ref, buffer) as buffer\r
+  //\r
+  if (IsTypeInBuffer(Value1) && IsTypeInBuffer(Value2)) {\r
+    Buf1    = GetBufferForValue(Value1);\r
+    Buf1Len = GetLengthForValue(Value1);\r
+    Buf2    = GetBufferForValue(Value2);\r
+    Buf2Len = GetLengthForValue(Value2);\r
+    \r
+    Len = Buf1Len > Buf2Len ? Buf2Len : Buf1Len;\r
+    *Result = CompareMem (Buf1, Buf2, Len);\r
+    if ((*Result == 0) && (Buf1Len != Buf2Len)) {\r
       //\r
       // In this case, means base on samll number buffer, the data is same\r
       // So which value has more data, which value is bigger.\r
       //\r
-      *Result = Value1->BufferLen > Value2->BufferLen ? 1 : -1;\r
+      *Result = Buf1Len > Buf2Len ? 1 : -1;\r
     }\r
     return EFI_SUCCESS;\r
   }  \r
 \r
   //\r
-  // Take remain types(integer, boolean, date/time) as integer\r
+  // Take types(integer, boolean) as integer\r
   //\r
-  Temp64 = HiiValueToUINT64(Value1) - HiiValueToUINT64(Value2);\r
-  if (Temp64 > 0) {\r
-    *Result = 1;\r
-  } else if (Temp64 < 0) {\r
-    *Result = -1;\r
-  } else {\r
-    *Result = 0;\r
+  if (IsTypeInUINT64(Value1) && IsTypeInUINT64(Value2)) {\r
+    Temp64 = HiiValueToUINT64(Value1) - HiiValueToUINT64(Value2);\r
+    if (Temp64 > 0) {\r
+      *Result = 1;\r
+    } else if (Temp64 < 0) {\r
+      *Result = -1;\r
+    } else {\r
+      *Result = 0;\r
+    }\r
+\r
+    return EFI_SUCCESS;\r
   }\r
 \r
-  return EFI_SUCCESS;\r
+  return EFI_UNSUPPORTED;\r
 }\r
 \r
 /**\r
@@ -2572,7 +2718,7 @@ EvaluateExpression (
       if (EFI_ERROR (Status)) {\r
         goto Done;\r
       }\r
-      if (Value->Type != EFI_IFR_TYPE_STRING && Value->Type != EFI_IFR_TYPE_BUFFER) {\r
+      if (Value->Type != EFI_IFR_TYPE_STRING && !IsTypeInBuffer (Value)) {\r
         Value->Type = EFI_IFR_TYPE_UNDEFINED;\r
         break;\r
       }\r
@@ -2589,7 +2735,7 @@ EvaluateExpression (
         FreePool (StrPtr);\r
       } else {\r
         Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;\r
-        Value->Value.u64 = Value->BufferLen;\r
+        Value->Value.u64 = GetLengthForValue(Value);\r
         FreePool (Value->Buffer);\r
       }\r
       break;\r
@@ -2680,7 +2826,7 @@ EvaluateExpression (
         // When converting from an unsigned integer, zero will be converted to\r
         // FALSE and any other value will be converted to TRUE.\r
         //\r
-        Value->Value.b = (BOOLEAN) (Value->Value.u64 != 0);\r
+        Value->Value.b = (BOOLEAN) (HiiValueToUINT64(Value) != 0);\r
 \r
         Value->Type = EFI_IFR_TYPE_BOOLEAN;\r
       } else if (Value->Type == EFI_IFR_TYPE_STRING) {\r
@@ -2781,7 +2927,7 @@ EvaluateExpression (
       }\r
 \r
       Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;\r
-      Value->Value.u64 = ~Value->Value.u64;\r
+      Value->Value.u64 = ~ HiiValueToUINT64(Value);\r
       break;\r
 \r
     case EFI_IFR_SET_OP:\r
@@ -2945,40 +3091,40 @@ EvaluateExpression (
 \r
       switch (OpCode->Operand) {\r
         case EFI_IFR_ADD_OP:\r
-          Value->Value.u64 = Data1.Value.u64 + Data2.Value.u64;\r
+          Value->Value.u64 = HiiValueToUINT64(&Data1) + HiiValueToUINT64(&Data2);\r
           break;\r
 \r
         case EFI_IFR_SUBTRACT_OP:\r
-          Value->Value.u64 = Data1.Value.u64 - Data2.Value.u64;\r
+          Value->Value.u64 = HiiValueToUINT64(&Data1) - HiiValueToUINT64(&Data2);\r
           break;\r
 \r
         case EFI_IFR_MULTIPLY_OP:\r
-          Value->Value.u64 = MultU64x32 (Data1.Value.u64, (UINT32) Data2.Value.u64);\r
+          Value->Value.u64 = MultU64x32 (HiiValueToUINT64(&Data1), (UINT32) HiiValueToUINT64(&Data2));\r
           break;\r
 \r
         case EFI_IFR_DIVIDE_OP:\r
-          Value->Value.u64 = DivU64x32 (Data1.Value.u64, (UINT32) Data2.Value.u64);\r
+          Value->Value.u64 = DivU64x32 (HiiValueToUINT64(&Data1), (UINT32) HiiValueToUINT64(&Data2));\r
           break;\r
 \r
         case EFI_IFR_MODULO_OP:\r
-          DivU64x32Remainder  (Data1.Value.u64, (UINT32) Data2.Value.u64, &TempValue);\r
+          DivU64x32Remainder  (HiiValueToUINT64(&Data1), (UINT32) HiiValueToUINT64(&Data2), &TempValue);\r
           Value->Value.u64 = TempValue;\r
           break;\r
 \r
         case EFI_IFR_BITWISE_AND_OP:\r
-          Value->Value.u64 = Data1.Value.u64 & Data2.Value.u64;\r
+          Value->Value.u64 = HiiValueToUINT64(&Data1) & HiiValueToUINT64(&Data2);\r
           break;\r
 \r
         case EFI_IFR_BITWISE_OR_OP:\r
-          Value->Value.u64 = Data1.Value.u64 | Data2.Value.u64;\r
+          Value->Value.u64 = HiiValueToUINT64(&Data1) | HiiValueToUINT64(&Data2);\r
           break;\r
 \r
         case EFI_IFR_SHIFT_LEFT_OP:\r
-          Value->Value.u64 = LShiftU64 (Data1.Value.u64, (UINTN) Data2.Value.u64);\r
+          Value->Value.u64 = LShiftU64 (HiiValueToUINT64(&Data1), (UINTN) HiiValueToUINT64(&Data2));\r
           break;\r
 \r
         case EFI_IFR_SHIFT_RIGHT_OP:\r
-          Value->Value.u64 = RShiftU64 (Data1.Value.u64, (UINTN) Data2.Value.u64);\r
+          Value->Value.u64 = RShiftU64 (HiiValueToUINT64(&Data1), (UINTN) HiiValueToUINT64(&Data2));\r
           break;\r
 \r
         default:\r
@@ -3045,14 +3191,14 @@ EvaluateExpression (
 \r
       if (Data2.Type > EFI_IFR_TYPE_BOOLEAN && \r
           Data2.Type != EFI_IFR_TYPE_STRING && \r
-          Data2.Type != EFI_IFR_TYPE_BUFFER) {\r
+          !IsTypeInBuffer(&Data2)) {\r
         Value->Type = EFI_IFR_TYPE_UNDEFINED;\r
         break;\r
       }\r
 \r
       if (Data1.Type > EFI_IFR_TYPE_BOOLEAN && \r
           Data1.Type != EFI_IFR_TYPE_STRING && \r
-          Data1.Type != EFI_IFR_TYPE_BUFFER) {\r
+          !IsTypeInBuffer(&Data1)) {\r
         Value->Type = EFI_IFR_TYPE_UNDEFINED;\r
         break;\r
       }\r
@@ -3060,6 +3206,8 @@ EvaluateExpression (
       Status = CompareHiiValue (&Data1, &Data2, &Result, FormSet->HiiHandle);\r
       if (Data1.Type == EFI_IFR_TYPE_BUFFER) {\r
         FreePool (Data1.Buffer);\r
+      }\r
+      if (Data2.Type == EFI_IFR_TYPE_BUFFER) {\r
         FreePool (Data2.Buffer);\r
       }\r
       \r