fix: 弥补缺失的脚本对象成员；

Wing-summer · Wing-summer · commit 8e436ab41780 · 2025-10-12T17:51:02.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,11 +10,27 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(PROJECT_VERSION "2.3.0")
 
-find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets Network Concurrent
-                                              PrintSupport Xml LinguistTools)
+set(QT_CREATOR_SKIP_MAINTENANCE_TOOL_PROVIDER ON)
+set(QT_NO_PRIVATE_MODULE_WARNING ON)
+
+find_package(
+    QT NAMES Qt6 REQUIRED
+    COMPONENTS Widgets
+               Network
+               Concurrent
+               GuiPrivate
+               PrintSupport
+               Xml
+               LinguistTools)
 find_package(
-    Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network Concurrent
-                                              PrintSupport Xml LinguistTools)
+    Qt${QT_VERSION_MAJOR} REQUIRED
+    COMPONENTS Widgets
+               Network
+               Concurrent
+               GuiPrivate
+               PrintSupport
+               Xml
+               LinguistTools)
 
 message("Build ${PROJECT_NAME} with ${CMAKE_BUILD_TYPE}.")
 
diff --git a/TestBadPlugin/TestBadPlugin.json b/TestBadPlugin/TestBadPlugin.json
@@ -1,6 +1,6 @@
 {
     "Id": "TestBadPlugin",
-    "SDK": 18,
+    "SDK": 19,
     "Version": "0.0.1",
     "Vendor": "WingCloudStudio",
     "Dependencies": [
diff --git a/TestHexExt/TestHexExt.json b/TestHexExt/TestHexExt.json
@@ -1,6 +1,6 @@
 {
     "Id": "TestHexExt",
-    "SDK": 18,
+    "SDK": 19,
     "Version": "0.0.1",
     "Vendor": "WingCloudStudio",
     "Author": "wingsummer",
diff --git a/TestManager/TestManager.json b/TestManager/TestManager.json
@@ -1,6 +1,6 @@
 {
     "Id": "TestManager",
-    "SDK": 18,
+    "SDK": 19,
     "Version": "0.0.1",
     "Vendor": "WingCloudStudio",
     "Author": "wingsummer",
diff --git a/TestPlugin/TestPlugin.json b/TestPlugin/TestPlugin.json
@@ -1,6 +1,6 @@
 {
     "Id": "TestPlugin",
-    "SDK": 18,
+    "SDK": 19,
     "Version": "0.0.1",
     "Vendor": "WingCloudStudio",
     "Dependencies": [
diff --git a/WingPlugin b/WingPlugin
@@ -1 +1 @@
-Subproject commit 4bde56213aa4b2ec6a89face70be43849ff5f46d
+Subproject commit 83d8b45e09dfebe4fd2b5b32c180adea17d7a618
diff --git a/lang/en_US/winghex_en_US.ts b/lang/en_US/winghex_en_US.ts
diff --git a/lang/zh_CN/winghex_zh_CN.ts b/lang/zh_CN/winghex_zh_CN.ts
diff --git a/lang/zh_TW/winghex_zh_TW.ts b/lang/zh_TW/winghex_zh_TW.ts
diff --git a/src/class/WingAngelAPI.json b/src/class/WingAngelAPI.json
@@ -1,6 +1,6 @@
 {
     "Id": "WingAngelAPI",
-    "SDK": 18,
+    "SDK": 19,
     "Author": "wingsummer",
     "Version": "2.2.2",
     "Vendor": "WingCloudStudio",
diff --git a/src/class/WingCStruct.json b/src/class/WingCStruct.json
@@ -1,6 +1,6 @@
 {
     "Id" : "WingCStruct",
-    "SDK": 18,
+    "SDK": 19,
     "Version" : "0.0.2",
     "Vendor" : "WingCloudStudio",
     "Author" : "wingsummer",
diff --git a/src/class/aspreprocesser.cpp b/src/class/aspreprocesser.cpp
@@ -37,9 +37,10 @@ Q_GLOBAL_STATIC_WITH_ARGS(
     QByteArrayList, DEFAULT_MARCO,
     ({"__AS_ARRAY__", "__AS_ANY__", "__AS_GRID__", "__AS_HANDLE__",
       "__AS_MATH__", "__AS_WEAKREF__", "__AS_COROUTINE__", "__AS_FILE__",
-      "__AS_FILESYSTEM__", "__WING_STRING__", "__WING_COLOR__", "__WING_JSON__",
-      "__WING_REGEX__", "__WING_DICTIONARY__", "__WING_PRINT_VAR__",
-      "__WING_PRINT_LN__", "__WING_CLIPBOARD__"}));
+      "__AS_FILESYSTEM__", "__WING_STRING__", "__WING_COLOR__",
+      "__WING_COLOR_EX__", "__WING_JSON__", "__WING_REGEX__",
+      "__WING_DICTIONARY__", "__WING_PRINT_VAR__", "__WING_PRINT_LN__",
+      "__WING_CLIPBOARD__"}));
 
 AsPreprocesser::AsPreprocesser(asIScriptEngine *engine) : engine(engine) {
     Q_ASSERT(engine);
diff --git a/src/class/wingangelapi.cpp b/src/class/wingangelapi.cpp
@@ -1771,8 +1771,11 @@ void WingAngelAPI::script_unsafe_call(asIScriptGeneric *gen) {
         gen->SetReturnFloat(std::get<float>(ret));
     } else if (std::holds_alternative<double>(ret)) {
         gen->SetReturnFloat(std::get<double>(ret));
-    } else if (std::holds_alternative<void *>(ret)) {
-        gen->SetReturnAddress(std::get<void *>(ret));
+    } else if (std::holds_alternative<WingHex::RefObjPtr>(ret)) {
+        gen->SetReturnObject(std::get<WingHex::RefObjPtr>(ret));
+    } else if (std::holds_alternative<WingHex::ValueObjPtr>(ret)) {
+        auto v = std::get<WingHex::ValueObjPtr>(ret);
+        gen->SetReturnObject(v->data());
     } else if (std::holds_alternative<WingHex::ScriptCallError>(ret)) {
         auto ctx = asGetActiveContext();
         auto err = std::get<WingHex::ScriptCallError>(ret);
diff --git a/src/class/wingcstruct.cpp b/src/class/wingcstruct.cpp
@@ -367,6 +367,71 @@ void WingCStruct::onRegisterScriptObj(WingHex::IWingAngel *o) {
                       &WingCStruct::constVarValueUInt),
                   this, std::placeholders::_1));
 
+    o->registerObjectType("int_type", sizeof(CINT_TYPE),
+                          asOBJ_VALUE | WingHex::asGetTypeTraits<CINT_TYPE>());
+    o->registerObjectBehaviour(
+        "int_type", WingHex::IWingAngel::asBehaviours::asBEHAVE_CONSTRUCT,
+        "void f(int64 v)",
+        asWINGFUNCTIONPR(
+            [](void *memory, qint64 v) { new (memory) CINT_TYPE(v); },
+            (void *, qint64), void),
+        WingHex::IWingAngel::asCallConvTypes::asCALL_CDECL_OBJFIRST);
+    o->registerObjectBehaviour(
+        "int_type", WingHex::IWingAngel::asBehaviours::asBEHAVE_CONSTRUCT,
+        "void f(const int_type &in)",
+        asWINGFUNCTIONPR(
+            [](CINT_TYPE *self, const CINT_TYPE &other) {
+                new (self) CINT_TYPE(other);
+            },
+            (CINT_TYPE *, const CINT_TYPE &), void),
+        WingHex::IWingAngel::asCallConvTypes::asCALL_CDECL_OBJFIRST);
+    o->registerObjectBehaviour(
+        "int_type", WingHex::IWingAngel::asBehaviours::asBEHAVE_CONSTRUCT,
+        "void f(uint64 v)",
+        asWINGFUNCTIONPR(
+            [](void *memory, quint64 v) { new (memory) CINT_TYPE(v); },
+            (void *, quint64), void),
+        WingHex::IWingAngel::asCallConvTypes::asCALL_CDECL_OBJFIRST);
+    o->registerObjectBehaviour(
+        "int_type", WingHex::IWingAngel::asBehaviours::asBEHAVE_DESTRUCT,
+        "void f()",
+        asWINGFUNCTIONPR([](CINT_TYPE *memory) { memory->~CINT_TYPE(); },
+                         (CINT_TYPE *), void),
+        WingHex::IWingAngel::asCallConvTypes::asCALL_CDECL_OBJFIRST);
+    o->registerObjectMethod(
+        "int_type", "bool isInt() const", asWINGMETHOD(CINT_TYPE, isInt),
+        WingHex::IWingAngel::asCallConvTypes::asCALL_THISCALL);
+    o->registerObjectMethod(
+        "int_type", "bool isUInt() const", asWINGMETHOD(CINT_TYPE, isUInt),
+        WingHex::IWingAngel::asCallConvTypes::asCALL_THISCALL);
+    o->registerObjectMethod(
+        "int_type", "int64 toInt() const", asWINGMETHOD(CINT_TYPE, toInt),
+        WingHex::IWingAngel::asCallConvTypes::asCALL_THISCALL);
+    o->registerObjectMethod(
+        "int_type", "uint64 toUInt() const", asWINGMETHOD(CINT_TYPE, toUInt),
+        WingHex::IWingAngel::asCallConvTypes::asCALL_THISCALL);
+
+    o->registerObjectEvaluator(
+        "int_type",
+        [](void *result, WingHex::IWingAngel::EvalMode mode)
+            -> WingHex::IWingAngel::EvaluateResult {
+            auto v = static_cast<CINT_TYPE *>(result);
+            WingHex::IWingAngel::EvalResult r;
+            if (v->isInt()) {
+                r.value = QString::number(v->toInt());
+            } else {
+                r.value = QString::number(v->toUInt());
+            }
+            r.expandable = false;
+            return r;
+        });
+    o->registerGlobalFunction(
+        QStringLiteral(
+            "WingCStruct::int_type constVarValue(const string &in type)"),
+        std::bind(
+            QOverload<const QList<void *> &>::of(&WingCStruct::constVarValue),
+            this, std::placeholders::_1));
+
     // nested dictionary is not supported, so unsafe registering will help
     o->registerGlobalFunction(
         QStringLiteral("dictionary@ read(") + getqsizeTypeAsString() +
@@ -1289,7 +1354,7 @@ WingHex::UNSAFE_RET WingCStruct::constVarValueInt(const QList<void *> &params) {
 
     auto type = WingHex::resolveUnsafeParamAsIn<QString>(params.at(0));
     auto ok = WingHex::resolveUnsafeParamAsOut<bool>(params.at(1));
-    return quint64(constVarValueInt(type, ok));
+    return WingHex::makeUnsafeRet(constVarValueInt(type, ok));
 }
 
 WingHex::UNSAFE_RET
@@ -1303,6 +1368,15 @@ WingCStruct::constVarValueUInt(const QList<void *> &params) {
     return constVarValueUInt(type, ok);
 }
 
+WingHex::UNSAFE_RET WingCStruct::constVarValue(const QList<void *> &params) {
+    if (params.size() != 1) {
+        return generateScriptCallError(-1, tr("InvalidParamsCount"));
+    }
+    auto type = WingHex::resolveUnsafeParamAsIn<QString>(params.at(0));
+    auto v = _parser->constVarValue(type);
+    return WingHex::makeValueObject<CINT_TYPE>(v);
+}
+
 WingHex::UNSAFE_RET WingCStruct::read(const QList<void *> &params) {
     if (params.size() != 2) {
         return generateScriptCallError(-1, tr("InvalidParamsCount"));
@@ -1312,7 +1386,7 @@ WingHex::UNSAFE_RET WingCStruct::read(const QList<void *> &params) {
     auto type = WingHex::resolveUnsafeParamAsIn<QString>(params.at(1));
 
     auto ret = read(offset, type);
-    return static_cast<void *>(convert2AsDictionary(ret));
+    return WingHex::makeRefObjPtr(convert2AsDictionary(ret));
 }
 
 QVariant WingCStruct::readRaw(const QVariantList &params) {
diff --git a/src/class/wingcstruct.h b/src/class/wingcstruct.h
@@ -108,6 +108,41 @@ class WingCStruct : public WingHex::IWingPlugin {
 public:
     virtual void onRegisterScriptObj(WingHex::IWingAngel *o) override;
 
+private:
+    struct CINT_TYPE {
+    public:
+        CINT_TYPE(qint64 v)
+            : d(CTypeParser::INT_TYPE(std::in_place_type_t<qint64>(), v)) {}
+        CINT_TYPE(quint64 v)
+            : d(CTypeParser::INT_TYPE(std::in_place_type_t<quint64>(), v)) {}
+        CINT_TYPE(CTypeParser::INT_TYPE v) : d(v) {}
+        ~CINT_TYPE() = default;
+
+    public:
+        bool isInt() const { return std::holds_alternative<qint64>(d); }
+
+        bool isUInt() const { return std::holds_alternative<quint64>(d); }
+
+        qint64 toInt() const {
+            if (isInt()) {
+                return std::get<qint64>(d);
+            } else {
+                return qint64(std::get<quint64>(d));
+            }
+        }
+
+        quint64 toUInt() const {
+            if (isUInt()) {
+                return std::get<quint64>(d);
+            } else {
+                return quint64(std::get<qint64>(d));
+            }
+        }
+
+    public:
+        CTypeParser::INT_TYPE d;
+    };
+
 private:
     // basic
     WING_SERVICE bool parseFromSource(const QString &header);
@@ -208,6 +243,7 @@ class WingCStruct : public WingHex::IWingPlugin {
 
     WingHex::UNSAFE_RET constVarValueInt(const QList<void *> &params);
     WingHex::UNSAFE_RET constVarValueUInt(const QList<void *> &params);
+    WingHex::UNSAFE_RET constVarValue(const QList<void *> &params);
 
     WingHex::UNSAFE_RET read(const QList<void *> &params);
     QVariant readRaw(const QVariantList &params);
diff --git a/src/dialog/mainwindow.cpp b/src/dialog/mainwindow.cpp
@@ -262,7 +262,9 @@ MainWindow::MainWindow(SplashDialog *splash) : FramelessMainWindow() {
                 msg.message = tr("EngineConfigError");
                 m_scriptConsole->onOutput(msg);
 
-                m_scriptConsole->setEnabled(false);
+                m_scriptConsole->setReadOnly(true);
+                m_scriptConsole->verticalScrollBar()->setValue(0);
+                m_scriptConsole->horizontalScrollBar()->setValue(0);
 
                 // configure error, so disable all script feature
                 m_ribbonMaps[WingHex::WingRibbonCatagories::SCRIPT]->setEnabled(
@@ -291,36 +293,39 @@ MainWindow::MainWindow(SplashDialog *splash) : FramelessMainWindow() {
 
                 m_scriptConsole->initOutput();
                 m_scriptConsole->setMode(QConsoleWidget::Input);
+
+                auto &lsp = AngelLsp::instance();
+                if (lsp.start()) {
+                    auto ret = lsp.initializeSync();
+                    if (!ret.isNull()) {
+                        lsp.initialized();
+                        connect(&lsp, &AngelLsp::serverExited, this, [this]() {
+                            Toast::toast(
+                                this, NAMEICONRES(QStringLiteral("angellsp")),
+                                tr("AngelLspExited"));
+                        });
+                    } else {
+                        QTimer::singleShot(1000, this, [this]() {
+                            Toast::toast(
+                                this, NAMEICONRES(QStringLiteral("angellsp")),
+                                tr("AngelLspInitFailed"));
+                        });
+                    }
+                } else {
+                    QTimer::singleShot(1000, this, [this]() {
+                        Toast::toast(this,
+                                     NAMEICONRES(QStringLiteral("angellsp")),
+                                     tr("AngelLspStartFailed"));
+                    });
+                }
+                m_scriptConsole->enableLSP();
             }
         } else {
             WingMessageBox::critical(this, qAppName(),
                                      tr("ScriptEngineInitFailed"));
             set.setScriptEnabled(false);
             throw CrashCode::ScriptInitFailed;
         }
-
-        auto &lsp = AngelLsp::instance();
-        if (lsp.start()) {
-            auto ret = lsp.initializeSync();
-            if (!ret.isNull()) {
-                lsp.initialized();
-                connect(&lsp, &AngelLsp::serverExited, this, [this]() {
-                    Toast::toast(this, NAMEICONRES(QStringLiteral("angellsp")),
-                                 tr("AngelLspExited"));
-                });
-            } else {
-                QTimer::singleShot(1000, this, [this]() {
-                    Toast::toast(this, NAMEICONRES(QStringLiteral("angellsp")),
-                                 tr("AngelLspInitFailed"));
-                });
-            }
-        } else {
-            QTimer::singleShot(1000, this, [this]() {
-                Toast::toast(this, NAMEICONRES(QStringLiteral("angellsp")),
-                             tr("AngelLspStartFailed"));
-            });
-        }
-        m_scriptConsole->enableLSP();
     }
 
     // connect settings signals
diff --git a/src/dialog/scriptingdialog.cpp b/src/dialog/scriptingdialog.cpp
@@ -1398,9 +1398,10 @@ void ScriptingDialog::on_newfile() {
 
         // create an empty file
         QFile f(filename);
-        f.open(QFile::WriteOnly | QFile::Text);
-        f.write("int main() {\n    return 0;\n}\n");
-        f.close();
+        if (f.open(QFile::WriteOnly | QFile::Text)) {
+            f.write(QByteArrayLiteral("int main() {\n    return 0;\n}\n"));
+            f.close();
+        }
 
         if (e) {
             e->reload();
diff --git a/src/model/asidbtreemodel.cpp b/src/model/asidbtreemodel.cpp
diff --git a/src/scriptaddon/scriptcolor.cpp b/src/scriptaddon/scriptcolor.cpp
diff --git a/src/scriptaddon/scriptcolor.h b/src/scriptaddon/scriptcolor.h
diff --git a/src/scriptaddon/scriptregex.cpp b/src/scriptaddon/scriptregex.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Id": "TestBadPlugin",`
`3`		`- "SDK": 18,`
	`3`	`+ "SDK": 19,`
`4`	`4`	`"Version": "0.0.1",`
`5`	`5`	`"Vendor": "WingCloudStudio",`
`6`	`6`	`"Dependencies": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Id": "TestHexExt",`
`3`		`- "SDK": 18,`
	`3`	`+ "SDK": 19,`
`4`	`4`	`"Version": "0.0.1",`
`5`	`5`	`"Vendor": "WingCloudStudio",`
`6`	`6`	`"Author": "wingsummer",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Id": "TestManager",`
`3`		`- "SDK": 18,`
	`3`	`+ "SDK": 19,`
`4`	`4`	`"Version": "0.0.1",`
`5`	`5`	`"Vendor": "WingCloudStudio",`
`6`	`6`	`"Author": "wingsummer",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Id": "TestPlugin",`
`3`		`- "SDK": 18,`
	`3`	`+ "SDK": 19,`
`4`	`4`	`"Version": "0.0.1",`
`5`	`5`	`"Vendor": "WingCloudStudio",`
`6`	`6`	`"Dependencies": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Id": "WingAngelAPI",`
`3`		`- "SDK": 18,`
	`3`	`+ "SDK": 19,`
`4`	`4`	`"Author": "wingsummer",`
`5`	`5`	`"Version": "2.2.2",`
`6`	`6`	`"Vendor": "WingCloudStudio",`