Gabriel Ivăncescu : msscript.ocx: Move parse_script_text up.

Alexandre Julliard julliard at winehq.org
Thu Jun 25 16:14:25 CDT 2020


Module: wine
Branch: master
Commit: e61a2a2fc0a7822de02fb84c6c43404e3a4f4b36
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e61a2a2fc0a7822de02fb84c6c43404e3a4f4b36

Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date:   Thu Jun 25 17:59:27 2020 +0300

msscript.ocx: Move parse_script_text up.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msscript.ocx/msscript.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c
index e8c0f0af77..4460afc808 100644
--- a/dlls/msscript.ocx/msscript.c
+++ b/dlls/msscript.ocx/msscript.c
@@ -291,6 +291,20 @@ static HRESULT add_script_object(ScriptHost *host, BSTR name, IDispatch *object,
     return hr;
 }
 
+static HRESULT parse_script_text(ScriptHost *host, BSTR script_text, DWORD flag, VARIANT *res)
+{
+    EXCEPINFO excepinfo;
+    HRESULT hr;
+
+    hr = start_script(host);
+    if (FAILED(hr)) return hr;
+
+    hr = IActiveScriptParse_ParseScriptText(host->parse, script_text, NULL,
+                                            NULL, NULL, 0, 1, flag, res, &excepinfo);
+    /* FIXME: more error handling */
+    return hr;
+}
+
 static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface)
 {
     return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface);
@@ -1555,20 +1569,6 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface)
     return set_script_state(This->host, SCRIPTSTATE_INITIALIZED);
 }
 
-static HRESULT parse_script_text(ScriptHost *host, BSTR script_text, DWORD flag, VARIANT *res)
-{
-    EXCEPINFO excepinfo;
-    HRESULT hr;
-
-    hr = start_script(host);
-    if (FAILED(hr)) return hr;
-
-    hr = IActiveScriptParse_ParseScriptText(host->parse, script_text, NULL,
-                                            NULL, NULL, 0, 1, flag, res, &excepinfo);
-    /* FIXME: more error handling */
-    return hr;
-}
-
 static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code)
 {
     ScriptControl *This = impl_from_IScriptControl(iface);




More information about the wine-cvs mailing list