From nobody Tue Apr 23 19:17:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+61460+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61460+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1592450662; cv=none; d=zohomail.com; s=zohoarc; b=Og+OUBAKNJguMfzeAAcNwF+UjEMPOzXoqUI/mg1V7Kv8tSm7gBlT7LLOG+gh6koNDSxxrm0yuY0i9lTrkap1JCgRYvqiQoSiGKwT8h3Cu1qLu7IsNNHRkn4a16D9ZrRH12tBOPCqHoH2onLHQhkDQCUVYbs6Jl3wiTsce97hbeQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592450662; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=2b1kCD1pJxpsO0soP3LM7zBDZPwV4v8vrZKfwKEl85M=; b=g8OWUqdqJEeiJix5PPtKGPFLVbGDHKBCrugS1/rIFn3QIosF/w+/8HoEq9zmgMsN6ixPDS1kda9hwVi/g490qxKlKYurofneauQUs5hqVdEDSWHZ/qSslv1HJLMxl+1xibqjFXmO3zf0cWj6SU64B2ynmePG5Lqz/8lJTm9gDtQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61460+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1592450662851641.8160680864444; Wed, 17 Jun 2020 20:24:22 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jGjFYY1788612xLMSoTkzJCu; Wed, 17 Jun 2020 20:24:22 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web12.2252.1592450661871163059 for ; Wed, 17 Jun 2020 20:24:22 -0700 IronPort-SDR: UhQ3GzzpKhCFH0IEmWlvSK9J3f3xj1soG9d5YKjZifCHn6asfkKlJOV1hYMDvaIjsObZH6+uhl wx5n1mIlN9dQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2020 20:24:20 -0700 IronPort-SDR: RI38e3i3keMqRQYRqf8QlXLnUh9AdjZgxNBeZI8Ncojs9P+jBpj/9EcyCFVSY+wKREGJrRuOQ/ fy0rM1WtPNmw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,524,1583222400"; d="scan'208";a="421364021" X-Received: from unknown (HELO shwdeOpenPSI114.ccr.corp.intel.com) ([10.239.157.145]) by orsmga004.jf.intel.com with ESMTP; 17 Jun 2020 20:24:18 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Liming Gao , Eric Dong Subject: [edk2-devel] [patch] MdeModulePkg/DisplayEngine: Add Debug message to show mismatch menu info Date: Thu, 18 Jun 2020 11:24:10 +0800 Message-Id: <20200618032410.106828-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com X-Gm-Message-State: UI24vxcZ0qgKpK5eiQi3uVuDx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1592450662; bh=L3d3/OyN8an3TEwc7gH3OrgA90gNPD3IiNb32dHmNhU=; h=Cc:Date:From:Reply-To:Subject:To; b=fXhJfwKmf7tpuZX4DoPNsPwgDtwDHZD9F8Er0mvQepSkioPgYWP+ko6pfNZ/ktErguE c2IzFY8pOjGvaTYXq5ssZDZiiQtc/awo6MUZ7BAlHC/NS6WuzVDxJYlaHbWkegPpBk3wh NcRZm23L2qKxWASoFhmrnuUEGS1MPsiCyMc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2326 Currently when meet mismatch case for one-of and ordered-list menu, just show a popup window to indicate mismatch, no more info for debugging. This patch is to add more debug message about mismatch menu info which is helpful to debug. Cc: Liming Gao Cc: Eric Dong Signed-off-by: Dandan Bi --- .../DisplayEngineDxe/ProcessOptions.c | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c b/Mde= ModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c index e7306f6d04..4331b2903c 100644 --- a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c +++ b/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c @@ -911,10 +911,73 @@ PasswordProcess ( FreePool (StringPtr); =20 return Status; } =20 +/** + Print some debug message about mismatched menu info. + + @param MenuOption The MenuOption for this Question. + +**/ +VOID +PrintMismatchMenuInfo ( + IN UI_MENU_OPTION *MenuOption +) +{ + CHAR16 *FormTitleStr; + CHAR16 *OneOfOptionStr; + CHAR16 *QuestionName; + LIST_ENTRY *Link; + FORM_DISPLAY_ENGINE_STATEMENT *Question; + EFI_IFR_ORDERED_LIST *OrderList; + UINTN Index; + EFI_HII_VALUE HiiValue; + EFI_HII_VALUE *QuestionValue; + DISPLAY_QUESTION_OPTION *Option; + UINT8 *ValueArray; + UINT8 ValueType; + + Question =3D MenuOption->ThisTag; + FormTitleStr =3D GetToken (gFormData->FormTitle, gFormData->HiiHandle); + + DEBUG ((DEBUG_ERROR, "\n[DisplayEngine]: Mismatch Formset : Formset G= uid =3D %g.\n", &gFormData->FormSetGuid)); + DEBUG ((DEBUG_ERROR, "[DisplayEngine]: Mismatch Form : FormId =3D = %d, Form title =3D %s.\n", gFormData->FormId, FormTitleStr)); + + if (Question->OpCode->OpCode =3D=3D EFI_IFR_ORDERED_LIST_OP) { + QuestionName =3D GetToken (((EFI_IFR_ORDERED_LIST*)MenuOption->ThisTag= ->OpCode)->Question.Header.Prompt, gFormData->HiiHandle); + Link =3D GetFirstNode (&Question->OptionListHead); + Option =3D DISPLAY_QUESTION_OPTION_FROM_LINK (Link); + ValueType =3D Option->OptionOpCode->Type; + + DEBUG ((DEBUG_ERROR, "[DisplayEngine]: Mismatch OrderedList: Name =3D = %s.\n", QuestionName)); + DEBUG ((DEBUG_ERROR, "[DisplayEngine]: Mismatch OrderedList: Value Arr= ary:\n")); + + OrderList =3D (EFI_IFR_ORDERED_LIST *) Question->OpCode; + for (Index =3D 0; Index < OrderList->MaxContainers; Index++) { + ValueArray =3D Question->CurrentValue.Buffer; + HiiValue.Value.u64 =3D GetArrayData (ValueArray, ValueType, Index); + DEBUG ((DEBUG_ERROR, " Value[%= d] =3D%d.\n",Index, HiiValue.Value.u64)); + } + } else if (Question->OpCode->OpCode =3D=3D EFI_IFR_ONE_OF_OP) { + QuestionName =3D GetToken (((EFI_IFR_ONE_OF*)MenuOption->ThisTag->OpCo= de)->Question.Header.Prompt, gFormData->HiiHandle); + QuestionValue =3D &Question->CurrentValue;; + DEBUG ((DEBUG_ERROR, "[DisplayEngine]: Mismatch OneOf : Named =3D= %s.\n", QuestionName)); + DEBUG ((DEBUG_ERROR, "[DisplayEngine]: Mismatch OneOf : Current v= alue =3D %d.\n",QuestionValue->Value.u8)); + } + + Index =3D 0; + Link =3D GetFirstNode (&Question->OptionListHead); + while (!IsNull (&Question->OptionListHead, Link)) { + Option =3D DISPLAY_QUESTION_OPTION_FROM_LINK (Link); + OneOfOptionStr =3D GetToken (Option->OptionOpCode->Option, gFormData->= HiiHandle); + DEBUG ((DEBUG_ERROR, "[DisplayEngine]: Option %d : Option N= ame =3D %s. Option Value =3D %d.\n",Index,OneOfOptionStr,Option->OptionOpCo= de->Value.u8)); + Link =3D GetNextNode (&Question->OptionListHead, Link); + Index++; + } +} + /** Process a Question's Option (whether selected or un-selected). =20 @param MenuOption The MenuOption for this Question. @param Selected TRUE: if Question is selected. @@ -1010,10 +1073,15 @@ ProcessOptions ( break; } =20 OneOfOption =3D ValueToOption (Question, &HiiValue); if (OneOfOption =3D=3D NULL) { + // + // Print debug msg for the mistach menu. + // + PrintMismatchMenuInfo (MenuOption); + if (SkipErrorValue) { // // Just try to get the option string, skip the value which not= has option. // continue; @@ -1102,10 +1170,15 @@ ProcessOptions ( continue; } =20 if (!ValueInvalid) { ValueInvalid =3D TRUE; + // + // Print debug msg for the mistach menu. + // + PrintMismatchMenuInfo (MenuOption); + // // Show error message // do { CreateDialog (&Key, gEmptyString, gOptionMismatch, gPressEnter= , gEmptyString, NULL); @@ -1152,10 +1225,15 @@ ProcessOptions ( *OptionString =3D AllocateZeroPool (BufferSize); ASSERT (*OptionString); =20 OneOfOption =3D ValueToOption (Question, QuestionValue); if (OneOfOption =3D=3D NULL) { + // + // Print debug msg for the mistach menu. + // + PrintMismatchMenuInfo (MenuOption); + if (SkipErrorValue) { // // Not report error, just get the correct option string info. // Link =3D GetFirstNode (&Question->OptionListHead); --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#61460): https://edk2.groups.io/g/devel/message/61460 Mute This Topic: https://groups.io/mt/74952223/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-