Dmitry Timoshkov : include/basetsd.h: Fix int64 to int truncation warnings when compiling with a 64-bit PSDK compiler .

Alexandre Julliard julliard at winehq.org
Fri Jun 29 14:24:27 CDT 2012


Module: wine
Branch: master
Commit: 79969b6cc4bed59e7c24f03a001776b3816d9b5e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=79969b6cc4bed59e7c24f03a001776b3816d9b5e

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Thu Jun 28 19:12:31 2012 +0900

include/basetsd.h: Fix int64 to int truncation warnings when compiling with a 64-bit PSDK compiler.

---

 include/basetsd.h |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/basetsd.h b/include/basetsd.h
index 698dd5c..4a59897 100644
--- a/include/basetsd.h
+++ b/include/basetsd.h
@@ -153,12 +153,12 @@ typedef unsigned int UHALF_PTR, *PUHALF_PTR;
 
 static inline ULONG32 HandleToULong(const void *h)
 {
-    return (ULONG_PTR)h;
+    return (ULONG32)(ULONG_PTR)h;
 }
 
 static inline LONG32 HandleToLong(const void *h)
 {
-    return (LONG_PTR)h;
+    return (LONG32)(LONG_PTR)h;
 }
 
 static inline void *ULongToHandle(ULONG32 ul)
@@ -173,32 +173,32 @@ static inline void *LongToHandle(LONG32 l)
 
 static inline ULONG32 PtrToUlong(const void *p)
 {
-    return (ULONG_PTR)p;
+    return (ULONG32)(ULONG_PTR)p;
 }
 
 static inline LONG32 PtrToLong(const void *p)
 {
-    return (LONG_PTR)p;
+    return (LONG32)(LONG_PTR)p;
 }
 
 static inline UINT32 PtrToUint(const void *p)
 {
-    return (UINT_PTR)p;
+    return (UINT32)(UINT_PTR)p;
 }
 
 static inline INT32 PtrToInt(const void *p)
 {
-    return (INT_PTR)p;
+    return (INT32)(INT_PTR)p;
 }
 
 static inline UINT16 PtrToUshort(const void *p)
 {
-    return (ULONG_PTR)p;
+    return (UINT16)(ULONG_PTR)p;
 }
 
 static inline INT16 PtrToShort(const void *p)
 {
-    return (LONG_PTR)p;
+    return (INT16)(LONG_PTR)p;
 }
 
 static inline void *IntToPtr(INT32 i)




More information about the wine-cvs mailing list