reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 04:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oleaut: Support conversion of VT_SAFEARRAY into VT_ARRAY|type.

Browse Source 
Typelib variant types that cannot be converted should return
DISP_E_BADVARTYPE.
Don't call DispCallFunc if conversion of one of the arguments failed.
This commit is contained in:
Robert Shearman 2006-01-12 11:53:47 +01:00 committed by Alexandre Julliard
parent f431353058
commit 9227902714
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/oleaut32/typelib.c
View File

@ -5008,7 +5008,7 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc,
HRESULT hr = S_OK;
/* enforce only one level of pointer indirection */
if (!(*vt & VT_BYREF) && (tdesc->vt == VT_PTR))
if (!(*vt & VT_BYREF) && !(*vt & VT_ARRAY) && (tdesc->vt == VT_PTR))
{
tdesc = tdesc->u.lptdesc;
@ -5045,9 +5045,17 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc,
case VT_USERDEFINED:
hr = userdefined_to_variantvt(tinfo, tdesc, vt);
break;
case VT_VOID:
case VT_CARRAY:
case VT_PTR:
ERR("cannot convert VT_PTR into variant VT\n");
hr = E_FAIL;
case VT_LPSTR:
case VT_LPWSTR:
ERR("cannot convert type %d into variant VT\n", tdesc->vt);
hr = DISP_E_BADVARTYPE;
break;
case VT_SAFEARRAY:
*vt |= VT_ARRAY;
hr = typedescvt_to_variantvt(tinfo, tdesc->u.lptdesc, vt);
break;
default:
*vt |= tdesc->vt;
@ -5288,6 +5296,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
break;
}
}
if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */
if (func_desc->cParamsOpt < 0)
{
FIXME("Does not support safearray optional parameters\n");