Eliminate lots of __WINE__ conditionals from the headers.

dlls/avicap32/avicap32_main.c

@@ -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"

dlls/avifil32/acmstream.c

@@ -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"

dlls/avifil32/api.c

@@ -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"

dlls/avifil32/avifile.c

@@ -26,6 +26,7 @@
  *  - IAVIStream_fnSetInfo: a stub.
  */
 
+#define COM_NO_WINDOWS_H
 #include <assert.h>
 
 #include "winbase.h"

dlls/avifil32/extrachunk.c

@@ -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"

dlls/avifil32/factory.c

@@ -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"

dlls/avifil32/getframe.c

@@ -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"

dlls/avifil32/icmstream.c

@@ -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"

dlls/avifil32/wavfile.c

@@ -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"

dlls/comcat/comcat_private.h

@@ -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"

dlls/comctl32/animate.c

@@ -28,6 +28,7 @@
  *   - concurrent access to infoPtr
  */
 
+#define COM_NO_WINDOWS_H
 #include <string.h>
 #include "winbase.h"
 #include "commctrl.h"

dlls/commdlg/cdlg.h

@@ -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"

dlls/commdlg/filedlgbrowser.h

@@ -22,6 +22,7 @@
 #ifndef SHBROWSER_H
 #define SHBROWSER_H
 
+#define COM_NO_WINDOWS_H
 #include "shlobj.h"
 #include "winbase.h"
 #include "objbase.h"

dlls/dplayx/Makefile.in

+EXTRADEFS = -DCOM_NO_WINDOWS_H
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/msvideo/mciwnd.c

@@ -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>
 

dlls/msvideo/msrle32/msrle_private.h

@@ -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"

dlls/msvideo/msvideo16.c

@@ -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>
 

dlls/msvideo/msvideo_private.h

@@ -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"

dlls/ole32/Makefile.in

-EXTRADEFS = -D_OLE32_
+EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/ole32/compositemoniker.c

-/***************************************************************************************
+/*
  *	                      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"

dlls/oleaut32/Makefile.in

-EXTRADEFS = -D_OLEAUT32_
+EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/oledlg/oledlg_main.c

@@ -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"
@@ -289,6 +290,3 @@ UINT WINAPI OleUIChangeSourceW(
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return OLEUI_FALSE;
 }
-
-
-

dlls/olepro32/olepro32stubs.c

@@ -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"

dlls/rpcrt4/Makefile.in

-EXTRADEFS = -D_RPCRT4_
+EXTRADEFS = -D_RPCRT4_ -DCOM_NO_WINDOWS_H
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/shdocvw/shdocvw.h

@@ -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"

dlls/shdocvw/shdocvw_main.c

@@ -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"
@@ -94,4 +95,3 @@ HRESULT WINAPI SHDOCVW_DllUnregisterServer()
     FIXME("(), stub!\n");
     return S_OK;
 }
-

dlls/shell32/Makefile.in

-EXTRADEFS = -D_SHELL32_
+EXTRADEFS = -D_SHELL32_ -DCOM_NO_WINDOWS_H
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/shlwapi/ordinal.c

@@ -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"
 

dlls/shlwapi/string.c

@@ -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"
 

dlls/urlmon/umon.c

@@ -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"

dlls/winmm/mciavi/private_mciavi.h

@@ -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"

dlls/x11drv/event.c

@@ -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>

include/comcat.h

@@ -16,14 +16,12 @@
  * 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
 #define __WINE_COMCAT_H

include/docobj.h

@@ -16,14 +16,12 @@
  * 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
 #define __WINE_DOCOBJ_H

include/mapicode.h

@@ -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))) )

include/mapidefs.h

@@ -20,13 +20,11 @@
 #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 */
 

include/mediaobj.h

@@ -16,14 +16,12 @@
  * 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__
 #define __mediaobj_h__

include/oaidl.h

@@ -16,14 +16,12 @@
  * 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
 #define __WINE_OAIDL_H

include/ocidl.h

@@ -16,14 +16,12 @@
  * 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
 #define __WINE_OCIDL_H
@@ -46,5 +44,3 @@
 #include "wine/obj_oleundo.h"
 
 #endif /* __WINE_OCIDL_H */
-
-

include/ole2.h

@@ -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
@@ -150,4 +148,3 @@ HRESULT     WINAPI OleSetAutoConvert( REFCLSID clsidOld, REFCLSID clsidNew );
 #endif /* defined(__cplusplus) */
 
 #endif  /* __WINE_OLE2_H */
-

include/oleidl.h

@@ -16,14 +16,12 @@
  * 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
 #define __WINE_OLEIDL_H
@@ -40,4 +38,3 @@
 #include "wine/obj_dragdrop.h"
 
 #endif /* __WINE_OLEIDL_H */
-

include/servprov.h

@@ -16,14 +16,12 @@
  * 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
 #define __WINE_SERVPROV_H

include/urlmon.h

@@ -16,14 +16,12 @@
  * 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
 #define __WINE_URLMON_H

include/wingdi.h

@@ -1166,7 +1166,7 @@ typedef struct
 
 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 @@ DECL_WINELIB_TYPE_AW(FONTENUMPROC)
 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 @@ DECL_WINELIB_TYPE_AW(FONTENUMPROC)
 typedef FARPROC GOBJENUMPROC;
 typedef FARPROC LINEDDAPROC;
 
-#endif /* defined(STRICT) || defined(__WINE__) */
+#endif /* defined(STRICT) */
 
   /* tmPitchAndFamily bits */
 #define TMPF_FIXED_PITCH    1		/* means variable pitch */

include/winnls.h

@@ -425,7 +425,7 @@ DECL_WINELIB_TYPE_AW(LPCURRENCYFMT)
 
 /* 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_ENUMPROCA;
 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)

include/winuser.h

@@ -29,7 +29,7 @@ extern "C" {
 
 /* 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 SENDASYNCPROC;
 typedef FARPROC TIMERPROC;
 typedef FARPROC WINEVENTPROC;
 typedef FARPROC WNDENUMPROC;
-#endif /* STRICT || __WINE__ */
+#endif /* STRICT */
 
 typedef NAMEENUMPROCA WINSTAENUMPROCA;
 typedef NAMEENUMPROCA DESKTOPENUMPROCA;

ole/dx8guid.c

@@ -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"

ole/dxguid.c

@@ -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"

ole/uuid.c

@@ -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 */