From: Francis De Brabandere <francisdb@gmail.com> Native VBScript calls GetIDsOfNames once per top-level declared name (Dim variable, Sub, Function, Class). Cover Dim, Sub, Function, and Class shapes plus a multi-Dim and dim+sub combination, asserting the exact host probe count for each. --- dlls/vbscript/tests/vbscript.c | 62 ++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 7500ec30a8d..61dd0ea7683 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -2088,8 +2088,8 @@ static void test_named_items(void) hres = IActiveScriptParse_ParseScriptText(parse, L"dim abc\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); 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(GetItemInfo_visible); + CHECK_CALLED(GetIDsOfNames_visible); CHECK_CALLED(OnLeaveScript); SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript); @@ -2113,6 +2113,64 @@ static void test_named_items(void) CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); + /* Probe: multiple names in a single Dim statement. Each name should + * be probed against the host dispatch via GetIDsOfNames. The host + * dispatch is already cached from the earlier "dim abc" parse, so + * GetItemInfo is not refetched. */ + SET_EXPECT(OnEnterScript); + SET_EXPECT_MULTI(GetIDsOfNames_visible, 3); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"dim probe_a, probe_b, probe_c\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08lx\n", hres); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED_MULTI(GetIDsOfNames_visible, 3); + CHECK_CALLED(OnLeaveScript); + + /* Probe: Dim with explicit array bounds. */ + SET_EXPECT(OnEnterScript); + SET_EXPECT(GetIDsOfNames_visible); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"dim probe_arr(5)\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08lx\n", hres); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(GetIDsOfNames_visible); + CHECK_CALLED(OnLeaveScript); + + /* Probes 3-7: native probes the host with GetIDsOfNames once per + * top-level declared name, which includes bare Subs, Functions, + * and Classes (in addition to Dim variables). Inner Dims inside a + * Sub body are not probed. */ +#define PROBE_DIM_HOST(src, expected) \ + do { \ + SET_EXPECT(OnEnterScript); \ + SET_EXPECT_MULTI(GetIDsOfNames_visible, expected); \ + SET_EXPECT(OnLeaveScript); \ + hres = IActiveScriptParse_ParseScriptText(parse, src, L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); \ + ok(hres == S_OK, "ParseScriptText failed: %08lx\n", hres); \ + CHECK_CALLED(OnEnterScript); \ + CHECK_CALLED_MULTI(GetIDsOfNames_visible, expected); \ + CHECK_CALLED(OnLeaveScript); \ + } while (0) + + PROBE_DIM_HOST(L"sub probe_sub\ndim probe_local\nend sub\n", 1); + PROBE_DIM_HOST(L"class probe_cls\npublic probe_prop\nend class\n", 1); + PROBE_DIM_HOST(L"sub probe_named_sub\nend sub\n", 1); + PROBE_DIM_HOST(L"function probe_fn\nend function\n", 1); + PROBE_DIM_HOST(L"dim probe_top\nsub probe_s3\nend sub\n", 2); +#undef PROBE_DIM_HOST + + /* Probe: a second top-level Dim parse on the same named item. The + * host dispatch is already cached, so GetItemInfo should not fire + * a second time. */ + SET_EXPECT(OnEnterScript); + SET_EXPECT(GetIDsOfNames_visible); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"dim probe_second\n", L"visibleItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08lx\n", hres); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(GetIDsOfNames_visible); + 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); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10393