Wine merge required: COM/OLE header changes

Ove Kaaven ovehk at ping.uio.no
Tue Nov 19 17:57:56 CST 2002


These patches are against ReWind and requires some merging work in order
to apply to Wine. Could someone (hm... Greg?) do that for me?

The fundamental idea here is to make sure that no files except unknwn.h
ever include wine/obj_base.h directly, because the IUnknown interface
definition will soon move to unknwn.h, and the API function prototypes
will move to objbase.h (which indirectly includes unknwn.h through
objidl.h).

While I was at it, I also made sure that a couple of common
to-be-IDL-generated files aren't included directly, as the headers in
question have wrapper headers that are supposed to contain related API
function prototypes - these prototypes will also be moved later, so I
thought I might as well ensure that the wrapper headers are used now.

The attached comhdr1.diff contains header changes and #ifdef guards that
force a compilation error if any of these "forbidden" headers are included
directly. It seems to apply to Wine as-is.

(And I think the #ifdef guards should be applied to Wine even if #ifdefs
aren't popular around here, because it protects against introduction of
new bad code in Wine while the conversion is in progress; and when a
particular header has been successfully converted, its respective #ifdef
guard will of course be removed again.)

The attached comhdr2.diff seems to fix all the resulting compilation
errors in ReWind, and is what needs "merging". Apply as much of it as you
can and fix the compilation errors that remain in Wine.

Thanks.
-------------- next part --------------
Index: include/oaidl.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/oaidl.h,v
retrieving revision 1.5
diff -u -r1.5 oaidl.h
--- include/oaidl.h	18 Jul 2001 20:04:08 -0000	1.5
+++ include/oaidl.h	19 Nov 2002 22:42:20 -0000
@@ -10,12 +10,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 */
Index: include/objbase.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/objbase.h,v
retrieving revision 1.21
diff -u -r1.21 objbase.h
--- include/objbase.h	23 Aug 2002 22:47:30 -0000	1.21
+++ include/objbase.h	19 Nov 2002 22:42:20 -0000
@@ -3,24 +3,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 */
Index: include/objidl.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/objidl.h,v
retrieving revision 1.6
diff -u -r1.6 objidl.h
--- include/objidl.h	18 Jul 2001 20:04:08 -0000	1.6
+++ include/objidl.h	19 Nov 2002 23:08:12 -0000
@@ -10,8 +10,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"
Index: include/ocidl.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/ocidl.h,v
retrieving revision 1.6
diff -u -r1.6 ocidl.h
--- include/ocidl.h	18 Jul 2001 20:04:08 -0000	1.6
+++ include/ocidl.h	19 Nov 2002 22:42:20 -0000
@@ -10,10 +10,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"
Index: include/ole2.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/ole2.h,v
retrieving revision 1.35
diff -u -r1.35 ole2.h
--- include/ole2.h	23 Aug 2002 22:47:30 -0000	1.35
+++ include/ole2.h	19 Nov 2002 22:42:21 -0000
@@ -8,17 +8,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;
Index: include/oleauto.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/oleauto.h,v
retrieving revision 1.43
diff -u -r1.43 oleauto.h
--- include/oleauto.h	23 Aug 2002 22:47:30 -0000	1.43
+++ include/oleauto.h	19 Nov 2002 22:42:21 -0000
@@ -2,14 +2,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" {
Index: include/olectl.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/olectl.h,v
retrieving revision 1.14
diff -u -r1.14 olectl.h
--- include/olectl.h	23 Aug 2002 22:47:30 -0000	1.14
+++ include/olectl.h	19 Nov 2002 22:42:21 -0000
@@ -2,7 +2,9 @@
 #define __WINE_OLECTL_H
 
 #include "windef.h"
+#define __WINE_INCLUDE_OCIDL
 #include "ocidl.h"
