ChangeSet ID:	7091
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard@wine.codeweavers.com	2003/01/21 13:29:33

Modified files:
	dlls/oleaut32  : typelib.c 

Log message:
	Marcus Meissner <marcus@jet.franken.de>
	Print a large failure message if we try to load stdole32.tlb and
	fail.

Patch: http://cvs.winehq.com/patch.py?id=7091

Old revision  New revision  Changes     Path
 1.88          1.89          +23 -2      wine/dlls/oleaut32/typelib.c

Index: wine/dlls/oleaut32/typelib.c
diff -u -p wine/dlls/oleaut32/typelib.c:1.88 wine/dlls/oleaut32/typelib.c:1.89
--- wine/dlls/oleaut32/typelib.c:1.88	Thu Jul 29 19:12:18 2010
+++ wine/dlls/oleaut32/typelib.c	Thu Jul 29 19:12:18 2010
@@ -284,8 +284,8 @@ HRESULT WINAPI LoadTypeLibEx(
     WCHAR *pIndexStr;
     HRESULT res;
     INT index = 1;
-    TRACE("(%s,%d,%p)\n",debugstr_w(szFile), regkind, pptLib);
 
+    TRACE("(%s,%d,%p)\n",debugstr_w(szFile), regkind, pptLib);
     if(!SearchPathW(NULL,szFile,NULL,sizeof(szPath)/sizeof(WCHAR),szPath,
 		    NULL)) {
 
@@ -301,8 +301,29 @@ HRESULT WINAPI LoadTypeLibEx(
 	        return TYPE_E_CANTLOADLIBRARY;
 	    if (GetFileAttributesW(szFileCopy) & FILE_ATTRIBUTE_DIRECTORY)
 		return TYPE_E_CANTLOADLIBRARY;
-	} else
+	} else {
+	    WCHAR tstpath[260];
+	    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;
+	}
     }
 
     TRACE("File %s index %d\n", debugstr_w(szPath), index);