scrobj: Run scripts when creating a scriptlet instance.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

scrobj: Run scripts when creating a scriptlet instance.
9d92ea3b · Jacek Caban · Alexandre Julliard · e50eae9d · 9d92ea3b · 9d92ea3b
Commit 9d92ea3b authored Sep 23, 2019 by Jacek Caban Committed by Alexandre Julliard Sep 23, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 11 deletions

scrobj.c dlls/scrobj/scrobj.c +8 -0

scrobj.c dlls/scrobj/tests/scrobj.c +0 -11

No files found.
--- a/dlls/scrobj/scrobj.c
+++ b/dlls/scrobj/scrobj.c
@@ -1032,8 +1032,16 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis
        hres = create_script_host(factory_host->language, factory_host->active_script, &obj->hosts, &host);
        if (FAILED(hres)) break;
        host->object = obj;
+
+        hres = IActiveScript_AddNamedItem(host->active_script, L"scriptlet",
+                                          SCRIPTITEM_ISVISIBLE | SCRIPTITEM_GLOBALMEMBERS);
+        if (FAILED(hres)) break;
+
+        hres = IActiveScript_AddNamedItem(host->active_script, L"globals", SCRIPTITEM_ISVISIBLE);
+        if (FAILED(hres)) break;
    }

+    if (SUCCEEDED(hres)) hres = parse_scripts(factory, &obj->hosts, TRUE);
    if (FAILED(hres))
    {
        IDispatchEx_Release(&obj->IDispatchEx_iface);

--- a/dlls/scrobj/tests/scrobj.c
+++ b/dlls/scrobj/tests/scrobj.c
@@ -783,9 +783,7 @@ static void test_create_object(void)
    CHECK_CALLED(QI_IActiveScriptParse);
    CHECK_CALLED(InitNew);
    CHECK_CALLED(SetScriptSite);
-    todo_wine
    CHECK_CALLED(AddNamedItem_scriptlet);
-    todo_wine
    CHECK_CALLED(AddNamedItem_globals);
    todo_wine
    CHECK_CALLED(GetScriptDispatch);
@@ -793,9 +791,7 @@ static void test_create_object(void)
    CHECK_CALLED(GetDispID_vbAddOne);
    todo_wine
    CHECK_CALLED(GetDispID_wtTest);
-    todo_wine
    CHECK_CALLED(SetScriptState_STARTED);
-    todo_wine
    CHECK_CALLED(ParseScriptText);

    hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp);
@@ -945,9 +941,7 @@ static void test_create_object(void)
    CHECK_CALLED(QI_IActiveScriptParse);
    CHECK_CALLED(InitNew);
    CHECK_CALLED(SetScriptSite);
-    todo_wine
    CHECK_CALLED(AddNamedItem_scriptlet);
-    todo_wine
    CHECK_CALLED(AddNamedItem_globals);
    todo_wine
    CHECK_CALLED(GetScriptDispatch);
@@ -955,9 +949,7 @@ static void test_create_object(void)
    CHECK_CALLED(GetDispID_vbAddOne);
    todo_wine
    CHECK_CALLED(GetDispID_wtTest);
-    todo_wine
    CHECK_CALLED(SetScriptState_STARTED);
-    todo_wine
    CHECK_CALLED(ParseScriptText);

    SET_EXPECT(SetScriptState_UNINITIALIZED);
@@ -981,9 +973,7 @@ static void test_create_object(void)
    CHECK_CALLED(Clone);
    CHECK_CALLED(QI_IActiveScriptParse);
    CHECK_CALLED(SetScriptSite);
-    todo_wine
    CHECK_CALLED(AddNamedItem_scriptlet);
-    todo_wine
    CHECK_CALLED(AddNamedItem_globals);
    todo_wine
    CHECK_CALLED(GetScriptDispatch);
@@ -991,7 +981,6 @@ static void test_create_object(void)
    CHECK_CALLED(GetDispID_vbAddOne);
    todo_wine
    CHECK_CALLED(GetDispID_wtTest);
-    todo_wine
    CHECK_CALLED(SetScriptState_STARTED);

    SET_EXPECT(SetScriptState_UNINITIALIZED);