Module: wine Branch: master Commit: 3f593aa62264b2699f0ef14f5594e473a840b764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f593aa62264b2699f0ef14f55...
Author: Alex Villacís Lasso a_villacis@palosanto.com Date: Mon Nov 6 16:58:03 2006 -0500
oleaut32: variant - allow conversion of VT_DISPATCH into VT_BSTR in VarCat.
---
dlls/oleaut32/variant.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 873011a..be5ced4 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2478,7 +2478,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LP leftvt == VT_UI8 || leftvt == VT_INT || leftvt == VT_UINT || leftvt == VT_EMPTY || leftvt == VT_NULL || leftvt == VT_DATE || - leftvt == VT_DECIMAL) + leftvt == VT_DECIMAL || leftvt == VT_DISPATCH) && (rightvt == VT_I2 || rightvt == VT_I4 || rightvt == VT_R4 || rightvt == VT_R8 || @@ -2489,7 +2489,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LP rightvt == VT_UI8 || rightvt == VT_INT || rightvt == VT_UINT || rightvt == VT_EMPTY || rightvt == VT_NULL || rightvt == VT_DATE || - rightvt == VT_DECIMAL)) + rightvt == VT_DECIMAL || rightvt == VT_DISPATCH)) resultvt = VT_BSTR; else if (rightvt == VT_ERROR && leftvt < VT_VOID) hres = DISP_E_TYPEMISMATCH;