Mike McCormack : server: Make wparam and lparam values unsigned long for win64 compatability.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Jun 8 05:06:10 CDT 2006


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

Author: Mike McCormack <mike at codeweavers.com>
Date:   Thu Jun  8 17:01:54 2006 +0900

server: Make wparam and lparam values unsigned long for win64 compatability.

---

 server/queue.c |    8 ++++----
 server/sock.c  |    2 +-
 server/user.h  |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/queue.c b/server/queue.c
index 307bda6..769895a 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -70,8 +70,8 @@ struct message
     enum message_type      type;      /* message type */
     user_handle_t          win;       /* window handle */
     unsigned int           msg;       /* message code */
-    unsigned int           wparam;    /* parameters */
-    unsigned int           lparam;    /* parameters */
+    unsigned long          wparam;    /* parameters */
+    unsigned long          lparam;    /* parameters */
     int                    x;         /* x position */
     int                    y;         /* y position */
     unsigned int           time;      /* message time */
@@ -544,7 +544,7 @@ static struct message_result *alloc_mess
             callback_msg->type      = MSG_CALLBACK_RESULT;
             callback_msg->win       = msg->win;
             callback_msg->msg       = msg->msg;
-            callback_msg->wparam    = (unsigned int)callback;
+            callback_msg->wparam    = (unsigned long)callback;
             callback_msg->lparam    = 0;
             callback_msg->time      = get_tick_count();
             callback_msg->x         = 0;
@@ -1446,7 +1446,7 @@ void queue_cleanup_window( struct thread
 
 /* post a message to a window; used by socket handling */
 void post_message( user_handle_t win, unsigned int message,
-                   unsigned int wparam, unsigned int lparam )
+                   unsigned long wparam, unsigned long lparam )
 {
     struct message *msg;
     struct thread *thread = get_window_thread( win );
diff --git a/server/sock.c b/server/sock.c
index 109e3bc..ce63932 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -276,7 +276,7 @@ static void sock_wake_up( struct sock *s
             if (sock->pmask & (1 << event))
             {
                 unsigned int lparam = (1 << event) | (sock->errors[event] << 16);
-                post_message( sock->window, sock->message, (unsigned int)sock->wparam, lparam );
+                post_message( sock->window, sock->message, (unsigned long)sock->wparam, lparam );
             }
         }
         sock->pmask = 0;
diff --git a/server/user.h b/server/user.h
index da169c1..662b796 100644
--- a/server/user.h
+++ b/server/user.h
@@ -91,7 +91,7 @@ extern int init_thread_queue( struct thr
 extern int attach_thread_input( struct thread *thread_from, struct thread *thread_to );
 extern void detach_thread_input( struct thread *thread_from );
 extern void post_message( user_handle_t win, unsigned int message,
-                          unsigned int wparam, unsigned int lparam );
+                          unsigned long wparam, unsigned long lparam );
 extern void post_win_event( struct thread *thread, unsigned int event,
                             user_handle_t win, unsigned int object_id,
                             unsigned int child_id, void *proc,




More information about the wine-cvs mailing list