From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.3083.1607326465445388349 for ; Sun, 06 Dec 2020 23:34:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=ZVzPY33/; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: hao.a.wu@intel.com) IronPort-SDR: ZKSfIu2jbMxd3ySmFVs4M1xo8iu2/YKqeog7tLD9+OWWvjMhoEOFzfAx0uL56BaJ8ImDqUi+EE cCPWPcunTKqw== X-IronPort-AV: E=McAfee;i="6000,8403,9827"; a="173809734" X-IronPort-AV: E=Sophos;i="5.78,399,1599548400"; d="scan'208";a="173809734" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Dec 2020 23:34:24 -0800 IronPort-SDR: TtGyUVmKqxf3h0gVKnTO6vmSiFttkdMuFPbrXpNe4AwyZc7ytTxgguXBxkcfxvoTCbaL6v8vZm 0kl11o/gypyw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,399,1599548400"; d="scan'208";a="337089617" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by orsmga006.jf.intel.com with ESMTP; 06 Dec 2020 23:34:24 -0800 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sun, 6 Dec 2020 23:34:23 -0800 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sun, 6 Dec 2020 23:34:23 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Sun, 6 Dec 2020 23:34:23 -0800 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.172) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Sun, 6 Dec 2020 23:34:23 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NNI3Ob1eCcLQm0sHceFl0Ip3fRPtI8Eqrv3R6w7JdzYtiDXoec/qtzulOXboLOGFE37mOq4DIFEWIkPEGmVOK9Whpksgwursmc5fZJ1nWyxdLMvgDmqYzHqa/khUJs5Asd0mHK8m3IZ3tmcXUMEgT+pDsgQ2fWfr/PtxF0+VPR/pPMbR30Rc1l6Zwf2Emry/76OfNIAIFPPlPWb8K+5AUKNsNz46+DrxuDSaQHWyKzeUgcEOFOnQ+sRf0wPMYL51JbGrMI8FTubaxwQv+qnTupG8DOvqLS+lGbZ8v59R5NSdqNnGAP2u4UnHq8s0qyNrVLzGNq7JzoJmatNHG/BaFA== 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=1GC5NtgMMtjyn6Y2pIvHm4wwXrD/5g1U9wrW8yBJ+Ec=; b=Dvjedm5FRx3Qet6wqawrcwpXVGidBOroTePolzNvZZrUlKxi15585ImlxJd2LVwiL5Wd+COIaLU9XGOlcosQHVRuN25Bi51/a8xE14AlQLdsbbcm0j0WKq5wMOQYlzTY4n2eWn8FrDVdrteyqO5Owz5292BbZ4ek2F/GdU+WEE5EkefNyEo0pYqt5NSnc6cFZc3polRvo1Gtfmh/HcHTwittCdOL9NeZTUMRTzfxPZRhxggfZ+lbZdfLMz9NUyC/sswBggw5AhoIsE79S/vGD+oB/0Pt9K8P/Zx8yVNv1MOEeHe2N9I8GMsjIarUfSSgfwhqoRTrfbYkQG0zhhJ42w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1GC5NtgMMtjyn6Y2pIvHm4wwXrD/5g1U9wrW8yBJ+Ec=; b=ZVzPY33/zxyOFMeIg7bCPp+ZY6IqkCeKhhzv9HB4I7GIShop2+fZNeDSOYeu5aW8wNp6/ixNM/SNvE2aipEjckQkWdCkXNyeZSd/L/vc7Yu875Z8cSmLdUZDPrpI2nc/Rsq/y/jZK2/jjAKXj+eGVGS/Rcwnws0sy6XkREPBR6U= Received: from BN8PR11MB3666.namprd11.prod.outlook.com (2603:10b6:408:8c::19) by BN6PR11MB1892.namprd11.prod.outlook.com (2603:10b6:404:105::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.20; Mon, 7 Dec 2020 07:34:21 +0000 Received: from BN8PR11MB3666.namprd11.prod.outlook.com ([fe80::4cda:993f:ffc1:f169]) by BN8PR11MB3666.namprd11.prod.outlook.com ([fe80::4cda:993f:ffc1:f169%6]) with mapi id 15.20.3632.022; Mon, 7 Dec 2020 07:34:21 +0000 From: "Wu, Hao A" To: "Chang, Abner (HPS SW/FW Technologist)" , "devel@edk2.groups.io" , Leif Lindholm , Liming Gao CC: "Wang, Jian J" , "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: AQHWzGGbnIp5k2YdTEmEUKndALmf7qnrMygggAAJMoCAAAFZQA== Date: Mon, 7 Dec 2020 07:34:21 +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, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 authentication-results: hpe.com; dkim=none (message not signed) header.d=none;hpe.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.218] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6c739215-474c-4fe4-a036-08d89a828379 x-ms-traffictypediagnostic: BN6PR11MB1892: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:309; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 1RC0kpF4YSXdIUi9UXLVjb3oQqslf9PNUId7iBZSHvia9jpIaCuauZFfYwuNsdXulL6WturcTeihkq2Xi5BU3Fd2PseQqk/vIrlYDXiDlUV0VRdZX0BB7EmHJQKPycGTyTxBdqL/gRfLMJa6V3ZDG81I2X4ne7ktshK0H3Y3L2/KLz9Z7GtfTzPyQIAznYcP+T4XuEsYzIh86rYxL5QgXZs0iOeik04EGdj3Am1AlSqqC5TIAfQa50p2AfjzJv6dAtPy2EoKv5Q7cEHLLVFxPU5biy/5cQZIjrlDXH1YAMNgUysni6j0mXghUIaYkMwB4mDeNlnVdPbe/HsrWJGojpyELwBCXXC7v2tPdfk6mwmcGq71lClYthVjhrd10vW8Yfxy8JYjzGOeSW5nJxQKmg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN8PR11MB3666.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(346002)(39860400002)(396003)(366004)(136003)(6506007)(296002)(66556008)(19627235002)(76116006)(71200400001)(110136005)(33656002)(64756008)(55016002)(66446008)(7696005)(66476007)(53546011)(316002)(26005)(54906003)(52536014)(9686003)(5660300002)(2906002)(66946007)(4326008)(8936002)(8676002)(478600001)(966005)(83380400001)(86362001)(186003)(30864003)(579004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?fHm0THtE/fQIqBwIsx0oaoVZ3i7gcCb7klpFVtaPJWLm3OjVkNmruwM58nq9?= =?us-ascii?Q?vyHr8QOUyc8alKX2U19rrBQRcXew6eKSYGt0oXAVpahgAr3eIUCg7rtmKhrC?= =?us-ascii?Q?yPYhw9YriRGyuy2plbTAxKYDUmPGNYqWTqLmle16hKEQ/u7krDSrzlX53mh7?= =?us-ascii?Q?8qF754F3Wqb+/3CRr5h9tgAaPpIC0gxwmc6GxdnCqx134jABgSmsaWhhhLU7?= =?us-ascii?Q?uW+1+tIGkRCAO06/EzdihI7EehK1QEK05gr7oaCmu0HQ5iou39KvBaWLoUk7?= =?us-ascii?Q?AbpLbN/8YxYXtbBMOk4Y2+nb9691An6UZLPU0aGBrOlHpAYCWpmsv9i5R+0t?= =?us-ascii?Q?7+fdcKyi/XsAW5K4wGKhY+XD8E/Oynyf7bA49V71oDThVkadm3DDcLT0GTF+?= =?us-ascii?Q?8d8OmI5IrPaNk6zM6MQxYdv9KB8Ag/UcIoo9qqGvIRbb1kQS6VV0F8rNMGOr?= =?us-ascii?Q?nRDzWpezxQ/RRZYXoFFNwwA+xXaECIWFR7shucJI1bRiilHwzM4J6UPykhDj?= =?us-ascii?Q?JfnuXP2BYLA0mu8kqsXNyQoYM/FCBxMvN9uVztwB6Z4ZJypnqMWoulvmEPUW?= =?us-ascii?Q?+34DhlBixw5P7W28moZmxeWpOW3QklmQQdq0IyksBI8yOtfi89lsjJLhQQbY?= =?us-ascii?Q?Kiz4HALvcMnGNp6hOq6BBuMPd2W6OlT1z9w98Kj9AUC1wbTl5pOXpK1qrz/U?= =?us-ascii?Q?Veyl6/OvYuOFdd5M/PE6wolTLI+3Cpvn/kJZ5snPjlBpdJ2AqDE7qT6tsD+z?= =?us-ascii?Q?lJkm6OBHbjT7sH1bWgxE05EG2bwZxGsYWngL+GVSVO2yJvt+48TtGEm+7QWU?= =?us-ascii?Q?S5vVUJEX8oAfBnJ+AWneawlRBbjzGIF6n7hjBbFxcP7NmHmn3izw/kZ/l9qC?= =?us-ascii?Q?YyiZwaOpLoBP7fU0zNR8uMvWeTRn2SkkrZq8GnPXS9Ufxgk+6FHS6KNHiTZr?= =?us-ascii?Q?oBg+r8JvdoJ7sEhrqoA42H4/s9jidTz+UJ1ECiB+rsHsjHKWH5AAdodfvsy/?= =?us-ascii?Q?2pCq?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN8PR11MB3666.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c739215-474c-4fe4-a036-08d89a828379 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Dec 2020 07:34:21.3928 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: QqAvTsTdzWWpiLMQAqip+sa7S/ns0Kmh+LXEru09Ooz7LkvJ7E5b//2fBlOitQtgxpLOteJZhV5OAn2hdBvjgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1892 Return-Path: hao.a.wu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > -----Original Message----- > From: Chang, Abner (HPS SW/FW Technologist) > Sent: Monday, December 7, 2020 3:28 PM > To: devel@edk2.groups.io; Wu, Hao A > 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 >=20 >=20 > > -----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 > > > > > -----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. > > > > > > Really sorry for missing the previous discussion between you and Leif. > > > > 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 fi= rst. > > We can move this library to a more generic place if there are more > > consumers. > > > > Best Regards, > > Hao Wu >=20 > Hi Hao, I have no problem with this. Will send patches again. > Thanks Thanks Abner. Leif and Liming, do you have comments on this? Thanks. Best Regards, Hao Wu >=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 ad= dress. > > Caller > > > + is responsible for Free this= string. > > > + > > > + @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 = been > > > 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 st= ring. > > > + @param[out] Ucs2StrAddr The converted UCS2 string ad= dress. > > > Caller > > > + is responsible for Free this= string. > > > + > > > + @retval EFI_INVALID_PARAMETER The UTF8 encoded string is n= ot > > valid > > > to > > > + convert to UCS2 string. > > > + One or more parameters are i= nvalid. > > > + @retval EFI_OUT_OF_RESOURCES System runs out of resources= . > > > + @retval EFI_SUCCESS The UCS2 string has been con= verted. > > > + > > > +**/ > > > +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 i= s 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 = buffer. > > > + > > > + @param[in] Utf8Buffer The buffer for UTF8 encoded = data. > > > + @param[out] Ucs2Char The converted UCS2 character= . > > > + > > > + @retval EFI_INVALID_PARAMETER Non-Ascii characters found i= n the > > > hexadecimal > > > + digits string, and can't be = converted to a UCS2 > > > + character. > > > + @retval EFI_SUCCESS The UCS2 character has been = retrieved. > > > + > > > +**/ > > > +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 d= ata. > > > + > > > + @retval Return the size of UTF8 encoding data for this UCS2 = character. > > > + > > > +**/ > > > +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 da= ta. > > > + @param[out] Ucs2Char The converted UCS2 character= . > > > + > > > + @retval EFI_INVALID_PARAMETER The UTF8 encoded string is n= ot > > 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 ad= dress. > > Caller > > > + is responsible for Free this= string. > > > + > > > + @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 = been > > > 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; Ucs2StrInd= ex > > > + ++) { > > > + > > > + ZeroMem (Utf8Buffer, sizeof (Utf8Buffer)); > > > + Utf8BufferSize =3D UCS2CharToUTF8 (Ucs2Str[Ucs2StrIndex], Utf8B= uffer); > > > + 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; Ucs2StrInd= ex > > > + ++) { > > > + > > > + 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 st= ring. > > > + @param[out] Ucs2StrAddr The converted UCS2 string ad= dress. > > > Caller > > > + is responsible for Free this= string. > > > + > > > + @retval EFI_INVALID_PARAMETER The UTF8 encoded string is n= ot > > valid > > > to > > > + convert to UCS2 string. > > > + One or more parameters are i= nvalid. > > > + @retval EFI_OUT_OF_RESOURCES System runs out of resources= . > > > + @retval EFI_SUCCESS The UCS2 string has been con= verted. > > > + > > > +**/ > > > +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, Ucs2StrTem= p > > > + + > > > 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-CDE1A3= 3B5256 > > > + 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 manipulatio= n > > > + # 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