Hi,
Another IShield6 patch, a better and more helpful error for the user
if winedefault.reg is not loaded.
License: LGPL
Changelog:
Tell the user if winedefault.reg is not loaded.
Index: marshal.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/marshal.c,v
retrieving revision 1.3
diff -u -r1.3 marshal.c
--- marshal.c 9 Mar 2002 23:39:09 -0000 1.3
+++ marshal.c 16 May 2002 07:36:22 -0000
@@ -473,7 +473,12 @@
}
hres = IMarshal_MarshalInterface(pMarshal,pStm,riid,pUnk,dwDestContext,pvDestContext,mshlflags);
if (hres) {
- FIXME("Failed to Marshal the interface, %lx?\n",hres);
+ if (IsEqualGUID(riid,&IID_IClassFactory)) {
+ MESSAGE("\nERROR: You need to merge the 'winedefault.reg' file into your\n");
+ MESSAGE(" WINE registry by running: `regapi setValue < winedefault.reg'!\n\n");
+ } else {
+ FIXME("Failed to Marshal the interface, %lx?\n",hres);
+ }
goto release_marshal;
}
release_marshal:
