MdeModulePkg:Set default string value

Previously construct Default Value in AltResp for string opcode is String Id,
Now change it to string value if the string opcode has default value.
This change is compatible for SetupBrowser to handle.And add default value
for string in DriverSample to test this case.

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

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 1366e827f21810202953ba5d07fed27f216b2544..8da0d4b30bda51dc24e055d4551394a8e6f67a6d 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -461,6 +461,7 @@ formset
               help     = STRING_TOKEN(STR_MY_STRING_HELP),\r
               minsize  = 6,\r
               maxsize  = 0x14,\r
+              default  = STRING_TOKEN(STR_MY_STRING_DEFAULT),\r
     endstring;\r
 \r
     //\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
index a3fbaed8a431621dd0b9338364a80d66f7313b88..0a5c2424d50061147fde63440a1fc82db3d984d0 100644 (file)
Binary files a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni and b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni differ

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 56868831a19e9203e72f1d4945d01fd459d9223e..1081e759211657c7ba408b6995ca0a2938540eda 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -2056,11 +2056,6 @@ ParseIfrData (
       if (EFI_ERROR (Status)) {\r
         goto Done;\r
       }\r
-\r
-      //\r
-      // No default value for string.\r
-      //\r
-      BlockData = NULL;\r
       break;\r
 \r
     case EFI_IFR_PASSWORD_OP:\r
@@ -2850,6 +2845,7 @@ GetStorageWidth (
 /**\r
   Generate ConfigAltResp string base on the varstore info.\r
 \r
+  @param      HiiHandle             Hii Handle for this hii package.\r
   @param      ConfigHdr             The config header for this varstore.\r
   @param      VarStorageData        The varstore info.\r
   @param      DefaultIdArray        The Default id array.\r
@@ -2860,6 +2856,7 @@ GetStorageWidth (
 **/\r
 EFI_STATUS\r
 GenerateAltConfigResp (\r
+  IN  EFI_HII_HANDLE               HiiHandle,\r
   IN  CHAR16                       *ConfigHdr,\r
   IN  IFR_VARSTORAGE_DATA          *VarStorageData,\r
   IN  IFR_DEFAULT_DATA             *DefaultIdArray,\r
@@ -2878,10 +2875,11 @@ GenerateAltConfigResp (
   IFR_DEFAULT_DATA      *DefaultValueData;\r
   UINTN                 Width;\r
   UINT8                 *TmpBuffer;\r
+  CHAR16                *DefaultString;\r
 \r
   BlockData     = NULL;\r
   DataExist     = FALSE;\r
-\r
+  DefaultString = NULL;\r
   //\r
   // Add length for <ConfigHdr> + '\0'\r
   //\r
@@ -2993,10 +2991,19 @@ GenerateAltConfigResp (
         // Convert Value to a hex string in "%x" format\r
         // NOTE: This is in the opposite byte that GUID and PATH use\r
         //\r
-        TmpBuffer = (UINT8 *) &(DefaultValueData->Value);\r
-        for (; Width > 0; Width--) {\r
+        if (BlockData->OpCode == EFI_IFR_STRING_OP){\r
+          DefaultString   = InternalGetString(HiiHandle, DefaultValueData->Value.string);\r
+          TmpBuffer = (UINT8 *) DefaultString;\r
+        } else {\r
+          TmpBuffer = (UINT8 *) &(DefaultValueData->Value);\r
+        }\r
+        for (; Width > 0 && (TmpBuffer != NULL); Width--) {\r
           StringPtr += UnicodeValueToString (StringPtr, PREFIX_ZERO | RADIX_HEX, TmpBuffer[Width - 1], 2);\r
         }\r
+        if (DefaultString != NULL){\r
+          FreePool(DefaultString);\r
+          DefaultString = NULL;\r
+        }\r
       }\r
     }\r
   }\r
@@ -3218,7 +3225,7 @@ GetFullStringFromHiiFormPackages (
   // Go through all VarStorageData Entry and get the DefaultId array for each one\r
   // Then construct them all to : ConfigHdr AltConfigHdr ConfigBody AltConfigHdr ConfigBody\r
   //\r
-  Status = GenerateAltConfigResp (ConfigHdr, VarStorageData, DefaultIdArray, &DefaultAltCfgResp);\r
+  Status = GenerateAltConfigResp (DataBaseRecord->Handle,ConfigHdr, VarStorageData, DefaultIdArray, &DefaultAltCfgResp);\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r