commit 5729abea736c149a7d4be92ac6dea35eb7abb7ab
author Ivan Leo Puoti <puoti@inwind.it> Thu Jun 17 19:55:24 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jun 17 19:55:24 2004 +0000
tree 6f2dbc38b7baf1b4e202cec328009bf80e28ca78
parent 484f1b82d226f4f6176917ffb538c61d969f7ff3

Removed the winedefault.reg message.

dlls/ole32/marshal.c

diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index 662f1b0..dd448e6 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -482,17 +482,11 @@
   }
   hres = IMarshal_MarshalInterface(pMarshal,pStm,riid,pUnk,dwDestContext,pvDestContext,mshlflags);
   if (hres) {
-    if (IsEqualGUID(riid,&IID_IClassFactory)) {
-	MESSAGE("\nERROR: You need to merge the 'winedefault.reg' file into your\n");
-	MESSAGE("       Wine registry by running: `regedit winedefault.reg'\n\n");
+    if (IsEqualGUID(riid,&IID_IOleObject)) {
+      ERR("WINE currently cannot marshal IOleObject interfaces. This means you cannot embed/link OLE objects between applications.\n");
     } else {
-    	if (IsEqualGUID(riid,&IID_IOleObject)) {
-	    ERR("WINE currently cannot marshal IOleObject interfaces. This means you cannot embed/link OLE objects between applications.\n");
-	} else {
-	    FIXME("Failed to marshal the interface %s, %lx?\n",debugstr_guid(riid),hres);
-	}
+      FIXME("Failed to marshal the interface %s, %lx?\n",debugstr_guid(riid),hres);
     }
-    goto release_marshal;
   }
 release_marshal:
   IMarshal_Release(pMarshal);