[reactos] 03/04: [PSDK][WIN32SS] Fix WINNT in ddraw.h; remove NT_BUILD_ENVIRONMENT usage
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e88f0485c0c909f2aa42d...
commit 0e88f0485c0c909f2aa42dbc84f00e282ef4008c Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Wed Nov 22 12:33:45 2023 +0100 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Wed Nov 22 15:46:06 2023 +0100
[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 5fcfaf2e1 (r42346). --- sdk/include/psdk/ddraw.h | 2 +- win32ss/pch.h | 1 - win32ss/reactx/dxapi/dxapi_driver.h | 1 - win32ss/reactx/dxg/dxg_int.h | 4 ---- 4 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/sdk/include/psdk/ddraw.h b/sdk/include/psdk/ddraw.h index 0d0889d9da9..637afd9e280 100644 --- 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 index cf06876ac54..2cc72405405 100644 --- 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 index 09a2ba7958a..6886c861f01 100644 --- 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 index 625a3e92afa..731afdc7ab0 100644 --- 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>
-
Hermès Bélusca-Maïto