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

oleaut32: Ignore the first named argument when invoking property-put methods 

as it is mandatory and doesn't indicate that the arguments will be
passed in as named ones.
This commit is contained in:
Rob Shearman 2007-02-06 19:26:04 +00:00 committed by Alexandre Julliard
parent 21140a9a53
commit e88d033044
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/oleaut32/typelib.c
View File

@ -5471,8 +5471,24 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
VARIANTARG **prgpvarg = INVBUF_GET_ARG_PTR_ARRAY(buffer, func_desc->cParams); VARIANTARG **prgpvarg = INVBUF_GET_ARG_PTR_ARRAY(buffer, func_desc->cParams);
VARIANTARG *rgvarg = INVBUF_GET_ARG_ARRAY(buffer, func_desc->cParams); VARIANTARG *rgvarg = INVBUF_GET_ARG_ARRAY(buffer, func_desc->cParams);
VARTYPE *rgvt = INVBUF_GET_ARG_TYPE_ARRAY(buffer, func_desc->cParams); VARTYPE *rgvt = INVBUF_GET_ARG_TYPE_ARRAY(buffer, func_desc->cParams);
UINT cNamedArgs = pDispParams->cNamedArgs;
DISPID *rgdispidNamedArgs = pDispParams->rgdispidNamedArgs;
hres = S_OK; hres = S_OK;
if (func_desc->invkind & (INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF))
{
if (!cNamedArgs || (rgdispidNamedArgs[0] != DISPID_PROPERTYPUT))
{
ERR("first named arg for property put invocation must be DISPID_PROPERTYPUT\n");
hres = DISP_E_PARAMNOTOPTIONAL;
goto func_fail;
}
/* ignore the DISPID_PROPERTYPUT named argument from now on */
cNamedArgs--;
rgdispidNamedArgs++;
}
for (i = 0; i < func_desc->cParams; i++) for (i = 0; i < func_desc->cParams; i++)
{ {
TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc; TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc;
@ -5487,25 +5503,17 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags;
VARIANTARG *src_arg; VARIANTARG *src_arg;
if (pDispParams->cNamedArgs) if (cNamedArgs)
{ {
USHORT j; USHORT j;
src_arg = NULL; src_arg = NULL;
for (j = 0; j < pDispParams->cNamedArgs; j++) for (j = 0; j < cNamedArgs; j++)
{ if (rgdispidNamedArgs[j] == i)
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]; src_arg = &pDispParams->rgvarg[j];
break; break;
} }
} }
}
else else
src_arg = i < pDispParams->cArgs ? &pDispParams->rgvarg[pDispParams->cArgs - 1 - i] : NULL; src_arg = i < pDispParams->cArgs ? &pDispParams->rgvarg[pDispParams->cArgs - 1 - i] : NULL;