- Follow up to 41644: Get rid of the Wine headers using include_next as the definitions are now in the PSDK, wrapped under _WINE. Also define _WINE for the modules using those types.

- Move MCI_OPEN_DRIVER and MCI_CLOSE_DRIVER to mmddk.h as this is where they belong. Also move them out of the _WINE guard as those defines are present in the official headers.
- Add GetDriverFlags to mmsystem.h (missed this one in 41644).
- Most Wine code now compiles fine in MSVC.
- Wrap include_next in crt/float.h under a __GNUC__ guard -- not quite correct as the included float.h defines some stuff that should be in the "real" float.h.
- winnt.h: Remove duplicated LANG* defines that are already defined there and present in the official headers. Remove the _WINE guard from the rest as we may want to provide translations for those languages too.

svn path=/trunk/; revision=42386
This commit is contained in:
Stefan Ginsberg 2009-08-04 18:34:06 +00:00
parent 353932e6da
commit 50e193b557
31 changed files with 31 additions and 360 deletions

View file

@ -5,6 +5,7 @@
<importlibrary definition="dsound.spec" />
<include base="dsound">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="_WINE" />
<library>wine</library>
<library>uuid</library>
<library>ntdll</library>

View file

@ -7,6 +7,7 @@
<include base="comctl32">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__WINESRC__" />
<define name="_WINE" />
<file>animate.c</file>
<file>comboex.c</file>
<file>comctl32undoc.c</file>

View file

@ -6,6 +6,7 @@
<include base="comdlg32">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__WINESRC__" />
<define name="_WINE" />
<file>cdlg32.c</file>
<file>colordlg.c</file>
<file>filedlg.c</file>

View file

@ -7,6 +7,7 @@
<include base="cryptui">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__WINESRC__" />
<define name="_WINE" />
<file>main.c</file>
<file>cryptui.rc</file>
<file>cryptui_De.rc</file>

View file

@ -6,6 +6,7 @@
<include base="dbghelp">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__WINESRC__" />
<define name="_WINE" />
<define name="HAVE_REGEX_H" />
<file>coff.c</file>
<file>dbghelp.c</file>

View file

@ -3,6 +3,7 @@
<include base="mciwave">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__WINESRC__" />
<define name="_WINE" />
<file>mciwave.c</file>
<library>wine</library>
<library>winmm</library>

View file

@ -6,6 +6,7 @@
<include base="mpr">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__WINESRC__" />
<define name="_WINE" />
<file>auth.c</file>
<file>mpr_main.c</file>
<file>multinet.c</file>

View file

@ -6,6 +6,7 @@
<include base="msvfw32">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__WINESRC__" />
<define name="_WINE" />
<file>mciwnd.c</file>
<file>msvideo_main.c</file>
<file>drawdib.c</file>

View file

@ -7,6 +7,7 @@
<include base="msxml3" root="intermediate">.</include>
<dependency>msxml3_v1</dependency>
<define name="__WINESRC__" />
<define name="_WINE" />
<redefine name="_WIN32_WINNT">0x601</redefine>
<define name="LIBXML_STATIC" />
<library>libxml2</library>

View file

@ -7,6 +7,7 @@
<include base="ReactOS">include/reactos/wine</include>
<define name="_SHELL32_" />
<define name="COM_NO_WINDOWS_H" />
<define name="_WINE" />
<redefine name="_WIN32_WINNT">0x600</redefine>
<library>wine</library>
<library>uuid</library>

View file

@ -7,6 +7,7 @@
<include base="wininet">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="__WINESRC__" />
<define name="_WINE" />
<library>wine</library>
<library>mpr</library>
<library>shlwapi</library>

View file

@ -8,6 +8,7 @@
<importlibrary definition="winmm.spec" />
<include base="winmm">.</include>
<include base="ReactOS">include/reactos/wine</include>
<define name="_WINE" />
<library>wine</library>
<library>ntdll</library>
<library>kernel32</library>

View file

@ -16,7 +16,9 @@
*
*/
#ifdef __GNUC__
#include_next<float.h>
#endif
#ifndef _MINGW_FLOAT_H_
#define _MINGW_FLOAT_H_

