From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4D00E81D4D for ; Tue, 1 Nov 2016 05:05:32 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 01 Nov 2016 05:05:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,579,1473145200"; d="scan'208";a="780809029" Received: from sliu17-mobl1.ccr.corp.intel.com (HELO jyao1-MOBL.ccr.corp.intel.com) ([10.254.210.237]) by FMSMGA003.fm.intel.com with ESMTP; 01 Nov 2016 05:05:31 -0700 From: Jiewen Yao To: edk2-devel@lists.01.org Cc: Eric Dong , Ruiyu Ni , Feng Tian , Star Zeng , Michael D Kinney , Liming Gao Date: Tue, 1 Nov 2016 20:05:04 +0800 Message-Id: <1478001910-8040-10-git-send-email-jiewen.yao@intel.com> X-Mailer: git-send-email 2.7.4.windows.1 In-Reply-To: <1478001910-8040-1-git-send-email-jiewen.yao@intel.com> References: <1478001910-8040-1-git-send-email-jiewen.yao@intel.com> Subject: [PATCH V7 09/15] MdeModulePkg/UiApp: Show test key warning info in FrontPage. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2016 12:05:32 -0000 The UiApp is updated to consume PcdTestKeyUsed to know if there is any test key used in current BIOS, such as recovery key, or capsule update key. Then UiApp show warning information in front page. Cc: Eric Dong Cc: Ruiyu Ni Cc: Feng Tian Cc: Star Zeng Cc: Michael D Kinney Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao --- MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c | 13 +++++++++++++ MdeModulePkg/Application/UiApp/FrontPageStrings.uni | 4 +++- MdeModulePkg/Application/UiApp/UiApp.inf | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c index 6e4f7b5..a9d2269 100644 --- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c +++ b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c @@ -16,8 +16,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include "FrontPage.h" #include "FrontPageCustomizedUiSupport.h" +extern FRONT_PAGE_CALLBACK_DATA gFrontPagePrivate; + /** Customize menus in the page. @@ -129,4 +132,14 @@ UiCustomizeFrontPageBanner ( IN OUT EFI_STRING *BannerStr ) { + if ((LineIndex == 5) && LeftOrRight) { + // Update STR_CUSTOMIZE_BANNER_LINE5_LEFT + if (PcdGetBool(PcdTestKeyUsed)) { + if (BannerStr != NULL) { + FreePool(*BannerStr); + } + *BannerStr = HiiGetString(gFrontPagePrivate.HiiHandle, STRING_TOKEN(STR_TEST_KEY_USED), NULL); + } + } + return; } diff --git a/MdeModulePkg/Application/UiApp/FrontPageStrings.uni b/MdeModulePkg/Application/UiApp/FrontPageStrings.uni index 71cb788..8080a20 100644 --- a/MdeModulePkg/Application/UiApp/FrontPageStrings.uni +++ b/MdeModulePkg/Application/UiApp/FrontPageStrings.uni @@ -2,7 +2,7 @@ // // String definitions for BdsPlatform formset. // -// Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+// Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
// This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at @@ -68,5 +68,7 @@ #language fr-FR "" #string STR_CUSTOMIZE_BANNER_LINE5_RIGHT #language en-US "" #language fr-FR "" +#string STR_TEST_KEY_USED #language en-US "WARNING: Test key detected." + #language fr-FR "WARNING: Test key detected." #string STR_NULL_STRING #language en-US " " #language fr-FR " " diff --git a/MdeModulePkg/Application/UiApp/UiApp.inf b/MdeModulePkg/Application/UiApp/UiApp.inf index 6df6e47..d144462 100644 --- a/MdeModulePkg/Application/UiApp/UiApp.inf +++ b/MdeModulePkg/Application/UiApp/UiApp.inf @@ -1,7 +1,7 @@ ## @file # UiApp module is driver for BDS phase. # -# Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at @@ -82,6 +82,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed ## CONSUMES [UserExtensions.TianoCore."ExtraFiles"] UiAppExtra.uni -- 2.7.4.windows.1