License: X11-MIT
Changelog:
* dlls/comctl32: imagelist.c;
dlls/ddraw: d3dcommon.c, d3dexecutebuffer.c, d3dlight.c, mesa.c,
d3dmaterial.c, d3dtexture.c, d3dvertexbuffer.c, d3dviewport.c;
dlls/ddraw/d3ddevice: main.c, mesa.c;
dlls/dplayx: dpclassfactory.c;
dlls/ole32: antimoniker.c, bindctx.c, compobj.c, compositemoniker.c,
datacache.c, errorinfo.c, filemoniker.c, ftmarshal.c, ifs.c,
itemmoniker.c, moniker.c, ole32_main.c, ole32_main.h, oleobj.c,
stg_bigblockfile.c, storage.c, storage32.h;
dlls/oleaut32: connpt.c, dispatch.c, olefont.c, safearray.c,
tmarshal.c, typelib.c
dlls/rpcrt4: cproxy.c, cpsf.c, cstub.c, ndr_marshall.c, ndr_midl.c,
ndr_ole.c;
dlls/shdocvw: classinfo.c, shdocvw.h;
dlls/shell32: dragdrophelper.c, folders.c, shellfolder.h, shellord.c,
shfldr_desktop.c, shfldr_fs.c, shfldr_mycomp.c, shlfolder.c,
shlmenu.c, shv_bg_cmenu.c, shv_item_cmenu.c;
dlls/shlwapi: clist.c, istream.c, ordinal.c, regstream.c, thread.c;
include: dplay.h, oaidl.h, objbase.h, objidl.h, ocidl.h, ole.h,
ole2.h, oleauto.h, olectl.h, oledlg.h, oleidl.h, servprov.h,
shlguid.h, shlobj.h, unknwn.h, urlmon.h;
include/wine: obj_base.h, obj_misc.h, obj_serviceprovider.h:
Ove Kaaven <ovek@transgaming.com>
- adaptation of rewind patch... probably not perfect, but seems ok,
so far, on linux.
--
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/comctl32/imagelist.c ./dlls/comctl32/imagelist.c
--- ../wine.test/dlls/comctl32/imagelist.c 2002-11-19 09:12:39.000000000 -0600
+++ ./dlls/comctl32/imagelist.c 2002-12-03 01:03:13.000000000 -0600
@@ -45,8 +45,7 @@
#include <string.h>
#include "winerror.h"
#include "winbase.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
#include "commctrl.h"
#include "imagelist.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ddraw/d3dcommon.c ./dlls/ddraw/d3dcommon.c
--- ../wine.test/dlls/ddraw/d3dcommon.c 2002-10-10 19:21:53.000000000 -0500
+++ ./dlls/ddraw/d3dcommon.c 2002-12-03 01:03:42.000000000 -0600
@@ -20,7 +20,7 @@
*/
#include "windef.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ddraw/d3ddevice/main.c ./dlls/ddraw/d3ddevice/main.c
--- ../wine.test/dlls/ddraw/d3ddevice/main.c 2002-12-02 23:52:12.000000000 -0600
+++ ./dlls/ddraw/d3ddevice/main.c 2002-12-03 01:19:33.000000000 -0600
@@ -24,7 +24,7 @@
#include "windef.h"
#include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ddraw/d3ddevice/mesa.c ./dlls/ddraw/d3ddevice/mesa.c
--- ../wine.test/dlls/ddraw/d3ddevice/mesa.c 2002-12-02 23:52:12.000000000 -0600
+++ ./dlls/ddraw/d3ddevice/mesa.c 2002-12-03 01:19:53.000000000 -0600
@@ -25,7 +25,7 @@
#include "windef.h"
#include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ddraw/d3dexecutebuffer.c ./dlls/ddraw/d3dexecutebuffer.c
--- ../wine.test/dlls/ddraw/d3dexecutebuffer.c 2002-11-24 22:11:14.000000000 -0600
+++ ./dlls/ddraw/d3dexecutebuffer.c 2002-12-03 01:04:20.000000000 -0600
@@ -24,7 +24,7 @@
#include "windef.h"
#include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ddraw/d3dlight.c ./dlls/ddraw/d3dlight.c
--- ../wine.test/dlls/ddraw/d3dlight.c 2002-11-21 20:38:18.000000000 -0600
+++ ./dlls/ddraw/d3dlight.c 2002-12-03 01:04:51.000000000 -0600
@@ -21,7 +21,7 @@
#include "config.h"
#include "windef.h"
#include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ddraw/d3dmaterial.c ./dlls/ddraw/d3dmaterial.c
--- ../wine.test/dlls/ddraw/d3dmaterial.c 2002-11-21 20:38:18.000000000 -0600
+++ ./dlls/ddraw/d3dmaterial.c 2002-12-03 01:05:11.000000000 -0600
@@ -21,7 +21,7 @@
#include "config.h"
#include "windef.h"
#include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ddraw/d3dtexture.c ./dlls/ddraw/d3dtexture.c
--- ../wine.test/dlls/ddraw/d3dtexture.c 2002-12-02 23:52:12.000000000 -0600
+++ ./dlls/ddraw/d3dtexture.c 2002-12-03 01:05:30.000000000 -0600
@@ -24,7 +24,7 @@
#include "windef.h"
#include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ddraw/d3dvertexbuffer.c ./dlls/ddraw/d3dvertexbuffer.c
--- ../wine.test/dlls/ddraw/d3dvertexbuffer.c 2002-11-30 14:42:30.000000000 -0600
+++ ./dlls/ddraw/d3dvertexbuffer.c 2002-12-03 01:48:37.000000000 -0600
@@ -21,7 +21,7 @@
#include "config.h"
#include "windef.h"
#include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ddraw/d3dviewport.c ./dlls/ddraw/d3dviewport.c
--- ../wine.test/dlls/ddraw/d3dviewport.c 2002-11-30 14:42:30.000000000 -0600
+++ ./dlls/ddraw/d3dviewport.c 2002-12-03 01:16:18.000000000 -0600
@@ -21,7 +21,7 @@
#include "config.h"
#include "windef.h"
#include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ddraw/mesa.c ./dlls/ddraw/mesa.c
--- ../wine.test/dlls/ddraw/mesa.c 2002-11-21 20:38:18.000000000 -0600
+++ ./dlls/ddraw/mesa.c 2002-12-03 01:17:43.000000000 -0600
@@ -21,7 +21,7 @@
#include "config.h"
#include "windef.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/dplayx/dpclassfactory.c ./dlls/dplayx/dpclassfactory.c
--- ../wine.test/dlls/dplayx/dpclassfactory.c 2002-03-09 17:29:36.000000000 -0600
+++ ./dlls/dplayx/dpclassfactory.c 2002-12-03 01:20:58.000000000 -0600
@@ -18,7 +18,7 @@
#include <string.h>
#include "windef.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "winerror.h"
#include "wine/debug.h"
#include "dpinit.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/antimoniker.c ./dlls/ole32/antimoniker.c
--- ../wine.test/dlls/ole32/antimoniker.c 2002-05-31 18:25:50.000000000 -0500
+++ ./dlls/ole32/antimoniker.c 2002-12-03 01:21:34.000000000 -0600
@@ -23,10 +23,7 @@
#include "winbase.h"
#include "winerror.h"
#include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
+#include "objbase.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/bindctx.c ./dlls/ole32/bindctx.c
--- ../wine.test/dlls/ole32/bindctx.c 2002-05-31 18:25:50.000000000 -0500
+++ ./dlls/ole32/bindctx.c 2002-12-03 01:22:18.000000000 -0600
@@ -23,10 +23,7 @@
#include "winerror.h"
#include "winbase.h"
#include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
+#include "objbase.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/compobj.c ./dlls/ole32/compobj.c
--- ../wine.test/dlls/ole32/compobj.c 2002-11-22 15:02:10.000000000 -0600
+++ ./dlls/ole32/compobj.c 2002-12-03 01:44:29.000000000 -0600
@@ -37,14 +37,8 @@
#include "winerror.h"
#include "winreg.h"
#include "wownt32.h"
-#include "wtypes.h"
#include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_clientserver.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_marshal.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
#include "compobj_private.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/compositemoniker.c ./dlls/ole32/compositemoniker.c
--- ../wine.test/dlls/ole32/compositemoniker.c 2002-05-31 18:25:50.000000000 -0500
+++ ./dlls/ole32/compositemoniker.c 2002-12-03 01:23:11.000000000 -0600
@@ -22,11 +22,6 @@
#include "winbase.h"
#include "winerror.h"
#include "wine/debug.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_inplace.h"
#include "wine/unicode.h"
#include "ole2.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/datacache.c ./dlls/ole32/datacache.c
--- ../wine.test/dlls/ole32/datacache.c 2002-11-22 15:02:10.000000000 -0600
+++ ./dlls/ole32/datacache.c 2002-12-03 01:23:25.000000000 -0600
@@ -50,13 +50,6 @@
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_dataobject.h"
-#include "wine/obj_oleview.h"
-#include "wine/obj_cache.h"
#include "wine/unicode.h"
#include "ole2.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/errorinfo.c ./dlls/ole32/errorinfo.c
--- ../wine.test/dlls/ole32/errorinfo.c 2002-05-31 18:25:50.000000000 -0500
+++ ./dlls/ole32/errorinfo.c 2002-12-03 01:23:58.000000000 -0600
@@ -30,9 +30,7 @@
#include "oleauto.h"
#include "winerror.h"
-#include "wine/obj_base.h"
-#include "wine/obj_oleaut.h"
-#include "wine/obj_errorinfo.h"
+#include "objbase.h"
#include "wine/unicode.h"
#include "thread.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/filemoniker.c ./dlls/ole32/filemoniker.c
--- ../wine.test/dlls/ole32/filemoniker.c 2002-08-15 20:39:13.000000000 -0500
+++ ./dlls/ole32/filemoniker.c 2002-12-03 01:24:19.000000000 -0600
@@ -26,9 +26,6 @@
#include "wine/unicode.h"
#include "wine/debug.h"
#include "objbase.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_base.h"
#include "compobj_private.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/ftmarshal.c ./dlls/ole32/ftmarshal.c
--- ../wine.test/dlls/ole32/ftmarshal.c 2002-08-02 19:17:10.000000000 -0500
+++ ./dlls/ole32/ftmarshal.c 2002-12-03 01:53:36.000000000 -0600
@@ -27,7 +27,7 @@
#include "winbase.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "wine/obj_storage.h"
#include "wine/obj_marshal.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/ifs.c ./dlls/ole32/ifs.c
--- ../wine.test/dlls/ole32/ifs.c 2002-08-02 19:17:10.000000000 -0500
+++ ./dlls/ole32/ifs.c 2002-12-03 01:24:32.000000000 -0600
@@ -30,8 +30,6 @@
#include "winbase.h"
#include "winerror.h"
-#include "wine/obj_base.h"
-
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/itemmoniker.c ./dlls/ole32/itemmoniker.c
--- ../wine.test/dlls/ole32/itemmoniker.c 2002-07-15 20:43:24.000000000 -0500
+++ ./dlls/ole32/itemmoniker.c 2002-12-03 01:25:04.000000000 -0600
@@ -24,11 +24,7 @@
#include "winbase.h"
#include "winnls.h"
#include "wine/debug.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_inplace.h"
+#include "ole2.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/moniker.c ./dlls/ole32/moniker.c
--- ../wine.test/dlls/ole32/moniker.c 2002-05-31 18:25:50.000000000 -0500
+++ ./dlls/ole32/moniker.c 2002-12-03 01:25:25.000000000 -0600
@@ -25,10 +25,6 @@
#include "winerror.h"
#include "winbase.h"
#include "wtypes.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_moniker.h"
#include "wine/debug.h"
#include "ole2.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/ole32_main.c ./dlls/ole32/ole32_main.c
--- ../wine.test/dlls/ole32/ole32_main.c 2002-11-22 15:02:10.000000000 -0600
+++ ./dlls/ole32/ole32_main.c 2002-12-03 15:55:47.000000000 -0600
@@ -22,7 +22,6 @@
#include "winerror.h"
#include "ole32_main.h"
#include "wine/debug.h"
-#include "wine/obj_misc.h" /* FIXME: CoRegisterMallocSpy */
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/ole32_main.h ./dlls/ole32/ole32_main.h
--- ../wine.test/dlls/ole32/ole32_main.h 2002-03-09 17:39:09.000000000 -0600
+++ ./dlls/ole32/ole32_main.h 2002-12-03 02:21:46.000000000 -0600
@@ -20,10 +20,16 @@
#define __WINE_OLE32_MAIN_H
#include "windef.h"
+#include "objbase.h"
extern HINSTANCE OLE32_hInstance;
void COMPOBJ_InitProcess( void );
void COMPOBJ_UninitProcess( void );
+/* FIXME: not implemented */
+HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy);
+/* FIXME: not implemented */
+HRESULT WINAPI CoRevokeMallocSpy(void);
+
#endif /* __WINE_OLE32_MAIN_H */
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/oleobj.c ./dlls/ole32/oleobj.c
--- ../wine.test/dlls/ole32/oleobj.c 2002-06-21 17:25:18.000000000 -0500
+++ ./dlls/ole32/oleobj.c 2002-12-03 01:25:41.000000000 -0600
@@ -24,7 +24,7 @@
#include "winbase.h"
#include "winerror.h"
#include "wine/debug.h"
-#include "oleidl.h"
+#include "ole2.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/stg_bigblockfile.c ./dlls/ole32/stg_bigblockfile.c
--- ../wine.test/dlls/ole32/stg_bigblockfile.c 2002-05-31 18:25:50.000000000 -0500
+++ ./dlls/ole32/stg_bigblockfile.c 2002-12-03 01:26:32.000000000 -0600
@@ -39,8 +39,7 @@
#include "winbase.h"
#include "winerror.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
#include "ole2.h"
#include "storage32.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/storage.c ./dlls/ole32/storage.c
--- ../wine.test/dlls/ole32/storage.c 2002-11-22 15:02:10.000000000 -0600
+++ ./dlls/ole32/storage.c 2002-12-03 01:27:12.000000000 -0600
@@ -35,9 +35,7 @@
#include "winerror.h"
#include "wine/winbase16.h"
#include "wine/unicode.h"
-#include "wtypes.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/ole32/storage32.h ./dlls/ole32/storage32.h
--- ../wine.test/dlls/ole32/storage32.h 2002-08-16 14:55:14.000000000 -0500
+++ ./dlls/ole32/storage32.h 2002-12-03 01:27:54.000000000 -0600
@@ -29,10 +29,8 @@
#ifndef __STORAGE32_H__
#define __STORAGE32_H__
-#include "wtypes.h"
#include "winnt.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
/*
* Definitions for the file format offsets.
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/oleaut32/connpt.c ./dlls/oleaut32/connpt.c
--- ../wine.test/dlls/oleaut32/connpt.c 2002-05-31 18:25:50.000000000 -0500
+++ ./dlls/oleaut32/connpt.c 2002-12-03 01:28:27.000000000 -0600
@@ -30,8 +30,6 @@
#include "winuser.h"
#include "ole2.h"
#include "olectl.h"
-#include "wine/obj_base.h"
-#include "wine/obj_connection.h"
#include "connpt.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/oleaut32/dispatch.c ./dlls/oleaut32/dispatch.c
--- ../wine.test/dlls/oleaut32/dispatch.c 2002-05-31 18:25:50.000000000 -0500
+++ ./dlls/oleaut32/dispatch.c 2002-12-03 01:28:41.000000000 -0600
@@ -34,8 +34,6 @@
#include "winreg.h" /* for HKEY_LOCAL_MACHINE */
#include "winnls.h" /* for PRIMARYLANGID */
-#include "wine/obj_oleaut.h"
-
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/oleaut32/olefont.c ./dlls/oleaut32/olefont.c
--- ../wine.test/dlls/oleaut32/olefont.c 2002-10-25 00:03:04.000000000 -0500
+++ ./dlls/oleaut32/olefont.c 2002-12-03 01:29:15.000000000 -0600
@@ -28,9 +28,7 @@
#include "winuser.h"
#include "wine/unicode.h"
#include "oleauto.h" /* for SysAllocString(....) */
-#include "wine/obj_base.h"
-#include "wine/obj_olefont.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
#include "ole2.h"
#include "olectl.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/oleaut32/safearray.c ./dlls/oleaut32/safearray.c
--- ../wine.test/dlls/oleaut32/safearray.c 2002-07-18 19:30:16.000000000 -0500
+++ ./dlls/oleaut32/safearray.c 2002-12-03 01:29:42.000000000 -0600
@@ -27,7 +27,6 @@
#include "winerror.h"
#include "winbase.h"
#include "oleauto.h"
-#include "wine/obj_base.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/oleaut32/tmarshal.c ./dlls/oleaut32/tmarshal.c
--- ../wine.test/dlls/oleaut32/tmarshal.c 2002-09-12 17:07:04.000000000 -0500
+++ ./dlls/oleaut32/tmarshal.c 2002-12-03 01:29:55.000000000 -0600
@@ -33,9 +33,6 @@
#include "ole2.h"
#include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
-#include "wine/obj_storage.h"
#include "heap.h"
#include "ole2disp.h"
#include "typelib.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/oleaut32/typelib.c ./dlls/oleaut32/typelib.c
--- ../wine.test/dlls/oleaut32/typelib.c 2002-11-13 22:22:17.000000000 -0600
+++ ./dlls/oleaut32/typelib.c 2002-12-03 01:30:18.000000000 -0600
@@ -66,7 +66,7 @@
#include "winuser.h"
#include "wine/unicode.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "heap.h"
#include "ole2disp.h"
#include "typelib.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/rpcrt4/cproxy.c ./dlls/rpcrt4/cproxy.c
--- ../wine.test/dlls/rpcrt4/cproxy.c 2002-10-17 11:45:24.000000000 -0500
+++ ./dlls/rpcrt4/cproxy.c 2002-12-03 01:31:02.000000000 -0600
@@ -25,9 +25,7 @@
#include "winbase.h"
#include "winerror.h"
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
-
+#include "objbase.h"
#include "rpcproxy.h"
#include "cpsf.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/rpcrt4/cpsf.c ./dlls/rpcrt4/cpsf.c
--- ../wine.test/dlls/rpcrt4/cpsf.c 2002-10-18 18:48:58.000000000 -0500
+++ ./dlls/rpcrt4/cpsf.c 2002-12-03 01:31:37.000000000 -0600
@@ -26,8 +26,7 @@
#include "winerror.h"
#include "winreg.h"
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
#include "rpcproxy.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/rpcrt4/cstub.c ./dlls/rpcrt4/cstub.c
--- ../wine.test/dlls/rpcrt4/cstub.c 2002-11-08 15:46:19.000000000 -0600
+++ ./dlls/rpcrt4/cstub.c 2002-12-03 01:31:57.000000000 -0600
@@ -22,8 +22,7 @@
#include "winbase.h"
#include "winerror.h"
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
#include "rpcproxy.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/rpcrt4/ndr_marshall.c ./dlls/rpcrt4/ndr_marshall.c
--- ../wine.test/dlls/rpcrt4/ndr_marshall.c 2002-10-31 20:13:49.000000000 -0600
+++ ./dlls/rpcrt4/ndr_marshall.c 2002-12-03 01:32:14.000000000 -0600
@@ -35,7 +35,7 @@
#include "rpcndr.h"
#include "wine/rpcfc.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/rpcrt4/ndr_midl.c ./dlls/rpcrt4/ndr_midl.c
--- ../wine.test/dlls/rpcrt4/ndr_midl.c 2002-10-29 12:59:02.000000000 -0600
+++ ./dlls/rpcrt4/ndr_midl.c 2002-12-03 01:32:49.000000000 -0600
@@ -31,8 +31,7 @@
#include "winerror.h"
#include "winreg.h"
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
#include "rpcproxy.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/rpcrt4/ndr_ole.c ./dlls/rpcrt4/ndr_ole.c
--- ../wine.test/dlls/rpcrt4/ndr_ole.c 2002-10-11 13:45:02.000000000 -0500
+++ ./dlls/rpcrt4/ndr_ole.c 2002-12-03 01:33:15.000000000 -0600
@@ -32,10 +32,7 @@
#include "winerror.h"
#include "winreg.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_marshal.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
#include "rpcndr.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shdocvw/classinfo.c ./dlls/shdocvw/classinfo.c
--- ../wine.test/dlls/shdocvw/classinfo.c 2002-05-31 18:25:51.000000000 -0500
+++ ./dlls/shdocvw/classinfo.c 2002-12-03 16:05:45.000000000 -0600
@@ -19,8 +19,10 @@
*/
#include <string.h>
-#include "wine/debug.h"
+
+#include "winbase.h"
#include "shdocvw.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shdocvw/shdocvw.h ./dlls/shdocvw/shdocvw.h
--- ../wine.test/dlls/shdocvw/shdocvw.h 2002-05-05 14:40:58.000000000 -0500
+++ ./dlls/shdocvw/shdocvw.h 2002-12-03 14:19:48.000000000 -0600
@@ -26,21 +26,9 @@
#include "winbase.h"
#include "winuser.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_inplace.h"
-#include "wine/obj_dataobject.h"
-#include "wine/obj_oleobj.h"
-#include "wine/obj_oleaut.h"
-#include "wine/obj_olefont.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_oleview.h"
-#include "wine/obj_control.h"
-#include "wine/obj_connection.h"
-#include "wine/obj_property.h"
-#include "wine/obj_oleundo.h"
+#include "ole2.h"
+#include "olectl.h"
+#include "shlobj.h"
#include "wine/obj_webbrowser.h"
/**********************************************************************
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shell32/dragdrophelper.c ./dlls/shell32/dragdrophelper.c
--- ../wine.test/dlls/shell32/dragdrophelper.c 2002-11-21 20:38:19.000000000 -0600
+++ ./dlls/shell32/dragdrophelper.c 2002-12-03 16:13:53.000000000 -0600
@@ -22,15 +22,13 @@
#include "config.h"
#include "wine/port.h"
-#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
-#include "winerror.h"
#include "winbase.h"
#include "winreg.h"
-#include "oleidl.h"
+#include "objbase.h"
+#include "ole2.h"
#include "shlguid.h"
#include "wine/obj_dragdrophelper.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shell32/folders.c ./dlls/shell32/folders.c
--- ../wine.test/dlls/shell32/folders.c 2002-07-23 20:56:03.000000000 -0500
+++ ./dlls/shell32/folders.c 2002-12-03 01:34:54.000000000 -0600
@@ -22,8 +22,7 @@
#include <string.h>
#include "windef.h"
-#include "wine/obj_base.h"
-#include "wine/obj_extracticon.h"
+#include "objbase.h"
#include "undocshell.h"
#include "shlguid.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shell32/shellfolder.h ./dlls/shell32/shellfolder.h
--- ../wine.test/dlls/shell32/shellfolder.h 2002-03-09 17:44:29.000000000 -0600
+++ ./dlls/shell32/shellfolder.h 2002-12-03 01:35:20.000000000 -0600
@@ -23,9 +23,7 @@
#include "winbase.h"
-#include "wine/obj_base.h"
-#include "wine/obj_shellfolder.h"
-
+#include "shlobj.h"
/*****************************************************************************
* Predeclare the interfaces
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shell32/shellord.c ./dlls/shell32/shellord.c
--- ../wine.test/dlls/shell32/shellord.c 2002-11-21 20:38:19.000000000 -0600
+++ ./dlls/shell32/shellord.c 2002-12-03 01:35:53.000000000 -0600
@@ -29,7 +29,6 @@
#include "winnls.h"
#include "heap.h"
-#include "wine/obj_base.h"
#include "shellapi.h"
#include "shlguid.h"
#include "shlobj.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shell32/shfldr_desktop.c ./dlls/shell32/shfldr_desktop.c
--- ../wine.test/dlls/shell32/shfldr_desktop.c 2002-11-21 20:38:19.000000000 -0600
+++ ./dlls/shell32/shfldr_desktop.c 2002-12-03 13:44:56.000000000 -0600
@@ -31,13 +31,10 @@
#include "winbase.h"
#include "winreg.h"
-#include "oleidl.h"
+#include "ole2.h"
#include "shlguid.h"
#include "pidl.h"
-#include "wine/obj_base.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_shellfolder.h"
#include "undocshell.h"
#include "shell32_main.h"
#include "shresdef.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shell32/shfldr_fs.c ./dlls/shell32/shfldr_fs.c
--- ../wine.test/dlls/shell32/shfldr_fs.c 2002-11-21 20:38:19.000000000 -0600
+++ ./dlls/shell32/shfldr_fs.c 2002-12-03 13:46:04.000000000 -0600
@@ -31,13 +31,10 @@
#include "winbase.h"
#include "winreg.h"
-#include "oleidl.h"
+#include "ole2.h"
#include "shlguid.h"
#include "pidl.h"
-#include "wine/obj_base.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_shellfolder.h"
#include "undocshell.h"
#include "shell32_main.h"
#include "shresdef.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shell32/shfldr_mycomp.c ./dlls/shell32/shfldr_mycomp.c
--- ../wine.test/dlls/shell32/shfldr_mycomp.c 2002-11-21 20:38:19.000000000 -0600
+++ ./dlls/shell32/shfldr_mycomp.c 2002-12-03 13:49:59.000000000 -0600
@@ -31,13 +31,9 @@
#include "winbase.h"
#include "winreg.h"
-#include "oleidl.h"
+#include "pidl.h"
#include "shlguid.h"
-#include "pidl.h"
-#include "wine/obj_base.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_shellfolder.h"
#include "undocshell.h"
#include "shell32_main.h"
#include "shresdef.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shell32/shlfolder.c ./dlls/shell32/shlfolder.c
--- ../wine.test/dlls/shell32/shlfolder.c 2002-08-06 20:18:41.000000000 -0500
+++ ./dlls/shell32/shlfolder.c 2002-12-03 01:36:35.000000000 -0600
@@ -33,13 +33,10 @@
#include "winbase.h"
#include "winreg.h"
-#include "oleidl.h"
+#include "ole2.h"
#include "shlguid.h"
#include "pidl.h"
-#include "wine/obj_base.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_shellfolder.h"
#include "undocshell.h"
#include "shell32_main.h"
#include "shresdef.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shell32/shlmenu.c ./dlls/shell32/shlmenu.c
--- ../wine.test/dlls/shell32/shlmenu.c 2002-11-21 20:38:19.000000000 -0600
+++ ./dlls/shell32/shlmenu.c 2002-12-03 01:36:45.000000000 -0600
@@ -22,9 +22,6 @@
#include "winreg.h"
#include "shlobj.h"
-#include "wine/obj_base.h"
-#include "wine/obj_enumidlist.h"
-#include "wine/obj_shellfolder.h"
#include "undocshell.h"
#include "shlwapi.h"
#include "heap.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shell32/shv_bg_cmenu.c ./dlls/shell32/shv_bg_cmenu.c
--- ../wine.test/dlls/shell32/shv_bg_cmenu.c 2002-11-21 20:38:19.000000000 -0600
+++ ./dlls/shell32/shv_bg_cmenu.c 2002-12-03 01:37:10.000000000 -0600
@@ -24,9 +24,7 @@
#include "pidl.h"
#include "shlguid.h"
-#include "wine/obj_base.h"
-#include "wine/obj_contextmenu.h"
-#include "wine/obj_shellbrowser.h"
+#include "shlobj.h"
#include "shell32_main.h"
#include "shellfolder.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shell32/shv_item_cmenu.c ./dlls/shell32/shv_item_cmenu.c
--- ../wine.test/dlls/shell32/shv_item_cmenu.c 2002-11-21 20:38:19.000000000 -0600
+++ ./dlls/shell32/shv_item_cmenu.c 2002-12-03 01:37:48.000000000 -0600
@@ -25,11 +25,8 @@
#include "pidl.h"
#include "shlguid.h"
-#include "wine/obj_base.h"
-#include "wine/obj_contextmenu.h"
-#include "wine/obj_shellbrowser.h"
-#include "wine/obj_shellextinit.h"
#include "undocshell.h"
+#include "shlobj.h"
#include "shell32_main.h"
#include "shellfolder.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shlwapi/clist.c ./dlls/shlwapi/clist.c
--- ../wine.test/dlls/shlwapi/clist.c 2002-07-08 21:01:56.000000000 -0500
+++ ./dlls/shlwapi/clist.c 2002-12-03 11:45:11.000000000 -0600
@@ -22,8 +22,7 @@
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shlwapi/istream.c ./dlls/shlwapi/istream.c
--- ../wine.test/dlls/shlwapi/istream.c 2002-07-15 20:21:52.000000000 -0500
+++ ./dlls/shlwapi/istream.c 2002-12-03 11:45:40.000000000 -0600
@@ -22,8 +22,6 @@
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
#define NO_SHLWAPI_REG
#define NO_SHLWAPI_PATH
#include "shlwapi.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shlwapi/ordinal.c ./dlls/shlwapi/ordinal.c
--- ../wine.test/dlls/shlwapi/ordinal.c 2002-12-02 23:52:12.000000000 -0600
+++ ./dlls/shlwapi/ordinal.c 2002-12-03 01:38:26.000000000 -0600
@@ -36,8 +36,6 @@
#include "shellapi.h"
#include "commdlg.h"
#include "wine/unicode.h"
-#include "wine/obj_base.h"
-#include "wine/obj_inplace.h"
#include "wine/obj_serviceprovider.h"
#include "wine/obj_control.h"
#include "wine/obj_connection.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shlwapi/regstream.c ./dlls/shlwapi/regstream.c
--- ../wine.test/dlls/shlwapi/regstream.c 2002-12-02 23:52:12.000000000 -0600
+++ ./dlls/shlwapi/regstream.c 2002-12-03 11:46:49.000000000 -0600
@@ -23,9 +23,8 @@
#include "winerror.h"
#include "winbase.h"
+#include "objbase.h"
#include "winreg.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
#include "wine/debug.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/dlls/shlwapi/thread.c ./dlls/shlwapi/thread.c
--- ../wine.test/dlls/shlwapi/thread.c 2002-10-25 00:03:04.000000000 -0500
+++ ./dlls/shlwapi/thread.c 2002-12-03 11:47:20.000000000 -0600
@@ -22,7 +22,6 @@
#include "windef.h"
#include "winnls.h"
-#include "wine/obj_base.h"
#include "wine/debug.h"
#define NO_SHLWAPI_REG
#define NO_SHLWAPI_PATH
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/dplay.h ./include/dplay.h
--- ../wine.test/include/dplay.h 2002-05-31 18:06:48.000000000 -0500
+++ ./include/dplay.h 2002-12-03 01:38:51.000000000 -0600
@@ -20,7 +20,6 @@
#define __WINE_DPLAY_H
#include "ole2.h"
-#include "wine/obj_base.h"
#ifdef __cplusplus
extern "C" {
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/oaidl.h ./include/oaidl.h
--- ../wine.test/include/oaidl.h 2002-03-09 18:02:34.000000000 -0600
+++ ./include/oaidl.h 2002-12-03 01:01:50.000000000 -0600
@@ -28,12 +28,15 @@
#ifndef __WINE_OAIDL_H
#define __WINE_OAIDL_H
-#include "ole2.h"
-#include "objidl.h"
-
-#include "wine/obj_base.h"
+#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OAIDL)
+#error DO NOT INCLUDE DIRECTLY
+#endif
+#define __WINE_INCLUDE_OBJIDL
+#include "objidl.h"
+#undef __WINE_INCLUDE_OBJIDL
/* the following depend only on obj_base.h */
#include "wine/obj_oleaut.h"
+#include "wine/obj_errorinfo.h"
#endif /* _WINE_OAIDL_H */
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/objbase.h ./include/objbase.h
--- ../wine.test/include/objbase.h 2002-05-31 18:06:48.000000000 -0500
+++ ./include/objbase.h 2002-12-03 01:01:50.000000000 -0600
@@ -21,24 +21,9 @@
#define _OBJBASE_H_
-#include "unknwn.h"
-
-/* the following depend only on obj_base.h */
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_channel.h"
-#include "wine/obj_clientserver.h"
-#include "wine/obj_storage.h"
-
-/* the following depend on obj_storage.h */
-#include "wine/obj_marshal.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_propertystorage.h"
-
-/* the following depend on obj_moniker.h */
-#include "wine/obj_dataobject.h"
-
-#include "wine/obj_dragdrop.h"
+#define __WINE_INCLUDE_OBJIDL
+#include "objidl.h"
+#undef __WINE_INCLUDE_OBJIDL
#ifndef RC_INVOKED
/* For compatibility only, at least for now */
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/objidl.h ./include/objidl.h
--- ../wine.test/include/objidl.h 2002-03-09 18:02:34.000000000 -0600
+++ ./include/objidl.h 2002-12-03 01:01:50.000000000 -0600
@@ -28,8 +28,11 @@
#ifndef __WINE_OBJIDL_H
#define __WINE_OBJIDL_H
+#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OBJIDL)
+#error DO NOT INCLUDE DIRECTLY
+#endif
-#include "wine/obj_base.h"
+#include "unknwn.h"
/* the following depend only on obj_base.h */
#include "wine/obj_misc.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/ocidl.h ./include/ocidl.h
--- ../wine.test/include/ocidl.h 2002-03-09 18:02:34.000000000 -0600
+++ ./include/ocidl.h 2002-12-03 01:01:50.000000000 -0600
@@ -28,10 +28,14 @@
#ifndef __WINE_OCIDL_H
#define __WINE_OCIDL_H
-#include "wine/obj_base.h"
+#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OCIDL)
+#error DO NOT INCLUDE DIRECTLY
+#endif
+
+#define __WINE_INCLUDE_OLEIDL
+#include "oleidl.h"
+#undef __WINE_INCLUDE_OLEIDL
-/* the following depend only on obj_base.h */
-#include "wine/obj_storage.h"
#include "wine/obj_oleaut.h"
#include "wine/obj_olefont.h"
#include "wine/obj_picture.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/ole.h ./include/ole.h
--- ../wine.test/include/ole.h 2002-05-31 18:06:48.000000000 -0500
+++ ./include/ole.h 2002-12-03 01:39:10.000000000 -0600
@@ -27,12 +27,7 @@
#include "windef.h"
#include "wine/windef16.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_dataobject.h"
-#include "wine/obj_dragdrop.h"
+#include "objbase.h"
struct tagLOGPALETTE;
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/ole2.h ./include/ole2.h
--- ../wine.test/include/ole2.h 2002-05-31 18:06:48.000000000 -0500
+++ ./include/ole2.h 2002-12-03 01:01:50.000000000 -0600
@@ -24,17 +24,10 @@
#include "windef.h"
#include "winerror.h"
#include "objbase.h"
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_dataobject.h"
-#include "wine/obj_dragdrop.h"
-#include "wine/obj_inplace.h"
-#include "wine/obj_oleobj.h"
-#include "wine/obj_oleview.h"
-#ifndef __WINE__
+#define __WINE_INCLUDE_OLEIDL
#include "oleidl.h"
+#undef __WINE_INCLUDE_OLEIDL
+#ifndef __WINE__
#include "oleauto.h"
#endif
struct tagMSG;
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/oleauto.h ./include/oleauto.h
--- ../wine.test/include/oleauto.h 2002-07-08 14:39:45.000000000 -0500
+++ ./include/oleauto.h 2002-12-03 01:01:50.000000000 -0600
@@ -20,14 +20,9 @@
#define __WINE_OLEAUTO_H
#include "winbase.h"
-#include "wtypes.h"
-#include "wine/obj_base.h"
-#include "wine/obj_oleaut.h"
-#include "wine/obj_errorinfo.h"
-
-#ifndef __WINE__
+#define __WINE_INCLUDE_OAIDL
#include "oaidl.h"
-#endif
+#undef __WINE_INCLUDE_OAIDL
#ifdef __cplusplus
extern "C" {
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/olectl.h ./include/olectl.h
--- ../wine.test/include/olectl.h 2002-05-31 18:06:48.000000000 -0500
+++ ./include/olectl.h 2002-12-03 01:01:50.000000000 -0600
@@ -20,7 +20,9 @@
#define __WINE_OLECTL_H
#include "windef.h"
+#define __WINE_INCLUDE_OCIDL
#include "ocidl.h"
+#undef __WINE_INCLUDE_OCIDL
#ifdef __cplusplus
extern "C" {
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/oledlg.h ./include/oledlg.h
--- ../wine.test/include/oledlg.h 2002-05-31 18:06:48.000000000 -0500
+++ ./include/oledlg.h 2002-12-03 01:39:31.000000000 -0600
@@ -24,7 +24,7 @@
#include "commdlg.h"
#include "prsht.h"
#include "windef.h"
-#include "oleidl.h"
+#include "ole2.h"
#ifdef __cplusplus
extern "C" {
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/oleidl.h ./include/oleidl.h
--- ../wine.test/include/oleidl.h 2002-03-09 18:02:34.000000000 -0600
+++ ./include/oleidl.h 2002-12-03 01:01:50.000000000 -0600
@@ -28,27 +28,16 @@
#ifndef __WINE_OLEIDL_H
#define __WINE_OLEIDL_H
-
-#include "wine/obj_base.h"
-#include "wine/obj_misc.h"
-
-/* the following depend only on obj_base.h */
-#include "wine/obj_storage.h"
-
-/* the following depend on obj_storage.h */
-#include "wine/obj_moniker.h"
-
-/* the following depend on obj_moniker */
-#include "wine/obj_dataobject.h"
-
-/* the following depend on obj_dataobject.h */
-#include "wine/obj_dragdrop.h"
+#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OLEIDL)
+#error DO NOT INCLUDE DIRECTLY
+#endif
#include "wine/obj_inplace.h"
#include "wine/obj_cache.h"
#include "wine/obj_oleobj.h"
#include "wine/obj_oleview.h"
#include "wine/obj_errorinfo.h"
+#include "wine/obj_dragdrop.h"
#endif /* __WINE_OLEIDL_H */
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/servprov.h ./include/servprov.h
--- ../wine.test/include/servprov.h 2002-03-09 18:02:34.000000000 -0600
+++ ./include/servprov.h 2002-12-03 01:39:53.000000000 -0600
@@ -29,7 +29,7 @@
#define __WINE_SERVPROV_H
-#include "wine/obj_base.h"
+#include "objbase.h"
/*****************************************************************************
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/shlguid.h ./include/shlguid.h
--- ../wine.test/include/shlguid.h 2002-07-23 20:57:22.000000000 -0500
+++ ./include/shlguid.h 2002-12-03 01:40:04.000000000 -0600
@@ -19,7 +19,7 @@
#ifndef __WINE_SHLGUID_H
#define __WINE_SHLGUID_H
-#include "wine/obj_base.h"
+#include "objbase.h"
#define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2)
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/shlobj.h ./include/shlobj.h
--- ../wine.test/include/shlobj.h 2002-11-12 15:57:30.000000000 -0600
+++ ./include/shlobj.h 2002-12-03 01:40:49.000000000 -0600
@@ -22,6 +22,7 @@
#include "windef.h"
#include "winbase.h" /* WIN32_FIND_* */
#include "ole2.h"
+#include "oleauto.h"
#include "commctrl.h"
#include "prsht.h"
@@ -53,10 +54,7 @@
#define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)
-#include "wine/obj_base.h"
#include "wine/obj_enumidlist.h"
-#include "wine/obj_inplace.h"
-#include "wine/obj_oleaut.h"
#include "wine/obj_shellfolder.h"
#include "wine/obj_shellview.h"
#include "wine/obj_shelllink.h"
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/unknwn.h ./include/unknwn.h
--- ../wine.test/include/unknwn.h 2002-03-09 18:02:34.000000000 -0600
+++ ./include/unknwn.h 2002-12-03 01:01:50.000000000 -0600
@@ -28,6 +28,8 @@
#ifndef __WINE_UNKNWN_H
#define __WINE_UNKNWN_H
+#define __WINE_INCLUDE_UNKNWN
#include "wine/obj_base.h"
+#undef __WINE_INCLUDE_UNKNWN
#endif /* __WINE_UNKNWN_H */
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/urlmon.h ./include/urlmon.h
--- ../wine.test/include/urlmon.h 2002-11-19 09:12:39.000000000 -0600
+++ ./include/urlmon.h 2002-12-03 01:40:59.000000000 -0600
@@ -29,7 +29,7 @@
#define __WINE_URLMON_H
#include "winbase.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
#ifdef __cplusplus
extern "C" {
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/wine/obj_base.h ./include/wine/obj_base.h
--- ../wine.test/include/wine/obj_base.h 2002-11-08 15:46:19.000000000 -0600
+++ ./include/wine/obj_base.h 2002-12-03 01:01:50.000000000 -0600
@@ -22,6 +22,10 @@
#ifndef __WINE_WINE_OBJ_BASE_H
#define __WINE_WINE_OBJ_BASE_H
+#ifndef __WINE_INCLUDE_UNKNWN
+#error DO NOT INCLUDE DIRECTLY
+#endif
+
/*****************************************************************************
* define ICOM_MSVTABLE_COMPAT
* to implement the microsoft com vtable compatibility workaround for g++.
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/wine/obj_misc.h ./include/wine/obj_misc.h
--- ../wine.test/include/wine/obj_misc.h 2002-11-08 15:46:19.000000000 -0600
+++ ./include/wine/obj_misc.h 2002-12-03 02:19:01.000000000 -0600
@@ -24,8 +24,6 @@
#ifndef __WINE_WINE_OBJ_MISC_H
#define __WINE_WINE_OBJ_MISC_H
-#include "wine/obj_base.h"
-
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
@@ -193,12 +191,6 @@
#define IMallocSpy_PreHeapMinimize(p) ICOM_CALL (PreHeapMinimize,p)
#define IMallocSpy_PostHeapMinimize(p) ICOM_CALL (PostHeapMinimize,p)
-/* FIXME: not implemented */
-HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoRevokeMallocSpy(void);
-
HRESULT WINAPI CoFileTimeNow(FILETIME* lpFileTime);
diff -ur -x CVS -x 'bigdif*' -x autom4te.cache ../wine.test/include/wine/obj_serviceprovider.h ./include/wine/obj_serviceprovider.h
--- ../wine.test/include/wine/obj_serviceprovider.h 2002-03-09 18:02:38.000000000 -0600
+++ ./include/wine/obj_serviceprovider.h 2002-12-03 01:41:22.000000000 -0600
@@ -23,7 +23,7 @@
#ifndef __WINE_WINE_OBJ_SERVICEPROVIDER_H
#define __WINE_WINE_OBJ_SERVICEPROVIDER_H
-#include "wine/obj_base.h"
+#include "objbase.h"
#include "winbase.h"
#ifdef __cplusplus
--
gmt