View file

@ -91,7 +91,7 @@ typedef struct {
#define DRV_QUERYSTRINGID (DRV_RESERVED + 14)
#define DRV_QUERYSTRINGIDSIZE (DRV_RESERVED + 15)
#define DRV_QUERYIDFROMSTRINGID (DRV_RESERVED + 16)
#ifdef __WINESRC__
#ifdef _WINE
#define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 20)
#define DRV_QUERYDSOUNDDESC (DRV_RESERVED + 21)
#define DRV_QUERYDSOUNDGUID (DRV_RESERVED + 22)
@ -330,6 +330,9 @@ typedef JOYDEVMSGPROC *LPJOYDEVMSGPROC;
#define MCI_MAX_DEVICE_TYPE_LENGTH 80
#define MCI_OPEN_DRIVER 0x0801
#define MCI_CLOSE_DRIVER 0x0802
#define MCI_FALSE (MCI_STRING_OFFSET + 19)
#define MCI_TRUE (MCI_STRING_OFFSET + 20)

View file

@ -911,8 +911,6 @@ extern "C" {
#define MCI_OVLY_WHERE_FRAME 0x80000
#define MCI_OVLY_WHERE_VIDEO 0x100000
#ifdef _WINE
#define MCI_OPEN_DRIVER 0x0801
#define MCI_CLOSE_DRIVER 0x0802
#define MCI_SOUND 0x0812
#define MCI_SOUND_NAME 0x00000100L
#endif
@ -1884,6 +1882,10 @@ BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD);
HTASK WINAPI mciGetCreatorTask(MCIDEVICEID);
YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD);
#ifdef _WINE
DWORD WINAPI GetDriverFlags(HDRVR hDriver);
#endif
typedef struct tagMCI_SEQ_SET_PARMS {
DWORD dwCallback;
DWORD dwTimeFormat;

View file

@ -884,25 +884,17 @@ typedef enum {
#define LANG_YORUBA 0x6a
#define LANG_ZULU 0x35
#ifdef _WINE
/* FIXME: non-standard */
#define LANG_ESPERANTO 0x8f
#define LANG_WALON 0x90
#define LANG_CORNISH 0x91
/* FIXME: not present in the official headers */
#define LANG_GAELIC 0x94
#define LANG_MALTESE 0x3a
#define LANG_ROMANSH 0x17
#define LANG_SAAMI 0x3b
#define LANG_LOWER_SORBIAN 0x2e
#define LANG_UPPER_SORBIAN 0x2e
#define LANG_SUTU 0x30
#define LANG_TAJIK 0x28
#define LANG_TSONGA 0x31
#define LANG_TSWANA 0x32
#define LANG_VENDA 0x33
#define LANG_XHOSA 0x34
#define LANG_ZULU 0x35
#endif
#define SUBLANG_CUSTOM_UNSPECIFIED 0x04
#define SUBLANG_CUSTOM_DEFAULT 0x03

View file

@ -443,9 +443,7 @@
#define HAVE_PCLOSE 1
/* Define to 1 if the system has the type `pid_t'. */
#if !defined(_MSC_VER)
#define HAVE_PID_T 1
#endif
/* Define to 1 if you have the <poll.h> header file. */
/* #undef HAVE_POLL_H */

View file

@ -1,20 +0,0 @@
/*
* Compatibility header
*
* This header is wrapper to allow compilation of Wine DLLs under ReactOS
* build system. It contains definitions commonly refered to as Wineisms
* and definitions that are missing in w32api.
*/
#ifndef __WINE_DLGS_H
#define __WINE_DLGS_H
#define OFN_DONTADDTORECENT 0x02000000
#define OFN_ENABLEINCLUDENOTIFY 0x00400000
#define NEWFILEOPENORD 1547
#if !defined (_MSC_VER)
#include_next <dlgs.h>
#endif
#endif /* __WINE_DLGS_H */

View file

@ -1,18 +0,0 @@
/* $Id $
*
* Compatibility header
*
* This header is wrapper to allow compilation of Wine DLLs under ReactOS
* build system. It contains definitions commonly refered to as Wineisms
* and definitions that are missing in w32api.
*/
#include_next <mmddk.h>
#ifndef __WINE_MMDDK_H
#define __WINE_MMDDK_H
#define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 20)
#define DRV_QUERYDSOUNDDESC (DRV_RESERVED + 21)
#endif /* __WINE_MMDDK_H */

View file

@ -1,64 +0,0 @@
/*
* MMSYSTEM - Multimedia Wine Extension ... :-)
*
* Copyright (C) the Wine project
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* 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
*/
#ifndef __WINE_MMSYSTEM_H
#define __WINE_MMSYSTEM_H
#include_next <mmsystem.h>
#define DRV_SUCCESS 0x0001
#define DRV_FAILURE 0x0000
#define DRV_EXITAPPLICATION 0x000C
#define MAXWAVEDRIVERS 10
#define MAXMIDIDRIVERS 10
#define MAXAUXDRIVERS 10
#define MAXMCIDRIVERS 32
#define MAXMIXERDRIVERS 10
#define MCI_OPEN_DRIVER 0x0801
#define MCI_CLOSE_DRIVER 0x0802
#define MCI_SOUND 0x0812
#define MCI_SOUND_NAME 0x00000100L
typedef LPCSTR HPCSTR; /* a huge version of LPCSTR */
typedef struct tagMCI_SOUND_PARMSA {
DWORD_PTR dwCallback;
LPCSTR lpstrSoundName;
} MCI_SOUND_PARMSA, *LPMCI_SOUND_PARMSA;
typedef struct tagMCI_SOUND_PARMSW {
DWORD_PTR dwCallback;
LPCWSTR lpstrSoundName;
} MCI_SOUND_PARMSW, *LPMCI_SOUND_PARMSW;
#ifdef UNICODE
typedef MCI_SOUND_PARMSW MCI_SOUND_PARMS;
#else
typedef MCI_SOUND_PARMSA MCI_SOUND_PARMS;
#endif
typedef struct midievent_tag *LPMIDIEVENT;
DWORD WINAPI GetDriverFlags(HDRVR hDriver);
#endif /* __WINE_WINNT_H */

View file

@ -242,10 +242,6 @@ extern int getopt_long_only (int ___argc, char *const *___argv,
size_t getpagesize(void);
#endif /* HAVE_GETPAGESIZE */
#ifndef HAVE_GETTID
pid_t gettid(void);
#endif /* HAVE_GETTID */
#ifndef HAVE_LSTAT
int lstat(const char *file_name, struct stat *buf);
#endif /* HAVE_LSTAT */

View file

@ -1,27 +0,0 @@
/*
* Copyright (C) the Wine project
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* 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_next <prsht.h>
#ifndef __WINE_PRSHT_H
#define __WINE_PRSHT_H
#define PSH_WIZARD97_OLD 0x00002000 /* for IE < 5 */
#define PSH_WIZARD97_NEW 0x01000000 /* for IE >= 5 */
#endif /* __WINE_PRSHT_H */

View file

@ -1,21 +0,0 @@
#ifndef __WINE_SYS_TYPES_H
#define __WINE_SYS_TYPES_H
#include_next <sys/types.h>
#ifndef _PID_T_
#define _PID_T_
#ifndef _WIN64
typedef int _pid_t;
#else
typedef __int64 _pid_t;
#endif
#ifndef NO_OLDNAMES
#ifndef __pid_t_defined
#define __pid_t_defined
typedef _pid_t pid_t;
#endif /* __pid_t_defined */
#endif
#endif /* Not _PID_T_ */
#endif /* __WINE_SYS_TYPES_H */

View file

@ -1,15 +0,0 @@
#ifndef __WINE_WINBASE_H
#define __WINE_WINBASE_H
#include_next <winbase.h>
/* undocumented functions */
typedef struct tagSYSLEVEL
{
CRITICAL_SECTION crst;
INT level;
} SYSLEVEL;
#endif /* __WINE_WINBASE_H */

View file

@ -317,6 +317,13 @@ typedef struct
#define __AHSHIFT 3 /* don't change! */
#define __AHINCR (1 << __AHSHIFT)
typedef struct tagSYSLEVEL
{
CRITICAL_SECTION crst;
INT level;
} SYSLEVEL;
/* undocumented functions */
WORD WINAPI AllocCStoDSAlias16(WORD);
WORD WINAPI AllocDStoCSAlias16(WORD);

View file

@ -1 +0,0 @@
#include "../../psdk/windef.h"

View file

@ -1,31 +0,0 @@
/* $Id: winnetwk.h 20909 2006-01-15 22:25:16Z gvg $
*
* Compatibility header
*
* This header is wrapper to allow compilation of Wine DLLs under ReactOS
* build system. It contains definitions commonly refered to as Wineisms
* and definitions that are missing in w32api.
*/
#include_next <winnetwk.h>
#ifndef __WINE_WINNETWK_H
#define __WINE_WINNETWK_H
/* WNetEnumCachedPasswords */
typedef struct tagPASSWORD_CACHE_ENTRY
{
WORD cbEntry;
WORD cbResource;
WORD cbPassword;
BYTE iEntry;
BYTE nType;
BYTE abResource[1];
} PASSWORD_CACHE_ENTRY;
typedef BOOL (CALLBACK *ENUMPASSWORDPROC)(PASSWORD_CACHE_ENTRY *, DWORD);
DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD );
UINT WINAPI WNetEnumCachedPasswords( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD);
DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE );
#endif /* __WINE_WINNETWK_H */

View file

@ -1,27 +0,0 @@
/*
* Copyright (C) the Wine project
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_WINNLS_H
#define __WINE_WINNLS_H
#include_next <winnls.h>
#define CP_UNIXCP CP_ACP
#endif /* __WINE_WINNLS_H */

View file

@ -1,54 +0,0 @@
/*
* Win32 definitions for Windows NT
*
* Copyright 1996 Alexandre Julliard
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* 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
*/
#ifndef __WINE_WINNT_H
#define __WINE_WINNT_H
#include_next <winnt.h>
#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
#else
#define __WINE_ALLOC_SIZE(x)
#endif
/* non standard; keep the number high enough (but < 0xff) */
#define LANG_ESPERANTO 0x8f
#define LANG_WALON 0x90
#define LANG_CORNISH 0x91
/* FIXME: these are not in the Windows header */
#define LANG_GAELIC 0x94
#define LANG_MALTESE 0x3a
#define LANG_ROMANSH 0x17
#define LANG_SAAMI 0x3b
#define LANG_LOWER_SORBIAN 0x2e
#define LANG_UPPER_SORBIAN 0x2e
#define LANG_SUTU 0x30
#define LANG_TAJIK 0x28
#define LANG_TSONGA 0x31
#define LANG_TSWANA 0x32
#define LANG_VENDA 0x33
#define LANG_XHOSA 0x34
#define LANG_ZULU 0x35
#define WINE_UNUSED __attribute__((unused))
#endif /* __WINE_WINNT_H */

View file

@ -1,48 +0,0 @@
/* Definitions for printing
*
* Copyright 1998 Huw Davies, Andreas Mohr
*
* Portions Copyright (c) 1999 Corel Corporation
* (Paul Quinn, Albert Den Haan)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_WINSPOOL_H
#define __WINE_WINSPOOL_H
#ifdef __cplusplus
extern "C" {
#endif
/*
* Compatibility header
*/
#if !defined(_MSC_VER)
#include_next "winspool.h"
#endif
/* DECLARATIONS */
LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc);
LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc);
#define StartDocDlg WINELIB_NAME_AW(StartDocDlg)
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* __WINE_WINSPOOL_H */

View file

@ -1,15 +0,0 @@
#ifndef __WINE_WINUSER_H
#define __WINE_WINUSER_H
/*
* Compatibility header
*/
#if !defined(_MSC_VER)
#include_next "winuser.h"
#endif
#define DCX_USESTYLE 0x00010000
#define LB_CARETOFF 0x01a4
#endif /* __WINE_WINUSER_H */