Commit f2042736 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard

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

parent cdec918b
......@@ -2544,10 +2544,11 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p
return S_OK;
}
}
}
TRACE("No TYPELIB resource found\n");
hr = E_FAIL;
}
}
TLB_PEFile_Release((IUnknown *)&This->lpvtbl);
return hr;
......@@ -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,9 +2965,16 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath
list_add_head(&tlb_cache, &impl->entry);
LeaveCriticalSection(&cache_section);
ret = S_OK;
} else
}
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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment