diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-08-18 07:57:01 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-08-18 07:57:01 +0000 |
| commit | e8e36190f4b89347b11801c849ff911cbf8428f3 (patch) | |
| tree | afeb0c3f08cd58858738206a6cfc2c1e744655ca | |
| parent | 55a9663bdea82251406a82c4eb0fdf81993a9664 (diff) | |
| download | edk2-platforms-e8e36190f4b89347b11801c849ff911cbf8428f3.tar.xz | |
Merge in [EDK 1166]: Form title is not displayed by Setup Browser
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5664 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c | 2 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c | 2 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c index b958f4fdc7..5235d32fe8 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c @@ -498,6 +498,8 @@ TheKey2: PrintChar (RIGHT_NUMERIC_DELIMITER);
}
}
+
+ goto EnterCarriageReturn;
break;
case SCAN_UP:
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c index 47f99f5b8d..a35ca35df9 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c @@ -462,7 +462,7 @@ DisplayForm ( CopyMem (&LocalScreen, &gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));
- StringPtr = GetToken (Selection->FormSet->FormSetTitle, Handle);
+ StringPtr = GetToken (Selection->Form->FormTitle, Handle);
if (gClassOfVfr != EFI_FRONT_PAGE_SUBCLASS) {
gST->ConOut->SetAttribute (gST->ConOut, TITLE_TEXT | TITLE_BACKGROUND);
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index 663bf7a209..fd5aee4ca1 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -298,7 +298,7 @@ SendForm ( // Initialize internal data structures of FormSet
//
Status = InitializeFormSet (Selection->Handle, &Selection->FormSetGuid, FormSet);
- if (EFI_ERROR (Status)) {
+ if (EFI_ERROR (Status) || IsListEmpty (&FormSet->FormListHead)) {
DestroyFormSet (FormSet);
break;
}
|