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.

diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index afad3b80559e9f4792f08e40ceef295332272b9c..41f37b42a3b27cfd601b0f1453cf64fc51129a37 100644 (file)
--- a/dlls/oleaut32/olefont.c
+++ b/dlls/oleaut32/olefont.c
@@ -1214,7 +1214,7 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo(
     return E_FAIL;
   hres = LoadTypeLib(stdole32tlb, &tl);
   if (FAILED(hres)) {
-    FIXME("Could not load the stdole32.tlb?\n");
+    ERR("Could not load the stdole32.tlb?\n");
     return hres;
   }
   hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IDispatch, ppTInfo);

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index ce8d56cf908ad6c7e7b180f0ae93226b5aad019e..b3cdf57b5fb563cb621528305303b446132f759d 100644 (file)
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -291,7 +291,7 @@ HRESULT WINAPI LoadTypeLib(
     const OLECHAR *szFile,/* [in] Name of file to load from */
     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);
 }
 
@@ -332,26 +332,7 @@ HRESULT WINAPI LoadTypeLibEx(
            if (GetFileAttributesW(szFileCopy) & FILE_ATTRIBUTE_DIRECTORY)
                return TYPE_E_CANTLOADLIBRARY;
        } else {
-           WCHAR tstpath[260];
-           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));
+           TRACE("Wanted to load %s as typelib, but file was not found.\n",debugstr_w(szFile));
            return TYPE_E_CANTLOADLIBRARY;
        }
     }