Dmitry Timoshkov : kernel32: Fix some compilation warnings in 64-bit mode.

[Alexandre Julliard]

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

Author: Dmitry Timoshkov 
Date:   Wed May 30 19:31:52 2007 +0900

kernel32: Fix some compilation warnings in 64-bit mode.

---

dlls/kernel32/kernel16_private.h |    2 +-
 dlls/kernel32/selector.c         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/kernel16_private.h b/dlls/kernel32/kernel16_private.h
index c153d81..0c59bbd 100644
--- a/dlls/kernel32/kernel16_private.h
+++ b/dlls/kernel32/kernel16_private.h
@@ -168,7 +168,7 @@ extern THHOOK *pThhook;
     (((offset)+(size) <= pModule->mapping_size) ? \
      (memcpy( buffer, (const char *)pModule->mapping + (offset), (size) ), TRUE) : FALSE)

-#define CURRENT_STACK16 ((STACK16FRAME*)MapSL((SEGPTR)NtCurrentTeb()->WOW32Reserved))
+#define CURRENT_STACK16 ((STACK16FRAME*)MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)))
 #define CURRENT_DS      (CURRENT_STACK16->ds)

/* push bytes on the 16-bit stack of a thread; return a segptr to the first pushed byte */
diff --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c
index db3a47e..c8841b1 100644
--- a/dlls/kernel32/selector.c
+++ b/dlls/kernel32/selector.c
@@ -482,7 +482,7 @@ SEGPTR WINAPI MapLS( LPCVOID ptr )

if (!HIWORD(ptr)) return (SEGPTR)LOWORD(ptr);

-    base = (const char *)ptr - ((unsigned int)ptr & 0x7fff);
+    base = (const char *)ptr - ((ULONG_PTR)ptr & 0x7fff);
     HeapLock( GetProcessHeap() );
     for (entry = first_entry; entry; entry = entry->next)
     {