From 381e224f6b06b66dc6415984f04896bcb20ceb8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Mon, 23 Dec 2024 20:31:08 +0100
Subject: [PATCH] [SDK] Fix the automatic definition of __ROS_LONG64__ (#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 89c3520c86 (r73383) and 75eeb2a7e4 (r38872).
---
 sdk/include/psdk/basetsd.h       | 6 +++---
 sdk/include/psdk/windef.h        | 8 ++++----
 sdk/include/psdk/winsock.h       | 4 ++--
 sdk/include/psdk/winsock2.h      | 4 ++--
 sdk/include/xdk/winnt.template.h | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sdk/include/psdk/basetsd.h b/sdk/include/psdk/basetsd.h
index 7d3efc04725..6d8d85f17e2 100644
--- a/sdk/include/psdk/basetsd.h
+++ b/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
diff --git a/sdk/include/psdk/windef.h b/sdk/include/psdk/windef.h
index a1f5581e3be..0766d6168e9 100644
--- a/sdk/include/psdk/windef.h
+++ b/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;
diff --git a/sdk/include/psdk/winsock.h b/sdk/include/psdk/winsock.h
index 0d95be1e49e..cad1913fc81 100644
--- a/sdk/include/psdk/winsock.h
+++ b/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
diff --git a/sdk/include/psdk/winsock2.h b/sdk/include/psdk/winsock2.h
index aa296a2311d..9646428a154 100644
--- a/sdk/include/psdk/winsock2.h
+++ b/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
diff --git a/sdk/include/xdk/winnt.template.h b/sdk/include/xdk/winnt.template.h
index 050e87d472d..0da46e9285b 100644
--- a/sdk/include/xdk/winnt.template.h
+++ b/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