[PATCH v6 11/15] dlls/oleaut32: Shink down ITypeLibComp_fnBind() verbosity some

[Edward O'Callaghan]

From: Edward O'Callaghan

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

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 6fcde6c94de..fcf778553c7 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -5390,6 +5390,9 @@ static HRESULT WINAPI ITypeLibComp_fnBind(

for(i = 0; i < This->TypeInfoCount; ++i){
         ITypeInfoImpl *pTypeInfo = This->typeinfos[i];
+        ITypeComp *pSubTypeComp = &pTypeInfo->ITypeComp_iface;
+        HRESULT hr;
+
         TRACE("testing %s\n", debugstr_w(TLB_get_bstr(pTypeInfo->Name)));

/* FIXME: check wFlags here? */
@@ -5401,18 +5404,11 @@ static HRESULT WINAPI ITypeLibComp_fnBind(
             if (pTypeInfo->Name && !wcscmp(pTypeInfo->Name->str, szName))
             {
                 *pDescKind = DESCKIND_TYPECOMP;
-                pBindPtr->lptcomp = &pTypeInfo->ITypeComp_iface;
+                pBindPtr->lptcomp = pSubTypeComp;
                 ITypeComp_AddRef(pBindPtr->lptcomp);
                 TRACE("module or enum: %s\n", debugstr_w(szName));
                 return S_OK;
             }
-        }
-
-        if ((pTypeInfo->typeattr.typekind == TKIND_MODULE) ||
-            (pTypeInfo->typeattr.typekind == TKIND_ENUM))
-        {
-            ITypeComp *pSubTypeComp = &pTypeInfo->ITypeComp_iface;
-            HRESULT hr;

hr = ITypeComp_Bind(pSubTypeComp, szName, lHash, wFlags, ppTInfo, pDescKind, pBindPtr);
             if (SUCCEEDED(hr) && (*pDescKind != DESCKIND_NONE))
@@ -5427,8 +5423,6 @@ static HRESULT WINAPI ITypeLibComp_fnBind(
         if ((pTypeInfo->typeattr.typekind == TKIND_COCLASS) &&
             (pTypeInfo->typeattr.wTypeFlags & TYPEFLAG_FAPPOBJECT))
         {
-            ITypeComp *pSubTypeComp = &pTypeInfo->ITypeComp_iface;
-            HRESULT hr;
             ITypeInfo *subtypeinfo;
             BINDPTR subbindptr;
             DESCKIND subdesckind;