From 5729abea736c149a7d4be92ac6dea35eb7abb7ab Mon Sep 17 00:00:00 2001 From: Ivan Leo Puoti Date: Thu, 17 Jun 2004 19:55:24 +0000 Subject: [PATCH] Removed the winedefault.reg message. --- dlls/ole32/marshal.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 662f1b07a6c..dd448e67b69 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -482,17 +482,11 @@ CoMarshalInterface( IStream *pStm, REFIID riid, IUnknown *pUnk, } 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);