From c3e57fc3e47c33c90e7a0cfaa28a578533e3c7d5 Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Tue, 1 Feb 2022 14:04:51 +0100 Subject: [PATCH] include/basetsd.h: Define PtrTo(Ul|L)ong to return a long (as SDK does). Signed-off-by: Eric Pouech Signed-off-by: Alexandre Julliard --- include/basetsd.h | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 329db66c8f0..6a6a3945205 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -165,6 +165,17 @@ static inline long HandleToLong(const void *h) return (long)(LONG_PTR)h; } +static inline unsigned long PtrToUlong(const void *p) +{ + return (unsigned long)(ULONG_PTR)p; +} + +static inline long PtrToLong(const void *p) +{ + return (long)(LONG_PTR)p; +} + + #else static inline unsigned HandleToULong(const void *h) @@ -177,6 +188,17 @@ static inline int HandleToLong(const void *h) return (int)(LONG_PTR)h; } +static inline unsigned PtrToUlong(const void *p) +{ + return (unsigned)(ULONG_PTR)p; +} + +static inline int PtrToLong(const void *p) +{ + return (int)(LONG_PTR)p; +} + + #endif /* !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) */ static inline void *ULongToHandle(ULONG32 ul) @@ -189,16 +211,6 @@ static inline void *LongToHandle(LONG32 l) return (void *)(LONG_PTR)l; } -static inline ULONG32 PtrToUlong(const void *p) -{ - return (ULONG32)(ULONG_PTR)p; -} - -static inline LONG32 PtrToLong(const void *p) -{ - return (LONG32)(LONG_PTR)p; -} - static inline UINT32 PtrToUint(const void *p) { return (UINT32)(UINT_PTR)p;