[ros-diffs] [reactos] 02/02: [PSDK] Minor cleanup and fixes in headers

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9578bae85848fdda94e00…

commit 9578bae85848fdda94e00d4598430ba878c3e235
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Tue Nov 21 22:01:55 2023 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Tue Nov 21 22:23:55 2023 +0100

    [PSDK] Minor cleanup and fixes in headers
    
    - Remove nonsensical XFree86 stuff;
    - Add missing #ifndef NORESOURCE around RT_* defines.
---
 sdk/include/psdk/basetsd.h |  2 --
 sdk/include/psdk/winbase.h |  2 --
 sdk/include/psdk/winuser.h | 13 +++++++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sdk/include/psdk/basetsd.h b/sdk/include/psdk/basetsd.h
index 29b1026d97c..7d3efc04725 100644
--- a/sdk/include/psdk/basetsd.h
+++ b/sdk/include/psdk/basetsd.h
@@ -119,9 +119,7 @@ typedef unsigned long HANDLE_PTR;
 extern "C" {
 #endif
 typedef int LONG32, *PLONG32;
-#ifndef XFree86Server
 typedef int INT32, *PINT32;
-#endif /* ndef XFree86Server */
 typedef unsigned int ULONG32, *PULONG32;
 typedef unsigned int DWORD32, *PDWORD32;
 typedef unsigned int UINT32, *PUINT32;
diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h
index 1a7be3db656..ca5fd2a3c58 100644
--- a/sdk/include/psdk/winbase.h
+++ b/sdk/include/psdk/winbase.h
@@ -2032,9 +2032,7 @@ BOOL WINAPI FreeLibrary(HMODULE);
 DECLSPEC_NORETURN void WINAPI FreeLibraryAndExitThread(HMODULE,DWORD);
 #define FreeModule(m) FreeLibrary(m)
 #define FreeProcInstance(p) (void)(p)
-#ifndef XFree86Server
 BOOL WINAPI FreeResource(HGLOBAL);
-#endif /* ndef XFree86Server */
 PVOID WINAPI FreeSid(PSID);
 BOOL WINAPI GetAce(PACL,DWORD,LPVOID*);
 BOOL WINAPI GetAclInformation(PACL,PVOID,DWORD,ACL_INFORMATION_CLASS);
diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h
index c3978697e3f..5f956a66239 100644
--- a/sdk/include/psdk/winuser.h
+++ b/sdk/include/psdk/winuser.h
@@ -593,16 +593,17 @@ extern "C" {
 #endif /* WINE_NO_UNICODE_MACROS */
 #endif /* !RC_INVOKED */
 
-#ifndef XFree86Server
-# define RT_CURSOR MAKEINTRESOURCE(1)
-# define RT_FONT MAKEINTRESOURCE(8)
-#endif /* ndef XFree86Server */
+
+#ifndef NORESOURCE
+
+#define RT_CURSOR MAKEINTRESOURCE(1)
 #define RT_BITMAP MAKEINTRESOURCE(2)
 #define RT_ICON MAKEINTRESOURCE(3)
 #define RT_MENU MAKEINTRESOURCE(4)
 #define RT_DIALOG MAKEINTRESOURCE(5)
 #define RT_STRING MAKEINTRESOURCE(6)
 #define RT_FONTDIR MAKEINTRESOURCE(7)
+#define RT_FONT MAKEINTRESOURCE(8)
 #define RT_ACCELERATOR MAKEINTRESOURCE(9)
 #define RT_RCDATA MAKEINTRESOURCE(10)
 #define RT_MESSAGETABLE MAKEINTRESOURCE(11)
@@ -627,6 +628,10 @@ extern "C" {
 #define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2
 #define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3
 #endif
+
+#endif /* !NORESOURCE */
+
+
 #define EWX_FORCE 0x00000004
 #define EWX_LOGOFF 0
 #define EWX_POWEROFF 0x00000008