Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarNeg.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jun 5 05:48:28 CDT 2007
Module: wine
Branch: master
Commit: 7f84b91bff253a8b8cedca8ab986ac460a614690
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f84b91bff253a8b8cedca8ab986ac460a614690
Author: Alex Villacís Lasso <a_villacis at palosanto.com>
Date: Mon Jun 4 13:08:33 2007 -0500
oleaut32: Support for VT_DISPATCH in VarNeg.
---
dlls/oleaut32/variant.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index 45bc9b6..8068d6a 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -4797,10 +4797,20 @@ HRESULT WINAPI VarEqv(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut
HRESULT WINAPI VarNeg(LPVARIANT pVarIn, LPVARIANT pVarOut)
{
HRESULT hRet = S_OK;
+ VARIANT temp;
+
+ VariantInit(&temp);
TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn),
debugstr_VF(pVarIn), pVarOut);
+ /* Handle VT_DISPATCH by storing and taking address of returned value */
+ if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0))
+ {
+ hRet = VARIANT_FetchDispatchValue(pVarIn, &temp);
+ if (FAILED(hRet)) goto VarNeg_Exit;
+ pVarIn = &temp;
+ }
V_VT(pVarOut) = V_VT(pVarIn);
switch (V_VT(pVarIn))
@@ -4872,8 +4882,10 @@ HRESULT WINAPI VarNeg(LPVARIANT pVarIn, LPVARIANT pVarOut)
else
hRet = DISP_E_TYPEMISMATCH;
}
+VarNeg_Exit:
if (FAILED(hRet))
V_VT(pVarOut) = VT_EMPTY;
+ VariantClear(&temp);
return hRet;
}
More information about the wine-cvs
mailing list