[PATCH v2 03/10] oleaut32: Mostly mirror fnFindName impl in typelib.c

[Edward O'Callaghan]

From: Edward O'Callaghan

The methods fnFindName and fnIsName() are almost identical.
Consistently match them where possible, paving the way for
a common internal worker implementation.

Signed-off-by: Edward O'Callaghan 
---
 dlls/oleaut32/typelib.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 00a148154eb..28c29777ffb 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -5094,27 +5094,34 @@ static HRESULT WINAPI ITypeLib2_fnIsName(
 {
     ITypeLibImpl *This = impl_from_ITypeLib2(iface);
     int tic;
-    UINT fdc, vrc;

TRACE("%p, %s, %#lx, %p.\n", iface, debugstr_w(szNameBuf), lHashVal, pfName);

*pfName=TRUE;
     for(tic = 0; tic < This->TypeInfoCount; ++tic){
         ITypeInfoImpl *pTInfo = This->typeinfos[tic];
-        if(!lstrcmpiW(TLB_get_bstr(pTInfo->Name), szNameBuf)) goto ITypeLib2_fnIsName_exit;
+        TLBVarDesc *pVDesc;
+        UINT fdc;
+
+        if(!lstrcmpiW(TLB_get_bstr(pTInfo->Name), szNameBuf))
+            goto ITypeLib2_fnIsName_exit;
+
         for(fdc = 0; fdc < pTInfo->typeattr.cFuncs; ++fdc) {
             TLBFuncDesc *pFDesc = &pTInfo->funcdescs[fdc];
             int pc;
-            if(!lstrcmpiW(TLB_get_bstr(pFDesc->Name), szNameBuf)) goto ITypeLib2_fnIsName_exit;
+
+            if(!lstrcmpiW(TLB_get_bstr(pFDesc->Name), szNameBuf))
+                goto ITypeLib2_fnIsName_exit;
+
             for(pc=0; pc < pFDesc->funcdesc.cParams; pc++){
                 if(!lstrcmpiW(TLB_get_bstr(pFDesc->pParamDesc[pc].Name), szNameBuf))
                     goto ITypeLib2_fnIsName_exit;
             }
         }
-        for(vrc = 0; vrc < pTInfo->typeattr.cVars; ++vrc){
-            TLBVarDesc *pVDesc = &pTInfo->vardescs[vrc];
-            if(!lstrcmpiW(TLB_get_bstr(pVDesc->Name), szNameBuf)) goto ITypeLib2_fnIsName_exit;
-        }
+
+        pVDesc = TLB_get_vardesc_by_name(pTInfo, szNameBuf);
+        if (pVDesc)
+            goto ITypeLib2_fnIsName_exit;

}
     *pfName=FALSE;