Gabriel Ivăncescu : vbscript: Look for the identifier in the named item's disp only if it doesn't have the CODEONLY flag.

[Alexandre Julliard]

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

Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
Date:   Mon Mar 30 15:53:37 2020 +0300

vbscript: Look for the identifier in the named item's disp only if it doesn't have the CODEONLY flag.

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

---

 dlls/vbscript/interp.c         | 4 +++-
 dlls/vbscript/tests/vbscript.c | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index d50ef4600d..342b7820ec 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -188,7 +188,9 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_
             return S_OK;
     }
 
-    if(ctx->func->code_ctx->named_item && ctx->func->code_ctx->named_item->disp) {
+    if(ctx->func->code_ctx->named_item && ctx->func->code_ctx->named_item->disp &&
+       !(ctx->func->code_ctx->named_item->flags & SCRIPTITEM_CODEONLY))
+    {
         hres = disp_get_id(ctx->func->code_ctx->named_item->disp, name, invoke_type, TRUE, &id);
         if(SUCCEEDED(hres)) {
             ref->type = REF_DISP;
diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c
index a997a510cd..bdd85befde 100644
--- a/dlls/vbscript/tests/vbscript.c
+++ b/dlls/vbscript/tests/vbscript.c
@@ -2038,6 +2038,13 @@ static void test_named_items(void)
     CHECK_CALLED(GetIDsOfNames_visible);
     CHECK_CALLED(OnLeaveScript);
 
+    SET_EXPECT(OnEnterScript);
+    SET_EXPECT(OnLeaveScript);
+    hres = IActiveScriptParse_ParseScriptText(parse, L"dim abc\ntestVar_global = 5\n", L"visibleCodeItem", NULL, NULL, 0, 0, 0, NULL, NULL);
+    ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres);
+    CHECK_CALLED(OnEnterScript);
+    CHECK_CALLED(OnLeaveScript);
+
     SET_EXPECT(OnEnterScript);
     SET_EXPECT(OnLeaveScript);
     hres = IActiveScriptParse_ParseScriptText(parse, L"set global_me = me\n", L"globalItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISPERSISTENT, NULL, NULL);