From f14812174dd57a0f483f8e5d27907aafb634b284 Mon Sep 17 00:00:00 2001
From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com>
Date: Sat, 8 Jul 2023 12:16:32 +0200
Subject: [PATCH] 1.10.0

---
 SandboxiePlus/SandMan/Engine/BoxEngine.cpp     | 6 +++++-
 SandboxiePlus/SandMan/Engine/JSEngineExt.cpp   | 6 +++++-
 SandboxiePlus/SandMan/SandMan.vcxproj          | 2 ++
 SandboxiePlus/SandMan/SandMan.vcxproj.filters  | 6 ++++++
 SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp | 4 ++--
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/SandboxiePlus/SandMan/Engine/BoxEngine.cpp b/SandboxiePlus/SandMan/Engine/BoxEngine.cpp
index 361445f2..a886f17c 100644
--- a/SandboxiePlus/SandMan/Engine/BoxEngine.cpp
+++ b/SandboxiePlus/SandMan/Engine/BoxEngine.cpp
@@ -98,7 +98,11 @@ QV4::ReturnedValue method_invoke(const QV4::FunctionObject *b, const QV4::Value
     if (!Script.isEmpty()) {
         QJSValue ret = pJSEngine->evaluateScript(Script, Name + ".js");
         if (ret.isError()) {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+			pJSEngine->throwError(ret.toString());
+#else
             pJSEngine->throwError(ret);
+#endif
             return QV4::Encode::undefined();
         } else {
             QV4::ScopedValue rv(scope, scope.engine->fromVariant(ret.toVariant()));
@@ -451,4 +455,4 @@ void CWizardEngine::OpenOptions(const QString& box, const QString& page)
 	});
     //theGUI->SafeExec(pOptionsWnd);
     pOptionsWnd->showTab(page);
-}
\ No newline at end of file
+}
diff --git a/SandboxiePlus/SandMan/Engine/JSEngineExt.cpp b/SandboxiePlus/SandMan/Engine/JSEngineExt.cpp
index de25b990..16ed85d2 100644
--- a/SandboxiePlus/SandMan/Engine/JSEngineExt.cpp
+++ b/SandboxiePlus/SandMan/Engine/JSEngineExt.cpp
@@ -130,7 +130,11 @@ QV4::ReturnedValue evalCall(const QV4::FunctionObject* b, const QV4::Value* v, c
     QMutexLocker locker(&g_engineMutex);
     QJSValue ret = g_engineMap.value(v4)->evaluateScript(scode->toQStringNoThrow(), "eval code");
     if (ret.isError()) {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+		v4->throwError(ret.toString());
+#else
         v4->throwError(QJSValuePrivate::asReturnedValue(&ret));
+#endif
         return QV4::Encode::undefined();
     } else {
         QV4::ScopedValue rv(scope, scope.engine->fromVariant(ret.toVariant()));
@@ -141,4 +145,4 @@ QV4::ReturnedValue evalCall(const QV4::FunctionObject* b, const QV4::Value* v, c
         }
         return rv->asReturnedValue();
     }
-}
\ No newline at end of file
+}
diff --git a/SandboxiePlus/SandMan/SandMan.vcxproj b/SandboxiePlus/SandMan/SandMan.vcxproj
index edb92356..ef0ff22a 100644
--- a/SandboxiePlus/SandMan/SandMan.vcxproj
+++ b/SandboxiePlus/SandMan/SandMan.vcxproj
@@ -293,6 +293,7 @@
     <ClCompile Include="Engine\IniObject.cpp" />
     <ClCompile Include="Engine\JSEngineExt.cpp" />
     <ClCompile Include="Engine\SbieObject.cpp" />
+    <ClCompile Include="Engine\ScriptManager.cpp" />
     <ClCompile Include="Engine\SysObject.cpp" />
     <ClCompile Include="Helpers\FindTool.cpp" />
     <ClCompile Include="Helpers\FullScreen.cpp" />
@@ -469,6 +470,7 @@
     <QtMoc Include="Engine\SysObject.h" />
     <QtMoc Include="Engine\WizardObject.h" />
     <QtMoc Include="Engine\JSEngineExt.h" />
+    <QtMoc Include="Engine\ScriptManager.h" />
     <ClInclude Include="Engine\V4ScriptDebuggerApi.h" />
     <ClInclude Include="Helpers\FindTool.h" />
     <ClInclude Include="Helpers\FullScreen.h" />
diff --git a/SandboxiePlus/SandMan/SandMan.vcxproj.filters b/SandboxiePlus/SandMan/SandMan.vcxproj.filters
index 29a68a42..3f068704 100644
--- a/SandboxiePlus/SandMan/SandMan.vcxproj.filters
+++ b/SandboxiePlus/SandMan/SandMan.vcxproj.filters
@@ -219,6 +219,9 @@
     <ClCompile Include="..\..\SandboxieTools\Common\verify.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Engine\ScriptManager.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -355,6 +358,9 @@
     <QtMoc Include="AddonManager.h">
       <Filter>SandMan</Filter>
     </QtMoc>
+    <QtMoc Include="Engine\ScriptManager.h">
+      <Filter>Engine</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <QtRcc Include="Resources\SandMan.qrc">
diff --git a/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp b/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp
index a3b87bd0..db83b247 100644
--- a/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp
+++ b/SandboxiePlus/SandMan/Wizards/BoxAssistant.cpp
@@ -78,7 +78,7 @@ void CBoxAssistant::TryFix(quint32 MsgCode, const QStringList& MsgData, const QS
         m_Params["sbieMsg"] = theGUI->FormatSbieMessage(MsgCode, MsgData, ProcessName);
         m_Params["docLink"] = theGUI->MakeSbieMsgLink(MsgCode, MsgData, ProcessName);
         m_Params["msgCode"] = MsgCode & 0xFFFF;
-        m_Params["msgData"] = MsgData.mid(1);
+        m_Params["msgData"] = QStringList(MsgData.mid(1));
         m_Params["processName"] = (!ProcessName.isEmpty() && ProcessName.left(4) != "PID:") ? ProcessName : QString();
         m_Params["boxName"] = BoxName;
         setStartId(Page_Run);
@@ -1066,4 +1066,4 @@ CCompletePage::CCompletePage(QWidget *parent)
 void CCompletePage::initializePage()
 {
     //wizard()->button(QWizard::CancelButton)->setEnabled(false);
-}
\ No newline at end of file
+}