[PATCH 0/1] MR10393: Draft: vbscript: Check named item dispatch for Dim variable names.

[Francis De Brabandere (＠francisdb)]

When declaring variables with Dim in a visible named item context,
check the named item's IDispatch for each variable name via
GetIDsOfNames. This matches Windows VBScript behavior where Dim
probes the host object before creating the variable.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10393

[PATCH 1/1] vbscript: Check named item dispatch for Dim variable names.

[Francis De Brabandere]

From: Francis De Brabandere <[e-mail]>

When declaring variables with Dim in a visible named item context,
check the named item's IDispatch for each variable name via
GetIDsOfNames. This matches Windows VBScript behavior where Dim
probes the host object before creating the variable.
---
 dlls/vbscript/tests/vbscript.c |  2 +-
 dlls/vbscript/vbscript.c       | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c
index adda087ce76..bf6ae951a4a 100644
--- a/dlls/vbscript/tests/vbscript.c
+++ b/dlls/vbscript/tests/vbscript.c
@@ -2089,7 +2089,7 @@ static void test_named_items(void)
     ok(hres == S_OK, "ParseScriptText failed: %08lx\n", hres);
     CHECK_CALLED(OnEnterScript);
     todo_wine CHECK_CALLED(GetItemInfo_visible);
-    todo_wine CHECK_CALLED(GetIDsOfNames_visible);
+    CHECK_CALLED(GetIDsOfNames_visible);
     CHECK_CALLED(OnLeaveScript);
     SET_EXPECT(OnEnterScript);
     SET_EXPECT(OnLeaveScript);
diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c
index 715c98d32bb..27dec79d132 100644
--- a/dlls/vbscript/vbscript.c
+++ b/dlls/vbscript/vbscript.c
@@ -91,6 +91,8 @@ static inline BOOL is_started(VBScript *This)
         || This->state == SCRIPTSTATE_DISCONNECTED;
 }
 
+static HRESULT retrieve_named_item_disp(IActiveScriptSite *site, named_item_t *item);
+
 static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res)
 {
     ScriptDisp *obj = ctx->script_obj;
@@ -148,6 +150,16 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res
         var->is_const = FALSE;
         var->array = NULL;
 
+        if(code->named_item && !(code->named_item->flags & SCRIPTITEM_CODEONLY))
+        {
+            DISPID id;
+
+            if(!code->named_item->disp)
+                retrieve_named_item_disp(ctx->site, code->named_item);
+            if(code->named_item->disp)
+                disp_get_id(code->named_item->disp, var->name, VBDISP_CALLGET, TRUE, &id);
+        }
+
         obj->global_vars[obj->global_vars_cnt + i] = var;
     }
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10393