From: Dandan Bi <dandan.bi@intel.com>
Date: Wed, 8 Jun 2016 08:46:55 +0000 (+0800)
Subject: MdeModulePkg/UiApp: Fix the incorrect use of the HiiHandle
X-Git-Tag: edk2-stable201903~6860
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=7258076baee1fad8e07684140bcca614fdabfcc7

MdeModulePkg/UiApp: Fix the incorrect use of the HiiHandle

In current code, when adding string package, it will return
'gStringPackHandle'. But the code use the 'gHiiHandle' to get
string. It is incorrect. This patch is to fix this issue.

Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
---

diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c
index dfb37ec9e1..dc5d1c6c40 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c
+++ b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c
@@ -55,7 +55,7 @@ typedef struct {
 CHAR8                        *gLanguageString;
 EFI_STRING_ID                *gLanguageToken;
 UI_HII_DRIVER_INSTANCE       *gHiiDriverList;
-EFI_HII_HANDLE               gHiiHandle;
+extern EFI_HII_HANDLE        gStringPackHandle;
 
 
 /**
@@ -589,7 +589,7 @@ UiListThirdPartyDrivers (
 
     String = HiiGetString (HiiHandles[Index], Token, NULL);
     if (String == NULL) {
-      String = HiiGetString (gHiiHandle, STRING_TOKEN (STR_MISSING_STRING), NULL);
+      String = HiiGetString (gStringPackHandle, STRING_TOKEN (STR_MISSING_STRING), NULL);
       ASSERT (String != NULL);
     } else if (SpecialHandlerFn != NULL) {
       //
@@ -607,7 +607,7 @@ UiListThirdPartyDrivers (
 
     String = HiiGetString (HiiHandles[Index], TokenHelp, NULL);
     if (String == NULL) {
-      String = HiiGetString (gHiiHandle, STRING_TOKEN (STR_MISSING_STRING), NULL);
+      String = HiiGetString (gStringPackHandle, STRING_TOKEN (STR_MISSING_STRING), NULL);
       ASSERT (String != NULL);
     }
     DriverListPtr[Count].HelpId = HiiSetString (HiiHandle, 0, String, NULL);