tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
rsun3 2009-05-08 05:55:25 +00:00
parent 844390f7d5
commit 0e8e994db3
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
View File

@ -359,12 +359,18 @@ CallDeviceManager (
} }
String = HiiGetString (HiiHandles[Index], FormSetTitle, NULL); 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); Token = HiiSetString (HiiHandle, 0, String, NULL);
FreePool (String); FreePool (String);
String = HiiGetString (HiiHandles[Index], FormSetHelp, NULL); 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); TokenHelp = HiiSetString (HiiHandle, 0, String, NULL);
FreePool (String); FreePool (String);

7
MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
View File

@ -76,6 +76,8 @@ CHAR16 *gAdjustNumber;
CHAR16 *gSaveChanges; CHAR16 *gSaveChanges;
CHAR16 *gOptionMismatch; CHAR16 *gOptionMismatch;
CHAR16 *mUnknownString = L"!";
CHAR16 gPromptBlockWidth; CHAR16 gPromptBlockWidth;
CHAR16 gOptionBlockWidth; CHAR16 gOptionBlockWidth;
CHAR16 gHelpBlockWidth; CHAR16 gHelpBlockWidth;
@ -650,7 +652,10 @@ GetToken (
EFI_STRING String; EFI_STRING String;
String = HiiGetString (HiiHandle, Token, NULL); String = HiiGetString (HiiHandle, Token, NULL);
ASSERT (String != NULL); if (String == NULL) {
String = AllocateCopyPool (sizeof (mUnknownString), mUnknownString);
ASSERT (String != NULL);
}
return (CHAR16 *) String; return (CHAR16 *) String;
} }