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

jscript: Accept DISPATCH_PROPERTYPUTREF for jsdisps. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45493
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 2022-04-12 17:47:30 +03:00 committed by Alexandre Julliard
parent eff83cd4e0
commit 3349dc5eea
2 changed files with 96 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/jscript/dispex.c
View File

@ -1627,6 +1627,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
} }
break; break;
} }
case DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT:
case DISPATCH_PROPERTYPUTREF:
case DISPATCH_PROPERTYPUT: { case DISPATCH_PROPERTYPUT: {
jsval_t val; jsval_t val;
DWORD i; DWORD i;

94
dlls/jscript/tests/run.c
View File

@ -2787,6 +2787,91 @@ static void test_retval(void)
close_script(engine); close_script(engine);
} }
static void test_propputref(void)
{
static DISPID propput_dispid = DISPID_PROPERTYPUT;
DISPPARAMS dp = {0}, dp_get = {0};
IActiveScript *script, *script2;
IDispatch *disp, *obj;
HRESULT hres;
VARIANT v;
DISPID id;
BSTR str;
hres = parse_script_expr(L"new Object()", &v, &script2);
ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres);
ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
obj = V_DISPATCH(&v);
hres = parse_script_expr(L"var disp = new Object(); disp.a = disp; disp", &v, &script);
ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres);
ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
disp = V_DISPATCH(&v);
str = SysAllocString(L"a");
hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &str, 1, 0, &id);
ok(hres == S_OK, "GetIDsOfNames failed: %08lx\n", hres);
SysFreeString(str);
dp.cArgs = dp.cNamedArgs = 1;
dp.rgdispidNamedArgs = &propput_dispid;
dp.rgvarg = &v;
V_VT(&v) = VT_DISPATCH;
V_DISPATCH(&v) = obj;
hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL);
ok(hres == S_OK, "Invoke failed: %08lx\n", hres);
V_VT(&v) = VT_EMPTY;
hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL);
ok(hres == S_OK, "Invoke failed: %08lx\n", hres);
ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
ok(V_DISPATCH(&v) == obj, "V_DISPATCH(v) = %p\n", V_DISPATCH(&v));
VariantClear(&v);
V_VT(&v) = VT_DISPATCH;
V_DISPATCH(&v) = obj;
hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL);
ok(hres == S_OK, "Invoke failed: %08lx\n", hres);
V_VT(&v) = VT_EMPTY;
hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL);
ok(hres == S_OK, "Invoke failed: %08lx\n", hres);
ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
ok(V_DISPATCH(&v) == obj, "V_DISPATCH(v) = %p\n", V_DISPATCH(&v));
IDispatch_Release(obj);
close_script(script2);
VariantClear(&v);
V_VT(&v) = VT_DISPATCH;
V_DISPATCH(&v) = NULL;
hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL);
ok(hres == S_OK, "Invoke failed: %08lx\n", hres);
V_VT(&v) = VT_EMPTY;
hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL);
ok(hres == S_OK, "Invoke failed: %08lx\n", hres);
ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
ok(!V_DISPATCH(&v), "V_DISPATCH(v) = %p\n", V_DISPATCH(&v));
V_VT(&v) = VT_EMPTY;
hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL);
ok(hres == S_OK, "Invoke failed: %08lx\n", hres);
V_VT(&v) = VT_EMPTY;
hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL);
ok(hres == S_OK, "Invoke failed: %08lx\n", hres);
ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v));
V_VT(&v) = VT_I4;
V_I4(&v) = 42;
hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL);
ok(hres == S_OK, "Invoke failed: %08lx\n", hres);
V_VT(&v) = VT_EMPTY;
hres = IDispatch_Invoke(disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp_get, &v, NULL, NULL);
ok(hres == S_OK, "Invoke failed: %08lx\n", hres);
ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v));
ok(V_I4(&v) == 42, "V_I4(v) = %ld\n", V_I4(&v));
IDispatch_Release(disp);
close_script(script);
}
static void test_default_value(void) static void test_default_value(void)
{ {
static DISPID propput_dispid = DISPID_PROPERTYPUT; static DISPID propput_dispid = DISPID_PROPERTYPUT;
@ -2888,6 +2973,10 @@ static void test_default_value(void)
V_VT(&v) = VT_EMPTY; V_VT(&v) = VT_EMPTY;
hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL);
ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres);
hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL);
ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres);
hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL);
ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres);
IDispatch_Release(disp); IDispatch_Release(disp);
close_script(script); close_script(script);
@ -2899,6 +2988,10 @@ static void test_default_value(void)
V_VT(&v) = VT_EMPTY; V_VT(&v) = VT_EMPTY;
hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL);
ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres); ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres);
hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, NULL, NULL);
ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres);
hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUTREF | DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL);
ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08lx\n", hres);
IDispatch_Release(disp); IDispatch_Release(disp);
close_script(script); close_script(script);
} }
@ -2968,6 +3061,7 @@ static void test_script_exprs(void)
VariantClear(&v); VariantClear(&v);
test_default_value(); test_default_value();
test_propputref();
test_retval(); test_retval();
testing_expr = FALSE; testing_expr = FALSE;