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 svn path=/trunk/; revision=41434
2025-04-05 05:01:03 +00:00 · 2009-06-17 11:18:51 +00:00 · 2009-06-17 11:18:51 +00:00 · 84833730d0
commit 84833730d0
parent 7e8ae7ca6b
34 changed files with 252 additions and 23 deletions
--- a/reactos/include/crt/_mingw.h
+++ b/reactos/include/crt/_mingw.h
@ -33,6 +33,10 @@
 # define __attribute__(x) /* nothing */
 #endif

+#ifdef _MSC_VER
+#define __restrict__ /* nothing */
+#endif
+
 #if defined (__GNUC__) && defined (__GNUC_MINOR__)
 #define __MINGW_GNUC_PREREQ(major, minor) \
  (__GNUC__ > (major) \
--- a/reactos/include/crt/stdarg.h
+++ b/reactos/include/crt/stdarg.h
@ -80,6 +80,7 @@ typedef __builtin_va_list __gnuc_va_list;
 #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 @@ typedef __builtin_va_list __gnuc_va_list;
 #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 @@ typedef __gnuc_va_list va_list;
 #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 @@ typedef __gnuc_va_list va_list;

 #endif /* not __svr4__ */

+#endif /* __GNUC__ */
 #endif /* _STDARG_H */

 #endif /* not _ANSI_STDARG_H_ */
--- a/reactos/include/crt/wchar.h
+++ b/reactos/include/crt/wchar.h
@ -17,6 +17,11 @@
 extern "C" {
 #endif

+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4820)
+#endif
+
 #ifndef WCHAR_MIN
 #define WCHAR_MIN 0
 #endif
@ -793,6 +798,11 @@ __CRT_INLINE wchar_t *__cdecl _wctime(const time_t *_Time) { return _wctime64(_T
    }
    return (_S);
  }
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/dde.h
+++ b/reactos/include/psdk/dde.h
@ -28,6 +28,12 @@
 extern "C" {
 #endif

+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4214)
+#pragma warning(disable:4820)
+#endif
+
 #define WM_DDE_INITIATE   0x3E0
 #define WM_DDE_TERMINATE  0x3E1
 #define WM_DDE_ADVISE	  0x3E2
@ -82,6 +88,9 @@ BOOL        WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR);
 BOOL        WINAPI FreeDDElParam(UINT,LPARAM);
 LPARAM      WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR);

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif

 #ifdef __cplusplus
 }
--- a/reactos/include/psdk/mmsystem.h
+++ b/reactos/include/psdk/mmsystem.h
@ -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 @@ typedef MCI_OVLY_SAVE_PARMSA MCI_OVLY_SAVE_PARMS,*PMCI_OVLY_SAVE_PARMS,*LPMCI_OV
 #define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDA
 #define mciGetErrorString mciGetErrorStringA
 #endif
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/poppack.h
+++ b/reactos/include/psdk/poppack.h
@ -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)
--- a/reactos/include/psdk/prsht.h
+++ b/reactos/include/psdk/prsht.h
@ -5,6 +5,11 @@
 extern "C" {
 #endif

+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4201)
+#endif
+
 #ifndef SNDMSG
 #ifdef __cplusplus
 #define SNDMSG ::SendMessage
@ -352,6 +357,11 @@ static const WCHAR WC_PROPSHEETW[] = { 'S','y','s',
 #define CreatePropertySheetPage CreatePropertySheetPageA
 #define PropertySheet PropertySheetA
 #endif
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/pshpack1.h
+++ b/reactos/include/psdk/pshpack1.h
@ -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)
--- a/reactos/include/psdk/pshpack2.h
+++ b/reactos/include/psdk/pshpack2.h
@ -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)
--- a/reactos/include/psdk/pshpack4.h
+++ b/reactos/include/psdk/pshpack4.h
@ -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)
--- a/reactos/include/psdk/pshpack8.h
+++ b/reactos/include/psdk/pshpack8.h
@ -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)
--- a/reactos/include/psdk/pshpck16.h
+++ b/reactos/include/psdk/pshpck16.h
@ -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)
--- a/reactos/include/psdk/rpcasync.h
+++ b/reactos/include/psdk/rpcasync.h
@ -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 @@ RPCRTAPI int        RPC_ENTRY I_RpcExceptionFilter(ULONG);
 }
 #endif

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif
--- a/reactos/include/psdk/rpcdce.h
+++ b/reactos/include/psdk/rpcdce.h
@ -190,7 +190,7 @@ typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE;
 #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 @@ RPC_STATUS RPC_ENTRY DceErrorInqTextW(RPC_STATUS e, RPC_WSTR buffer);

 RPCRTAPI DECLSPEC_NORETURN void RPC_ENTRY
  RpcRaiseException( RPC_STATUS exception );
