Jacek Caban : vbscript: Call GetItemInfo() with original item name.

Alexandre Julliard julliard at winehq.org
Mon Dec 19 13:10:37 CST 2016


Module: wine
Branch: stable
Commit: a1f860a4d80d34f65deb2376cb56ff47096df2d0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a1f860a4d80d34f65deb2376cb56ff47096df2d0

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Nov  7 14:08:17 2016 +0100

vbscript: Call GetItemInfo() with original item name.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit c46dbfb131958849ac5fa5eab5703ad404cd0c6e)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

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

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index bc34860..02180d9 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -183,7 +183,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_
             if(!item->disp) {
                 IUnknown *unk;
 
-                hres = IActiveScriptSite_GetItemInfo(ctx->script->site, name, SCRIPTINFO_IUNKNOWN, &unk, NULL);
+                hres = IActiveScriptSite_GetItemInfo(ctx->script->site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL);
                 if(FAILED(hres)) {
                     WARN("GetItemInfo failed: %08x\n", hres);
                     continue;
diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c
index d8c5467..0209106 100644
--- a/dlls/vbscript/tests/run.c
+++ b/dlls/vbscript/tests/run.c
@@ -2126,6 +2126,12 @@ static void run_tests(void)
     CHECK_CALLED(global_success_d);
     CHECK_CALLED(global_success_i);
 
+    SET_EXPECT(global_success_d);
+    SET_EXPECT(global_success_i);
+    parse_script_af(0, "TEST.reportSuccess()");
+    CHECK_CALLED(global_success_d);
+    CHECK_CALLED(global_success_i);
+
     SET_EXPECT(global_vbvar_d);
     SET_EXPECT(global_vbvar_i);
     parse_script_a("Option Explicit\nvbvar = 3");




More information about the wine-cvs mailing list