+#undef __WINE_INCLUDE_OCIDL
 
 #ifdef __cplusplus
 extern "C" {
Index: include/oleidl.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/oleidl.h,v
retrieving revision 1.6
diff -u -r1.6 oleidl.h
--- include/oleidl.h	18 Jul 2001 20:04:08 -0000	1.6
+++ include/oleidl.h	19 Nov 2002 23:08:40 -0000
@@ -10,27 +10,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 */
 
Index: include/unknwn.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/unknwn.h,v
retrieving revision 1.4
diff -u -r1.4 unknwn.h
--- include/unknwn.h	18 Jul 2001 20:04:08 -0000	1.4
+++ include/unknwn.h	19 Nov 2002 23:37:18 -0000
@@ -10,6 +10,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 */
Index: include/wine/obj_base.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/wine/obj_base.h,v
retrieving revision 1.48
diff -u -r1.48 obj_base.h
--- include/wine/obj_base.h	18 Nov 2002 17:53:44 -0000	1.48
+++ include/wine/obj_base.h	19 Nov 2002 23:37:18 -0000
@@ -6,6 +6,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++.
-------------- next part --------------
Index: dlls/comctl32/imagelist.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/comctl32/imagelist.c,v
retrieving revision 1.50
diff -u -r1.50 imagelist.c
--- dlls/comctl32/imagelist.c	23 Aug 2002 22:47:14 -0000	1.50
+++ dlls/comctl32/imagelist.c	19 Nov 2002 22:41:52 -0000
@@ -32,8 +32,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 "debugtools.h"
Index: dlls/ddraw/d3dcommon.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ddraw/d3dcommon.c,v
retrieving revision 1.4
diff -u -r1.4 d3dcommon.c
--- dlls/ddraw/d3dcommon.c	23 Aug 2002 22:47:15 -0000	1.4
+++ dlls/ddraw/d3dcommon.c	19 Nov 2002 22:41:52 -0000
@@ -5,7 +5,7 @@
    different 'objects' */
 
 #include "windef.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
Index: dlls/ddraw/d3dexecutebuffer.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ddraw/d3dexecutebuffer.c,v
retrieving revision 1.7
diff -u -r1.7 d3dexecutebuffer.c
--- dlls/ddraw/d3dexecutebuffer.c	23 Aug 2002 22:47:15 -0000	1.7
+++ dlls/ddraw/d3dexecutebuffer.c	19 Nov 2002 22:41:53 -0000
@@ -10,7 +10,7 @@
 
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
Index: dlls/ddraw/d3dlight.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ddraw/d3dlight.c,v
retrieving revision 1.6
diff -u -r1.6 d3dlight.c
--- dlls/ddraw/d3dlight.c	23 Aug 2002 22:47:15 -0000	1.6
+++ dlls/ddraw/d3dlight.c	19 Nov 2002 22:41:53 -0000
@@ -7,7 +7,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 "debugtools.h"
Index: dlls/ddraw/d3dmaterial.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ddraw/d3dmaterial.c,v
retrieving revision 1.8
diff -u -r1.8 d3dmaterial.c
--- dlls/ddraw/d3dmaterial.c	23 Aug 2002 22:47:15 -0000	1.8
+++ dlls/ddraw/d3dmaterial.c	19 Nov 2002 22:41:53 -0000
@@ -6,7 +6,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 "debugtools.h"
Index: dlls/ddraw/d3dtexture.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ddraw/d3dtexture.c,v
retrieving revision 1.12
diff -u -r1.12 d3dtexture.c
--- dlls/ddraw/d3dtexture.c	23 Aug 2002 22:47:15 -0000	1.12
+++ dlls/ddraw/d3dtexture.c	19 Nov 2002 22:41:53 -0000
@@ -10,7 +10,7 @@
 
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
Index: dlls/ddraw/d3dviewport.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ddraw/d3dviewport.c,v
retrieving revision 1.6
diff -u -r1.6 d3dviewport.c
--- dlls/ddraw/d3dviewport.c	23 Aug 2002 22:47:15 -0000	1.6
+++ dlls/ddraw/d3dviewport.c	19 Nov 2002 22:41:53 -0000
@@ -6,7 +6,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 "debugtools.h"
Index: dlls/ddraw/mesa.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ddraw/mesa.c,v
retrieving revision 1.5
diff -u -r1.5 mesa.c
--- dlls/ddraw/mesa.c	23 Aug 2002 22:47:15 -0000	1.5
+++ dlls/ddraw/mesa.c	19 Nov 2002 22:41:53 -0000
@@ -6,7 +6,7 @@
 #include "config.h"
 
 #include "windef.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
Index: dlls/ddraw/d3ddevice/main.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ddraw/d3ddevice/main.c,v
retrieving revision 1.9
diff -u -r1.9 main.c
--- dlls/ddraw/d3ddevice/main.c	23 Aug 2002 22:47:15 -0000	1.9
+++ dlls/ddraw/d3ddevice/main.c	19 Nov 2002 22:41:54 -0000
@@ -10,7 +10,7 @@
 
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
Index: dlls/ddraw/d3ddevice/mesa.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ddraw/d3ddevice/mesa.c,v
retrieving revision 1.17
diff -u -r1.17 mesa.c
--- dlls/ddraw/d3ddevice/mesa.c	23 Aug 2002 22:47:15 -0000	1.17
+++ dlls/ddraw/d3ddevice/mesa.c	19 Nov 2002 22:41:55 -0000
@@ -10,7 +10,7 @@
 
 #include "windef.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
Index: dlls/dplayx/dpclassfactory.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/dplayx/dpclassfactory.c,v
retrieving revision 1.13
diff -u -r1.13 dpclassfactory.c
--- dlls/dplayx/dpclassfactory.c	2 Jul 2001 19:59:41 -0000	1.13
+++ dlls/dplayx/dpclassfactory.c	19 Nov 2002 22:41:55 -0000
@@ -1,6 +1,6 @@
 #include <string.h>
 #include "windef.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "winerror.h"
 #include "debugtools.h"
 #include "dpinit.h"
Index: dlls/ole32/antimoniker.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/antimoniker.c,v
retrieving revision 1.9
diff -u -r1.9 antimoniker.c
--- dlls/ole32/antimoniker.c	23 Aug 2002 22:47:19 -0000	1.9
+++ dlls/ole32/antimoniker.c	19 Nov 2002 22:41:55 -0000
@@ -9,10 +9,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 "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
Index: dlls/ole32/bindctx.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/bindctx.c,v
retrieving revision 1.13
diff -u -r1.13 bindctx.c
--- dlls/ole32/bindctx.c	23 Aug 2002 22:47:19 -0000	1.13
+++ dlls/ole32/bindctx.c	19 Nov 2002 22:41:56 -0000
@@ -9,10 +9,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 "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
Index: dlls/ole32/compobj.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/compobj.c,v
retrieving revision 1.55
diff -u -r1.55 compobj.c
--- dlls/ole32/compobj.c	23 Aug 2002 22:47:19 -0000	1.55
+++ dlls/ole32/compobj.c	19 Nov 2002 22:50:19 -0000
@@ -23,14 +23,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 "wine/winbase16.h"
 #include "compobj_private.h"
 #include "ifs.h"
Index: dlls/ole32/compositemoniker.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/compositemoniker.c,v
retrieving revision 1.14
diff -u -r1.14 compositemoniker.c
--- dlls/ole32/compositemoniker.c	23 Aug 2002 22:47:19 -0000	1.14
+++ dlls/ole32/compositemoniker.c	19 Nov 2002 22:48:38 -0000
@@ -8,11 +8,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "debugtools.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"
 
Index: dlls/ole32/datacache.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/datacache.c,v
retrieving revision 1.13
diff -u -r1.13 datacache.c
--- dlls/ole32/datacache.c	24 Sep 2002 14:08:13 -0000	1.13
+++ dlls/ole32/datacache.c	19 Nov 2002 22:41:59 -0000
@@ -36,13 +36,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 "debugtools.h"
Index: dlls/ole32/errorinfo.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/errorinfo.c,v
retrieving revision 1.11
diff -u -r1.11 errorinfo.c
--- dlls/ole32/errorinfo.c	23 Aug 2002 22:47:19 -0000	1.11
+++ dlls/ole32/errorinfo.c	19 Nov 2002 22:41:59 -0000
@@ -15,9 +15,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"
 
Index: dlls/ole32/filemoniker.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/filemoniker.c,v
retrieving revision 1.17
diff -u -r1.17 filemoniker.c
--- dlls/ole32/filemoniker.c	23 Aug 2002 22:47:19 -0000	1.17
+++ dlls/ole32/filemoniker.c	19 Nov 2002 22:42:00 -0000
@@ -12,9 +12,6 @@
 #include "wine/unicode.h"
 #include "debugtools.h"
 #include "objbase.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
-#include "wine/obj_base.h"
 
 #include "compobj_private.h"
 
Index: dlls/ole32/ifs.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/ifs.c,v
retrieving revision 1.19
diff -u -r1.19 ifs.c
--- dlls/ole32/ifs.c	23 Aug 2002 22:47:19 -0000	1.19
+++ dlls/ole32/ifs.c	19 Nov 2002 22:42:00 -0000
@@ -15,7 +15,6 @@
 #include "windef.h"
 #include "winerror.h"
 
-#include "wine/obj_base.h"
 #include "wine/winbase16.h"
 #include "ifs.h"
 
Index: dlls/ole32/ifs.h
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/ifs.h,v
retrieving revision 1.2
diff -u -r1.2 ifs.h
--- dlls/ole32/ifs.h	23 Jul 2001 23:50:19 -0000	1.2
+++ dlls/ole32/ifs.h	19 Nov 2002 22:42:00 -0000
@@ -1,7 +1,7 @@
 #ifndef __WINE_OLE_IFS_H
 #define __WINE_OLE_IFS_H
 
-#include "wine/obj_base.h"
+#include "objbase.h"
 
 /***********************************************************************
  * IMalloc16 interface
Index: dlls/ole32/itemmoniker.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/itemmoniker.c,v
retrieving revision 1.12
diff -u -r1.12 itemmoniker.c
--- dlls/ole32/itemmoniker.c	23 Aug 2002 22:47:19 -0000	1.12
+++ dlls/ole32/itemmoniker.c	19 Nov 2002 22:42:01 -0000
@@ -10,11 +10,7 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "debugtools.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"
 
 DEFAULT_DEBUG_CHANNEL(ole);
Index: dlls/ole32/moniker.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/moniker.c,v
retrieving revision 1.19
diff -u -r1.19 moniker.c
--- dlls/ole32/moniker.c	23 Aug 2002 22:47:19 -0000	1.19
+++ dlls/ole32/moniker.c	19 Nov 2002 22:51:32 -0000
@@ -11,10 +11,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 "debugtools.h"
 #include "ole2.h"
 
Index: dlls/ole32/oleobj.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/oleobj.c,v
retrieving revision 1.7
diff -u -r1.7 oleobj.c
--- dlls/ole32/oleobj.c	23 Aug 2002 22:47:19 -0000	1.7
+++ dlls/ole32/oleobj.c	19 Nov 2002 22:42:01 -0000
@@ -10,7 +10,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "debugtools.h"
-#include "oleidl.h"
+#include "ole2.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
 
Index: dlls/ole32/stg_bigblockfile.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/stg_bigblockfile.c,v
retrieving revision 1.6
diff -u -r1.6 stg_bigblockfile.c
--- dlls/ole32/stg_bigblockfile.c	23 Aug 2002 22:47:19 -0000	1.6
+++ dlls/ole32/stg_bigblockfile.c	19 Nov 2002 22:42:02 -0000
@@ -26,8 +26,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"
Index: dlls/ole32/storage.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/storage.c,v
retrieving revision 1.20
diff -u -r1.20 storage.c
--- dlls/ole32/storage.c	23 Aug 2002 22:47:19 -0000	1.20
+++ dlls/ole32/storage.c	19 Nov 2002 22:52:34 -0000
@@ -17,9 +17,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 "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
Index: dlls/ole32/storage32.h
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/ole32/storage32.h,v
retrieving revision 1.10
diff -u -r1.10 storage32.h
--- dlls/ole32/storage32.h	23 Aug 2002 22:47:19 -0000	1.10
+++ dlls/ole32/storage32.h	19 Nov 2002 22:53:04 -0000
@@ -15,10 +15,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.
Index: dlls/oleaut32/connpt.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/oleaut32/connpt.c,v
retrieving revision 1.6
diff -u -r1.6 connpt.c
--- dlls/oleaut32/connpt.c	23 Aug 2002 22:47:19 -0000	1.6
+++ dlls/oleaut32/connpt.c	19 Nov 2002 22:42:03 -0000
@@ -15,8 +15,6 @@
 #include "winuser.h"
 #include "ole2.h"
 #include "olectl.h"
-#include "wine/obj_base.h"
-#include "wine/obj_connection.h"
 #include "connpt.h"
 
 #include "debugtools.h"
Index: dlls/oleaut32/dispatch.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/oleaut32/dispatch.c,v
retrieving revision 1.6
diff -u -r1.6 dispatch.c
--- dlls/oleaut32/dispatch.c	23 Aug 2002 22:47:19 -0000	1.6
+++ dlls/oleaut32/dispatch.c	19 Nov 2002 22:55:02 -0000
@@ -22,8 +22,6 @@
 #include "winreg.h"         /* for HKEY_LOCAL_MACHINE */
 #include "winnls.h"         /* for PRIMARYLANGID */
 
-#include "wine/obj_oleaut.h"
-
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
Index: dlls/oleaut32/olefont.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/oleaut32/olefont.c,v
retrieving revision 1.15
diff -u -r1.15 olefont.c
--- dlls/oleaut32/olefont.c	23 Aug 2002 22:47:19 -0000	1.15
+++ dlls/oleaut32/olefont.c	19 Nov 2002 22:42:05 -0000
@@ -14,9 +14,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 "olectl.h"
 #include "ole2.h"
 #include "olectl.h"
 #include "debugtools.h"
Index: dlls/oleaut32/safearray.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/oleaut32/safearray.c,v
retrieving revision 1.15
diff -u -r1.15 safearray.c
--- dlls/oleaut32/safearray.c	23 Aug 2002 22:47:20 -0000	1.15
+++ dlls/oleaut32/safearray.c	19 Nov 2002 22:42:06 -0000
@@ -13,7 +13,6 @@
 #include "winerror.h"
 #include "winbase.h"
 #include "oleauto.h"
-#include "wine/obj_base.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
Index: dlls/oleaut32/tmarshal.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/oleaut32/tmarshal.c,v
retrieving revision 1.2
diff -u -r1.2 tmarshal.c
--- dlls/oleaut32/tmarshal.c	23 Aug 2002 22:47:20 -0000	1.2
+++ dlls/oleaut32/tmarshal.c	19 Nov 2002 22:42:06 -0000
@@ -19,9 +19,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"
Index: dlls/oleaut32/typelib.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/oleaut32/typelib.c,v
retrieving revision 1.65
diff -u -r1.65 typelib.c
--- dlls/oleaut32/typelib.c	23 Aug 2002 22:47:20 -0000	1.65
+++ dlls/oleaut32/typelib.c	19 Nov 2002 22:42:09 -0000
@@ -51,7 +51,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"
Index: dlls/rpcrt4/cproxy.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/rpcrt4/cproxy.c,v
retrieving revision 1.1
diff -u -r1.1 cproxy.c
--- dlls/rpcrt4/cproxy.c	31 Oct 2002 21:28:17 -0000	1.1
+++ dlls/rpcrt4/cproxy.c	19 Nov 2002 22:42:11 -0000
@@ -11,8 +11,7 @@
 #include "winbase.h"
 #include "winerror.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
 
 #include "rpcproxy.h"
 
Index: dlls/rpcrt4/cpsf.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/rpcrt4/cpsf.c,v
retrieving revision 1.1
diff -u -r1.1 cpsf.c
--- dlls/rpcrt4/cpsf.c	31 Oct 2002 22:45:23 -0000	1.1
+++ dlls/rpcrt4/cpsf.c	19 Nov 2002 22:42:11 -0000
@@ -12,8 +12,7 @@
 #include "winerror.h"
 #include "winreg.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
 
 #include "rpcproxy.h"
 
Index: dlls/rpcrt4/cstub.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/rpcrt4/cstub.c,v
retrieving revision 1.1
diff -u -r1.1 cstub.c
--- dlls/rpcrt4/cstub.c	31 Oct 2002 21:37:07 -0000	1.1
+++ dlls/rpcrt4/cstub.c	19 Nov 2002 22:42:12 -0000
@@ -8,8 +8,7 @@
 #include "winbase.h"
 #include "winerror.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
 
 #include "rpcproxy.h"
 
Index: dlls/rpcrt4/ndr_marshall.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/rpcrt4/ndr_marshall.c,v
retrieving revision 1.13
diff -u -r1.13 ndr_marshall.c
--- dlls/rpcrt4/ndr_marshall.c	7 Nov 2002 02:16:12 -0000	1.13
+++ dlls/rpcrt4/ndr_marshall.c	19 Nov 2002 22:42:12 -0000
@@ -21,7 +21,7 @@
 #include "rpcndr.h"
 
 #include "wine/rpcfc.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 
 #include "wine/debug.h"
 
Index: dlls/rpcrt4/ndr_midl.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/rpcrt4/ndr_midl.c,v
retrieving revision 1.10
diff -u -r1.10 ndr_midl.c
--- dlls/rpcrt4/ndr_midl.c	7 Nov 2002 01:53:27 -0000	1.10
+++ dlls/rpcrt4/ndr_midl.c	19 Nov 2002 22:42:12 -0000
@@ -17,8 +17,7 @@
 #include "winerror.h"
 #include "winreg.h"
 
-#include "wine/obj_base.h"
-#include "wine/obj_channel.h"
+#include "objbase.h"
 
 #include "rpcproxy.h"
 
Index: dlls/rpcrt4/ndr_ole.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/rpcrt4/ndr_ole.c,v
retrieving revision 1.1
diff -u -r1.1 ndr_ole.c
--- dlls/rpcrt4/ndr_ole.c	31 Oct 2002 22:55:20 -0000	1.1
+++ dlls/rpcrt4/ndr_ole.c	19 Nov 2002 22:42:12 -0000
@@ -18,10 +18,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"
 
Index: dlls/shdocvw/shdocvw.h
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/shdocvw/shdocvw.h,v
retrieving revision 1.1
diff -u -r1.1 shdocvw.h
--- dlls/shdocvw/shdocvw.h	11 Jan 2001 22:32:44 -0000	1.1
+++ dlls/shdocvw/shdocvw.h	19 Nov 2002 22:42:13 -0000
@@ -12,21 +12,8 @@
 #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 "wine/obj_webbrowser.h"
 
 /**********************************************************************
Index: dlls/shell32/enumidlist.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/shell32/enumidlist.c,v
retrieving revision 1.24
diff -u -r1.24 enumidlist.c
--- dlls/shell32/enumidlist.c	23 Aug 2002 22:47:22 -0000	1.24
+++ dlls/shell32/enumidlist.c	19 Nov 2002 22:42:13 -0000
@@ -11,7 +11,7 @@
 #include "undocshell.h"
 #include "shlwapi.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 #include "wine/obj_enumidlist.h"
 
 #include "pidl.h"
Index: dlls/shell32/folders.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/shell32/folders.c,v
retrieving revision 1.30
diff -u -r1.30 folders.c
--- dlls/shell32/folders.c	23 Aug 2002 22:47:22 -0000	1.30
+++ dlls/shell32/folders.c	19 Nov 2002 22:42:13 -0000
@@ -9,8 +9,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"
 
Index: dlls/shell32/shellfolder.h
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/shell32/shellfolder.h,v
retrieving revision 1.2
diff -u -r1.2 shellfolder.h
--- dlls/shell32/shellfolder.h	26 Sep 2000 00:00:57 -0000	1.2
+++ dlls/shell32/shellfolder.h	19 Nov 2002 22:42:13 -0000
@@ -7,9 +7,7 @@
 #define __WINE_SHELLFOLDER_HELP_H
 
 #include "winbase.h"
-
-#include "wine/obj_base.h"
-#include "wine/obj_shellfolder.h"
+#include "shlobj.h"
 
 
 /*****************************************************************************
Index: dlls/shell32/shellord.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/shell32/shellord.c,v
retrieving revision 1.95
diff -u -r1.95 shellord.c
--- dlls/shell32/shellord.c	23 Aug 2002 22:47:22 -0000	1.95
+++ dlls/shell32/shellord.c	19 Nov 2002 22:59:27 -0000
@@ -13,7 +13,6 @@
 #include "winnls.h"
 #include "heap.h"
 
-#include "wine/obj_base.h"
 #include "shellapi.h"
 #include "shlguid.h"
 #include "shlobj.h"
Index: dlls/shell32/shlfolder.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/shell32/shlfolder.c,v
retrieving revision 1.66
diff -u -r1.66 shlfolder.c
--- dlls/shell32/shlfolder.c	23 Aug 2002 22:47:22 -0000	1.66
+++ dlls/shell32/shlfolder.c	19 Nov 2002 22:42:16 -0000
@@ -16,13 +16,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"
Index: dlls/shell32/shlmenu.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/shell32/shlmenu.c,v
retrieving revision 1.27
diff -u -r1.27 shlmenu.c
--- dlls/shell32/shlmenu.c	23 Aug 2002 22:47:22 -0000	1.27
+++ dlls/shell32/shlmenu.c	19 Nov 2002 22:42:16 -0000
@@ -5,9 +5,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"
Index: dlls/shell32/shv_bg_cmenu.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/shell32/shv_bg_cmenu.c,v
retrieving revision 1.16
diff -u -r1.16 shv_bg_cmenu.c
--- dlls/shell32/shv_bg_cmenu.c	23 Aug 2002 22:47:22 -0000	1.16
+++ dlls/shell32/shv_bg_cmenu.c	19 Nov 2002 22:42:17 -0000
@@ -10,9 +10,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"
Index: dlls/shell32/shv_item_cmenu.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/shell32/shv_item_cmenu.c,v
retrieving revision 1.8
diff -u -r1.8 shv_item_cmenu.c
--- dlls/shell32/shv_item_cmenu.c	23 Aug 2002 22:47:22 -0000	1.8
+++ dlls/shell32/shv_item_cmenu.c	19 Nov 2002 22:42:18 -0000
@@ -10,10 +10,7 @@
 
 #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 "shlobj.h"
 #include "undocshell.h"
 
 #include "shell32_main.h"
Index: dlls/shlwapi/ordinal.c
===================================================================
RCS file: /cvsroot/rewind/rewind/dlls/shlwapi/ordinal.c,v
retrieving revision 1.35
diff -u -r1.35 ordinal.c
--- dlls/shlwapi/ordinal.c	23 Aug 2002 22:47:22 -0000	1.35
+++ dlls/shlwapi/ordinal.c	19 Nov 2002 22:42:19 -0000
@@ -17,8 +17,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 "wingdi.h"
 #include "winreg.h"
Index: include/dplay.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/dplay.h,v
retrieving revision 1.23
diff -u -r1.23 dplay.h
--- include/dplay.h	23 Aug 2002 22:47:30 -0000	1.23
+++ include/dplay.h	19 Nov 2002 22:42:20 -0000
@@ -2,7 +2,6 @@
 #define __WINE_DPLAY_H
 
 #include "ole2.h"
-#include "wine/obj_base.h"
 
 #ifdef __cplusplus
 extern "C" {
Index: include/ole.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/ole.h,v
retrieving revision 1.24
diff -u -r1.24 ole.h
--- include/ole.h	23 Aug 2002 22:47:30 -0000	1.24
+++ include/ole.h	19 Nov 2002 22:42:21 -0000
@@ -11,12 +11,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;
 
Index: include/oledlg.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/oledlg.h,v
retrieving revision 1.8
diff -u -r1.8 oledlg.h
--- include/oledlg.h	23 Aug 2002 22:47:30 -0000	1.8
+++ include/oledlg.h	19 Nov 2002 22:42:22 -0000
@@ -8,7 +8,7 @@
 #include "commdlg.h"
 #include "prsht.h"
 #include "windef.h"
-#include "oleidl.h"
+#include "ole2.h"
 
 #ifdef __cplusplus
 extern "C" {
Index: include/servprov.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/servprov.h,v
retrieving revision 1.4
diff -u -r1.4 servprov.h
--- include/servprov.h	18 Jul 2001 20:04:08 -0000	1.4
+++ include/servprov.h	19 Nov 2002 22:42:22 -0000
@@ -11,7 +11,7 @@
 #define __WINE_SERVPROV_H
 
 
-#include "wine/obj_base.h"
+#include "objbase.h"
 
 
 /*****************************************************************************
Index: include/shlguid.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/shlguid.h,v
retrieving revision 1.11
diff -u -r1.11 shlguid.h
--- include/shlguid.h	3 Aug 2000 04:19:24 -0000	1.11
+++ include/shlguid.h	19 Nov 2002 22:42:22 -0000
@@ -1,7 +1,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)
 
Index: include/shlobj.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/shlobj.h,v
retrieving revision 1.50
diff -u -r1.50 shlobj.h
--- include/shlobj.h	23 Aug 2002 22:47:30 -0000	1.50
+++ include/shlobj.h	19 Nov 2002 22:42:23 -0000
@@ -4,6 +4,7 @@
 #include "windef.h"
 #include "winbase.h"	/* WIN32_FIND_* */
 #include "ole2.h"
+#include "oleauto.h"
 #include "commctrl.h"
 #include "prsht.h"
 
@@ -33,10 +34,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"
Index: include/urlmon.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/urlmon.h,v
retrieving revision 1.8
diff -u -r1.8 urlmon.h
--- include/urlmon.h	8 Oct 2001 20:27:01 -0000	1.8
+++ include/urlmon.h	19 Nov 2002 22:42:23 -0000
@@ -15,7 +15,7 @@
 #define __WINE_URLMON_H
 
 #include "winbase.h"
-#include "wine/obj_base.h"
+#include "objbase.h"
 
 #ifdef __cplusplus
 extern "C" {
Index: include/wine/obj_serviceprovider.h
===================================================================
RCS file: /cvsroot/rewind/rewind/include/wine/obj_serviceprovider.h,v
retrieving revision 1.1
diff -u -r1.1 obj_serviceprovider.h
--- include/wine/obj_serviceprovider.h	1 Nov 2000 01:50:22 -0000	1.1
+++ include/wine/obj_serviceprovider.h	19 Nov 2002 22:42:23 -0000
@@ -7,9 +7,6 @@
 #ifndef __WINE_WINE_OBJ_SERVICEPROVIDER_H
 #define __WINE_WINE_OBJ_SERVICEPROVIDER_H
 
-#include "wine/obj_base.h"
-#include "winbase.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */


More information about the wine-devel mailing list