-        
+
 RPCRTAPI RPC_STATUS RPC_ENTRY
  RpcBindingCopy( RPC_BINDING_HANDLE SourceBinding, RPC_BINDING_HANDLE* DestinationBinding );

--- a/reactos/include/psdk/rpcndr.h
+++ b/reactos/include/psdk/rpcndr.h
@ -30,6 +30,13 @@ extern "C" {

 #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
 # define CONST_VTBL const
@ -750,6 +757,10 @@ RPCRTAPI void RPC_ENTRY
 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
--- a/reactos/include/psdk/shellapi.h
+++ b/reactos/include/psdk/shellapi.h
@ -4,6 +4,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
 #define ABE_TOP	1
@ -419,6 +423,9 @@ typedef LPSHNAMEMAPPINGA LPSHNAMEMAPPING;
 #define SHEmptyRecycleBin SHEmptyRecycleBinA
 #define SHGetNewLinkInfo SHGetNewLinkInfoA
 #endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/winbase.h
+++ b/reactos/include/psdk/winbase.h
@ -11,6 +11,13 @@
 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
 #define FILE_IS_ENCRYPTED        1
 #define FILE_SYSTEM_ATTR         2
@ -2618,6 +2625,11 @@ typedef ENUMRESTYPEPROCA ENUMRESTYPEPROC;
 #define WriteProfileString WriteProfileStringA
 #endif
 #endif
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/wincon.h
+++ b/reactos/include/psdk/wincon.h
@ -5,6 +5,11 @@
 extern "C" {
 #endif

+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4820)
+#endif
+
 #define FOREGROUND_BLUE	1
 #define FOREGROUND_GREEN	2
 #define FOREGROUND_RED	4
@ -266,6 +271,10 @@ BOOL WINAPI WriteConsoleOutputCharacterW(HANDLE,LPCWSTR,DWORD,COORD,PDWORD);
 #define WriteConsoleOutputCharacter WriteConsoleOutputCharacterA
 #endif

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/wincrypt.h
+++ b/reactos/include/psdk/wincrypt.h
@ -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 @@ typedef struct _HMAC_INFO {
  BYTE*  pbOuterString;
  DWORD  cbOuterString;
 } HMAC_INFO, *PHMAC_INFO;
-		
+
 typedef struct _CRYPTOAPI_BLOB {
  DWORD    cbData;
  BYTE*    pbData;
@ -1951,7 +1956,7 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] =           { 'M','i','c','r','o','s'
 #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 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] =           { 'M','i','c','r','o','s'
 #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 @@ static const WCHAR CRYPT_OID_REG_FLAGS_VALUE_NAME[] =
 # 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 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid,
 PCRYPT_RETRIEVE_AUX_INFO pAuxInfo);
 #define CryptRetrieveObjectByUrl WINELIB_NAME_AW(CryptRetrieveObjectByUrl)

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/windef.h
+++ b/reactos/include/psdk/windef.h
@ -11,6 +11,11 @@
 extern "C" {
 #endif

+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4255)
+#endif
+
 #ifndef WINVER
 #define WINVER 0x0400
 /*
@ -420,6 +425,10 @@ typedef struct tagPOINTS {
 	SHORT y;
 } POINTS,*PPOINTS,*LPPOINTS;

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/windows.h
+++ b/reactos/include/psdk/windows.h
@ -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__ */
--- a/reactos/include/psdk/wingdi.h
+++ b/reactos/include/psdk/wingdi.h
@ -6,6 +6,12 @@
 extern "C" {
 #endif

+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4201)
+#pragma warning(disable:4820)
+#endif
+
 /* Get/SetSystemPaletteUse() values */
 #define SYSPAL_ERROR        0
 #define SYSPAL_STATIC       1
@ -3329,6 +3335,11 @@ typedef DISPLAY_DEVICEA DISPLAY_DEVICE, *PDISPLAY_DEVICE, *LPDISPLAY_DEVICE;
 #define wglUseFontOutlines wglUseFontOutlinesA
 #endif
 #endif
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/winioctl.h
+++ b/reactos/include/psdk/winioctl.h
@ -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 @@ typedef struct {
    ((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
--- a/reactos/include/psdk/winnetwk.h
+++ b/reactos/include/psdk/winnetwk.h
@ -4,6 +4,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
 #define WNNC_NET_NETWARE    0x00030000
@ -341,6 +345,9 @@ typedef REMOTE_NAME_INFOA REMOTE_NAME_INFO,*LPREMOTE_NAME_INFO;
 #define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceA
 #endif
 #endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/winnls.h
+++ b/reactos/include/psdk/winnls.h
@ -5,6 +5,11 @@
 extern "C" {
 #endif

+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4820)
+#endif
+
 #define GEOID_NOT_AVAILABLE (-1)
 #define MAX_LEADBYTES 	12
 #define MAX_DEFAULTCHAR	2
@ -744,6 +749,11 @@ typedef LPNUMBERFMTA LPNUMBERFMT;
 #endif /* (WINVER >= 0x0500) */
 #endif /* UNICODE */
 #endif /* RC_INVOKED */
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@ -236,6 +236,14 @@ typedef DWORD FLONG;

 #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 OSVERSIONINFOA OSVERSIONINFO,*POSVERSIONINFO,*LPOSVERSIONINFO;
 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 @@ MemoryBarrier(VOID)

 #endif

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif /* RC_INVOKED */

 #ifdef __cplusplus
--- a/reactos/include/psdk/winperf.h
+++ b/reactos/include/psdk/winperf.h
@ -4,6 +4,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
 #define PERF_NO_INSTANCES -1
@ -130,6 +134,9 @@ typedef struct _PERF_COUNTER_BLOCK {
 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
--- a/reactos/include/psdk/winsmcrd.h
+++ b/reactos/include/psdk/winsmcrd.h
@ -22,6 +22,11 @@
 extern "C" {
 #endif

+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4820)
+#endif
+
 typedef struct _SCARD_IO_REQUEST
 {
  DWORD dwProtocol;
@ -203,6 +208,10 @@ typedef struct _SCARD_T1_REQUEST
 #define SCARD_ATTR_DEVICE_SYSTEM_NAME SCARD_ATTR_DEVICE_SYSTEM_NAME_A
 #endif /* UNICODE */

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/winsock2.h
+++ b/reactos/include/psdk/winsock2.h
@ -27,6 +27,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 )
 /* also defined in gmon.h and in cygwin's sys/types */
@ -102,7 +106,7 @@ if (__i == ((fd_set *)(set))->fd_count) {\
 #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 @@ typedef DWORD (WINAPI *LPFN_WSAWAITFORMULTIPLEEVENTS)(DWORD, const WSAEVENT *, B
 #define WSASetService WSASetServiceA
 #endif

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/winspool.h
+++ b/reactos/include/psdk/winspool.h
@ -4,6 +4,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
 #define DI_READ_SPOOL_JOB 3
@ -1019,6 +1023,9 @@ typedef PRINTER_DEFAULTSA PRINTER_DEFAULTS,*PPRINTER_DEFAULTS,*LPPRINTER_DEFAULT
 #define StartDocPrinter StartDocPrinterA
 #endif
 #endif /* RC_INVOKED */
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/winuser.h
+++ b/reactos/include/psdk/winuser.h
@ -5,6 +5,12 @@
 extern "C" {
 #endif

+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4201)
+#pragma warning(disable:4820)
+#endif
+
 #if !defined(_USER32_)
 #define WINUSERAPI DECLSPEC_IMPORT
 #else
@ -4676,6 +4682,10 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
 #endif /* UNICODE */
 #endif /* RC_INVOKED */

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
--- a/reactos/include/psdk/wtypes.idl
+++ b/reactos/include/psdk/wtypes.idl
@ -25,6 +25,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")
+
 [
  uuid(D3980A60-910C-1068-9341-00DD010F2F1C),
  version(0.1),
@ -831,3 +837,7 @@ typedef union switch(DWORD tyspec)
 } uCLSSPEC;

 } /* interface IWinTypes */
+
+cpp_quote("#ifdef _MSC_VER")
+cpp_quote("#pragma warning(pop)")
+cpp_quote("#endif")
--- a/reactos/include/reactos/mingw-w64/internal.h
+++ b/reactos/include/reactos/mingw-w64/internal.h
@ -32,6 +32,12 @@ extern "C" {
 #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;
@ -43,6 +49,10 @@ extern "C" {
    char pipech2[2];
  } ioinfo;

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #define IOINFO_ARRAY_ELTS (1 << 5)

 #define _pioinfo(i) (__pioinfo[(i) >> 5] + ((i) & (IOINFO_ARRAY_ELTS - 1)))
@ -159,7 +169,7 @@ extern char **_imp___wcmdln;
 #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);
--- a/reactos/include/reactos/mingw-w64/oscalls.h
+++ b/reactos/include/reactos/mingw-w64/oscalls.h
@ -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 @@ typedef struct _FDATE
  unsigned short year : 7;
 } FDATE;

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 typedef FDATE *PFDATE;

 #endif