fix: 修复 WING_API 调用带有自定义类型会失败的问题；

Author: Wing-summer

TestPlugin/lang/TestPlugin_zh_CN.ts

@@ -306,12 +306,12 @@
         <location filename="../testplugin.cpp" line="246"/>
         <location filename="../testplugin.cpp" line="253"/>
         <location filename="../testplugin.cpp" line="260"/>
-        <location filename="../testplugin.cpp" line="288"/>
-        <location filename="../testplugin.cpp" line="296"/>
-        <location filename="../testplugin.cpp" line="304"/>
-        <location filename="../testplugin.cpp" line="312"/>
-        <location filename="../testplugin.cpp" line="321"/>
-        <location filename="../testplugin.cpp" line="328"/>
+        <location filename="../testplugin.cpp" line="286"/>
+        <location filename="../testplugin.cpp" line="294"/>
+        <location filename="../testplugin.cpp" line="302"/>
+        <location filename="../testplugin.cpp" line="310"/>
+        <location filename="../testplugin.cpp" line="319"/>
+        <location filename="../testplugin.cpp" line="326"/>
         <source>InvalidParamsCount</source>
         <translation>无效参数个数</translation>
     </message>
@@ -322,7 +322,7 @@
         <translation>非法参数</translation>
     </message>
     <message>
-        <location filename="../testplugin.cpp" line="279"/>
+        <location filename="../testplugin.cpp" line="277"/>
         <source>AllocArrayFailed</source>
         <translation>分配数组失败</translation>
     </message>

TestPlugin/testplugin.cpp

@@ -261,10 +261,9 @@ WingHex::UNSAFE_RET TestPlugin::colorTable(const QList<void *> &params) {
     }
 
     void *array = nullptr;
-    QVector<void *> colors;
-    for (auto &c : colorTable()) {
-        colors.append(&c);
-    }
+
+    auto ctbl = colorTable(); // note: you should hold the reference
+    auto colors = WingHex::normalizePackedVector(ctbl);
 
     auto invoked =
         invokeService(QStringLiteral("WingAngelAPI"), "vector2AsArray",
@@ -275,7 +274,6 @@ WingHex::UNSAFE_RET TestPlugin::colorTable(const QList<void *> &params) {
         }
     }
 
-    qDeleteAll(colors);
     return generateScriptCallError(-2, tr("AllocArrayFailed"));
 }
 

WingPlugin

@@ -600,9 +600,17 @@ bool PluginSystem::invokeServiceImpl(const QObject *sender, const QString &puid,
         if (met.name() == method) {
             bool err = false;
             for (int i = 1; i < paramCount; ++i) {
-                if (met.parameterTypeName(i).compare(metaTypes[i]->name)) {
-                    err = true;
-                    break;
+                if (metaTypes[i]->typeId == QMetaType::UnknownType) {
+                    // user defined meta type
+                    if (met.parameterTypeName(i).compare(metaTypes[i]->name)) {
+                        err = true;
+                        break;
+                    }
+                } else {
+                    if (metaTypes[i]->typeId != met.parameterType(i)) {
+                        err = true;
+                        break;
+                    }
                 }
             }
             if (err) {

lang/zh_CN/winghex_zh_CN.ts

@@ -2083,6 +2083,14 @@ void *WingAngelAPI::list2AsArray(const WingHex::SenderInfo &sender,
     return vector2AsArray(sender, type, content);
 }
 
+void WingAngelAPI::releaseAsArray(const WingHex::SenderInfo &sender,
+                                 void *array) {
+    Q_UNUSED(sender);
+    if (array) {
+        reinterpret_cast<CScriptArray *>(array)->Release();
+    }
+}
+
 void *WingAngelAPI::newAsDictionary(
     const WingHex::SenderInfo &sender,
     const QHash<QString, QPair<WingHex::MetaType, void *>> &content) {
@@ -2104,6 +2112,14 @@ void *WingAngelAPI::newAsDictionary(
     return dic;
 }
 
+void WingAngelAPI::releaseAsDictionary(const WingHex::SenderInfo &sender,
+                                      void *dic) {
+    Q_UNUSED(sender);
+    if (dic) {
+        reinterpret_cast<CScriptDictionary *>(dic)->Release();
+    }
+}
+
 void WingAngelAPI::cleanUpHandles(const QVector<int> &handles) {
     for (auto &h : _handles) {
         if (!handles.contains(h)) {

lang/zh_TW/winghex_zh_TW.ts

@@ -176,9 +176,14 @@ class WingAngelAPI : public WingHex::IWingPlugin {
                                     WingHex::MetaType type,
                                     const QList<void *> &content);
 
+    WING_SERVICE void releaseAsArray(const WingHex::SenderInfo &sender,
+                                     void *array);
+
     WING_SERVICE void *newAsDictionary(
         const WingHex::SenderInfo &sender,
         const QHash<QString, QPair<WingHex::MetaType, void *>> &content);
+    WING_SERVICE void releaseAsDictionary(const WingHex::SenderInfo &sender,
+                                          void *dic);
 
     // =========================================================