Commit dff207d3 authored by Vincent Béron's avatar Vincent Béron Committed by Alexandre Julliard

Remove message telling users to copy native stdole32.tlb over as we

now provide it. Better trace in LoadTypeLib. Change debug messages type to reflect we provide stdole32.tlb.
parent b8cb0e12
...@@ -1214,7 +1214,7 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo( ...@@ -1214,7 +1214,7 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo(
return E_FAIL; return E_FAIL;
hres = LoadTypeLib(stdole32tlb, &tl); hres = LoadTypeLib(stdole32tlb, &tl);
if (FAILED(hres)) { if (FAILED(hres)) {
FIXME("Could not load the stdole32.tlb?\n"); ERR("Could not load the stdole32.tlb?\n");
return hres; return hres;
} }
hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IDispatch, ppTInfo); hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IDispatch, ppTInfo);
......
...@@ -291,7 +291,7 @@ HRESULT WINAPI LoadTypeLib( ...@@ -291,7 +291,7 @@ HRESULT WINAPI LoadTypeLib(
const OLECHAR *szFile,/* [in] Name of file to load from */ const OLECHAR *szFile,/* [in] Name of file to load from */
ITypeLib * *pptLib) /* [out] Pointer to pointer to loaded type library */ ITypeLib * *pptLib) /* [out] Pointer to pointer to loaded type library */
{ {
TRACE("\n"); TRACE("(%s,%p)\n",debugstr_w(szFile), pptLib);
return LoadTypeLibEx(szFile, REGKIND_DEFAULT, pptLib); return LoadTypeLibEx(szFile, REGKIND_DEFAULT, pptLib);
} }
...@@ -332,26 +332,7 @@ HRESULT WINAPI LoadTypeLibEx( ...@@ -332,26 +332,7 @@ HRESULT WINAPI LoadTypeLibEx(
if (GetFileAttributesW(szFileCopy) & FILE_ATTRIBUTE_DIRECTORY) if (GetFileAttributesW(szFileCopy) & FILE_ATTRIBUTE_DIRECTORY)
return TYPE_E_CANTLOADLIBRARY; return TYPE_E_CANTLOADLIBRARY;
} else { } else {
WCHAR tstpath[260]; TRACE("Wanted to load %s as typelib, but file was not found.\n",debugstr_w(szFile));
static const WCHAR stdole32tlb[] = { 's','t','d','o','l','e','3','2','.','t','l','b',0 };
int i;
lstrcpyW(tstpath,szFile);
CharLowerW(tstpath);
for (i=0;i<strlenW(tstpath);i++) {
if (tstpath[i] == 's') {
if (!strcmpW(tstpath+i,stdole32tlb)) {
MESSAGE("\n");
MESSAGE("**************************************************************************\n");
MESSAGE("You must copy a 'stdole32.tlb' file to your Windows\\System directory!\n");
MESSAGE("You can get one from a Windows installation, or look for the DCOM95 package\n");
MESSAGE("on the Microsoft Download Pages.\n");
MESSAGE("**************************************************************************\n");
break;
}
}
}
FIXME("Wanted to load %s as typelib, but file was not found.\n",debugstr_w(szFile));
return TYPE_E_CANTLOADLIBRARY; return TYPE_E_CANTLOADLIBRARY;
} }
} }
......
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