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

oleaut32: Support for VT_DISPATCH in VarXor.

This commit is contained in:
Alex Villacís Lasso 2007-01-02 18:53:37 -05:00 committed by Alexandre Julliard
parent e98a49dee4
commit 5aacee9550
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/oleaut32/variant.c
View File

@ -4520,6 +4520,7 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut
{
VARTYPE vt;
VARIANT varLeft, varRight;
VARIANT tempLeft, tempRight;
double d;
HRESULT hRet;
@ -4542,6 +4543,23 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut
return S_OK;
}
VariantInit(&tempLeft);
VariantInit(&tempRight);
/* Handle VT_DISPATCH by storing and taking address of returned value */
if ((V_VT(pVarLeft) & VT_TYPEMASK) == VT_DISPATCH)
{
hRet = VARIANT_FetchDispatchValue(pVarLeft, &tempLeft);
if (FAILED(hRet)) goto VarXor_Exit;
pVarLeft = &tempLeft;
}
if ((V_VT(pVarRight) & VT_TYPEMASK) == VT_DISPATCH)
{
hRet = VARIANT_FetchDispatchValue(pVarRight, &tempRight);
if (FAILED(hRet)) goto VarXor_Exit;
pVarRight = &tempRight;
}
/* Copy our inputs so we don't disturb anything */
V_VT(&varLeft) = V_VT(&varRight) = VT_EMPTY;
@ -4576,7 +4594,10 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut
if (V_VT(&varLeft) == VT_I8 || V_VT(&varRight) == VT_I8)
{
if (V_VT(pVarLeft) == VT_INT || V_VT(pVarRight) == VT_INT)
return DISP_E_TYPEMISMATCH;
{
hRet = DISP_E_TYPEMISMATCH;
goto VarXor_Exit;
}
vt = VT_I8;
}
else
@ -4654,6 +4675,8 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut
VarXor_Exit:
VariantClear(&varLeft);
VariantClear(&varRight);
VariantClear(&tempLeft);
VariantClear(&tempRight);
return hRet;
}