[SDK] Fix the automatic definition of __ROS_LONG64__ (reactos#7576)

It is not wishable anymore to automatically define __ROS_LONG64__
whenever __WINESRC__ is defined. Indeed, Wine now has started to
introduce the possibility to "Enable compilation with long types".

Thus, for these modules we import from them, we want to be able to
define __WINESRC__ without __ROS_LONG64__ automatically defined.

Addendum to commits 89c3520 (r73383) and 75eeb2a (r38872).

Author: HBelusca

sdk/include/psdk/basetsd.h

@@ -6,8 +6,8 @@
 #include <msvctarget.h>
 #endif
 
-#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__))
-#if !defined(__ROS_LONG64__)
+#if (defined(_LP64) || defined(__LP64__)) && !defined(_M_AMD64)
+#ifndef __ROS_LONG64__
 #define __ROS_LONG64__
 #endif
 #endif
@@ -161,7 +161,7 @@ static inline void* ULongToPtr( const unsigned long ul )
     { return( (void*)(ULONG_PTR)ul ); }
 #endif /* !__midl */
 #else /*  !_WIN64 */
-#if !defined(__ROS_LONG64__)
+#ifndef __ROS_LONG64__
 typedef int INT_PTR, *PINT_PTR;
 typedef unsigned int UINT_PTR, *PUINT_PTR;
 #else

sdk/include/psdk/windef.h

@@ -14,8 +14,8 @@
 #pragma warning(disable:4255)
 #endif
 
-#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__))
-#if !defined(__ROS_LONG64__)
+#if (defined(_LP64) || defined(__LP64__)) && !defined(_M_AMD64)
+#ifndef __ROS_LONG64__
 #define __ROS_LONG64__
 #endif
 #endif
@@ -166,9 +166,9 @@ typedef BOOL *LPBOOL;
 typedef unsigned char BYTE;
 typedef unsigned short WORD;
 #ifndef __ROS_LONG64__
-    typedef unsigned long DWORD;
+typedef unsigned long DWORD;
 #else
-    typedef unsigned int DWORD;
+typedef unsigned int DWORD;
 #endif
 typedef float FLOAT;
 typedef FLOAT *PFLOAT;

sdk/include/psdk/winsock.h

@@ -15,8 +15,8 @@
 #include <windows.h>
 #endif
 
-#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__))
-#if !defined(__ROS_LONG64__)
+#if (defined(_LP64) || defined(__LP64__)) && !defined(_M_AMD64)
+#ifndef __ROS_LONG64__
 #define __ROS_LONG64__
 #endif
 #endif

sdk/include/psdk/winsock2.h

@@ -39,8 +39,8 @@
 #endif
 #endif
 
-#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__))
-#if !defined(__ROS_LONG64__)
+#if (defined(_LP64) || defined(__LP64__)) && !defined(_M_AMD64)
+#ifndef __ROS_LONG64__
 #define __ROS_LONG64__
 #endif
 #endif

sdk/include/xdk/winnt.template.h

@@ -28,8 +28,8 @@
 #error Compiler too old!
 #endif
 
-#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__))
-#if !defined(__ROS_LONG64__)
+#if (defined(_LP64) || defined(__LP64__)) && !defined(_M_AMD64)
+#ifndef __ROS_LONG64__
 #define __ROS_LONG64__
 #endif
 #endif