Replace BufToHexString by UnicodeValueToString

[mirror_edk2.git] / MdeModulePkg / Universal / SetupBrowserDxe / Setup.c

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 7e948b305892ba1b4a4a5f22356646378d388550..e617f2f367b12c39cc3ca2132b7b2a2ad7bb2de3 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -1018,8 +1018,12 @@ GetQuestionValue (
   CHAR16              *Value;\r
   CHAR16              *StringPtr;\r
   UINTN               Length;\r
+  UINTN               Index;\r
+  UINTN               LengthStr;\r
   BOOLEAN             IsBufferStorage;\r
   BOOLEAN             IsString;\r
+  CHAR16              TemStr[5];\r
+  UINT8               DigitUint8;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -1141,15 +1145,44 @@ GetQuestionValue (
       if (EFI_ERROR (Status)) {\r
         return Status;\r
       }\r
-\r
+      \r
+      LengthStr = StrLen (Value);\r
+      Status    = EFI_SUCCESS;\r
       if (IsString) {\r
         //\r
         // Convert Config String to Unicode String, e.g "0041004200430044" => "ABCD"\r
+        // Add string tail char L'\0' into Length\r
         //\r
-        Length = StorageWidth + sizeof (CHAR16);\r
-        Status = ConfigStringToUnicode ((CHAR16 *) Dst, &Length, Value);\r
+        Length    = StorageWidth + sizeof (CHAR16);\r
+        if (Length < ((LengthStr / 4 + 1) * 2)) {\r
+          Status = EFI_BUFFER_TOO_SMALL;\r
+        } else {\r
+          StringPtr = (CHAR16 *) Dst;\r
+          ZeroMem (TemStr, sizeof (TemStr));\r
+          for (Index = 0; Index < LengthStr; Index += 4) {\r
+            StrnCpy (TemStr, Value + Index, 4);\r
+            StringPtr[Index/4] = (CHAR16) StrHexToUint64 (TemStr);\r
+          }\r
+          //\r
+          // Add tailing L'\0' character\r
+          //\r
+          StringPtr[Index/4] = L'\0';\r
+        }\r
       } else {\r
-        Status = HexStringToBuf (Dst, &StorageWidth, Value, NULL);\r
+        if (StorageWidth < ((LengthStr + 1) / 2)) {\r
+          Status = EFI_BUFFER_TOO_SMALL;\r
+        } else {\r
+          ZeroMem (TemStr, sizeof (TemStr));\r
+          for (Index = 0; Index < LengthStr; Index ++) {\r
+            TemStr[0] = Value[LengthStr - Index - 1];\r
+            DigitUint8 = (UINT8) StrHexToUint64 (TemStr);\r
+            if ((Index & 1) == 0) {\r
+              Dst [Index/2] = DigitUint8;\r
+            } else {\r
+              Dst [Index/2] = (UINT8) ((Dst [Index/2] << 4) + DigitUint8);\r
+            }\r
+          }\r
+        }\r
       }\r
 \r
       FreePool (Value);\r
@@ -1222,20 +1255,50 @@ GetQuestionValue (
     }\r
     *StringPtr = L'\0';\r
 \r
+    LengthStr = StrLen (Value);\r
+    Status    = EFI_SUCCESS;\r
     if (!IsBufferStorage && IsString) {\r
       //\r
       // Convert Config String to Unicode String, e.g "0041004200430044" => "ABCD"\r
+      // Add string tail char L'\0' into Length\r
       //\r
-      Length = StorageWidth + sizeof (CHAR16);\r
-      Status = ConfigStringToUnicode ((CHAR16 *) Dst, &Length, Value);\r
+      Length    = StorageWidth + sizeof (CHAR16);\r
+      if (Length < ((LengthStr / 4 + 1) * 2)) {\r
+        Status = EFI_BUFFER_TOO_SMALL;\r
+      } else {\r
+        StringPtr = (CHAR16 *) Dst;\r
+        ZeroMem (TemStr, sizeof (TemStr));\r
+        for (Index = 0; Index < LengthStr; Index += 4) {\r
+          StrnCpy (TemStr, Value + Index, 4);\r
+          StringPtr[Index/4] = (CHAR16) StrHexToUint64 (TemStr);\r
+        }\r
+        //\r
+        // Add tailing L'\0' character\r
+        //\r
+        StringPtr[Index/4] = L'\0';\r
+      }\r
     } else {\r
-      Status = HexStringToBuf (Dst, &StorageWidth, Value, NULL);\r
-      if (EFI_ERROR (Status)) {\r
-        FreePool (Result);\r
-        return Status;\r
+      if (StorageWidth < ((LengthStr + 1) / 2)) {\r
+        Status = EFI_BUFFER_TOO_SMALL;\r
+      } else {\r
+        ZeroMem (TemStr, sizeof (TemStr));\r
+        for (Index = 0; Index < LengthStr; Index ++) {\r
+          TemStr[0] = Value[LengthStr - Index - 1];\r
+          DigitUint8 = (UINT8) StrHexToUint64 (TemStr);\r
+          if ((Index & 1) == 0) {\r
+            Dst [Index/2] = DigitUint8;\r
+          } else {\r
+            Dst [Index/2] = (UINT8) ((Dst [Index/2] << 4) + DigitUint8);\r
+          }\r
+        }\r
       }\r
     }\r
 \r
+    if (EFI_ERROR (Status)) {\r
+      FreePool (Result);\r
+      return Status;\r
+    }\r
+\r
     //\r
     // Synchronize Edit Buffer\r
     //\r
@@ -1244,6 +1307,7 @@ GetQuestionValue (
     } else {\r
       SetValueByName (Storage, Question->VariableName, Value);\r
     }\r
+\r
     FreePool (Result);\r
   }\r
 \r
@@ -1286,6 +1350,10 @@ SetQuestionValue (
   UINTN               Length;\r
   BOOLEAN             IsBufferStorage;\r
   BOOLEAN             IsString;\r
+  UINT8               *TemBuffer;\r
+  CHAR16              *TemName;\r
+  CHAR16              *TemString;\r
+  UINTN               Index;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -1397,20 +1465,32 @@ SetQuestionValue (
   } else {\r
     if (IsString) {\r
       //\r
-      // Convert Unicode String to Config String, e.g. "ABCD" => "0041004200430044"\r
+      // Allocate enough string buffer.\r
       //\r
       Value = NULL;\r
       BufferLen = ((StrLen ((CHAR16 *) Src) * 4) + 1) * sizeof (CHAR16);\r
       Value = AllocateZeroPool (BufferLen);\r
       ASSERT (Value != NULL);\r
-      Status = UnicodeToConfigString (Value, &BufferLen, (CHAR16 *) Src);\r
-      ASSERT_EFI_ERROR (Status);\r
+      //\r
+      // Convert Unicode String to Config String, e.g. "ABCD" => "0041004200430044"\r
+      //\r
+      TemName = (CHAR16 *) Src;\r
+      TemString = Value;\r
+      for (; *TemName != L'\0'; TemName++) {\r
+        TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemName, 4);\r
+      }\r
     } else {\r
       BufferLen = StorageWidth * 2 + 1;\r
       Value = AllocateZeroPool (BufferLen * sizeof (CHAR16));\r
       ASSERT (Value != NULL);\r
-      BufToHexString (Value, &BufferLen, Src, StorageWidth);\r
-      ToLower (Value);\r
+      //\r
+      // Convert Buffer to Hex String\r
+      //\r
+      TemBuffer = Src + StorageWidth - 1;\r
+      TemString = Value;\r
+      for (Index = 0; Index < StorageWidth; Index ++, TemBuffer --) {\r
+        TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemBuffer, 2);\r
+      }\r
     }\r
 \r
     Status = SetValueByName (Storage, Question->VariableName, Value);\r
@@ -1446,17 +1526,34 @@ SetQuestionValue (
     }\r
 \r
     Value = ConfigResp + StrLen (ConfigResp);\r
+\r
     if (!IsBufferStorage && IsString) {\r
       //\r
       // Convert Unicode String to Config String, e.g. "ABCD" => "0041004200430044"\r
       //\r
-      BufferLen = ((StrLen ((CHAR16 *) Src) * 4) + 1) * sizeof (CHAR16);\r
-      Status = UnicodeToConfigString (Value, &BufferLen, (CHAR16 *) Src);\r
-      ASSERT_EFI_ERROR (Status);\r
+      TemName = (CHAR16 *) Src;\r
+      TemString = Value;\r
+      for (; *TemName != L'\0'; TemName++) {\r
+        TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemName, 4);\r
+      }\r
     } else {\r
-      BufferLen = StorageWidth * 2 + 1;\r
-      BufToHexString (Value, &BufferLen, Src, StorageWidth);\r
-      ToLower (Value);\r
+      //\r
+      // Convert Buffer to Hex String\r
+      //\r
+      TemBuffer = Src + StorageWidth - 1;\r
+      TemString = Value;\r
+      for (Index = 0; Index < StorageWidth; Index ++, TemBuffer --) {\r
+        TemString += UnicodeValueToString (TemString, PREFIX_ZERO | RADIX_HEX, *TemBuffer, 2);\r
+      }\r
+    }\r
+    \r
+    //\r
+    // Convert to lower char.\r
+    //\r
+    for (TemString = Value; *Value != L'\0'; Value++) {\r
+      if (*Value >= L'A' && *Value <= L'Z') {\r
+        *Value = (CHAR16) (*Value - L'A' + L'a');\r
+      }\r
     }\r
 \r
     //\r