[PATCH v3 10/10] oleaut32: Factor out TLB_get_typeinfo_by_guid()

[Edward O'Callaghan]

From: Edward O'Callaghan

Allows for a clear ITypeLib2::GetTypeInfoOfGuid() implementation.

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

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 5d7829b790c..010e860ea42 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -1753,6 +1753,18 @@ static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeLibImpl *typelib, con
     return NULL;
 }

+static inline ITypeInfoImpl *TLB_get_typeinfo_by_guid(ITypeLibImpl *typelib, REFGUID guid)
+{
+    for (UINT i = 0; i < typelib->TypeInfoCount; ++i) {
+        ITypeInfoImpl *pTInfo = typelib->typeinfos[i];
+
+        if (IsEqualIID(TLB_get_guid_null(pTInfo->guid), guid))
+            return pTInfo;
+    }
+
+    return NULL;
+}
+
 static void TLBVarDesc_Constructor(TLBVarDesc *var_desc)
 {
     list_init(&var_desc->custdata_list);
@@ -4960,19 +4972,18 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoOfGuid(
     ITypeInfo **ppTInfo)
 {
     ITypeLibImpl *This = impl_from_ITypeLib2(iface);
-    int i;
+    ITypeInfoImpl *pTInfo;

TRACE("%p %s %p\n", This, debugstr_guid(guid), ppTInfo);

-    for(i = 0; i < This->TypeInfoCount; ++i){
-        if(IsEqualIID(TLB_get_guid_null(This->typeinfos[i]->guid), guid)){
-            *ppTInfo = (ITypeInfo *)&This->typeinfos[i]->ITypeInfo2_iface;
-            ITypeInfo_AddRef(*ppTInfo);
-            return S_OK;
-        }
-    }
+    pTInfo = TLB_get_typeinfo_by_guid(This, guid);
+    if (!pTInfo)
+        return TYPE_E_ELEMENTNOTFOUND;

-    return TYPE_E_ELEMENTNOTFOUND;
+    *ppTInfo = (ITypeInfo *)&pTInfo->ITypeInfo2_iface;
+    ITypeInfo_AddRef(*ppTInfo);
+
+    return S_OK;
 }

/* ITypeLib::GetLibAttr