openharmony/js_api_module
1
0
Fork 0
mirror of https://github.com/openharmony/js_api_module.git synced 2026-08-24 22:21:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolve multithreaded use case crashes

Browse Source 
Fix the static napi_property_descriptor to napi_property_descriptor

issue: https://gitee.com/openharmony/js_util_module/issues/I53PXU

Signed-off-by: xdmal <maxiaodong16@huawei.com>
This commit is contained in:
xdmal
2022-04-20 17:11:18 +08:00
parent a65d03e135
commit 43f3e6b102
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
convertxml/native_module_convertxml.cpp
+2 -2
View File
@@ -75,13 +75,13 @@ namespace OHOS::Xml {
{
const char *convertXmlClassName = "ConvertXml";
napi_value convertXmlClass = nullptr;
static napi_property_descriptor convertXmlDesc[] = {
napi_property_descriptor convertXmlDesc[] = {
DECLARE_NAPI_FUNCTION("convert", Convert)
};
NAPI_CALL(env, napi_define_class(env, convertXmlClassName, strlen(convertXmlClassName), ConvertXmlConstructor,
nullptr, sizeof(convertXmlDesc) / sizeof(convertXmlDesc[0]), convertXmlDesc,
&convertXmlClass));
static napi_property_descriptor desc[] = {
napi_property_descriptor desc[] = {
DECLARE_NAPI_PROPERTY("ConvertXml", convertXmlClass)
};
NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc));
uri/native_module_uri.cpp
+3 -3
View File
@@ -256,7 +256,7 @@ namespace OHOS::Uri {
{
const char *uriClassName = "uri";
napi_value uriClass = nullptr;
static napi_property_descriptor uriDesc[] = {
napi_property_descriptor uriDesc[] = {
DECLARE_NAPI_FUNCTION("normalize", Normalize),
DECLARE_NAPI_FUNCTION("equals", Equals),
DECLARE_NAPI_FUNCTION("checkIsAbsolute", IsAbsolute),
@@ -264,7 +264,7 @@ namespace OHOS::Uri {
DECLARE_NAPI_GETTER("scheme", GetScheme),
DECLARE_NAPI_GETTER("authority", GetAuthority),
DECLARE_NAPI_GETTER("ssp", GetSsp),
DECLARE_NAPI_GETTER("userinfo", GetUserinfo),
DECLARE_NAPI_GETTER("userInfo", GetUserinfo),
DECLARE_NAPI_GETTER("host", GetHost),
DECLARE_NAPI_GETTER("port", GetPort),
DECLARE_NAPI_GETTER("path", GetPath),
@@ -274,7 +274,7 @@ namespace OHOS::Uri {
};
NAPI_CALL(env, napi_define_class(env, uriClassName, strlen(uriClassName), UriConstructor,
nullptr, sizeof(uriDesc) / sizeof(uriDesc[0]), uriDesc, &uriClass));
static napi_property_descriptor desc[] = {
napi_property_descriptor desc[] = {
DECLARE_NAPI_PROPERTY("Uri", uriClass)
};
napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc);
uri/src/js_uri.ts
+5 -3
View File
@@ -56,8 +56,8 @@ class URI {
return this.uricalss.ssp;
}
get userinfo() {
return this.uricalss.userinfo;
get userInfo() {
return this.uricalss.userInfo;
}
get host() {
@@ -100,4 +100,6 @@ function createNewUri(uriStr : string) {
return new URI(uriStr);
}
export default URI
export default {
URI : URI
}
url/native_module_url.cpp
+4 -4
View File
@@ -892,7 +892,7 @@ namespace OHOS::Url {
{
const char *seachParamsClassName = "URLSearchParams";
napi_value seachParamsInitClass = nullptr;
static napi_property_descriptor UrlDesc[] = {
napi_property_descriptor UrlDesc[] = {
DECLARE_NAPI_FUNCTION("has", IsHas),
DECLARE_NAPI_FUNCTION("set", Set),
DECLARE_NAPI_FUNCTION("sort", Sort),
@@ -909,7 +909,7 @@ namespace OHOS::Url {
NAPI_CALL(env, napi_define_class(env, seachParamsClassName, strlen(seachParamsClassName),
SeachParamsConstructor, nullptr, sizeof(UrlDesc) / sizeof(UrlDesc[0]),
UrlDesc, &seachParamsInitClass));
static napi_property_descriptor desc[] = {
napi_property_descriptor desc[] = {
DECLARE_NAPI_PROPERTY("URLSearchParams1", seachParamsInitClass)
};
napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc);
@@ -920,7 +920,7 @@ namespace OHOS::Url {
{
const char *urlClassName = "Url";
napi_value urlClass = nullptr;
static napi_property_descriptor UrlDesc[] = {
napi_property_descriptor UrlDesc[] = {
DECLARE_NAPI_GETTER_SETTER("hostname", GetHostname, SetHostname),
DECLARE_NAPI_FUNCTION("href", SetHref),
DECLARE_NAPI_GETTER_SETTER("search", GetSearch, SetSearch),
@@ -936,7 +936,7 @@ namespace OHOS::Url {
};
NAPI_CALL(env, napi_define_class(env, urlClassName, strlen(urlClassName), UrlConstructor,
nullptr, sizeof(UrlDesc) / sizeof(UrlDesc[0]), UrlDesc, &urlClass));
static napi_property_descriptor desc[] = {
napi_property_descriptor desc[] = {
DECLARE_NAPI_PROPERTY("Url", urlClass)
};
napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc);
xml/native_module_xml.cpp
+4 -4
View File
@@ -349,7 +349,7 @@ namespace OHOS::xml {
{
const char *xmlSerializerClass = "XmlSerializer";
napi_value xmlClass = nullptr;
static napi_property_descriptor xmlDesc[] = {
napi_property_descriptor xmlDesc[] = {
DECLARE_NAPI_FUNCTION("setAttributes", SetAttributes),
DECLARE_NAPI_FUNCTION("addEmptyElement", AddEmptyElement),
DECLARE_NAPI_FUNCTION("setDeclaration", SetDeclaration),
@@ -364,7 +364,7 @@ namespace OHOS::xml {
};
NAPI_CALL(env, napi_define_class(env, xmlSerializerClass, strlen(xmlSerializerClass), XmlSerializerConstructor,
nullptr, sizeof(xmlDesc) / sizeof(xmlDesc[0]), xmlDesc, &xmlClass));
static napi_property_descriptor desc[] = {
napi_property_descriptor desc[] = {
DECLARE_NAPI_PROPERTY("XmlSerializer", xmlClass)
};
napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc);
@@ -409,14 +409,14 @@ namespace OHOS::xml {
{
const char *xmlPullParserClass = "XmlPullParser";
napi_value xmlClass = nullptr;
static napi_property_descriptor xmlDesc[] = {
napi_property_descriptor xmlDesc[] = {
DECLARE_NAPI_FUNCTION("parse", Parse),
DECLARE_NAPI_FUNCTION("XmlPullParserError", XmlPullParserError)
};
NAPI_CALL(env, napi_define_class(env, xmlPullParserClass, strlen(xmlPullParserClass),
XmlPullParserConstructor, nullptr, sizeof(xmlDesc) / sizeof(xmlDesc[0]),
xmlDesc, &xmlClass));
static napi_property_descriptor desc[] = {
napi_property_descriptor desc[] = {
DECLARE_NAPI_PROPERTY("XmlPullParser", xmlClass)
};
napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc);