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.web10.3162.1607326123147636627 for ; Sun, 06 Dec 2020 23:28:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=m0S4ULlL; spf=pass (domain: hpe.com, ip: 148.163.147.86, mailfrom: prvs=0610f89c5f=abner.chang@hpe.com) Received: from pps.filterd (m0148663.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0B77NOQL021245; Mon, 7 Dec 2020 07:28:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pps0720; bh=xGPCDhLimeu0zZh5HU18CcqADNNDeWZJM7zz64Y9xdc=; b=m0S4ULlLZutbcoFiikUw3+mL2Nwhj0O8iJ7FjoBuf+EOstr2HwsvJgQEzzW2YKCupC1N FNZiNNge57goeZRAy4BJZatfxJLEVLuYqKDQ38uddbGHcmO8fT+mGUhmcml9SSXadpAc ZpIZgRvjsEgmieNh+nv19IgKYYVt2LGPrb9PtSFWrIWakK8740x4NbL2goasKiH+Pl1q GY5sq/a185XD449iZJwgt8P777BI2zlb6cGKQWgPMel+ILHyiYACMxXqsFIbNpoMyD78 7TCj4KO3fepqN+oCPPPdmAA0LlQphVlSg+taFtALxBuUVryKI3B1iR5ayaW6sc5MovqZ vw== Received: from g9t5009.houston.hpe.com (g9t5009.houston.hpe.com [15.241.48.73]) by mx0a-002e3701.pphosted.com with ESMTP id 358maf5x76-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 07 Dec 2020 07:28:33 +0000 Received: from G2W6311.americas.hpqcorp.net (g2w6311.austin.hp.com [16.197.64.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g9t5009.houston.hpe.com (Postfix) with ESMTPS id D057F73; Mon, 7 Dec 2020 07:28:31 +0000 (UTC) Received: from G4W9329.americas.hpqcorp.net (16.208.32.99) by G2W6311.americas.hpqcorp.net (16.197.64.53) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 7 Dec 2020 07:28:31 +0000 Received: from G9W9209.americas.hpqcorp.net (2002:10dc:429c::10dc:429c) by G4W9329.americas.hpqcorp.net (2002:10d0:2063::10d0:2063) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 7 Dec 2020 07:28:31 +0000 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (15.241.52.12) by G9W9209.americas.hpqcorp.net (16.220.66.156) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Mon, 7 Dec 2020 07:28:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kh9Ev4NkzYP0QgIir8XcrXqK1AztclXSCOXfuvWQb0vJ/Is3SWdurXZXd6Me3vZiWopkr7S5Z8gKSCTQuHfQeZ5ZDrXY1qAuYhfmNfU9WfLuau90kMSnGIsqQ9MDmxHj8tD8haUVeH69CBG2kT4o23mvD4E0CQxj5G6FUv3lNdq1GgpPvWiCKGnUTj8xVK3wg2ZoFKlNLrAc/aA3bHQfmd3dxSmZ8MQi5Cqr2fOdqIW0ZKhFx4pDbfLL+No15bqaNUBIEWlOt1DZ8Oom2Zz1WPvQZAdFrJINUQV9/0gu7vnHdoT9QrM6cuFW9BCVULr6j0ENeJRLKnuKMEOFwb+9sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q0oFvaf8Y4uPL1E11R4y1lADe2erwgikg5eWD9F4o7Y=; b=NkLUZczIeSHUvafU24uElf7cokNakOXjE4c+7U89v2ZTG888Da2/VSu+G/+C2RJ3ykw2VlwAEg6QKB2EsBs8YJ5ADsWgC7v69Oa/XnZ1kIG4tTrk7+H0Wdf3XEFSDORRXuyI6itnAPZaAPE7UaSnsBX/awV1VKhztCq0w0nRV1eIOdUYcZ0vMgF1P7lUlOSao9aMXilUgqTbokN01Hy6PwQ/Zy2YPwH0XRW1Mx8VSX1swKR2wOvqQ9iyFbPySxELG44d6QheZ/z83X9sr/0TMwo/BQCuG05PqLLFAUm2rLAzrTy1ZQQB6kmUDJb1mDNuv+dVYJPL5jdI9p6ExdSzqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none Received: from CS1PR8401MB1144.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7508::16) by CS1PR8401MB0342.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:750a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.19; Mon, 7 Dec 2020 07:28:29 +0000 Received: from CS1PR8401MB1144.NAMPRD84.PROD.OUTLOOK.COM ([fe80::a094:ed67:fb40:340e]) by CS1PR8401MB1144.NAMPRD84.PROD.OUTLOOK.COM ([fe80::a094:ed67:fb40:340e%10]) with mapi id 15.20.3632.021; Mon, 7 Dec 2020 07:28:29 +0000 From: "Abner Chang" To: "devel@edk2.groups.io" , "hao.a.wu@intel.com" CC: "Wang, Jian J" , Liming Gao , Leif Lindholm , "Wang, Nickle (HPS SW)" , "O'Hanley, Peter (EXL)" Subject: Re: [edk2-devel] [PATCH v4 1/6] MdeModulePkg/Ucs2Utf8lib: UCS2 to UFT8 manipulation library Thread-Topic: [edk2-devel] [PATCH v4 1/6] MdeModulePkg/Ucs2Utf8lib: UCS2 to UFT8 manipulation library Thread-Index: AQHWzGdSODE2j4SORkSZswTYVXEBGKnrPB1g Date: Mon, 7 Dec 2020 07:28:29 +0000 Message-ID: References: <20201207053655.29101-1-abner.chang@hpe.com> <20201207053655.29101-2-abner.chang@hpe.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=hpe.com; x-originating-ip: [16.242.247.131] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b17ed5d2-8cf0-48c1-d50c-08d89a81b182 x-ms-traffictypediagnostic: CS1PR8401MB0342: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:277; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: UHHPRzXSb2C1X5swBi9vAqMTXSL6stvCBt0/ACmF294i3IP18TOZHmAV/7bVE7hQHJ/6TOLuoZKlDuvZhKYiqcODa44lCFiY3mPTbCtoPv3oYiDfBTCirWAMgZ2ygG7Gbiz5T/45i8nwbqnUp4+aDrdPTnMldlUbiSoLZ8g58kO5Tm17d4u6PUScQrP42/aBm6dxeFUKP3AFce4vu3SXH07VIkyK8CkbvaIwjkqzG6gTJLQt7Ll3bjs5O/xLJ7UvIGt157fAVKN3r+P/pNorGMcnq4VmRfGFlYuyDgUm6oErsWUXggNyPd7u6+lIeAso+vSYgduI7E7yhX4cpCvT92XUKOTuUykSjafnJz0AHfYCfIhytja+e1JvmG4aFA9OoXZJQJLsX15BPk1wZG9Swg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CS1PR8401MB1144.NAMPRD84.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(376002)(396003)(366004)(136003)(39860400002)(346002)(6506007)(4326008)(71200400001)(83380400001)(55016002)(9686003)(53546011)(33656002)(5660300002)(8936002)(316002)(19627235002)(86362001)(7696005)(2906002)(66556008)(186003)(66946007)(26005)(8676002)(52536014)(110136005)(54906003)(64756008)(66476007)(966005)(478600001)(30864003)(66446008)(76116006)(579004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?Z5L3yRty0Yr17g4R7yvgDgtmC7gt/+jkVnivvjR6Pg04E+zpxu6IuAVhMwHX?= =?us-ascii?Q?imQH0bfa2eJh5vFFURTxfMX+25Ot2bZ2xl70Rc2n77h3RavNJ9SI8nns9lZ/?= =?us-ascii?Q?bgQDF/+qDTdgM4E+JI/m5es1mgs2je7QolGFqS7+pBNavipIop+FYM6QGAgZ?= =?us-ascii?Q?8O4pl8oYMt82TXWqhBMy5bQ8Wzb3eN1gUkuEINP02cAm3KxDkNygwkOLIMPk?= =?us-ascii?Q?rev7Qi7v8xx05PiZgeXM7toALjulm7ZSV84ljToP5MHh9ssS1JtiZUztuMFy?= =?us-ascii?Q?ok4qjObOaKllh1/CimizRXpoegshJBNrbuOPqg/fv0sIsStyOFHuUzYOon9M?= =?us-ascii?Q?a+nxrtH2rLoCRRl1XGzF28mcox93xxoXGvGoqVnrilrRPH9GfH32i4Xd0PEz?= =?us-ascii?Q?315hVLtfCUPMQfW7GQicGHy90crakDB6yYU1idpH2IWBqKDhvD7yTOfzP4vD?= =?us-ascii?Q?5hk+MsTTX7wY9MgkaU3c38U5FRWkLx93YJviw6dDQ3zUt7jxFzjix8JRqHEb?= =?us-ascii?Q?06jP81LPbLu6BNxzhl0WKxt3YkWMgShdc4WfSk22eFhukv1QCO07Pofth5mN?= =?us-ascii?Q?Pwf31u/RwvPvX0MyJRw1liFpfSVRG31z5ny4nifECw+WAM6hokhdwxOp8KwW?= =?us-ascii?Q?+Z++KqIspPhGXi7MG0z22NLU5Avp7klSU4SIVC2K24hNimuxldvwmW2cgACi?= =?us-ascii?Q?6AqN3UNofsGcHGIUGhKxaVzYQD3UinyvvVdktT1fmV63wdkDJ7Z6GBrdenBk?= =?us-ascii?Q?NYqPvwdV65dqCUPIwiy9zq496XTQaivWm+VECIkk1aLezPD/QWdxr0lVt7Q0?= =?us-ascii?Q?iEICw6gw79p/pTX0XJHRrJ4epnUXh9mOhHA06E0dN94nsQhCVW43wml0Sdrr?= =?us-ascii?Q?tajf6wNklWwceULXcqJc8wdgFTQvo8n5k8Qe6jQhoIEIyz/Xuaxc5JVjDItE?= =?us-ascii?Q?SLgIavdBWUE0qDQfxpQVgjnYuRF0hvMEjAfNMEsj5V8=3D?= X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CS1PR8401MB1144.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: b17ed5d2-8cf0-48c1-d50c-08d89a81b182 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Dec 2020 07:28:29.1335 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: FbssWS4zpByZTIPFFno/716edTLBmevZ2xrsRAj7MX9apoDS045+h+LEsKP996bLA2Obhzg7wAdu5pnOTaOo7A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CS1PR8401MB0342 X-OriginatorOrg: hpe.com X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-12-07_05:2020-12-04,2020-12-07 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 impostorscore=0 mlxscore=0 adultscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012070045 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Wu, Hao A > Sent: Monday, December 7, 2020 3:05 PM > To: devel@edk2.groups.io; Chang, Abner (HPS SW/FW Technologist) > > Cc: Wang, Jian J ; Liming Gao > ; Leif Lindholm ; Wang, > Nickle (HPS SW) ; O'Hanley, Peter (EXL) > > Subject: Re: [edk2-devel] [PATCH v4 1/6] MdeModulePkg/Ucs2Utf8lib: UCS2 > to UFT8 manipulation library >=20 > > -----Original Message----- > > From: devel@edk2.groups.io On Behalf Of Abner > > Chang > > Sent: Monday, December 7, 2020 1:37 PM > > To: devel@edk2.groups.io > > Cc: Wang, Jian J ; Wu, Hao A > > ; Liming Gao ; Leif > > Lindholm ; Nickle Wang ; > Peter > > O'Hanley > > Subject: [edk2-devel] [PATCH v4 1/6] MdeModulePkg/Ucs2Utf8lib: UCS2 to > > UFT8 manipulation library > > > > This library provides UCS2 to UFT8 or vise versa functions to > > manipulate > > UCS2/UTF8 strings. This library is currently used by edk2 port of open > > source jansson library. >=20 >=20 > Really sorry for missing the previous discussion between you and Leif. >=20 > For me, the Ucs2Utf8lib case is kind of similar with the jansson library= case for > the Redfish feature. > If the current consumer is only the jansson library under the RedfishPkg= , I > would suggest to put the Ucs2Utf8lib under RedfishPkg first. > We can move this library to a more generic place if there are more > consumers. >=20 > Best Regards, > Hao Wu Hi Hao, I have no problem with this. Will send patches again.=20 Thanks >=20 >=20 > > > > Signed-off-by: Abner Chang > > > > Cc: Jian J Wang > > Cc: Hao A Wu > > Cc: Liming Gao > > Cc: Leif Lindholm > > Cc: Nickle Wang > > Cc: Peter O'Hanley > > --- > > .../Include/Library/BaseUcs2Utf8Lib.h | 69 +++ > > .../Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.c | 417 > ++++++++++++++++++ > > .../BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.inf | 30 ++ > > MdeModulePkg/MdeModulePkg.dec | 5 + > > MdeModulePkg/MdeModulePkg.dsc | 2 + > > 5 files changed, 523 insertions(+) > > create mode 100644 MdeModulePkg/Include/Library/BaseUcs2Utf8Lib.h > > create mode 100644 > > MdeModulePkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.c > > create mode 100644 > > MdeModulePkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.inf > > > > diff --git a/MdeModulePkg/Include/Library/BaseUcs2Utf8Lib.h > > b/MdeModulePkg/Include/Library/BaseUcs2Utf8Lib.h > > new file mode 100644 > > index 0000000000..51ae924929 > > --- /dev/null > > +++ b/MdeModulePkg/Include/Library/BaseUcs2Utf8Lib.h > > @@ -0,0 +1,69 @@ > > +/** @file > > + UCS2 to UTF8 manipulation library header file. > > + > > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> > + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> > + > > + SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > +**/ > > + > > +#ifndef BASE_UCS2UTF8_LIB_H_ > > +#define BASE_UCS2UTF8_LIB_H_ > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +/// > > +/// L"\u0000" > > +/// > > +#define UNICODE_FORMAT_LEN 6 > > +#define UNICODE_FORMAT_CHAR_LEN 2 > > +#define UNICODE_FORMAT_CHAR_SIZE 3 > > + > > +#define UTF8_BUFFER_FOR_UCS2_MAX_SIZE 3 > > + > > +/** > > + Convert a UCS2 string to a UTF8 encoded string. > > + > > + @param[in] Ucs2Str The provided UCS2 string. > > + @param[out] Utf8StrAddr The converted UTF8 string addr= ess. > Caller > > + is responsible for Free this s= tring. > > + > > + @retval EFI_INVALID_PARAMETER One or more parameters are > invalid. > > + @retval EFI_OUT_OF_RESOURCES System runs out of resources. > > + @retval EFI_SUCCESS The UTF8 encoded string has be= en > > converted. > > + > > +**/ > > +EFI_STATUS > > +UCS2StrToUTF8 ( > > + IN CHAR16 *Ucs2Str, > > + OUT CHAR8 **Utf8StrAddr > > + ); > > + > > +/** > > + Convert a UTF8 encoded string to a UCS2 string. > > + > > + @param[in] Utf8Str The provided UTF8 encoded stri= ng. > > + @param[out] Ucs2StrAddr The converted UCS2 string addr= ess. > > Caller > > + is responsible for Free this s= tring. > > + > > + @retval EFI_INVALID_PARAMETER The UTF8 encoded string is not > valid > > to > > + convert to UCS2 string. > > + One or more parameters are inv= alid. > > + @retval EFI_OUT_OF_RESOURCES System runs out of resources. > > + @retval EFI_SUCCESS The UCS2 string has been conve= rted. > > + > > +**/ > > +EFI_STATUS > > +UTF8StrToUCS2 ( > > + IN CHAR8 *Utf8Str, > > + OUT CHAR16 **Ucs2StrAddr > > + ); > > + > > +#endif > > diff --git a/MdeModulePkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.c > > b/MdeModulePkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.c > > new file mode 100644 > > index 0000000000..6cff109a5c > > --- /dev/null > > +++ b/MdeModulePkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.c > > @@ -0,0 +1,417 @@ > > +/** @file > > + UCS2 to UTF8 manipulation library. > > + > > + Copyright (c) 2018 - 2019, Intel Corporation. All rights > > + reserved.
> > + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> > + > > + SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > +**/ > > + > > +#include > > + > > +/** > > + Since each UCS2 character can be represented by 1-3 UTF8 encoded > > +characters, > > + this function is used to retrieve the UTF8 encoding size for a UCS2 > > character. > > + > > + @param[in] Utf8Buffer The buffer for UTF8 encoded data. > > + > > + @retval Return the size of UTF8 encoding string or 0 if it is = not for > > + UCS2 format. > > + > > +**/ > > +UINT8 > > +GetUTF8SizeForUCS2 ( > > + IN CHAR8 *Utf8Buffer > > + ) > > +{ > > + CHAR8 TempChar; > > + UINT8 Utf8Size; > > + > > + ASSERT (Utf8Buffer !=3D NULL); > > + > > + TempChar =3D *Utf8Buffer; > > + if ((TempChar & 0xF0) =3D=3D 0xF0) { > > + > > + // > > + // This format is not for UCS2. > > + // > > + return 0; > > + } > > + > > + Utf8Size =3D 1; > > + if ((TempChar & 0x80) =3D=3D 0x80) { > > + if ((TempChar & 0xC0) =3D=3D 0xC0) { > > + > > + Utf8Size ++; > > + if ((TempChar & 0xE0) =3D=3D 0xE0) { > > + > > + Utf8Size ++; > > + } > > + } > > + } > > + > > + return Utf8Size; > > +} > > + > > +/** > > + Since each UCS2 character can be represented by the format: \uXXXX, > > +this function > > + is used to retrieve the UCS2 character from a Unicode format. > > + Call MUST make sure there are at least 6 Bytes in the input UTF8 bu= ffer. > > + > > + @param[in] Utf8Buffer The buffer for UTF8 encoded da= ta. > > + @param[out] Ucs2Char The converted UCS2 character. > > + > > + @retval EFI_INVALID_PARAMETER Non-Ascii characters found in = the > > hexadecimal > > + digits string, and can't be co= nverted to a UCS2 > > + character. > > + @retval EFI_SUCCESS The UCS2 character has been re= trieved. > > + > > +**/ > > +EFI_STATUS > > +GetUCS2CharByFormat ( > > + IN CHAR8 *Utf8Buffer, > > + OUT CHAR16 *Ucs2Char > > + ) > > +{ > > + UINT8 Num1; > > + UINT8 Num2; > > + UINT8 Index; > > + CHAR8 Ucs2CharFormat[UNICODE_FORMAT_CHAR_SIZE]; /// two > > Hexadecimal digits Ascii string, like "3F" > > + > > + for (Index =3D 0; Index < 4; Index ++) { > > + if ((*(Utf8Buffer + 2 + Index) & 0x80) !=3D 0x00) { > > + return EFI_INVALID_PARAMETER; > > + } > > + } > > + > > + ZeroMem (Ucs2CharFormat, UNICODE_FORMAT_CHAR_SIZE); > > + > > + // > > + // Get the First Number, Offset is 2 // CopyMem (Ucs2CharFormat, > > + Utf8Buffer + 2, > > UNICODE_FORMAT_CHAR_LEN); > > + Num1 =3D (UINT8) AsciiStrHexToUintn (Ucs2CharFormat); > > + > > + // > > + // Get the Second Number, Offset is 4 // CopyMem (Ucs2CharFormat, > > + Utf8Buffer + 4, UNICODE_FORMAT_CHAR_LEN); > > + Num2 =3D (UINT8) AsciiStrHexToUintn (Ucs2CharFormat); > > + > > + // > > + // Ucs2Char is Little-Endian > > + // > > + *((CHAR8 *) Ucs2Char) =3D Num2; > > + *(((CHAR8 *) Ucs2Char) + 1) =3D Num1; > > + > > + return EFI_SUCCESS; > > +} > > + > > +/** > > + Convert a UCS2 character to UTF8 encoding string. > > + > > + @param[in] Ucs2Char The provided UCS2 character. > > + @param[out] Utf8Buffer The converted UTF8 encoded dat= a. > > + > > + @retval Return the size of UTF8 encoding data for this UCS2 ch= aracter. > > + > > +**/ > > +UINT8 > > +UCS2CharToUTF8 ( > > + IN CHAR16 Ucs2Char, > > + OUT CHAR8 *Utf8Buffer > > + ) > > +{ > > + UINT16 Ucs2Number; > > + > > + ASSERT (Utf8Buffer !=3D NULL); > > + > > + Ucs2Number =3D (UINT16) Ucs2Char; > > + if (Ucs2Number <=3D 0x007F) { > > + > > + // > > + // UTF8 format: 0xxxxxxx > > + // > > + *Utf8Buffer =3D Ucs2Char & 0x7F; > > + return 1; > > + > > + } else if (Ucs2Number >=3D 0x0080 && Ucs2Number <=3D 0x07FF) { > > + > > + // > > + // UTF8 format: 110xxxxx 10xxxxxx > > + // > > + *(Utf8Buffer + 1) =3D (Ucs2Char & 0x3F) | 0x80; > > + *Utf8Buffer =3D ((Ucs2Char >> 6) & 0x1F) | 0xC0; > > + return 2; > > + > > + } else { /// Ucs2Number >=3D 0x0800 && Ucs2Number <=3D 0xFFFF > > + > > + // > > + // UTF8 format: 1110xxxx 10xxxxxx 10xxxxxx > > + // > > + *(Utf8Buffer + 2) =3D (Ucs2Char & 0x3F) | 0x80; > > + *(Utf8Buffer + 1) =3D ((Ucs2Char >> 6) & 0x3F) | 0x80; > > + *Utf8Buffer =3D ((Ucs2Char >> 12) & 0x0F) | 0xE0; > > + return 3; > > + } > > +} > > + > > +/** > > + Convert a UTF8 encoded data to a UCS2 character. > > + > > + @param[in] Utf8Buffer The provided UTF8 encoded data= . > > + @param[out] Ucs2Char The converted UCS2 character. > > + > > + @retval EFI_INVALID_PARAMETER The UTF8 encoded string is not > valid > > or > > + not for UCS2 character. > > + @retval EFI_SUCCESS The converted UCS2 character. > > + > > +**/ > > +EFI_STATUS > > +UTF8ToUCS2Char ( > > + IN CHAR8 *Utf8Buffer, > > + OUT CHAR16 *Ucs2Char > > + ) > > +{ > > + UINT8 Utf8Size; > > + CHAR8 *Ucs2Buffer; > > + CHAR8 TempChar1; > > + CHAR8 TempChar2; > > + CHAR8 TempChar3; > > + > > + ASSERT (Utf8Buffer !=3D NULL && Ucs2Char !=3D NULL); ZeroMem > > + (Ucs2Char, sizeof (CHAR16)); Ucs2Buffer =3D (CHAR8 *) Ucs2Char; > > + > > + Utf8Size =3D GetUTF8SizeForUCS2 (Utf8Buffer); switch (Utf8Size) { > > + > > + case 1: > > + > > + // > > + // UTF8 format: 0xxxxxxx > > + // > > + TempChar1 =3D *Utf8Buffer; > > + if ((TempChar1 & 0x80) !=3D 0x00) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + *Ucs2Buffer =3D TempChar1; > > + *(Ucs2Buffer + 1) =3D 0; > > + break; > > + > > + case 2: > > + > > + // > > + // UTF8 format: 110xxxxx 10xxxxxx > > + // > > + TempChar1 =3D *Utf8Buffer; > > + if ((TempChar1 & 0xE0) !=3D 0xC0) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + TempChar2 =3D *(Utf8Buffer + 1); > > + if ((TempChar2 & 0xC0) !=3D 0x80) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + *Ucs2Buffer =3D (TempChar1 << 6) + (TempChar2 & 0x3F); > > + *(Ucs2Buffer + 1) =3D (TempChar1 >> 2) & 0x07; > > + break; > > + > > + case 3: > > + > > + // > > + // UTF8 format: 1110xxxx 10xxxxxx 10xxxxxx > > + // > > + TempChar1 =3D *Utf8Buffer; > > + if ((TempChar1 & 0xF0) !=3D 0xE0) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + TempChar2 =3D *(Utf8Buffer + 1); > > + if ((TempChar2 & 0xC0) !=3D 0x80) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + TempChar3 =3D *(Utf8Buffer + 2); > > + if ((TempChar3 & 0xC0) !=3D 0x80) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + *Ucs2Buffer =3D (TempChar2 << 6) + (TempChar3 & 0x3F); > > + *(Ucs2Buffer + 1) =3D (TempChar1 << 4) + ((TempChar2 >> 2) & > > + 0x0F); > > + > > + break; > > + > > + default: > > + > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + return EFI_SUCCESS; > > +} > > + > > +/** > > + Convert a UCS2 string to a UTF8 encoded string. > > + > > + @param[in] Ucs2Str The provided UCS2 string. > > + @param[out] Utf8StrAddr The converted UTF8 string addr= ess. > Caller > > + is responsible for Free this s= tring. > > + > > + @retval EFI_INVALID_PARAMETER One or more parameters are > invalid. > > + @retval EFI_OUT_OF_RESOURCES System runs out of resources. > > + @retval EFI_SUCCESS The UTF8 encoded string has be= en > > converted. > > + > > +**/ > > +EFI_STATUS > > +UCS2StrToUTF8 ( > > + IN CHAR16 *Ucs2Str, > > + OUT CHAR8 **Utf8StrAddr > > + ) > > +{ > > + UINTN Ucs2StrIndex; > > + UINTN Ucs2StrLength; > > + CHAR8 *Utf8Str; > > + UINTN Utf8StrLength; > > + UINTN Utf8StrIndex; > > + CHAR8 Utf8Buffer[UTF8_BUFFER_FOR_UCS2_MAX_SIZE]; > > + UINT8 Utf8BufferSize; > > + > > + if (Ucs2Str =3D=3D NULL || Utf8StrAddr =3D=3D NULL) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + Ucs2StrLength =3D StrLen (Ucs2Str); > > + Utf8StrLength =3D 0; > > + > > + for (Ucs2StrIndex =3D 0; Ucs2StrIndex < Ucs2StrLength; Ucs2StrIndex > > + ++) { > > + > > + ZeroMem (Utf8Buffer, sizeof (Utf8Buffer)); > > + Utf8BufferSize =3D UCS2CharToUTF8 (Ucs2Str[Ucs2StrIndex], Utf8Buf= fer); > > + Utf8StrLength +=3D Utf8BufferSize; > > + } > > + > > + Utf8Str =3D AllocateZeroPool (Utf8StrLength + 1); if (Utf8Str =3D= =3D > > + NULL) { > > + return EFI_OUT_OF_RESOURCES; > > + } > > + > > + Utf8StrIndex =3D 0; > > + for (Ucs2StrIndex =3D 0; Ucs2StrIndex < Ucs2StrLength; Ucs2StrIndex > > + ++) { > > + > > + ZeroMem (Utf8Buffer, sizeof (Utf8Buffer)); > > + Utf8BufferSize =3D UCS2CharToUTF8 (Ucs2Str[Ucs2StrIndex], > > + Utf8Buffer); > > + > > + CopyMem (Utf8Str + Utf8StrIndex, Utf8Buffer, Utf8BufferSize); > > + Utf8StrIndex +=3D Utf8BufferSize; > > + } > > + > > + Utf8Str[Utf8StrIndex] =3D '\0'; > > + *Utf8StrAddr =3D Utf8Str; > > + > > + return EFI_SUCCESS; > > +} > > + > > +/** > > + Convert a UTF8 encoded string to a UCS2 string. > > + > > + @param[in] Utf8Str The provided UTF8 encoded stri= ng. > > + @param[out] Ucs2StrAddr The converted UCS2 string addr= ess. > > Caller > > + is responsible for Free this s= tring. > > + > > + @retval EFI_INVALID_PARAMETER The UTF8 encoded string is not > valid > > to > > + convert to UCS2 string. > > + One or more parameters are inv= alid. > > + @retval EFI_OUT_OF_RESOURCES System runs out of resources. > > + @retval EFI_SUCCESS The UCS2 string has been conve= rted. > > + > > +**/ > > +EFI_STATUS > > +UTF8StrToUCS2 ( > > + IN CHAR8 *Utf8Str, > > + OUT CHAR16 **Ucs2StrAddr > > + ) > > +{ > > + EFI_STATUS Status; > > + UINTN Utf8StrIndex; > > + UINTN Utf8StrLength; > > + UINTN Ucs2StrIndex; > > + UINT8 Utf8BufferSize; > > + CHAR16 *Ucs2StrTemp; > > + > > + if (Utf8Str =3D=3D NULL || Ucs2StrAddr =3D=3D NULL) { > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + // > > + // It is not an Ascii string, calculate string length. > > + // > > + Utf8StrLength =3D 0; > > + while (*(Utf8Str + Utf8StrLength) !=3D '\0') { > > + Utf8StrLength ++; > > + } > > + > > + // > > + // UCS2 string shall not be longer than the UTF8 string. > > + // > > + Ucs2StrTemp =3D AllocateZeroPool ((Utf8StrLength + 1) * sizeof > > + (CHAR16)); if (Ucs2StrTemp =3D=3D NULL) { > > + return EFI_OUT_OF_RESOURCES; > > + } > > + > > + Utf8StrIndex =3D 0; > > + Ucs2StrIndex =3D 0; > > + while (Utf8Str[Utf8StrIndex] !=3D '\0') { > > + > > + if (CompareMem (Utf8Str + Utf8StrIndex, "\\u", 2) =3D=3D 0 && > > + Utf8StrLength - Utf8StrIndex >=3D UNICODE_FORMAT_LEN) { > > + > > + Status =3D GetUCS2CharByFormat (Utf8Str + Utf8StrIndex, > > + Ucs2StrTemp + > > Ucs2StrIndex); > > + if (!EFI_ERROR (Status)) { > > + > > + Utf8StrIndex +=3D UNICODE_FORMAT_LEN; > > + Ucs2StrIndex ++; > > + } else { > > + > > + StrCpyS (Ucs2StrTemp + Ucs2StrIndex, 3, L"\\u"); > > + > > + Ucs2StrIndex +=3D 2; > > + Utf8StrIndex +=3D 2; > > + } > > + } else { > > + > > + Utf8BufferSize =3D GetUTF8SizeForUCS2 (Utf8Str + Utf8StrIndex); > > + if (Utf8BufferSize =3D=3D 0 || Utf8StrLength - Utf8StrIndex < > > + Utf8BufferSize) { > > + > > + FreePool (Ucs2StrTemp); > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + Status =3D UTF8ToUCS2Char (Utf8Str + Utf8StrIndex, Ucs2StrTemp = + > > Ucs2StrIndex); > > + if (EFI_ERROR (Status)) { > > + > > + FreePool (Ucs2StrTemp); > > + return EFI_INVALID_PARAMETER; > > + } > > + > > + Ucs2StrIndex ++; > > + Utf8StrIndex +=3D Utf8BufferSize; > > + } > > + } > > + > > + *Ucs2StrAddr =3D AllocateZeroPool ((Ucs2StrIndex + 1) * sizeof > > + (CHAR16)); if (*Ucs2StrAddr =3D=3D NULL) { > > + > > + FreePool (Ucs2StrTemp); > > + return EFI_OUT_OF_RESOURCES; > > + } > > + > > + StrCpyS (*Ucs2StrAddr, Ucs2StrIndex + 1, Ucs2StrTemp); > > + *(*Ucs2StrAddr + Ucs2StrIndex) =3D L'\0'; FreePool (Ucs2StrTemp); > > + > > + return EFI_SUCCESS; > > +} > > + > > diff --git a/MdeModulePkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.inf > > b/MdeModulePkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.inf > > new file mode 100644 > > index 0000000000..93efb1fb88 > > --- /dev/null > > +++ b/MdeModulePkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.inf > > @@ -0,0 +1,30 @@ > > +## @file > > +# UCS2 to UTF8 manipulation library. > > +# > > +# Copyright (c) 2019, Intel Corporation. All rights reserved.
# > > +(C) Copyright 2020 Hewlett Packard Enterprise Development LP
# > > +# SPDX-License-Identifier: BSD-2-Clause-Patent > > +# > > +## > > + > > +[Defines] > > + INF_VERSION =3D 0x0001001b > > + BASE_NAME =3D BaseUcs2Utf8Lib > > + FILE_GUID =3D 536646C3-46D0-4B12-ABC4-CDE1A33B= 5256 > > + MODULE_TYPE =3D BASE > > + VERSION_STRING =3D 1.0 > > + LIBRARY_CLASS =3D Ucs2Utf8Lib > > + > > +# > > +# VALID_ARCHITECTURES =3D IA32 X64 ARM AARCH64 RISCV64 > > +# > > + > > +[Sources.common] > > + BaseUcs2Utf8Lib.c > > + > > +[Packages] > > + MdePkg/MdePkg.dec > > + MdeModulePkg/MdeModulePkg.dec > > + > > + > > diff --git a/MdeModulePkg/MdeModulePkg.dec > > b/MdeModulePkg/MdeModulePkg.dec index 9b52b34494..1cd8c6392d > > 100644 > > --- a/MdeModulePkg/MdeModulePkg.dec > > +++ b/MdeModulePkg/MdeModulePkg.dec > > @@ -154,6 +154,11 @@ > > # > > VariablePolicyHelperLib|Include/Library/VariablePolicyHelperLib.h > > > > + ## @libraryclass This library provides UCS2 to UTF8 manipulation > > + # functions. > > + # > > + Ucs2Utf8Lib|Include/Library/BaseUcs2Utf8Lib.h > > + > > [Guids] > > ## MdeModule package token space guid > > # Include/Guid/MdeModulePkgTokenSpace.h > > diff --git a/MdeModulePkg/MdeModulePkg.dsc > > b/MdeModulePkg/MdeModulePkg.dsc index 90165ca443..85e2daeeea > > 100644 > > --- a/MdeModulePkg/MdeModulePkg.dsc > > +++ b/MdeModulePkg/MdeModulePkg.dsc > > @@ -43,6 +43,7 @@ > > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > > > > > PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/Base > > PeCoffGetEntryPointLib.inf > > SortLib|MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf > > + > > > Ucs2Utf8Lib|MdeModulePkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.inf > > # > > # UEFI & PI > > # > > @@ -212,6 +213,7 @@ > > MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.inf > > > > MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > > + MdeModulePkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.inf > > MdeModulePkg/Logo/Logo.inf > > MdeModulePkg/Logo/LogoDxe.inf > > MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf > > -- > > 2.17.1 > > > > > > > > > > >=20 >=20 >=20 >=20 >=20