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

oleaut32: variant - allow conversion of VT_DISPATCH into VT_BSTR in VarCat.

This commit is contained in:
Alex Villacís Lasso 2006-11-06 16:58:03 -05:00 committed by Alexandre Julliard
parent a7128fbc4d
commit 3f593aa622
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/oleaut32/variant.c
View File

@ -2478,7 +2478,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out)
leftvt == VT_UI8 || leftvt == VT_INT || leftvt == VT_UI8 || leftvt == VT_INT ||
leftvt == VT_UINT || leftvt == VT_EMPTY || leftvt == VT_UINT || leftvt == VT_EMPTY ||
leftvt == VT_NULL || leftvt == VT_DATE || leftvt == VT_NULL || leftvt == VT_DATE ||
leftvt == VT_DECIMAL) leftvt == VT_DECIMAL || leftvt == VT_DISPATCH)
&& &&
(rightvt == VT_I2 || rightvt == VT_I4 || (rightvt == VT_I2 || rightvt == VT_I4 ||
rightvt == VT_R4 || rightvt == VT_R8 || rightvt == VT_R4 || rightvt == VT_R8 ||
@ -2489,7 +2489,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out)
rightvt == VT_UI8 || rightvt == VT_INT || rightvt == VT_UI8 || rightvt == VT_INT ||
rightvt == VT_UINT || rightvt == VT_EMPTY || rightvt == VT_UINT || rightvt == VT_EMPTY ||
rightvt == VT_NULL || rightvt == VT_DATE || rightvt == VT_NULL || rightvt == VT_DATE ||
rightvt == VT_DECIMAL)) rightvt == VT_DECIMAL || rightvt == VT_DISPATCH))
resultvt = VT_BSTR; resultvt = VT_BSTR;
else if (rightvt == VT_ERROR && leftvt < VT_VOID) else if (rightvt == VT_ERROR && leftvt < VT_VOID)
hres = DISP_E_TYPEMISMATCH; hres = DISP_E_TYPEMISMATCH;