From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web11.7076.1604633723499334843 for ; Thu, 05 Nov 2020 19:35:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=ejXP4snR; spf=pass (domain: hpe.com, ip: 148.163.147.86, mailfrom: prvs=057929b778=abner.chang@hpe.com) Received: from pps.filterd (m0150242.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A63W8Um022374; Fri, 6 Nov 2020 03:35:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=pps0720; bh=H+kOttp6bK6gsCEN/mE+2UGErkganMEuIPschar5saM=; b=ejXP4snRmtwapl+ylknP3Lqd0G0xEoXM95m7T9XdsjPhyRqV7txNyJHXtonqUYyzTUgD NZz7j+Cnf3TD+IJFt6niUztAApQNA05fhrqC/7GGSRTcWnVLTy+81FClyTupyD2vrDFd zZ6d/fCnCONCrn1XZxtJIVfASx1Al4IZefCf5XcI5wUcAnpllT61DhdahhRnBE/Ckje4 lM0wvVQdArQBK/k2uvsuaVQGe+g8V83DGX21KCSw8EjffzHMqgDSzXIxM4zsVCCRwJwc foaCw632Hvsq9LKiGXiWTHOzu4ubQiC+Mq78pmiLwqMyC8c3xfCDXbVA0WCrrzgyQ2zj Bg== Received: from g2t2354.austin.hpe.com (g2t2354.austin.hpe.com [15.233.44.27]) by mx0a-002e3701.pphosted.com with ESMTP id 34kc7v6jhd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Nov 2020 03:35:23 +0000 Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2354.austin.hpe.com (Postfix) with ESMTP id 3DD12AE; Fri, 6 Nov 2020 03:35:22 +0000 (UTC) Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 3AA3D36; Fri, 6 Nov 2020 03:35:21 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Dandan Bi , Eric Dong , Nickle Wang Subject: [VFR support REST_STYLE PATCH v4 3/4] MdeModulePkg/Library: Revise HiiLib to check REST_STYLE Date: Fri, 6 Nov 2020 10:49:38 +0800 Message-Id: <20201106024939.17761-4-abner.chang@hpe.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201106024939.17761-1-abner.chang@hpe.com> References: <20201106024939.17761-1-abner.chang@hpe.com> X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-06_01:2020-11-05,2020-11-06 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 adultscore=0 bulkscore=0 mlxlogscore=999 impostorscore=0 malwarescore=0 lowpriorityscore=0 mlxscore=0 suspectscore=1 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011060022 This change checks REST_STYLE flag. Signed-off-by: Jiaxin Wu Signed-off-by: Ting Ye Signed-off-by: Siyuan Fu Signed-off-by: Fan Wang Signed-off-by: Abner Chang Cc: Dandan Bi Cc: Eric Dong Cc: Nickle Wang --- MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c index 564169bc14..57602828fe 100644 --- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c @@ -3605,7 +3605,7 @@ HiiCreateCheckBoxOpCode ( EFI_IFR_CHECKBOX OpCode; UINTN Position; - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) == 0); ZeroMem (&OpCode, sizeof (OpCode)); OpCode.Question.QuestionId = QuestionId; @@ -3674,7 +3674,7 @@ HiiCreateNumericOpCode ( UINTN Position; UINTN Length; - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) == 0); Length = 0; ZeroMem (&OpCode, sizeof (OpCode)); @@ -3773,7 +3773,7 @@ HiiCreateStringOpCode ( EFI_IFR_STRING OpCode; UINTN Position; - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) == 0); ZeroMem (&OpCode, sizeof (OpCode)); OpCode.Question.Header.Prompt = Prompt; @@ -3841,7 +3841,7 @@ HiiCreateOneOfOpCode ( UINTN Length; ASSERT (OptionsOpCodeHandle != NULL); - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0); ZeroMem (&OpCode, sizeof (OpCode)); OpCode.Question.Header.Prompt = Prompt; @@ -3912,7 +3912,7 @@ HiiCreateOrderedListOpCode ( UINTN Position; ASSERT (OptionsOpCodeHandle != NULL); - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE | EFI_IFR_FLAG_OPTIONS_ONLY))) == 0); ZeroMem (&OpCode, sizeof (OpCode)); OpCode.Question.Header.Prompt = Prompt; @@ -4009,7 +4009,7 @@ HiiCreateDateOpCode ( EFI_IFR_DATE OpCode; UINTN Position; - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) == 0); ASSERT ((DateFlags & (~(EFI_QF_DATE_YEAR_SUPPRESS | EFI_QF_DATE_MONTH_SUPPRESS | EFI_QF_DATE_DAY_SUPPRESS | EFI_QF_DATE_STORAGE))) == 0); ZeroMem (&OpCode, sizeof (OpCode)); @@ -4074,7 +4074,7 @@ HiiCreateTimeOpCode ( EFI_IFR_TIME OpCode; UINTN Position; - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED))) == 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBACK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) == 0); ASSERT ((TimeFlags & (~(QF_TIME_HOUR_SUPPRESS | QF_TIME_MINUTE_SUPPRESS | QF_TIME_SECOND_SUPPRESS | QF_TIME_STORAGE))) == 0); ZeroMem (&OpCode, sizeof (OpCode)); -- 2.17.1