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

Fix handling of VARIANT with VT_BYREF and null pointer in 

VariantChangeTypeEx.
This commit is contained in:
Jacek Caban 2004-08-25 00:38:59 +00:00 committed by Alexandre Julliard
parent 5f6e3c88bd
commit 3a2574e3cc
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/oleaut32/tests/vartype.c
View File

@ -5249,7 +5249,35 @@ static void test_ClearCustData(void)
ok(!ci.cCustData && !ci.prgCustData, "ClearCustData didn't clear fields!\n");
}
static void test_NullByRef()
{
VARIANT v1, v2;
HRESULT hRes;
VariantClear(&v1);
VariantClear(&v2);
V_VT(&v1) = VT_BYREF|VT_VARIANT;
V_BYREF(&v1) = 0;
hRes = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_I4);
ok(hRes == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx should return DISP_E_TYPEMISMATCH\n");
VariantClear(&v1);
V_VT(&v1) = VT_BYREF|VT_VARIANT;
V_BYREF(&v1) = 0;
V_VT(&v2) = VT_I4;
V_I4(&v2) = 123;
hRes = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_VARIANT);
ok(hRes == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx should return DISP_E_TYPEMISMATCH\n");
ok(V_VT(&v2) == VT_I4 && V_I4(&v2) == 123, "VariantChangeTypeEx shouldn't change pvargDest\n");
hRes = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_BYREF|VT_I4);
ok(hRes == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx should return DISP_E_TYPEMISMATCH\n");
hRes = VariantChangeTypeEx(&v2, &v1, 0, 0, 0x3847);
ok(hRes == DISP_E_BADVARTYPE, "VariantChangeTypeEx should return DISP_E_BADVARTYPE\n");
}
START_TEST(vartype)
{
@ -5539,4 +5567,6 @@ START_TEST(vartype)
test_UintChangeTypeEx();
test_ClearCustData();
test_NullByRef();
}

9
dlls/oleaut32/variant.c
View File

@ -984,8 +984,13 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
{
VARIANTARG vTmp;
V_VT(&vTmp) = VT_EMPTY;
res = VariantCopyInd(&vTmp, pvargSrc);
if(V_VT(pvargSrc)&VT_BYREF && !V_BYREF(pvargSrc))
res = DISP_E_TYPEMISMATCH;
else
{
V_VT(&vTmp) = VT_EMPTY;
res = VariantCopyInd(&vTmp, pvargSrc);
}
if (SUCCEEDED(res))
{