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

oleaut32: Support for VT_DISPATCH in VarMul.

This commit is contained in:
Alex Villacís Lasso 2007-01-02 18:50:41 -05:00 committed by Alexandre Julliard
parent 308a0b2e18
commit 01395dec51
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/oleaut32/variant.c
View File

@ -3345,6 +3345,7 @@ HRESULT WINAPI VarMul(LPVARIANT left, LPVARIANT right, LPVARIANT result)
HRESULT hres; HRESULT hres;
VARTYPE lvt, rvt, resvt, tvt; VARTYPE lvt, rvt, resvt, tvt;
VARIANT lv, rv, tv; VARIANT lv, rv, tv;
VARIANT tempLeft, tempRight;
double r8res; double r8res;
/* Variant priority for coercion. Sorted from lowest to highest. /* Variant priority for coercion. Sorted from lowest to highest.
@ -3374,6 +3375,23 @@ HRESULT WINAPI VarMul(LPVARIANT left, LPVARIANT right, LPVARIANT result)
VariantInit(&lv); VariantInit(&lv);
VariantInit(&rv); VariantInit(&rv);
VariantInit(&tv); VariantInit(&tv);
VariantInit(&tempLeft);
VariantInit(&tempRight);
/* Handle VT_DISPATCH by storing and taking address of returned value */
if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH)
{
hres = VARIANT_FetchDispatchValue(left, &tempLeft);
if (FAILED(hres)) goto end;
left = &tempLeft;
}
if ((V_VT(right) & VT_TYPEMASK) == VT_DISPATCH)
{
hres = VARIANT_FetchDispatchValue(right, &tempRight);
if (FAILED(hres)) goto end;
right = &tempRight;
}
lvt = V_VT(left)&VT_TYPEMASK; lvt = V_VT(left)&VT_TYPEMASK;
rvt = V_VT(right)&VT_TYPEMASK; rvt = V_VT(right)&VT_TYPEMASK;
@ -3482,6 +3500,8 @@ end:
VariantClear(&lv); VariantClear(&lv);
VariantClear(&rv); VariantClear(&rv);
VariantClear(&tv); VariantClear(&tv);
VariantClear(&tempLeft);
VariantClear(&tempRight);
TRACE("returning 0x%8x (variant type %s)\n", hres, debugstr_VT(result)); TRACE("returning 0x%8x (variant type %s)\n", hres, debugstr_VT(result));
return hres; return hres;
} }