Alexandre Julliard : rpcrt4: Fix the pointer alignment macros for 64-bit.

Alexandre Julliard julliard at winehq.org
Mon Apr 5 11:22:57 CDT 2010


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Apr  2 21:38:32 2010 +0200

rpcrt4: Fix the pointer alignment macros for 64-bit.

---

 dlls/rpcrt4/ndr_marshall.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index f36069c..62f5847 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -93,7 +93,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /* _Align must be the desired alignment,
  * e.g. ALIGN_LENGTH(len, 4) to align on a dword boundary. */
-#define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align)-1)&~((_Align)-1))
+#define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align)-1)&~((ULONG_PTR)(_Align)-1))
 #define ALIGNED_POINTER(_Ptr, _Align) ((LPVOID)ALIGNED_LENGTH((ULONG_PTR)(_Ptr), _Align))
 #define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align)
 #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align)




More information about the wine-cvs mailing list