Merge trunk head (r43756)

[reactos.git] / reactos / include / psdk / basetsd.h

diff --git a/reactos/include/psdk/basetsd.h b/reactos/include/psdk/basetsd.h
index db2a0ac..e2e5b93 100644 (file)
--- a/reactos/include/psdk/basetsd.h
+++ b/reactos/include/psdk/basetsd.h
@@ -1,11 +1,13 @@
 #ifndef _BASETSD_H
 #define _BASETSD_H
 
+#ifndef _M_AMD64
 #if !defined(__ROS_LONG64__)
 #ifdef __WINESRC__
 #define __ROS_LONG64__
 #endif
 #endif
+#endif
 
 #ifdef __GNUC__
 #ifndef __int64
@@ -48,6 +50,13 @@
 #define MAXHALF_PTR  ((HALF_PTR)(MAXUHALF_PTR >> 1))
 #define MINHALF_PTR  (~MAXHALF_PTR)
 
+#if _WIN32_WINNT >= 0x0600
+
+#define MAXUINT      ((UINT)~((UINT)0))
+#define MAXULONGLONG ((ULONGLONG)~((ULONGLONG)0))
+
+#endif
+
 #ifndef RC_INVOKED
 #ifdef __cplusplus
 extern "C" {
@@ -100,10 +109,10 @@ static inline void* ULongToPtr( const unsigned long ul )
     { return( (void*)(ULONG_PTR)ul ); }
 #endif /* !__midl */
 #else /*  !_WIN64 */
-#if 1// !defined(__ROS_LONG64__)
+#if !defined(__ROS_LONG64__)
 typedef int INT_PTR, *PINT_PTR;
 typedef unsigned int UINT_PTR, *PUINT_PTR;
-#else // WTF??? HACK of break
+#else
 typedef long INT_PTR, *PINT_PTR;
 typedef unsigned long UINT_PTR, *PUINT_PTR;
 #endif