diff options
author | rsun3 <rsun3@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-05-08 05:55:25 +0000 |
---|---|---|
committer | rsun3 <rsun3@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-05-08 05:55:25 +0000 |
commit | 0e8e994db30cf4c2383b6e39e1d40e8025dfda45 (patch) | |
tree | dec18f175b24169b44b386643cb09145b0e6c056 | |
parent | 844390f7d59690b09abca9d4807615bb95a8e510 (diff) | |
download | edk2-0e8e994db30cf4c2383b6e39e1d40e8025dfda45.tar.gz edk2-0e8e994db30cf4c2383b6e39e1d40e8025dfda45.tar.bz2 edk2-0e8e994db30cf4c2383b6e39e1d40e8025dfda45.zip |
Update SetupBrowserDxe and BdsDxe to use an internal string for prompting string missing instead of ASSERT if it fails to get a string for separate module's forms.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8263 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r-- | IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c | 10 | ||||
-rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c index 86046081fe..6f153d0c3f 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c @@ -359,12 +359,18 @@ CallDeviceManager ( }
String = HiiGetString (HiiHandles[Index], FormSetTitle, NULL);
- ASSERT (String != NULL);
+ if (String == NULL) {
+ String = HiiGetString (HiiHandle, STR_MISSING_STRING, NULL);
+ ASSERT (String != NULL);
+ }
Token = HiiSetString (HiiHandle, 0, String, NULL);
FreePool (String);
String = HiiGetString (HiiHandles[Index], FormSetHelp, NULL);
- ASSERT (String != NULL);
+ if (String == NULL) {
+ String = HiiGetString (HiiHandle, STR_MISSING_STRING, NULL);
+ ASSERT (String != NULL);
+ }
TokenHelp = HiiSetString (HiiHandle, 0, String, NULL);
FreePool (String);
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index 0a067f0376..15d4af3cf1 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -76,6 +76,8 @@ CHAR16 *gAdjustNumber; CHAR16 *gSaveChanges;
CHAR16 *gOptionMismatch;
+CHAR16 *mUnknownString = L"!";
+
CHAR16 gPromptBlockWidth;
CHAR16 gOptionBlockWidth;
CHAR16 gHelpBlockWidth;
@@ -650,7 +652,10 @@ GetToken ( EFI_STRING String;
String = HiiGetString (HiiHandle, Token, NULL);
- ASSERT (String != NULL);
+ if (String == NULL) {
+ String = AllocateCopyPool (sizeof (mUnknownString), mUnknownString);
+ ASSERT (String != NULL);
+ }
return (CHAR16 *) String;
}
|