From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81]) by mx.groups.io with SMTP id smtpd.web11.3023.1593682762653452657 for ; Thu, 02 Jul 2020 02:39:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fmSHANjy; spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593682761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DuBv0u5MxZUGInTTSSEveiSaoFsbn/IcHopQ66m0vlg=; b=fmSHANjyeX/OeQoyocIf7/L1yRh7tdC8+/s9EZOjWC9dZ3m9Q9uHwnjnbEbFmkYe0AZkbJ xxcOy69ZDNY2KMJJejJ3SFteYOs6QRp+evHT3qCGrhR64QYPrDSRk1USW2B6j4lpe/iJUt o1ygkbiW4df3T8rzOhaRBqNA7NcSzVw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-399-d2NBcPg8MtWjNSKrjfBwIg-1; Thu, 02 Jul 2020 05:39:13 -0400 X-MC-Unique: d2NBcPg8MtWjNSKrjfBwIg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F8DD107ACF3; Thu, 2 Jul 2020 09:39:12 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-177.ams2.redhat.com [10.36.113.177]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC7EC73FDF; Thu, 2 Jul 2020 09:39:10 +0000 (UTC) Subject: Re: [patch V2] MdeModulePkg/DisplayEngine: Add Debug message to show mismatch menu info To: Dandan Bi , devel@edk2.groups.io Cc: Liming Gao , Eric Dong References: <20200628021639.13828-1-dandan.bi@intel.com> From: "Laszlo Ersek" Message-ID: <7e844563-c2b6-2834-5384-37e46e09088e@redhat.com> Date: Thu, 2 Jul 2020 11:39:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200628021639.13828-1-dandan.bi@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 06/28/20 04:16, Dandan Bi wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2326 > > 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 > Cc: Laszlo Ersek > Signed-off-by: Dandan Bi > --- > v2: > 1) Refine debug message info. > 2) Use gEfiCallerBaseName.to replace hard code "DisplayEngine" Thanks for the update, I have no more comments! Laszlo > 3) Handle question and option value based on value type. > > .../DisplayEngineDxe/ProcessOptions.c | 125 ++++++++++++++++++ > 1 file changed, 125 insertions(+) > > diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c b/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c > index e7306f6d04..c02e36a63a 100644 > --- a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c > +++ b/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c > @@ -911,10 +911,120 @@ PasswordProcess ( > FreePool (StringPtr); > > return Status; > } > > +/** > + 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 *FormSetTitleStr; > + CHAR16 *OneOfOptionStr; > + CHAR16 *QuestionName; > + LIST_ENTRY *Link; > + FORM_DISPLAY_ENGINE_STATEMENT *Question; > + EFI_IFR_ORDERED_LIST *OrderList; > + UINT8 Index; > + EFI_HII_VALUE HiiValue; > + EFI_HII_VALUE *QuestionValue; > + DISPLAY_QUESTION_OPTION *Option; > + UINT8 *ValueArray; > + UINT8 ValueType; > + EFI_IFR_FORM_SET *FormsetBuffer; > + UINTN FormsetBufferSize; > + > + Question = MenuOption->ThisTag; > + HiiGetFormSetFromHiiHandle (gFormData->HiiHandle, &FormsetBuffer, &FormsetBufferSize); > + > + FormSetTitleStr = GetToken (FormsetBuffer->FormSetTitle, gFormData->HiiHandle); > + FormTitleStr = GetToken (gFormData->FormTitle, gFormData->HiiHandle); > + > + DEBUG ((DEBUG_ERROR, "\n[%a]: Mismatch Formset : Formset Guid = %g, FormSet title = %s\n", gEfiCallerBaseName, &gFormData->FormSetGuid, FormSetTitleStr)); > + DEBUG ((DEBUG_ERROR, "[%a]: Mismatch Form : FormId = %d, Form title = %s.\n", gEfiCallerBaseName, gFormData->FormId, FormTitleStr)); > + > + if (Question->OpCode->OpCode == EFI_IFR_ORDERED_LIST_OP) { > + QuestionName = GetToken (((EFI_IFR_ORDERED_LIST*)MenuOption->ThisTag->OpCode)->Question.Header.Prompt, gFormData->HiiHandle); > + Link = GetFirstNode (&Question->OptionListHead); > + Option = DISPLAY_QUESTION_OPTION_FROM_LINK (Link); > + ValueType = Option->OptionOpCode->Type; > + DEBUG ((DEBUG_ERROR, "[%a]: Mismatch Error : OrderedList value in the array doesn't match with option value.\n", gEfiCallerBaseName)); > + DEBUG ((DEBUG_ERROR, "[%a]: Mismatch OrderedList: Name = %s.\n", gEfiCallerBaseName, QuestionName)); > + DEBUG ((DEBUG_ERROR, "[%a]: Mismatch OrderedList: OrderedList array value :\n", gEfiCallerBaseName)); > + > + OrderList = (EFI_IFR_ORDERED_LIST *) Question->OpCode; > + for (Index = 0; Index < OrderList->MaxContainers; Index++) { > + ValueArray = Question->CurrentValue.Buffer; > + HiiValue.Value.u64 = GetArrayData (ValueArray, ValueType, Index); > + DEBUG ((DEBUG_ERROR, " Value[%d] =%ld.\n", Index, HiiValue.Value.u64)); > + } > + } else if (Question->OpCode->OpCode == EFI_IFR_ONE_OF_OP) { > + QuestionName = GetToken (((EFI_IFR_ONE_OF*)MenuOption->ThisTag->OpCode)->Question.Header.Prompt, gFormData->HiiHandle); > + QuestionValue = &Question->CurrentValue; > + DEBUG ((DEBUG_ERROR, "[%a]: Mismatch Error : OneOf value doesn't match with option value.\n", gEfiCallerBaseName)); > + DEBUG ((DEBUG_ERROR, "[%a]: Mismatch OneOf : Name = %s.\n", gEfiCallerBaseName, QuestionName)); > + switch (QuestionValue->Type) { > + case EFI_IFR_TYPE_NUM_SIZE_64: > + DEBUG ((DEBUG_ERROR, "[%a]: Mismatch OneOf : OneOf value = %ld.\n",gEfiCallerBaseName, QuestionValue->Value.u64)); > + break; > + > + case EFI_IFR_TYPE_NUM_SIZE_32: > + DEBUG ((DEBUG_ERROR, "[%a]: Mismatch OneOf : OneOf value = %d.\n",gEfiCallerBaseName, QuestionValue->Value.u32)); > + break; > + > + case EFI_IFR_TYPE_NUM_SIZE_16: > + DEBUG ((DEBUG_ERROR, "[%a]: Mismatch OneOf : OneOf value = %d.\n",gEfiCallerBaseName, QuestionValue->Value.u16)); > + break; > + > + case EFI_IFR_TYPE_NUM_SIZE_8: > + DEBUG ((DEBUG_ERROR, "[%a]: Mismatch OneOf : OneOf value = %d.\n",gEfiCallerBaseName, QuestionValue->Value.u8)); > + break; > + > + default: > + ASSERT (FALSE); > + break; > + } > + } > + > + Index = 0; > + Link = GetFirstNode (&Question->OptionListHead); > + while (!IsNull (&Question->OptionListHead, Link)) { > + Option = DISPLAY_QUESTION_OPTION_FROM_LINK (Link); > + OneOfOptionStr = GetToken (Option->OptionOpCode->Option, gFormData->HiiHandle); > + switch (Option->OptionOpCode->Type) { > + case EFI_IFR_TYPE_NUM_SIZE_64: > + DEBUG ((DEBUG_ERROR, "[%a]: Option %d : Option Value = %ld, Option Name = %s.\n",gEfiCallerBaseName, Index, Option->OptionOpCode->Value.u64, OneOfOptionStr)); > + break; > + > + case EFI_IFR_TYPE_NUM_SIZE_32: > + DEBUG ((DEBUG_ERROR, "[%a]: Option %d : Option Value = %d, Option Name = %s.\n",gEfiCallerBaseName, Index, Option->OptionOpCode->Value.u32, OneOfOptionStr)); > + break; > + > + case EFI_IFR_TYPE_NUM_SIZE_16: > + DEBUG ((DEBUG_ERROR, "[%a]: Option %d : Option Value = %d, Option Name = %s.\n",gEfiCallerBaseName, Index, Option->OptionOpCode->Value.u16, OneOfOptionStr)); > + break; > + > + case EFI_IFR_TYPE_NUM_SIZE_8: > + DEBUG ((DEBUG_ERROR, "[%a]: Option %d : Option Value = %d, Option Name = %s.\n",gEfiCallerBaseName, Index, Option->OptionOpCode->Value.u8, OneOfOptionStr)); > + break; > + > + default: > + ASSERT (FALSE); > + break; > + } > + Link = GetNextNode (&Question->OptionListHead, Link); > + Index++; > + } > +} > + > /** > Process a Question's Option (whether selected or un-selected). > > @param MenuOption The MenuOption for this Question. > @param Selected TRUE: if Question is selected. > @@ -1010,10 +1120,15 @@ ProcessOptions ( > break; > } > > OneOfOption = ValueToOption (Question, &HiiValue); > if (OneOfOption == 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; > @@ -1082,10 +1197,15 @@ ProcessOptions ( > > if (FindArrayData (ValueArray, ValueType, OneOfOption->OptionOpCode->Value.u64, NULL)) { > continue; > } > > + // > + // Print debug msg for the mistach menu. > + // > + PrintMismatchMenuInfo (MenuOption); > + > if (SkipErrorValue) { > // > // Not report error, just get the correct option string info. > // > Character[0] = LEFT_ONEOF_DELIMITER; > @@ -1152,10 +1272,15 @@ ProcessOptions ( > *OptionString = AllocateZeroPool (BufferSize); > ASSERT (*OptionString); > > OneOfOption = ValueToOption (Question, QuestionValue); > if (OneOfOption == NULL) { > + // > + // Print debug msg for the mistach menu. > + // > + PrintMismatchMenuInfo (MenuOption); > + > if (SkipErrorValue) { > // > // Not report error, just get the correct option string info. > // > Link = GetFirstNode (&Question->OptionListHead); >