[PATCH 3/5] jscript/tests: Add tests for persistent named items.
Gabriel Ivăncescu
gabrielopcode at gmail.com
Mon Mar 23 08:53:34 CDT 2020
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/jscript/tests/jscript.c | 86 +++++++++++++++++++++++++++++++++---
1 file changed, 81 insertions(+), 5 deletions(-)
diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c
index d79b974..ef0099d 100644
--- a/dlls/jscript/tests/jscript.c
+++ b/dlls/jscript/tests/jscript.c
@@ -109,6 +109,7 @@ DEFINE_EXPECT(GetItemInfo_global);
DEFINE_EXPECT(GetItemInfo_global_code);
DEFINE_EXPECT(GetItemInfo_visible);
DEFINE_EXPECT(GetItemInfo_visible_code);
+DEFINE_EXPECT(GetItemInfo_persistent);
DEFINE_EXPECT(testCall);
static const CLSID *engine_clsid = &CLSID_JScript;
@@ -146,7 +147,7 @@ static ULONG WINAPI Dispatch_Release(IDispatch *iface)
return 1;
}
-static ULONG global_named_item_ref, visible_named_item_ref, visible_code_named_item_ref;
+static ULONG global_named_item_ref, visible_named_item_ref, visible_code_named_item_ref, persistent_named_item_ref;
static ULONG WINAPI global_AddRef(IDispatch *iface)
{
@@ -178,6 +179,16 @@ static ULONG WINAPI visible_code_Release(IDispatch *iface)
return --visible_code_named_item_ref;
}
+static ULONG WINAPI persistent_AddRef(IDispatch *iface)
+{
+ return ++persistent_named_item_ref;
+}
+
+static ULONG WINAPI persistent_Release(IDispatch *iface)
+{
+ return --persistent_named_item_ref;
+}
+
static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo)
{
ok(0, "unexpected call\n");
@@ -261,6 +272,18 @@ static const IDispatchVtbl visible_code_named_item_vtbl = {
static IDispatch visible_code_named_item = { &visible_code_named_item_vtbl };
+static const IDispatchVtbl persistent_named_item_vtbl = {
+ Dispatch_QueryInterface,
+ persistent_AddRef,
+ persistent_Release,
+ Dispatch_GetTypeInfoCount,
+ Dispatch_GetTypeInfo,
+ Dispatch_GetIDsOfNames,
+ Dispatch_Invoke
+};
+
+static IDispatch persistent_named_item = { &persistent_named_item_vtbl };
+
static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv)
{
*ppv = NULL;
@@ -320,6 +343,12 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC
*ppiunkItem = (IUnknown*)&visible_code_named_item;
return S_OK;
}
+ if(!wcscmp(pstrName, L"persistent")) {
+ CHECK_EXPECT(GetItemInfo_persistent);
+ IDispatch_AddRef(&persistent_named_item);
+ *ppiunkItem = (IUnknown*)&persistent_named_item;
+ return S_OK;
+ }
ok(0, "unexpected call %s\n", wine_dbgstr_w(pstrName));
return E_NOTIMPL;
}
@@ -1163,6 +1192,8 @@ static void test_named_items(void)
ok(hr == E_UNEXPECTED, "AddNamedItem returned: %08x\n", hr);
hr = IActiveScript_AddNamedItem(script, L"codeOnlyItem", SCRIPTITEM_CODEONLY);
ok(hr == E_UNEXPECTED, "AddNamedItem returned: %08x\n", hr);
+ hr = IActiveScript_AddNamedItem(script, L"persistent", SCRIPTITEM_ISPERSISTENT | SCRIPTITEM_CODEONLY);
+ ok(hr == E_UNEXPECTED, "AddNamedItem returned: %08x\n", hr);
SET_EXPECT(GetLCID);
hr = IActiveScript_SetScriptSite(script, &ActiveScriptSite);
@@ -1180,10 +1211,13 @@ static void test_named_items(void)
ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr);
hr = IActiveScript_AddNamedItem(script, L"codeOnlyItem", SCRIPTITEM_CODEONLY);
ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr);
+ hr = IActiveScript_AddNamedItem(script, L"persistent", SCRIPTITEM_ISPERSISTENT | SCRIPTITEM_CODEONLY);
+ ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr);
ok(global_named_item_ref > 0, "global_named_item_ref = %u\n", global_named_item_ref);
ok(visible_named_item_ref == 0, "visible_named_item_ref = %u\n", visible_named_item_ref);
ok(visible_code_named_item_ref == 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref);
+ ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref);
hr = IActiveScript_GetScriptDispatch(script, L"noContext", &disp);
ok(hr == E_INVALIDARG, "GetScriptDispatch returned: %08x\n", hr);
@@ -1267,6 +1301,7 @@ static void test_named_items(void)
ok(global_named_item_ref > 0, "global_named_item_ref = %u\n", global_named_item_ref);
ok(visible_named_item_ref > 0, "visible_named_item_ref = %u\n", visible_named_item_ref);
ok(visible_code_named_item_ref > 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref);
+ ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref);
SET_EXPECT(testCall);
parse_script(parse, L"visibleItem.testCall();");
@@ -1433,6 +1468,28 @@ static void test_named_items(void)
IDispatchEx_Release(dispex2);
IDispatchEx_Release(dispex);
+ SET_EXPECT(OnEnterScript);
+ SET_EXPECT(OnLeaveScript);
+ hr = IActiveScriptParse_ParseScriptText(parse, L"var x = 13;\n", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISPERSISTENT, NULL, NULL);
+ ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr);
+ CHECK_CALLED(OnEnterScript);
+ CHECK_CALLED(OnLeaveScript);
+ SET_EXPECT(OnEnterScript);
+ SET_EXPECT(OnLeaveScript);
+ hr = IActiveScriptParse_ParseScriptText(parse, L"x = 10;\n", L"persistent", NULL, NULL, 0, 0, 0, NULL, NULL);
+ ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr);
+ CHECK_CALLED(OnEnterScript);
+ CHECK_CALLED(OnLeaveScript);
+ SET_EXPECT(OnEnterScript);
+ SET_EXPECT(OnLeaveScript);
+ hr = IActiveScriptParse_ParseScriptText(parse, L"x", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL);
+ ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr);
+ ok(V_VT(&var) == VT_I4 && V_I4(&var) == 10, "Unexpected 'x': V_VT = %d, V_I4 = %d\n", V_VT(&var), V_I4(&var));
+ CHECK_CALLED(OnEnterScript);
+ CHECK_CALLED(OnLeaveScript);
+
+ dispex = get_script_dispatch(script, L"persistent");
+
/* reinitialize script engine */
SET_EXPECT(OnStateChange_DISCONNECTED);
@@ -1448,30 +1505,48 @@ static void test_named_items(void)
ok(global_named_item_ref == 0, "global_named_item_ref = %u\n", global_named_item_ref);
ok(visible_named_item_ref == 0, "visible_named_item_ref = %u\n", visible_named_item_ref);
ok(visible_code_named_item_ref == 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref);
+ ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref);
hr = IActiveScript_GetScriptDispatch(script, L"codeOnlyItem", &disp);
ok(hr == E_UNEXPECTED, "hr = %08x, expected E_UNEXPECTED\n", hr);
SET_EXPECT(GetLCID);
SET_EXPECT(OnStateChange_INITIALIZED);
+ SET_EXPECT(GetItemInfo_persistent);
hr = IActiveScript_SetScriptSite(script, &ActiveScriptSite);
ok(hr == S_OK, "SetScriptSite failed: %08x\n", hr);
CHECK_CALLED(GetLCID);
CHECK_CALLED(OnStateChange_INITIALIZED);
+ CHECK_CALLED(GetItemInfo_persistent);
+ ok(persistent_named_item_ref > 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref);
hr = IActiveScript_AddNamedItem(script, L"codeOnlyItem", SCRIPTITEM_CODEONLY);
ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr);
SET_EXPECT(OnStateChange_CONNECTED);
- SET_EXPECT_MULTI(OnEnterScript, 4);
- SET_EXPECT_MULTI(OnLeaveScript, 4);
+ SET_EXPECT_MULTI(OnEnterScript, 5);
+ SET_EXPECT_MULTI(OnLeaveScript, 5);
+ SET_EXPECT(GetIDsOfNames);
hr = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED);
ok(hr == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hr);
CHECK_CALLED(OnStateChange_CONNECTED);
- CHECK_CALLED_MULTI(OnEnterScript, 4);
- CHECK_CALLED_MULTI(OnLeaveScript, 4);
+ CHECK_CALLED_MULTI(OnEnterScript, 5);
+ CHECK_CALLED_MULTI(OnLeaveScript, 5);
+ todo_wine CHECK_CALLED(GetIDsOfNames);
test_state(script, SCRIPTSTATE_CONNECTED);
+ dispex2 = get_script_dispatch(script, L"persistent");
+ ok(dispex != dispex2, "Same script dispatch returned for \"persistent\" named item\n");
+ IDispatchEx_Release(dispex2);
+ IDispatchEx_Release(dispex);
+ SET_EXPECT(OnEnterScript);
+ SET_EXPECT(OnLeaveScript);
+ hr = IActiveScriptParse_ParseScriptText(parse, L"x", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL);
+ ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr);
+ ok(V_VT(&var) == VT_I4 && V_I4(&var) == 13, "Unexpected 'x': V_VT = %d, V_I4 = %d\n", V_VT(&var), V_I4(&var));
+ CHECK_CALLED(OnEnterScript);
+ CHECK_CALLED(OnLeaveScript);
+
dispex = get_script_dispatch(script, NULL);
for (i = 0; i < ARRAY_SIZE(global_idents); i++)
{
@@ -1592,6 +1667,7 @@ static void test_named_items(void)
ok(global_named_item_ref == 0, "global_named_item_ref = %u\n", global_named_item_ref);
ok(visible_named_item_ref == 0, "visible_named_item_ref = %u\n", visible_named_item_ref);
ok(visible_code_named_item_ref == 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref);
+ ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref);
test_state(script, SCRIPTSTATE_CLOSED);
IActiveScriptParse_Release(parse);
--
2.21.0
More information about the wine-devel
mailing list