[hyperion] 41434: modified include/crt/_mingw.h No "restrict" support in Visual C++ (and __restrict isn't the same thing) modified include/crt/stdarg.h Really fix stdarg.h this time modified include/crt/wchar.h modified include/psdk/dde.h modified include/psdk/mmsystem.h modified include/psdk/prsht.h modified include/psdk/rpcndr.h modified include/psdk/shellapi.h modified include/psdk/winbase.h modified include/psdk/wincon.h modified include/psdk/wincrypt.h modified include/psdk/windef.h modifie
Author: hyperion Date: Wed Jun 17 15:18:51 2009 New Revision: 41434
URL: http://svn.reactos.org/svn/reactos?rev=41434&view=rev Log: modified include/crt/_mingw.h No "restrict" support in Visual C++ (and __restrict isn't the same thing)
modified include/crt/stdarg.h Really fix stdarg.h this time
modified include/crt/wchar.h modified include/psdk/dde.h modified include/psdk/mmsystem.h modified include/psdk/prsht.h modified include/psdk/rpcndr.h modified include/psdk/shellapi.h modified include/psdk/winbase.h modified include/psdk/wincon.h modified include/psdk/wincrypt.h modified include/psdk/windef.h modified include/psdk/wingdi.h modified include/psdk/winioctl.h modified include/psdk/winnetwk.h modified include/psdk/winnls.h modified include/psdk/winnt.h modified include/psdk/winperf.h modified include/psdk/winsmcrd.h modified include/psdk/winsock2.h modified include/psdk/winspool.h modified include/psdk/winuser.h modified include/psdk/wtypes.idl modified include/reactos/mingw-w64/internal.h modified include/reactos/mingw-w64/oscalls.h Disable some unavoidable warnings in Visual C++
modified include/psdk/poppack.h modified include/psdk/pshpack1.h modified include/psdk/pshpack2.h modified include/psdk/pshpack4.h modified include/psdk/pshpack8.h modified include/psdk/pshpck16.h modified include/psdk/windows.h modified include/psdk/winsock2.h Check that defines are defined before testing their value
modified include/psdk/rpcasync.h
modified include/psdk/rpcdce.h Visual C++ doesn't support functions without a prototype anymore, and RPC_AUTH_KEY_RETRIEVAL_FN has a documented prototype anyway
modified include/psdk/winnt.h WIN32_WINNT -> _WIN32_WINNT
Modified: trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/stdarg.h trunk/reactos/include/crt/wchar.h trunk/reactos/include/psdk/dde.h trunk/reactos/include/psdk/mmsystem.h trunk/reactos/include/psdk/poppack.h trunk/reactos/include/psdk/prsht.h trunk/reactos/include/psdk/pshpack1.h trunk/reactos/include/psdk/pshpack2.h trunk/reactos/include/psdk/pshpack4.h trunk/reactos/include/psdk/pshpack8.h trunk/reactos/include/psdk/pshpck16.h trunk/reactos/include/psdk/rpcasync.h trunk/reactos/include/psdk/rpcdce.h trunk/reactos/include/psdk/rpcndr.h trunk/reactos/include/psdk/shellapi.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincon.h trunk/reactos/include/psdk/wincrypt.h trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winioctl.h trunk/reactos/include/psdk/winnetwk.h trunk/reactos/include/psdk/winnls.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winperf.h trunk/reactos/include/psdk/winsmcrd.h trunk/reactos/include/psdk/winsock2.h trunk/reactos/include/psdk/winspool.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/psdk/wtypes.idl trunk/reactos/include/reactos/mingw-w64/internal.h trunk/reactos/include/reactos/mingw-w64/oscalls.h
Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=41... ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -31,6 +31,10 @@ # endif #else # define __attribute__(x) /* nothing */ +#endif + +#ifdef _MSC_VER +#define __restrict__ /* nothing */ #endif
#if defined (__GNUC__) && defined (__GNUC_MINOR__)
Modified: trunk/reactos/include/crt/stdarg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdarg.h?rev=41... ============================================================================== --- trunk/reactos/include/crt/stdarg.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdarg.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -80,6 +80,7 @@ #undef _BSD_VA_LIST #endif
+#ifdef __GNUC__ #if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST)) /* SVR4.2 uses _VA_LIST for an internal alias for va_list, so we must avoid testing it and setting it here. @@ -92,9 +93,7 @@ #define _VA_LIST va_list #endif #endif /* __i860__ */ -#ifdef __GNUC__ typedef __gnuc_va_list va_list; -#endif #ifdef _SCO_DS #define __VA_LIST #endif @@ -114,9 +113,7 @@ #ifndef _VA_LIST_T_H /* The macro __va_list__ is used by BeOS. */ #ifndef __va_list__ -#ifdef __GNUC__ typedef __gnuc_va_list va_list; -#endif #endif /* not __va_list__ */ #endif /* not _VA_LIST_T_H */ #endif /* not _VA_LIST */ @@ -141,6 +138,7 @@
#endif /* not __svr4__ */
+#endif /* __GNUC__ */ #endif /* _STDARG_H */
#endif /* not _ANSI_STDARG_H_ */
Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=414... ============================================================================== --- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -15,6 +15,11 @@
#ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif
#ifndef WCHAR_MIN @@ -793,6 +798,11 @@ } return (_S); } + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/dde.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dde.h?rev=4143... ============================================================================== --- trunk/reactos/include/psdk/dde.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dde.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -26,6 +26,12 @@
#ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4214) +#pragma warning(disable:4820) #endif
#define WM_DDE_INITIATE 0x3E0 @@ -82,6 +88,9 @@ BOOL WINAPI FreeDDElParam(UINT,LPARAM); LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR);
+#ifdef _MSC_VER +#pragma warning(pop) +#endif
#ifdef __cplusplus }
Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?rev... ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -9,6 +9,12 @@ #ifdef __cplusplus extern "C" { #endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#endif + #define WINMMAPI DECLSPEC_IMPORT #define _loadds #define _huge @@ -2056,6 +2062,11 @@ #define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDA #define mciGetErrorString mciGetErrorStringA #endif + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/poppack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/poppack.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/poppack.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/poppack.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(4) # else # pragma pack(pop)
Modified: trunk/reactos/include/psdk/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/prsht.h?rev=41... ============================================================================== --- trunk/reactos/include/psdk/prsht.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/prsht.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,11 @@
#ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) #endif
#ifndef SNDMSG @@ -352,6 +357,11 @@ #define CreatePropertySheetPage CreatePropertySheetPageA #define PropertySheet PropertySheetA #endif + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/pshpack1.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack1.h?rev... ============================================================================== --- trunk/reactos/include/psdk/pshpack1.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pshpack1.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(1) # else # pragma pack(push,1)
Modified: trunk/reactos/include/psdk/pshpack2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack2.h?rev... ============================================================================== --- trunk/reactos/include/psdk/pshpack2.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pshpack2.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(2) # else # pragma pack(push,2)
Modified: trunk/reactos/include/psdk/pshpack4.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack4.h?rev... ============================================================================== --- trunk/reactos/include/psdk/pshpack4.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pshpack4.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(4) # else # pragma pack(push,4)
Modified: trunk/reactos/include/psdk/pshpack8.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpack8.h?rev... ============================================================================== --- trunk/reactos/include/psdk/pshpack8.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pshpack8.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(8) # else # pragma pack(push,8)
Modified: trunk/reactos/include/psdk/pshpck16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pshpck16.h?rev... ============================================================================== --- trunk/reactos/include/psdk/pshpck16.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pshpck16.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -2,7 +2,7 @@ #if ( _MSC_VER >= 800 ) #pragma warning(disable:4103) #endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) +# if defined(__FreeBSD__) && ( __FreeBSD__ == 5 ) # pragma pack(16) # else # pragma pack(push,16)
Modified: trunk/reactos/include/psdk/rpcasync.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcasync.h?rev... ============================================================================== --- trunk/reactos/include/psdk/rpcasync.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcasync.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -18,6 +18,10 @@ #ifndef __WINE_RPCASYNC_H #define __WINE_RPCASYNC_H
+#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) +#endif
typedef struct tagRPC_ERROR_ENUM_HANDLE { @@ -187,4 +191,8 @@ } #endif
+#ifdef _MSC_VER +#pragma warning(pop) #endif + +#endif
Modified: trunk/reactos/include/psdk/rpcdce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdce.h?rev=4... ============================================================================== --- trunk/reactos/include/psdk/rpcdce.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcdce.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -190,7 +190,7 @@ #define RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE 0x10
typedef RPC_STATUS RPC_ENTRY RPC_IF_CALLBACK_FN( RPC_IF_HANDLE InterfaceUuid, void *Context ); -typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)(); +typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)( void *Arg, unsigned char *ServerPrincName, unsigned long KeyVer, void **Key, RPC_STATUS *Status );
typedef struct _RPC_POLICY { @@ -305,7 +305,7 @@
RPCRTAPI DECLSPEC_NORETURN void RPC_ENTRY RpcRaiseException( RPC_STATUS exception ); - + RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingCopy( RPC_BINDING_HANDLE SourceBinding, RPC_BINDING_HANDLE* DestinationBinding );
Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=4... ============================================================================== --- trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -29,6 +29,13 @@ #endif
#include <basetsd.h> + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4255) +#pragma warning(disable:4820) +#endif
#undef CONST_VTBL #ifdef CONST_VTABLE @@ -750,6 +757,10 @@ RPCRTAPI RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo( ULONG *pFlags, ULONG InformationLevel, NDR_USER_MARSHAL_INFO *pMarshalInfo );
+#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?rev... ============================================================================== --- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,10 @@
#ifdef __cplusplus extern "C" { +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) #endif #define WINSHELLAPI DECLSPEC_IMPORT #define ABE_LEFT 0 @@ -419,6 +423,9 @@ #define SHEmptyRecycleBin SHEmptyRecycleBinA #define SHGetNewLinkInfo SHGetNewLinkInfoA #endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -9,6 +9,13 @@
#ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4214) +#pragma warning(disable:4820) #endif
#define FILE_ENCRYPTABLE 0 @@ -2618,6 +2625,11 @@ #define WriteProfileString WriteProfileStringA #endif #endif + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=4... ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,11 @@
#ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif
#define FOREGROUND_BLUE 1 @@ -266,6 +271,10 @@ #define WriteConsoleOutputCharacter WriteConsoleOutputCharacterA #endif
+#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?rev... ============================================================================== --- trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincrypt.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -21,12 +21,17 @@ #ifndef __WINE_WINCRYPT_H #define __WINE_WINCRYPT_H
+#include <bcrypt.h> +/* FIXME: #include <ncrypt.h> */ + #ifdef __cplusplus extern "C" { #endif
-#include <bcrypt.h> -/* FIXME: #include <ncrypt.h> */ +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#endif
#ifdef _ADVAPI32_ # define WINADVAPI @@ -87,7 +92,7 @@ BYTE* pbOuterString; DWORD cbOuterString; } HMAC_INFO, *PHMAC_INFO; - + typedef struct _CRYPTOAPI_BLOB { DWORD cbData; BYTE* pbData; @@ -1951,7 +1956,7 @@ #define CRYPT_MODE_OFB 3 #define CRYPT_MODE_CFB 4
-#define CRYPT_ENCRYPT 0x0001 +#define CRYPT_ENCRYPT 0x0001 #define CRYPT_DECRYPT 0x0002 #define CRYPT_EXPORT 0x0004 #define CRYPT_READ 0x0008 @@ -2106,10 +2111,10 @@ #define CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH \ L"Software\Policies\Microsoft\SystemCertificates" #else -static const WCHAR CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH[] = +static const WCHAR CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH[] = {'S','o','f','t','w','a','r','e','\','M','i','c','r','o','s','o','f','t','\', 'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0 }; -static const WCHAR CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH[] = +static const WCHAR CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH[] = {'S','o','f','t','w','a','r','e','\','P','o','l','i','c','i','e','s','\', 'M','i','c','r','o','s','o','f','t','\','S','y','s','t','e','m','C','e','r', 't','i','f','i','c','a','t','e','s',0 }; @@ -2366,7 +2371,7 @@ # define CERT_PHYSICAL_STORE_AUTH_ROOT_NAME \ L".AuthRoot" #else -static const WCHAR CERT_PHYSICAL_STORE_DEFAULT_NAME[] = +static const WCHAR CERT_PHYSICAL_STORE_DEFAULT_NAME[] = {'.','D','e','f','a','u','l','t','0'}; static const WCHAR CERT_PHYSICAL_STORE_GROUP_POLICY_NAME[] = {'.','G','r','o','u','p','P','o','l','i','c','y',0}; @@ -4446,6 +4451,10 @@ PCRYPT_RETRIEVE_AUX_INFO pAuxInfo); #define CryptRetrieveObjectByUrl WINELIB_NAME_AW(CryptRetrieveObjectByUrl)
+#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=4... ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -9,6 +9,11 @@
#ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4255) #endif
#ifndef WINVER @@ -420,6 +425,10 @@ SHORT y; } POINTS,*PPOINTS,*LPPOINTS;
+#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -101,7 +101,7 @@ #endif #ifndef NOGDI #if !defined (__OBJC__) -#if (__GNUC__ >= 3) || defined (__WATCOMC__) +#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined (__WATCOMC__) #include <ole2.h> #endif #endif /* __OBJC__ */
Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=4... ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -4,6 +4,12 @@
#ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4820) #endif
/* Get/SetSystemPaletteUse() values */ @@ -3329,6 +3335,11 @@ #define wglUseFontOutlines wglUseFontOutlinesA #endif #endif + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?rev... ============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -4,6 +4,13 @@ #ifdef __cplusplus extern "C" { #endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4820) +#endif + #define HIST_NO_OF_BUCKETS 24 #define HISTOGRAM_BUCKET_SIZE sizeof(HISTOGRAM_BUCKET) #define DISK_HISTOGRAM_SIZE sizeof(DISK_HISTOGRAM) @@ -551,6 +558,11 @@ ((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13_EXTENDED))||\ ((t&~PARTITION_NTFT)==PARTITION_EXTENDED)||\ ((t&~PARTITION_NTFT)==PARTITION_XINT13_EXTENDED)) + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/winnetwk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnetwk.h?rev... ============================================================================== --- trunk/reactos/include/psdk/winnetwk.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnetwk.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,10 @@
#ifdef __cplusplus extern "C" { +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif #define WNNC_NET_MSNET 0x00010000 #define WNNC_NET_LANMAN 0x00020000 @@ -341,6 +345,9 @@ #define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceA #endif #endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=4... ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,11 @@
#ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif
#define GEOID_NOT_AVAILABLE (-1) @@ -744,6 +749,11 @@ #endif /* (WINVER >= 0x0500) */ #endif /* UNICODE */ #endif /* RC_INVOKED */ + +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=41... ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -236,6 +236,14 @@
#define NTAPI __stdcall #include <basetsd.h> + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4214) +#pragma warning(disable:4820) +#endif + #define ACE_OBJECT_TYPE_PRESENT 0x00000001 #define ACE_INHERITED_OBJECT_TYPE_PRESENT 0x00000002 #define APPLICATION_ERROR_MASK 0x20000000 @@ -4579,7 +4587,7 @@ typedef OSVERSIONINFOEXA OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX; #endif
-#if (WIN32_WINNT >= 0x0500) +#if (_WIN32_WINNT >= 0x0500) ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE); #endif
@@ -4978,6 +4986,10 @@
#endif
+#ifdef _MSC_VER +#pragma warning(pop) +#endif + #endif /* RC_INVOKED */
#ifdef __cplusplus
Modified: trunk/reactos/include/psdk/winperf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winperf.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/winperf.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winperf.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,10 @@
#ifdef __cplusplus extern "C" { +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif #define PERF_DATA_VERSION 1 #define PERF_DATA_REVISION 1 @@ -130,6 +134,9 @@ typedef DWORD(CALLBACK PM_OPEN_PROC)(LPWSTR); typedef DWORD(CALLBACK PM_COLLECT_PROC)(LPWSTR,PVOID*,PDWORD,PDWORD); typedef DWORD(CALLBACK PM_CLOSE_PROC)(void); +#ifdef _MSC_VER +#pragma warning(pop) +#endif #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/winsmcrd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsmcrd.h?rev... ============================================================================== --- trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsmcrd.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -20,6 +20,11 @@
#ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif
typedef struct _SCARD_IO_REQUEST @@ -203,6 +208,10 @@ #define SCARD_ATTR_DEVICE_SYSTEM_NAME SCARD_ATTR_DEVICE_SYSTEM_NAME_A #endif /* UNICODE */
+#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsock2.h?rev... ============================================================================== --- trunk/reactos/include/psdk/winsock2.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsock2.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -26,6 +26,10 @@
#ifdef __cplusplus extern "C" { +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif /* Names common to Winsock1.1 and Winsock2 */ #if !defined ( _BSDTYPES_DEFINED ) @@ -102,7 +106,7 @@ #warning "fd_set and associated macros have been defined in sys/types. \ This may cause runtime problems with W32 sockets" #endif /* ndef _SYS_TYPES_FD_SET */ -#if !(defined (__INSIDE_CYGWIN__) || (__INSIDE_MSYS__)) +#if !(defined (__INSIDE_CYGWIN__) || (defined (__INSIDE_MSYS__) && (__INSIDE_MSYS__))) #ifndef _TIMEVAL_DEFINED /* also in sys/time.h */ #define _TIMEVAL_DEFINED @@ -1210,6 +1214,10 @@ #define WSASetService WSASetServiceA #endif
+#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winspool.h?rev... ============================================================================== --- trunk/reactos/include/psdk/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winspool.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,10 @@
#ifdef __cplusplus extern "C" { +#endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4820) #endif #define DI_CHANNEL 1 #define DI_CHANNEL_WRITE 2 @@ -1019,6 +1023,9 @@ #define StartDocPrinter StartDocPrinterA #endif #endif /* RC_INVOKED */ +#ifdef _MSC_VER +#pragma warning(pop) +#endif #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -3,6 +3,12 @@
#ifdef __cplusplus extern "C" { +#endif + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#pragma warning(disable:4820) #endif
#if !defined(_USER32_) @@ -4676,6 +4682,10 @@ #endif /* UNICODE */ #endif /* RC_INVOKED */
+#ifdef _MSC_VER +#pragma warning(pop) +#endif + #ifdef __cplusplus } #endif
Modified: trunk/reactos/include/psdk/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wtypes.idl?rev... ============================================================================== --- trunk/reactos/include/psdk/wtypes.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wtypes.idl [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -23,6 +23,12 @@
cpp_quote("#ifndef __wtypes_h__") cpp_quote("#define __wtypes_h__") +cpp_quote("#endif") + +cpp_quote("#ifdef _MSC_VER") +cpp_quote("#pragma warning(push)") +cpp_quote("#pragma warning(disable:4201)") +cpp_quote("#pragma warning(disable:4820)") cpp_quote("#endif")
[ @@ -831,3 +837,7 @@ } uCLSSPEC;
} /* interface IWinTypes */ + +cpp_quote("#ifdef _MSC_VER") +cpp_quote("#pragma warning(pop)") +cpp_quote("#endif")
Modified: trunk/reactos/include/reactos/mingw-w64/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/i... ============================================================================== --- trunk/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -32,6 +32,12 @@ #define __IOINFO_TM_UTF8 1 #define __IOINFO_TM_UTF16LE 2
+#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4214) +#pragma warning(disable:4820) +#endif + typedef struct { intptr_t osfhnd; char osfile; @@ -42,6 +48,10 @@ char unicode : 1; char pipech2[2]; } ioinfo; + +#ifdef _MSC_VER +#pragma warning(pop) +#endif
#define IOINFO_ARRAY_ELTS (1 << 5)
@@ -159,7 +169,7 @@ #include <errno.h>
void * __cdecl _encode_pointer(void *); - void * __cdecl _encoded_null(); + void * __cdecl _encoded_null(void); void * __cdecl _decode_pointer(void *);
BOOL __cdecl _ValidateImageBase (PBYTE pImageBase);
Modified: trunk/reactos/include/reactos/mingw-w64/oscalls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/o... ============================================================================== --- trunk/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] Wed Jun 17 15:18:51 2009 @@ -30,6 +30,11 @@ #endif #endif
+#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4214) +#endif + typedef struct _FTIME { unsigned short twosecs : 5; @@ -46,6 +51,10 @@ unsigned short year : 7; } FDATE;
+#ifdef _MSC_VER +#pragma warning(pop) +#endif + typedef FDATE *PFDATE;
#endif
-
hyperion＠svn.reactos.org