vbscript: Added support for SCRIPTITEM_ISVISIBLE named items.

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index 306c2a21c7655f2c5fb0e0043e62dca2ed0b859a..0593a8633389f973be9174d1de7bd9295b82e4b8 100644 (file)
--- 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 64230dc1ecfe1c1769b271132c520168a7420aa8..2b33a2d0a92530895fb388ed0643f40e125ed394 100644 (file)
--- 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()