ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Create separate script dispatches for each named item. 

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gabriel Ivăncescu 2020-03-18 15:19:50 +02:00 committed by Alexandre Julliard
parent 0cc48cfd87
commit 23bc78c199
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/jscript/jscript.c
View File

@ -110,10 +110,15 @@ static inline BOOL is_started(script_ctx_t *ctx)
HRESULT create_named_item_script_obj(script_ctx_t *ctx, named_item_t *item)
{
/* FIXME: Create a separate script dispatch instead of using the global */
item->script_obj = ctx->global;
IDispatchEx_AddRef(&item->script_obj->IDispatchEx_iface);
return S_OK;
static const builtin_info_t disp_info = {
JSCLASS_GLOBAL,
{NULL, NULL, 0},
0, NULL,
NULL,
NULL
};
return create_dispex(ctx, &disp_info, NULL, &item->script_obj);
}
static void release_named_item_script_obj(named_item_t *item)

18
dlls/jscript/tests/jscript.c
View File

@ -1203,7 +1203,6 @@ static void test_named_items(void)
ok(dispex == dispex2, "get_script_dispatch returned different dispatch objects.\n");
IDispatchEx_Release(dispex2);
dispex2 = get_script_dispatch(script, L"codeOnlyItem");
todo_wine
ok(dispex != dispex2, "get_script_dispatch returned same dispatch objects.\n");
SET_EXPECT(OnStateChange_INITIALIZED);
@ -1333,9 +1332,7 @@ static void test_named_items(void)
id = 0;
hr = IDispatchEx_GetDispID(dispex2, bstr, 0, &id);
todo_wine
ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(global_idents[i]), hr);
todo_wine
ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(global_idents[i]), id);
SysFreeString(bstr);
}
@ -1345,9 +1342,7 @@ static void test_named_items(void)
bstr = SysAllocString(context_idents[i]);
id = 0;
hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id);
todo_wine
ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(context_idents[i]), hr);
todo_wine
ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(context_idents[i]), id);
id = 0;
hr = IDispatchEx_GetDispID(dispex2, bstr, 0, &id);
@ -1381,12 +1376,9 @@ static void test_named_items(void)
SET_EXPECT(OnScriptError);
SET_EXPECT(OnLeaveScript);
hr = IActiveScriptParse_ParseScriptText(parse, context_code_test[i], NULL, NULL, NULL, 0, 0, 0, NULL, NULL);
todo_wine
ok(FAILED(hr), "ParseScriptText(%s) returned: %08x\n", wine_dbgstr_w(context_code_test[i]), hr);
CHECK_CALLED(OnEnterScript);
todo_wine_if(i != 0)
CHECK_CALLED(GetIDsOfNames);
todo_wine
CHECK_CALLED(OnScriptError);
CHECK_CALLED(OnLeaveScript);
@ -1496,9 +1488,7 @@ static void test_named_items(void)
bstr = SysAllocString(context_idents[i]);
id = 0;
hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id);
todo_wine_if(i != 0)
ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(context_idents[i]), hr);
todo_wine_if(i != 0)
ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(context_idents[i]), id);
SysFreeString(bstr);
}
@ -1537,9 +1527,7 @@ static void test_named_items(void)
bstr = SysAllocString(global_idents[i]);
id = 0;
hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id);
todo_wine
ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(global_idents[i]), hr);
todo_wine
ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(global_idents[i]), id);
SysFreeString(bstr);
}
@ -1549,9 +1537,7 @@ static void test_named_items(void)
bstr = SysAllocString(context_idents[i]);
id = 0;
hr = IDispatchEx_GetDispID(dispex, bstr, 0, &id);
todo_wine_if(i != 0)
ok(hr == DISP_E_UNKNOWNNAME, "GetDispID(%s) returned %08x\n", wine_dbgstr_w(context_idents[i]), hr);
todo_wine_if(i != 0)
ok(id == -1, "[%s] id = %d, expected -1\n", wine_dbgstr_w(context_idents[i]), id);
SysFreeString(bstr);
}
@ -1579,10 +1565,8 @@ static void test_named_items(void)
SET_EXPECT(OnScriptError);
SET_EXPECT(OnLeaveScript);
hr = IActiveScriptParse_ParseScriptText(parse, context_code_test[i], NULL, NULL, NULL, 0, 0, 0, NULL, NULL);
todo_wine_if(i != 0)
ok(FAILED(hr), "ParseScriptText(%s) returned: %08x\n", wine_dbgstr_w(context_code_test[i]), hr);
CHECK_CALLED(OnEnterScript);
todo_wine_if(i != 0)
CHECK_CALLED(OnScriptError);
CHECK_CALLED(OnLeaveScript);
@ -1590,10 +1574,8 @@ static void test_named_items(void)
SET_EXPECT(OnScriptError);
SET_EXPECT(OnLeaveScript);
hr = IActiveScriptParse_ParseScriptText(parse, context_code_test[i], L"codeOnlyItem", NULL, NULL, 0, 0, 0, NULL, NULL);
todo_wine_if(i != 0)
ok(FAILED(hr), "ParseScriptText(%s) returned: %08x\n", wine_dbgstr_w(context_code_test[i]), hr);
CHECK_CALLED(OnEnterScript);
todo_wine_if(i != 0)
CHECK_CALLED(OnScriptError);
CHECK_CALLED(OnLeaveScript);
}