system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

jscript: Fixed conversion in place in IVariantChangeType::ChangeType.

Browse source
This commit is contained in:
Jacek Caban 2012-09-21 18:00:33 +02:00 committed by Alexandre Julliard
parent 5c02bc11e1
commit c0d2029560
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/jscript/jscript.c
View file

@ -1007,20 +1007,28 @@ static ULONG WINAPI VariantChangeType_Release(IVariantChangeType *iface)
static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VARIANT *dst, VARIANT *src, LCID lcid, VARTYPE vt)
{
JScript *This = impl_from_IVariantChangeType(iface);
VARIANT res;
HRESULT hres;
TRACE("(%p)->(%p %s %x %d)\n", This, dst, debugstr_variant(src), lcid, vt);
TRACE("(%p)->(%p %p%s %x %d)\n", This, dst, src, debugstr_variant(src), lcid, vt);
if(!This->ctx) {
FIXME("Object uninitialized\n");
return E_UNEXPECTED;
}
hres = VariantClear(dst);
hres = variant_change_type(This->ctx, &res, src, vt);
if(FAILED(hres))
return hres;
return variant_change_type(This->ctx, dst, src, vt);
hres = VariantClear(dst);
if(FAILED(hres)) {
VariantClear(&res);
return hres;
}
*dst = res;
return S_OK;
}
static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = {

10
dlls/jscript/tests/caller.c
View file

@ -168,6 +168,7 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons
static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_disp)
{
VARIANT v, dst;
BSTR str;
HRESULT hres;
static const conv_results_t bool_results[] = {
@ -214,6 +215,15 @@ static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_di
hres = IVariantChangeType_ChangeType(change_type, &dst, &v, 0, VT_I4);
ok(hres == DISP_E_BADVARTYPE, "ChangeType failed: %08x, expected DISP_E_BADVARTYPE\n", hres);
ok(V_VT(&dst) == 0xdead, "V_VT(dst) = %d\n", V_VT(&dst));
/* Test conversion in place */
V_VT(&v) = VT_BSTR;
V_BSTR(&v) = str = a2bstr("test");
hres = IVariantChangeType_ChangeType(change_type, &v, &v, 0, VT_BSTR);
ok(hres == S_OK, "ChangeType failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
ok(V_BSTR(&v) != str, "V_BSTR(v) == str\n");
ok(!strcmp_wa(V_BSTR(&v), "test"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
}
static void test_caller(IServiceProvider *caller, IDispatch *arg_obj)