From 21140a9a53a6cd025f1c83bbfd388a4632a28de6 Mon Sep 17 00:00:00 2001 From: Rob Shearman Date: Tue, 6 Feb 2007 19:25:27 +0000 Subject: [PATCH] oleaut32: Add support for named arguments in ITypeInfo::Invoke. --- dlls/oleaut32/typelib.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f61f4601a74..508bb89d47d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5485,6 +5485,29 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( for (i = 0; i < func_desc->cParams; i++) { USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; + VARIANTARG *src_arg; + + if (pDispParams->cNamedArgs) + { + USHORT j; + src_arg = NULL; + for (j = 0; j < pDispParams->cNamedArgs; j++) + { + if ((func_desc->invkind & INVOKE_PROPERTYPUT) && + (pDispParams->rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) + { + src_arg = &pDispParams->rgvarg[0]; + break; + } + if (pDispParams->rgdispidNamedArgs[j] == i) + { + src_arg = &pDispParams->rgvarg[j]; + break; + } + } + } + else + src_arg = i < pDispParams->cArgs ? &pDispParams->rgvarg[pDispParams->cArgs - 1 - i] : NULL; if (wParamFlags & PARAMFLAG_FRETVAL) { @@ -5507,9 +5530,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( break; } } - else if (i < pDispParams->cArgs) + else if (src_arg) { - VARIANTARG *src_arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - i]; dump_Variant(src_arg); if (rgvt[i] == VT_VARIANT) -- 2.11.4.GIT