Skip to content

W
wine-cw
Commit 8ca5afa4 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

oleaut32/typelib: Remove explicit check already handled by the loop condition.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f7d26b42
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 11 deletions
dlls/oleaut32/typelib.c
View file @ 8ca5afa4
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment