ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminate lots of __WINE__ conditionals from the headers.

This commit is contained in:
Dimitrie O. Paun 2003-01-03 19:12:55 +00:00 committed by Alexandre Julliard
parent 5f87d778aa
commit cef5961d2b
49 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/avicap32/avicap32_main.c
View File

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

1
dlls/avifil32/acmstream.c
View File

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

1
dlls/avifil32/api.c
View File

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

1
dlls/avifil32/avifile.c
View File

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

1
dlls/avifil32/extrachunk.c
View File

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

1
dlls/avifil32/factory.c
View File

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

1
dlls/avifil32/getframe.c
View File

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

1
dlls/avifil32/icmstream.c
View File

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

1
dlls/avifil32/wavfile.c
View File

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

1
dlls/comcat/comcat_private.h
View File

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

1
dlls/comctl32/animate.c
View File

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

1
dlls/commdlg/cdlg.h
View File

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

1
dlls/commdlg/filedlgbrowser.h
View File

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

1
dlls/dplayx/Makefile.in
View File

@ -1,3 +1,4 @@
EXTRADEFS = -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@

1
dlls/msvideo/mciwnd.c
View File

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

1
dlls/msvideo/msrle32/msrle_private.h
View File

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

1
dlls/msvideo/msvideo16.c
View File

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

1
dlls/msvideo/msvideo_private.h
View File

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

2
dlls/ole32/Makefile.in
View File

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

5
dlls/ole32/compositemoniker.c
View File

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

2
dlls/oleaut32/Makefile.in
View File

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

4
dlls/oledlg/oledlg_main.c
View File

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

1
dlls/olepro32/olepro32stubs.c
View File

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

2
dlls/rpcrt4/Makefile.in
View File

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

1
dlls/shdocvw/shdocvw.h
View File

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

2
dlls/shdocvw/shdocvw_main.c
View File

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

2
dlls/shell32/Makefile.in
View File

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

1
dlls/shlwapi/ordinal.c
View File

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

1
dlls/shlwapi/string.c
View File

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

1
dlls/urlmon/umon.c
View File

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

1
dlls/winmm/mciavi/private_mciavi.h
View File

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

1
dlls/x11drv/event.c
View File

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

2
include/comcat.h
View File

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

2
include/docobj.h
View File

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

2
include/mapicode.h
View File

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

2
include/mapidefs.h
View File

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

2
include/mediaobj.h
View File

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

2
include/oaidl.h
View File

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

4
include/ocidl.h
View File

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

3
include/ole2.h
View File

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

3
include/oleidl.h
View File

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

2
include/servprov.h
View File

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

2
include/urlmon.h
View File

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

6
include/wingdi.h
View File

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

4
include/winnls.h
View File

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

4
include/winuser.h
View File

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

1
ole/dx8guid.c
View File

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

1
ole/dxguid.c
View File

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

1
ole/uuid.c
View File

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