mirror of
https://github.com/reactos/wine.git
synced 2025-01-19 10:13:01 +00:00
server: A window timer id should be an unsigned long.
This commit is contained in:
parent
ce2b767f6a
commit
85f518ac6b
@ -2355,14 +2355,14 @@ struct set_win_timer_request
|
||||
struct request_header __header;
|
||||
user_handle_t win;
|
||||
unsigned int msg;
|
||||
unsigned int id;
|
||||
unsigned int rate;
|
||||
unsigned long id;
|
||||
unsigned long lparam;
|
||||
};
|
||||
struct set_win_timer_reply
|
||||
{
|
||||
struct reply_header __header;
|
||||
unsigned int id;
|
||||
unsigned long id;
|
||||
};
|
||||
|
||||
|
||||
@ -2372,7 +2372,7 @@ struct kill_win_timer_request
|
||||
struct request_header __header;
|
||||
user_handle_t win;
|
||||
unsigned int msg;
|
||||
unsigned int id;
|
||||
unsigned long id;
|
||||
};
|
||||
struct kill_win_timer_reply
|
||||
{
|
||||
@ -4426,6 +4426,6 @@ union generic_reply
|
||||
struct query_symlink_reply query_symlink_reply;
|
||||
};
|
||||
|
||||
#define SERVER_PROTOCOL_VERSION 254
|
||||
#define SERVER_PROTOCOL_VERSION 255
|
||||
|
||||
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
|
||||
|
@ -1687,11 +1687,11 @@ enum message_type
|
||||
@REQ(set_win_timer)
|
||||
user_handle_t win; /* window handle */
|
||||
unsigned int msg; /* message to post */
|
||||
unsigned int id; /* timer id */
|
||||
unsigned int rate; /* timer rate in ms */
|
||||
unsigned long id; /* timer id */
|
||||
unsigned long lparam; /* message lparam (callback proc) */
|
||||
@REPLY
|
||||
unsigned int id; /* timer id */
|
||||
unsigned long id; /* timer id */
|
||||
@END
|
||||
|
||||
|
||||
@ -1699,7 +1699,7 @@ enum message_type
|
||||
@REQ(kill_win_timer)
|
||||
user_handle_t win; /* window handle */
|
||||
unsigned int msg; /* message to post */
|
||||
unsigned int id; /* timer id */
|
||||
unsigned long id; /* timer id */
|
||||
@END
|
||||
|
||||
|
||||
|
@ -89,7 +89,7 @@ struct timer
|
||||
unsigned int rate; /* timer rate in ms */
|
||||
user_handle_t win; /* window handle */
|
||||
unsigned int msg; /* message to post */
|
||||
unsigned int id; /* timer id */
|
||||
unsigned long id; /* timer id */
|
||||
unsigned long lparam; /* lparam for message */
|
||||
};
|
||||
|
||||
@ -126,7 +126,7 @@ struct msg_queue
|
||||
struct message_result *recv_result; /* stack of received messages waiting for result */
|
||||
struct list pending_timers; /* list of pending timers */
|
||||
struct list expired_timers; /* list of expired timers */
|
||||
unsigned int next_timer_id; /* id for the next timer with a 0 window */
|
||||
unsigned long next_timer_id; /* id for the next timer with a 0 window */
|
||||
struct timeout_user *timeout; /* timeout for next timer to expire */
|
||||
struct thread_input *input; /* thread input descriptor */
|
||||
struct hook_table *hooks; /* hook table */
|
||||
@ -966,7 +966,7 @@ static void set_next_timer( struct msg_queue *queue )
|
||||
|
||||
/* find a timer from its window and id */
|
||||
static struct timer *find_timer( struct msg_queue *queue, user_handle_t win,
|
||||
unsigned int msg, unsigned int id )
|
||||
unsigned int msg, unsigned long id )
|
||||
{
|
||||
struct list *ptr;
|
||||
|
||||
@ -1832,7 +1832,7 @@ DECL_HANDLER(set_win_timer)
|
||||
struct msg_queue *queue;
|
||||
struct thread *thread = NULL;
|
||||
user_handle_t win = 0;
|
||||
unsigned int id = req->id;
|
||||
unsigned long id = req->id;
|
||||
|
||||
if (req->win)
|
||||
{
|
||||
|
@ -2179,21 +2179,21 @@ static void dump_set_win_timer_request( const struct set_win_timer_request *req
|
||||
{
|
||||
fprintf( stderr, " win=%p,", req->win );
|
||||
fprintf( stderr, " msg=%08x,", req->msg );
|
||||
fprintf( stderr, " id=%08x,", req->id );
|
||||
fprintf( stderr, " rate=%08x,", req->rate );
|
||||
fprintf( stderr, " id=%lx,", req->id );
|
||||
fprintf( stderr, " lparam=%lx", req->lparam );
|
||||
}
|
||||
|
||||
static void dump_set_win_timer_reply( const struct set_win_timer_reply *req )
|
||||
{
|
||||
fprintf( stderr, " id=%08x", req->id );
|
||||
fprintf( stderr, " id=%lx", req->id );
|
||||
}
|
||||
|
||||
static void dump_kill_win_timer_request( const struct kill_win_timer_request *req )
|
||||
{
|
||||
fprintf( stderr, " win=%p,", req->win );
|
||||
fprintf( stderr, " msg=%08x,", req->msg );
|
||||
fprintf( stderr, " id=%08x", req->id );
|
||||
fprintf( stderr, " id=%lx", req->id );
|
||||
}
|
||||
|
||||
static void dump_get_serial_info_request( const struct get_serial_info_request *req )
|
||||
|
Loading…
x
Reference in New Issue
Block a user