Update SetupBrowserDxe and BdsDxe to use an internal string for prompting string...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8263 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index 86046081fea1336f7cc95c6c5e084d3a69f8ba5c..6f153d0c3f10789d8659ed96faa821e3540bfa4f 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -359,12 +359,18 @@ CallDeviceManager (
     }\r
 \r
     String = HiiGetString (HiiHandles[Index], FormSetTitle, NULL);\r
-    ASSERT (String != NULL);\r
+    if (String == NULL) {\r
+      String = HiiGetString (HiiHandle, STR_MISSING_STRING, NULL);\r
+      ASSERT (String != NULL);\r
+    }\r
     Token = HiiSetString (HiiHandle, 0, String, NULL);\r
     FreePool (String);\r
 \r
     String = HiiGetString (HiiHandles[Index], FormSetHelp, NULL);\r
-    ASSERT (String != NULL);\r
+    if (String == NULL) {\r
+      String = HiiGetString (HiiHandle, STR_MISSING_STRING, NULL);\r
+      ASSERT (String != NULL);\r
+    }\r
     TokenHelp = HiiSetString (HiiHandle, 0, String, NULL);\r
     FreePool (String);\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 0a067f03762ee8ae6dad5e4bc396ab862ff5ef32..15d4af3cf1af843018dbc4eafa6314da5c2044b0 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -76,6 +76,8 @@ CHAR16            *gAdjustNumber;
 CHAR16            *gSaveChanges;\r
 CHAR16            *gOptionMismatch;\r
 \r
+CHAR16            *mUnknownString = L"!";\r
+\r
 CHAR16            gPromptBlockWidth;\r
 CHAR16            gOptionBlockWidth;\r
 CHAR16            gHelpBlockWidth;\r
@@ -650,7 +652,10 @@ GetToken (
   EFI_STRING  String;\r
 \r
   String = HiiGetString (HiiHandle, Token, NULL);\r
-  ASSERT (String != NULL);\r
+  if (String == NULL) {\r
+    String = AllocateCopyPool (sizeof (mUnknownString), mUnknownString);\r
+    ASSERT (String != NULL);\r
+  }\r
   return (CHAR16 *) String;\r
 }\r
 \r