system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

oleaut32/typelib: Get rid of redundant argument in typeinfo lookup helper.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2019-12-10 16:49:03 +03:00 committed by Alexandre Julliard
parent 2dfcb31cf3
commit 5d05d4acd6
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dlls/oleaut32/typelib.c
View file

@ -1724,15 +1724,16 @@ static inline TLBCustData *TLB_get_custdata_by_guid(struct list *custdata_list,
return NULL;
}
static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeInfoImpl **typeinfos,
UINT n, const OLECHAR *name)
static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeLibImpl *typelib, const OLECHAR *name)
{
while(n){
if(!lstrcmpiW(TLB_get_bstr((*typeinfos)->Name), name))
return *typeinfos;
++typeinfos;
--n;
int i;
for (i = 0; i < typelib->TypeInfoCount; ++i)
{
if (!lstrcmpiW(TLB_get_bstr(typelib->typeinfos[i]->Name), name))
return typelib->typeinfos[i];
}
return NULL;
}
@ -5507,7 +5508,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType(
if(!szName || !ppTInfo || !ppTComp)
return E_INVALIDARG;
info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, szName);
info = TLB_get_typeinfo_by_name(This, szName);
if(!info){
*ppTInfo = NULL;
*ppTComp = NULL;
@ -9007,7 +9008,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface,
if (!ctinfo || !name)
return E_INVALIDARG;
info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, name);
info = TLB_get_typeinfo_by_name(This, name);
if (info)
return TYPE_E_NAMECONFLICT;