Removed the winedefault.reg message.

This commit is contained in:
Ivan Leo Puoti 2004-06-17 19:55:24 +00:00 committed by Alexandre Julliard
parent 484f1b82d2
commit 5729abea73
1 changed files with 3 additions and 9 deletions

View File

@ -482,18 +482,12 @@ CoMarshalInterface( IStream *pStm, REFIID riid, IUnknown *pUnk,
} }
hres = IMarshal_MarshalInterface(pMarshal,pStm,riid,pUnk,dwDestContext,pvDestContext,mshlflags); hres = IMarshal_MarshalInterface(pMarshal,pStm,riid,pUnk,dwDestContext,pvDestContext,mshlflags);
if (hres) { 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");
} else {
if (IsEqualGUID(riid,&IID_IOleObject)) { if (IsEqualGUID(riid,&IID_IOleObject)) {
ERR("WINE currently cannot marshal IOleObject interfaces. This means you cannot embed/link OLE objects between applications.\n"); ERR("WINE currently cannot marshal IOleObject interfaces. This means you cannot embed/link OLE objects between applications.\n");
} else { } 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: release_marshal:
IMarshal_Release(pMarshal); IMarshal_Release(pMarshal);
return hres; return hres;