marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

oldstable
Alistair Leslie-Hughes 2012-12-14 14:05:09 +11:00 committed by Alexandre Julliard
parent cdec918b26
commit f20427361c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/oleaut32/typelib.c
View File

@ -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;
}