ChangeLog
Eliminate lots of __WINE__ conditionals from the headers.
Index: include/comcat.h
===================================================================
RCS file: /var/cvs/wine/include/comcat.h,v
retrieving revision 1.6
diff -u -r1.6 comcat.h
--- include/comcat.h 23 Dec 2002 01:39:35 -0000 1.6
+++ include/comcat.h 2 Jan 2003 19:56:18 -0000
@@ -16,13 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __WINE__
#include "rpc.h"
#include "rpcndr.h"
#ifndef COM_NO_WINDOWS_H
#include "windows.h"
#include "ole2.h"
-#endif
#endif
#ifndef __WINE_COMCAT_H
Index: include/docobj.h
===================================================================
RCS file: /var/cvs/wine/include/docobj.h,v
retrieving revision 1.10
diff -u -r1.10 docobj.h
--- include/docobj.h 31 May 2002 23:06:48 -0000 1.10
+++ include/docobj.h 2 Jan 2003 19:58:53 -0000
@@ -16,13 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __WINE__
#include "rpc.h"
#include "rpcndr.h"
#ifndef COM_NO_WINDOWS_H
#include "windows.h"
#include "ole2.h"
-#endif
#endif
#ifndef __WINE_DOCOBJ_H
Index: include/mapicode.h
===================================================================
RCS file: /var/cvs/wine/include/mapicode.h,v
retrieving revision 1.3
diff -u -r1.3 mapicode.h
--- include/mapicode.h 23 May 2002 02:38:56 -0000 1.3
+++ include/mapicode.h 2 Jan 2003 20:01:06 -0000
@@ -21,9 +21,7 @@
#ifndef MAPICODE_H
#define MAPICODE_H
-#ifndef __WINE__
#include "winerror.h"
-#endif
#define MAKE_MAPI_SCODE(sev,fac,code) \
( (((ULONG)(sev)<<31) | ((ULONG)(fac)<<16) | ((ULONG)(code))) )
Index: include/mapidefs.h
===================================================================
RCS file: /var/cvs/wine/include/mapidefs.h,v
retrieving revision 1.8
diff -u -r1.8 mapidefs.h
--- include/mapidefs.h 25 Jun 2002 03:03:19 -0000 1.8
+++ include/mapidefs.h 2 Jan 2003 20:01:53 -0000
@@ -20,13 +20,9 @@
#define __WINE_MAPIDEFS_H
#include "windef.h"
-#ifndef __WINE__
#include "windows.h"
#include "winerror.h"
-#ifndef _OBJBASE_H_
#include "objbase.h"
-#endif
-#endif
/* Some types */
Index: include/mediaobj.h
===================================================================
RCS file: /var/cvs/wine/include/mediaobj.h,v
retrieving revision 1.2
diff -u -r1.2 mediaobj.h
--- include/mediaobj.h 22 Mar 2002 19:20:11 -0000 1.2
+++ include/mediaobj.h 2 Jan 2003 20:02:14 -0000
@@ -16,13 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __WINE__
#include "rpc.h"
#include "rpcndr.h"
#ifndef COM_NO_WINDOWS_H
#include "windows.h"
#include "ole2.h"
-#endif
#endif
#ifndef __mediaobj_h__
Index: include/oaidl.h
===================================================================
RCS file: /var/cvs/wine/include/oaidl.h,v
retrieving revision 1.8
diff -u -r1.8 oaidl.h
--- include/oaidl.h 23 Dec 2002 01:33:50 -0000 1.8
+++ include/oaidl.h 2 Jan 2003 20:04:24 -0000
@@ -16,13 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __WINE__
#include "rpc.h"
#include "rpcndr.h"
#ifndef COM_NO_WINDOWS_H
#include "windows.h"
#include "ole2.h"
-#endif
#endif
#ifndef __WINE_OAIDL_H
Index: include/ocidl.h
===================================================================
RCS file: /var/cvs/wine/include/ocidl.h,v
retrieving revision 1.8
diff -u -r1.8 ocidl.h
--- include/ocidl.h 5 Dec 2002 20:33:07 -0000 1.8
+++ include/ocidl.h 2 Jan 2003 20:05:44 -0000
@@ -16,13 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __WINE__
#include "rpc.h"
#include "rpcndr.h"
#ifndef COM_NO_WINDOWS_H
#include "windows.h"
#include "ole2.h"
-#endif
#endif
#ifndef __WINE_OCIDL_H
Index: include/ole2.h
===================================================================
RCS file: /var/cvs/wine/include/ole2.h,v
retrieving revision 1.37
diff -u -r1.37 ole2.h
--- include/ole2.h 5 Dec 2002 20:33:07 -0000 1.37
+++ include/ole2.h 2 Jan 2003 20:06:26 -0000
@@ -27,9 +27,7 @@
#define __WINE_INCLUDE_OLEIDL
#include "oleidl.h"
#undef __WINE_INCLUDE_OLEIDL
-#ifndef __WINE__
#include "oleauto.h"
-#endif
struct tagMSG;
#ifdef __cplusplus
Index: include/oleidl.h
===================================================================
RCS file: /var/cvs/wine/include/oleidl.h,v
retrieving revision 1.8
diff -u -r1.8 oleidl.h
--- include/oleidl.h 5 Dec 2002 20:33:07 -0000 1.8
+++ include/oleidl.h 2 Jan 2003 20:06:51 -0000
@@ -16,13 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __WINE__
#include "rpc.h"
#include "rpcndr.h"
#ifndef COM_NO_WINDOWS_H
#include "windows.h"
#include "ole2.h"
-#endif
#endif
#ifndef __WINE_OLEIDL_H
Index: include/servprov.h
===================================================================
RCS file: /var/cvs/wine/include/servprov.h,v
retrieving revision 1.6
diff -u -r1.6 servprov.h
--- include/servprov.h 5 Dec 2002 20:33:07 -0000 1.6
+++ include/servprov.h 2 Jan 2003 20:08:17 -0000
@@ -16,13 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __WINE__
#include "rpc.h"
#include "rpcndr.h"
#ifndef COM_NO_WINDOWS_H
#include "windows.h"
#include "ole2.h"
-#endif
#endif
#ifndef __WINE_SERVPROV_H
Index: include/urlmon.h
===================================================================
RCS file: /var/cvs/wine/include/urlmon.h,v
retrieving revision 1.12
diff -u -r1.12 urlmon.h
--- include/urlmon.h 5 Dec 2002 20:33:07 -0000 1.12
+++ include/urlmon.h 2 Jan 2003 20:09:07 -0000
@@ -16,13 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __WINE__
#include "rpc.h"
#include "rpcndr.h"
#ifndef COM_NO_WINDOWS_H
#include "windows.h"
#include "ole2.h"
-#endif
#endif
#ifndef __WINE_URLMON_H
Index: include/wingdi.h
===================================================================
RCS file: /var/cvs/wine/include/wingdi.h,v
retrieving revision 1.85
diff -u -r1.85 wingdi.h
--- include/wingdi.h 23 Dec 2002 01:33:00 -0000 1.85
+++ include/wingdi.h 2 Jan 2003 20:12:28 -0000
@@ -1166,7 +1166,7 @@
DECL_WINELIB_TYPE_AW(NEWTEXTMETRICEX)
-#if defined(STRICT) || defined(__WINE__)
+#if defined(STRICT)
#if !defined(NOTEXTMETRIC)
typedef int (CALLBACK *OLDFONTENUMPROCA)(const LOGFONTA *, const TEXTMETRICA *, DWORD, LPARAM);
@@ -1184,7 +1184,7 @@
typedef INT (CALLBACK *GOBJENUMPROC)(LPVOID, LPARAM);
typedef VOID (CALLBACK *LINEDDAPROC)(INT, INT, LPARAM);
-#else /* defined(STRICT) || defined(__WINE__) */
+#else /* defined(STRICT) */
typedef FARPROC OLDFONTENUMPROC;
@@ -1195,7 +1195,7 @@
typedef FARPROC GOBJENUMPROC;
typedef FARPROC LINEDDAPROC;
-#endif /* defined(STRICT) || defined(__WINE__) */
+#endif /* defined(STRICT) */
/* tmPitchAndFamily bits */
#define TMPF_FIXED_PITCH 1 /* means variable pitch */
Index: include/winnls.h
===================================================================
RCS file: /var/cvs/wine/include/winnls.h,v
retrieving revision 1.38
diff -u -r1.38 winnls.h
--- include/winnls.h 19 Dec 2002 21:11:54 -0000 1.38
+++ include/winnls.h 2 Jan 2003 20:12:54 -0000
@@ -425,7 +425,7 @@
/* Define a bunch of callback types */
-#if defined(STRICT) || defined(__WINE__)
+#if defined(STRICT)
typedef BOOL (CALLBACK *CALINFO_ENUMPROCA)(LPSTR);
typedef BOOL (CALLBACK *CALINFO_ENUMPROCW)(LPWSTR);
typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXA)(LPSTR,CALID);
@@ -455,7 +455,7 @@
typedef FARPROC LOCALE_ENUMPROCW;
typedef FARPROC TIMEFMT_ENUMPROCA;
typedef FARPROC TIMEFMT_ENUMPROCW;
-#endif /* STRICT || __WINE__ */
+#endif /* STRICT */
DECL_WINELIB_TYPE_AW(CALINFO_ENUMPROC)
DECL_WINELIB_TYPE_AW(CALINFO_ENUMPROCEX)
Index: include/winuser.h
===================================================================
RCS file: /var/cvs/wine/include/winuser.h,v
retrieving revision 1.156
diff -u -r1.156 winuser.h
--- include/winuser.h 19 Dec 2002 04:14:19 -0000 1.156
+++ include/winuser.h 2 Jan 2003 20:15:54 -0000
@@ -29,7 +29,7 @@
/* Define a bunch of callback types */
-#if defined(STRICT) || defined(__WINE__)
+#if defined(STRICT)
typedef INT_PTR (CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
typedef BOOL (CALLBACK *DRAWSTATEPROC)(HDC,LPARAM,WPARAM,int,int);
typedef INT (CALLBACK *EDITWORDBREAKPROCA)(LPSTR,INT,INT,INT);
@@ -65,7 +65,7 @@
typedef FARPROC TIMERPROC;
typedef FARPROC WINEVENTPROC;
typedef FARPROC WNDENUMPROC;
-#endif /* STRICT || __WINE__ */
+#endif /* STRICT */
typedef NAMEENUMPROCA WINSTAENUMPROCA;
typedef NAMEENUMPROCA DESKTOPENUMPROCA;
Index: dlls/avifil32/acmstream.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/acmstream.c,v
retrieving revision 1.2
diff -u -r1.2 acmstream.c
--- dlls/avifil32/acmstream.c 2 Dec 2002 18:11:00 -0000 1.2
+++ dlls/avifil32/acmstream.c 2 Jan 2003 20:35:25 -0000
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include <assert.h>
#include "winbase.h"
Index: dlls/avifil32/api.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/api.c,v
retrieving revision 1.13
diff -u -r1.13 api.c
--- dlls/avifil32/api.c 2 Dec 2002 18:11:00 -0000 1.13
+++ dlls/avifil32/api.c 2 Jan 2003 20:35:49 -0000
@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include <assert.h>
#include "winbase.h"
Index: dlls/avifil32/avifile.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/avifile.c,v
retrieving revision 1.30
diff -u -r1.30 avifile.c
--- dlls/avifil32/avifile.c 2 Dec 2002 18:11:00 -0000 1.30
+++ dlls/avifil32/avifile.c 2 Jan 2003 20:36:17 -0000
@@ -26,6 +26,7 @@
* - IAVIStream_fnSetInfo: a stub.
*/
+#define COM_NO_WINDOWS_H
#include <assert.h>
#include "winbase.h"
Index: dlls/avifil32/extrachunk.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/extrachunk.c,v
retrieving revision 1.3
diff -u -r1.3 extrachunk.c
--- dlls/avifil32/extrachunk.c 2 Dec 2002 18:11:00 -0000 1.3
+++ dlls/avifil32/extrachunk.c 2 Jan 2003 20:36:40 -0000
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include <assert.h>
#include "extrachunk.h"
Index: dlls/avifil32/factory.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/factory.c,v
retrieving revision 1.5
diff -u -r1.5 factory.c
--- dlls/avifil32/factory.c 4 Nov 2002 23:53:47 -0000 1.5
+++ dlls/avifil32/factory.c 2 Jan 2003 20:37:03 -0000
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include <assert.h>
#include "winbase.h"
Index: dlls/avifil32/getframe.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/getframe.c,v
retrieving revision 1.3
diff -u -r1.3 getframe.c
--- dlls/avifil32/getframe.c 2 Dec 2002 18:11:00 -0000 1.3
+++ dlls/avifil32/getframe.c 2 Jan 2003 20:37:20 -0000
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include <assert.h>
#include "winbase.h"
Index: dlls/avifil32/icmstream.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/icmstream.c,v
retrieving revision 1.2
diff -u -r1.2 icmstream.c
--- dlls/avifil32/icmstream.c 2 Dec 2002 18:11:00 -0000 1.2
+++ dlls/avifil32/icmstream.c 2 Jan 2003 20:37:46 -0000
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include <assert.h>
#include "winbase.h"
Index: dlls/avifil32/wavfile.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/wavfile.c,v
retrieving revision 1.3
diff -u -r1.3 wavfile.c
--- dlls/avifil32/wavfile.c 2 Dec 2002 18:11:00 -0000 1.3
+++ dlls/avifil32/wavfile.c 2 Jan 2003 20:38:11 -0000
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include <assert.h>
#include "winbase.h"
Index: dlls/commdlg/cdlg.h
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/cdlg.h,v
retrieving revision 1.24
diff -u -r1.24 cdlg.h
--- dlls/commdlg/cdlg.h 21 Nov 2002 23:55:10 -0000 1.24
+++ dlls/commdlg/cdlg.h 2 Jan 2003 20:56:30 -0000
@@ -21,6 +21,7 @@
#ifndef _WINE_DLL_CDLG_H
#define _WINE_DLL_CDLG_H
+#define COM_NO_WINDOWS_H
#include "dlgs.h"
#include "wine/windef16.h"
#include "wownt32.h"
Index: dlls/commdlg/filedlgbrowser.h
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/filedlgbrowser.h,v
retrieving revision 1.13
diff -u -r1.13 filedlgbrowser.h
--- dlls/commdlg/filedlgbrowser.h 16 Aug 2002 23:26:22 -0000 1.13
+++ dlls/commdlg/filedlgbrowser.h 2 Jan 2003 20:58:06 -0000
@@ -22,6 +22,7 @@
#ifndef SHBROWSER_H
#define SHBROWSER_H
+#define COM_NO_WINDOWS_H
#include "shlobj.h"
#include "winbase.h"
#include "objbase.h"
Index: dlls/ole32/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/Makefile.in,v
retrieving revision 1.24
diff -u -r1.24 Makefile.in
--- dlls/ole32/Makefile.in 22 Nov 2002 04:43:02 -0000 1.24
+++ dlls/ole32/Makefile.in 2 Jan 2003 21:12:22 -0000
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_OLE32_
+EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: dlls/ole32/compositemoniker.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/compositemoniker.c,v
retrieving revision 1.17
diff -u -r1.17 compositemoniker.c
--- dlls/ole32/compositemoniker.c 19 Dec 2002 01:09:40 -0000 1.17
+++ dlls/ole32/compositemoniker.c 2 Jan 2003 21:11:20 -0000
@@ -1,4 +1,4 @@
-/***************************************************************************************
+/*
* CompositeMonikers implementation
*
* Copyright 1999 Noomen Hamza
@@ -16,7 +16,8 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- ***************************************************************************************/
+ */
+
#include <assert.h>
#include <string.h>
#include "winbase.h"
Index: dlls/urlmon/umon.c
===================================================================
RCS file: /var/cvs/wine/dlls/urlmon/umon.c,v
retrieving revision 1.17
diff -u -r1.17 umon.c
--- dlls/urlmon/umon.c 19 Dec 2002 21:16:56 -0000 1.17
+++ dlls/urlmon/umon.c 2 Jan 2003 20:09:47 -0000
@@ -23,6 +23,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include <stdio.h>
#include "windef.h"
Index: dlls/x11drv/event.c
===================================================================
RCS file: /var/cvs/wine/dlls/x11drv/event.c,v
retrieving revision 1.15
diff -u -r1.15 event.c
--- dlls/x11drv/event.c 3 Dec 2002 23:34:54 -0000 1.15
+++ dlls/x11drv/event.c 2 Jan 2003 20:31:50 -0000
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include "config.h"
#include <X11/Xatom.h>
Index: ole/dx8guid.c
===================================================================
RCS file: /var/cvs/wine/ole/dx8guid.c,v
retrieving revision 1.1
diff -u -r1.1 dx8guid.c
--- ole/dx8guid.c 17 Dec 2002 01:16:07 -0000 1.1
+++ ole/dx8guid.c 2 Jan 2003 20:18:26 -0000
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
Index: ole/dxguid.c
===================================================================
RCS file: /var/cvs/wine/ole/dxguid.c,v
retrieving revision 1.1
diff -u -r1.1 dxguid.c
--- ole/dxguid.c 17 Dec 2002 01:16:07 -0000 1.1
+++ ole/dxguid.c 2 Jan 2003 20:18:48 -0000
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
Index: ole/uuid.c
===================================================================
RCS file: /var/cvs/wine/ole/uuid.c,v
retrieving revision 1.15
diff -u -r1.15 uuid.c
--- ole/uuid.c 18 Dec 2002 20:48:05 -0000 1.15
+++ ole/uuid.c 2 Jan 2003 19:58:08 -0000
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include "initguid.h"
/* GUIDs defined in uuids.lib */
Index: dlls/msvideo/mciwnd.c
===================================================================
RCS file: /var/cvs/wine/dlls/msvideo/mciwnd.c,v
retrieving revision 1.8
diff -u -r1.8 mciwnd.c
--- dlls/msvideo/mciwnd.c 2 Dec 2002 18:10:59 -0000 1.8
+++ dlls/msvideo/mciwnd.c 2 Jan 2003 21:25:21 -0000
@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include <stdio.h>
#include <string.h>
Index: dlls/msvideo/msvideo16.c
===================================================================
RCS file: /var/cvs/wine/dlls/msvideo/msvideo16.c,v
retrieving revision 1.7
diff -u -r1.7 msvideo16.c
--- dlls/msvideo/msvideo16.c 20 Nov 2002 19:47:08 -0000 1.7
+++ dlls/msvideo/msvideo16.c 2 Jan 2003 21:24:41 -0000
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include <stdio.h>
#include <string.h>
Index: dlls/msvideo/msvideo_private.h
===================================================================
RCS file: /var/cvs/wine/dlls/msvideo/msvideo_private.h,v
retrieving revision 1.2
diff -u -r1.2 msvideo_private.h
--- dlls/msvideo/msvideo_private.h 20 Nov 2002 19:47:08 -0000 1.2
+++ dlls/msvideo/msvideo_private.h 2 Jan 2003 21:26:05 -0000
@@ -19,6 +19,7 @@
#ifndef __WINE_MSVIDEO_PRIVATE_H
#define __WINE_MSVIDEO_PRIVATE_H
+#define COM_NO_WINDOWS_H
#include "winbase.h"
#include "windef.h"
#include "vfw.h"
Index: dlls/oleaut32/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/Makefile.in,v
retrieving revision 1.41
diff -u -r1.41 Makefile.in
--- dlls/oleaut32/Makefile.in 12 Dec 2002 22:24:45 -0000 1.41
+++ dlls/oleaut32/Makefile.in 2 Jan 2003 21:30:26 -0000
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_OLEAUT32_
+EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: dlls/shell32/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/Makefile.in,v
retrieving revision 1.57
diff -u -r1.57 Makefile.in
--- dlls/shell32/Makefile.in 11 Dec 2002 01:34:52 -0000 1.57
+++ dlls/shell32/Makefile.in 2 Jan 2003 21:39:14 -0000
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_SHELL32_
+EXTRADEFS = -D_SHELL32_ -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: dlls/avicap32/avicap32_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/avicap32/avicap32_main.c,v
retrieving revision 1.7
diff -u -r1.7 avicap32_main.c
--- dlls/avicap32/avicap32_main.c 18 Oct 2002 23:48:59 -0000 1.7
+++ dlls/avicap32/avicap32_main.c 2 Jan 2003 21:53:04 -0000
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include "vfw.h"
#include "winternl.h"
#include "wine/debug.h"
Index: dlls/comcat/comcat_private.h
===================================================================
RCS file: /var/cvs/wine/dlls/comcat/comcat_private.h,v
retrieving revision 1.1
diff -u -r1.1 comcat_private.h
--- dlls/comcat/comcat_private.h 23 Dec 2002 01:39:35 -0000 1.1
+++ dlls/comcat/comcat_private.h 2 Jan 2003 21:53:49 -0000
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
Index: dlls/comctl32/animate.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/animate.c,v
retrieving revision 1.44
diff -u -r1.44 animate.c
--- dlls/comctl32/animate.c 13 Dec 2002 00:35:44 -0000 1.44
+++ dlls/comctl32/animate.c 2 Jan 2003 21:54:36 -0000
@@ -28,6 +28,7 @@
* - concurrent access to infoPtr
*/
+#define COM_NO_WINDOWS_H
#include <string.h>
#include "winbase.h"
#include "commctrl.h"
Index: dlls/dplayx/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/dplayx/Makefile.in,v
retrieving revision 1.25
diff -u -r1.25 Makefile.in
--- dlls/dplayx/Makefile.in 23 Oct 2002 22:20:47 -0000 1.25
+++ dlls/dplayx/Makefile.in 2 Jan 2003 21:59:06 -0000
@@ -1,3 +1,4 @@
+EXTRADEFS = -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: dlls/winmm/mciavi/private_mciavi.h
===================================================================
RCS file: /var/cvs/wine/dlls/winmm/mciavi/private_mciavi.h,v
retrieving revision 1.6
diff -u -r1.6 private_mciavi.h
--- dlls/winmm/mciavi/private_mciavi.h 31 Oct 2002 02:23:43 -0000 1.6
+++ dlls/winmm/mciavi/private_mciavi.h 2 Jan 2003 22:01:36 -0000
@@ -23,6 +23,7 @@
#ifndef __WINE_PRIVATE_MCIAVI_H
#define __WINE_PRIVATE_MCIAVI_H
+#define COM_NO_WINDOWS_H
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
Index: dlls/msvideo/msrle32/msrle_private.h
===================================================================
RCS file: /var/cvs/wine/dlls/msvideo/msrle32/msrle_private.h,v
retrieving revision 1.1
diff -u -r1.1 msrle_private.h
--- dlls/msvideo/msrle32/msrle_private.h 8 Oct 2002 00:40:06 -0000 1.1
+++ dlls/msvideo/msrle32/msrle_private.h 2 Jan 2003 22:04:58 -0000
@@ -19,6 +19,7 @@
#ifndef __MSRLE32_PRIVATE_H
#define __MSRLE32_PRIVATE_H
+#define COM_NO_WINDOWS_H
#include "winbase.h"
#include "mmsystem.h"
#include "vfw.h"
Index: dlls/oledlg/oledlg_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/oledlg/oledlg_main.c,v
retrieving revision 1.6
diff -u -r1.6 oledlg_main.c
--- dlls/oledlg/oledlg_main.c 18 Oct 2002 23:48:58 -0000 1.6
+++ dlls/oledlg/oledlg_main.c 2 Jan 2003 22:07:17 -0000
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
Index: dlls/olepro32/olepro32stubs.c
===================================================================
RCS file: /var/cvs/wine/dlls/olepro32/olepro32stubs.c,v
retrieving revision 1.7
diff -u -r1.7 olepro32stubs.c
--- dlls/olepro32/olepro32stubs.c 9 Mar 2002 23:39:10 -0000 1.7
+++ dlls/olepro32/olepro32stubs.c 2 Jan 2003 22:07:50 -0000
@@ -20,6 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include "wine/debug.h"
#include "winbase.h"
#include "ole2.h"
Index: dlls/rpcrt4/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/rpcrt4/Makefile.in,v
retrieving revision 1.20
diff -u -r1.20 Makefile.in
--- dlls/rpcrt4/Makefile.in 2 Dec 2002 21:17:05 -0000 1.20
+++ dlls/rpcrt4/Makefile.in 2 Jan 2003 22:09:34 -0000
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_RPCRT4_
+EXTRADEFS = -D_RPCRT4_ -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: dlls/shdocvw/shdocvw.h
===================================================================
RCS file: /var/cvs/wine/dlls/shdocvw/shdocvw.h,v
retrieving revision 1.5
diff -u -r1.5 shdocvw.h
--- dlls/shdocvw/shdocvw.h 5 Dec 2002 20:33:08 -0000 1.5
+++ dlls/shdocvw/shdocvw.h 2 Jan 2003 22:11:32 -0000
@@ -21,6 +21,7 @@
#ifndef __WINE_SHDOCVW_H
#define __WINE_SHDOCVW_H
+#define COM_NO_WINDOWS_H
/* FIXME: Is there a better way to deal with all these includes? */
#include "wingdi.h"
#include "winbase.h"
Index: dlls/shdocvw/shdocvw_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/shdocvw/shdocvw_main.c,v
retrieving revision 1.9
diff -u -r1.9 shdocvw_main.c
--- dlls/shdocvw/shdocvw_main.c 22 May 2002 01:55:18 -0000 1.9
+++ dlls/shdocvw/shdocvw_main.c 2 Jan 2003 22:12:29 -0000
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include <string.h>
#include "winreg.h"
#include "initguid.h"
Index: dlls/shlwapi/ordinal.c
===================================================================
RCS file: /var/cvs/wine/dlls/shlwapi/ordinal.c,v
retrieving revision 1.63
diff -u -r1.63 ordinal.c
--- dlls/shlwapi/ordinal.c 16 Dec 2002 22:42:01 -0000 1.63
+++ dlls/shlwapi/ordinal.c 2 Jan 2003 22:13:52 -0000
@@ -20,6 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include "config.h"
#include "wine/port.h"
Index: dlls/shlwapi/string.c
===================================================================
RCS file: /var/cvs/wine/dlls/shlwapi/string.c,v
retrieving revision 1.28
diff -u -r1.28 string.c
--- dlls/shlwapi/string.c 20 Sep 2002 19:41:08 -0000 1.28
+++ dlls/shlwapi/string.c 2 Jan 2003 22:14:46 -0000
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define COM_NO_WINDOWS_H
#include "config.h"
#include "wine/port.h"
--
Dimi.
