Alistair Leslie-Hughes : oleaut32: Don' t output an error when the typelib cannot be found.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f20427361c77e08ee852b0d304b5e2fef696491e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f20427361c77e08ee852b0d304...

Author: Alistair Leslie-Hughes 
Date:   Fri Dec 14 14:05:09 2012 +1100

oleaut32: Don't output an error when the typelib cannot be found.

---

dlls/oleaut32/typelib.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index fa9b050..722b0c4 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -2544,9 +2544,10 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p
                     return S_OK;
                 }
             }
-
-            hr = E_FAIL;
         }
+
+        TRACE("No TYPELIB resource found\n");
+        hr = E_FAIL;
     }

TLB_PEFile_Release((IUnknown *)&This->lpvtbl);
@@ -2949,8 +2950,6 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath
             ret = TYPE_E_CANTLOADLIBRARY;
         IUnknown_Release(pFile);
     }
-    else
-        ret = TYPE_E_CANTLOADLIBRARY;

if(*ppTypeLib) {
    ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib;
@@ -2966,8 +2965,15 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath
         list_add_head(&tlb_cache, &impl->entry);
         LeaveCriticalSection(&cache_section);
         ret = S_OK;
-    } else
-	ERR("Loading of typelib %s failed with error %d\n", debugstr_w(pszFileName), GetLastError());
+    }
+    else
+    {
+        if(ret != E_FAIL)
+            ERR("Loading of typelib %s failed with error %d\n", debugstr_w(pszFileName), GetLastError());
+
+        ret = TYPE_E_CANTLOADLIBRARY;
+    }
+

return ret;
 }