From 95d040e99e276d546a01f5cef49a4fd340dcdd0b Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 19 Sep 2011 14:09:45 +0200 Subject: [PATCH] vbscript: Added support for SCRIPTITEM_ISVISIBLE named items. --- dlls/vbscript/interp.c | 23 +++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 2 ++ 2 files changed, 25 insertions(+) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 306c2a21c7..0593a86333 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -149,6 +149,29 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } } + + if((item->flags & SCRIPTITEM_ISVISIBLE) && !strcmpiW(item->name, name)) { + if(!item->disp) { + IUnknown *unk; + + hres = IActiveScriptSite_GetItemInfo(ctx->script->site, name, SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hres)) { + WARN("GetItemInfo failed: %08x\n", hres); + continue; + } + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); + IUnknown_Release(unk); + if(FAILED(hres)) { + WARN("object does not implement IDispatch\n"); + continue; + } + } + + ref->type = REF_OBJ; + ref->u.obj = item->disp; + return S_OK; + } } if(!strcmpiW(name, errW)) { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 64230dc1ec..2b33a2d0a9 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -620,4 +620,6 @@ Call ok(not (x is Nothing), "x is 1") Call ok(Nothing is Nothing, "Nothing is not Nothing") Call ok(x is obj and true, "x is obj and true is false") +Call ok(getVT(test) = "VT_DISPATCH", "getVT(test) = " & getVT(test)) + reportSuccess() -- 2.33.8