From 8ca5afa43046627bcc1acd0f465715397825ed1c Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Fri, 20 Aug 2021 13:57:56 +0300 Subject: [PATCH] oleaut32/typelib: Remove explicit check already handled by the loop condition. Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- dlls/oleaut32/typelib.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0526af0abdb..ac326afe1a1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7216,7 +7216,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( UINT *pArgErr) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - int i; + int i, j; unsigned int var_index; TYPEKIND type_kind; HRESULT hres; @@ -7323,15 +7323,13 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( src_arg = NULL; - if (cNamedArgs) + for (j = 0; j < cNamedArgs; j++) { - USHORT j; - for (j = 0; j < cNamedArgs; j++) - if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) - { - src_arg = &pDispParams->rgvarg[j]; - break; - } + if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) + { + src_arg = &pDispParams->rgvarg[j]; + break; + } } if (!src_arg && vargs_converted + cNamedArgs < pDispParams->cArgs) @@ -7400,7 +7398,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( { SAFEARRAYBOUND bound; VARIANT *v; - LONG j; + bound.lLbound = 0; bound.cElements = pDispParams->cArgs-i; if (!(a = SafeArrayCreate(VT_VARIANT, 1, &bound))) @@ -7585,7 +7583,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( i == func_desc->cParams-1) { SAFEARRAY *a = V_ARRAY(prgpvarg[i]); - LONG j, ubound; + LONG ubound; VARIANT *v; hres = SafeArrayGetUBound(a, 1, &ubound); if (hres != S_OK)