- Rename WIN_Handle16 to HWDN_16 and make it a macro.
- Prepare user.dll for the change of HWND to a void*.

diff --git a/windows/message.c b/windows/message.c
index bb3b0c6..bcf0228 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -499,7 +499,8 @@
 
     if ((hittest == HTERROR) || (hittest == HTNOWHERE))
     {
-        SendMessageA( msg->hwnd, WM_SETCURSOR, msg->hwnd, MAKELONG( hittest, raw_message ));
+        SendMessageA( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd,
+		      MAKELONG( hittest, raw_message ));
         return FALSE;
     }
 
@@ -523,7 +524,7 @@
 
         if (msg->hwnd != GetActiveWindow() && hwndTop != GetDesktopWindow())
         {
-            LONG ret = SendMessageA( msg->hwnd, WM_MOUSEACTIVATE, hwndTop,
+            LONG ret = SendMessageA( msg->hwnd, WM_MOUSEACTIVATE, (WPARAM)hwndTop,
                                      MAKELONG( hittest, raw_message ) );
 
             switch(ret)
@@ -555,7 +556,8 @@
 
     /* Windows sends the normal mouse message as the message parameter
        in the WM_SETCURSOR message even if it's non-client mouse message */
-    SendMessageA( msg->hwnd, WM_SETCURSOR, msg->hwnd, MAKELONG( hittest, raw_message ));
+    SendMessageA( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd,
+		  MAKELONG( hittest, raw_message ));
 
     return !eatMsg;
 }