[PSDK][WIN32SS] Fix WINNT in ddraw.h; remove NT_BUILD_ENVIRONMENT usage

Keep compatibility with MS PSDK ddraw.h file by using WINNT instead of _WINNT_ in the preprocessor conditional test. Incidentally this allows also removing those #define NT_BUILD_ENVIRONMENT in the win32ss modules. See commit 5fcfaf2 (r42346).
reactos · Nov 22, 2023 · 0e88f04 · 0e88f04 · JoachimHenze · Feb 4, 2024
1 parent f5563ad
commit 0e88f04
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/sdk/include/psdk/ddraw.h b/sdk/include/psdk/ddraw.h
@@ -7,7 +7,7 @@
 #include <objbase.h>
 #else
 #define IUnknown void
-#if !defined(NT_BUILD_ENVIRONMENT) && !defined(_WINNT_)
+#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT)
         #define CO_E_NOTINITIALIZED 0x800401F0L
 #endif
 #endif

diff --git a/win32ss/pch.h b/win32ss/pch.h
@@ -55,7 +55,6 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
 
 #include <winerror.h>
 #include <wingdi.h>
-#define NT_BUILD_ENVIRONMENT
 #define _ENGINE_EXPORT_
 #include <winddi.h>
 #define OEMRESOURCE

diff --git a/win32ss/reactx/dxapi/dxapi_driver.h b/win32ss/reactx/dxapi/dxapi_driver.h
@@ -3,7 +3,6 @@
 #include <windef.h>
 #include <winerror.h>
 #include <wingdi.h>
-#define NT_BUILD_ENVIRONMENT
 #include <winddi.h>
 
 #include <ddkmapi.h>

diff --git a/win32ss/reactx/dxg/dxg_int.h b/win32ss/reactx/dxg/dxg_int.h
@@ -5,14 +5,10 @@
 
 /* Win32 Headers */
 #define WINBASEAPI
-#define STARTF_USESIZE 2
-#define STARTF_USEPOSITION 4
-#define NT_BUILD_ENVIRONMENT
 
 #define DDHMG_HANDLE_LIMIT 0x200000
 #define DDHMG_HTOI(DdHandle) ((DWORD_PTR)DdHandle & (DDHMG_HANDLE_LIMIT-1))
 
-
 #include <windef.h>
 #include <winerror.h>
 #include <wingdi.h>