Commit a624977f authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

server: Fix some comparisons between signed and unsigned.

parent 0f273c17
...@@ -1021,7 +1021,7 @@ static int write_console_output( struct screen_buffer *screen_buffer, data_size_ ...@@ -1021,7 +1021,7 @@ static int write_console_output( struct screen_buffer *screen_buffer, data_size_
const void* data, enum char_info_mode mode, const void* data, enum char_info_mode mode,
int x, int y, int wrap ) int x, int y, int wrap )
{ {
int i; unsigned int i;
char_info_t *end, *dest = screen_buffer->data + y * screen_buffer->width + x; char_info_t *end, *dest = screen_buffer->data + y * screen_buffer->width + x;
if (y >= screen_buffer->height) return 0; if (y >= screen_buffer->height) return 0;
......
...@@ -288,7 +288,7 @@ static int read_thread_int( struct thread *thread, const int *addr, int *data ) ...@@ -288,7 +288,7 @@ static int read_thread_int( struct thread *thread, const int *addr, int *data )
static int write_thread_int( struct thread *thread, int *addr, int data, unsigned int mask ) static int write_thread_int( struct thread *thread, int *addr, int data, unsigned int mask )
{ {
int res; int res;
if (mask != ~0) if (mask != ~0u)
{ {
if (read_thread_int( thread, addr, &res ) == -1) return -1; if (read_thread_int( thread, addr, &res ) == -1) return -1;
data = (data & mask) | (res & ~mask); data = (data & mask) | (res & ~mask);
......
...@@ -1298,7 +1298,7 @@ static int check_hw_message_filter( user_handle_t win, unsigned int msg_code, ...@@ -1298,7 +1298,7 @@ static int check_hw_message_filter( user_handle_t win, unsigned int msg_code,
/* find a hardware message for the given queue */ /* find a hardware message for the given queue */
static int get_hardware_message( struct thread *thread, int hw_id, user_handle_t filter_win, static int get_hardware_message( struct thread *thread, unsigned int hw_id, user_handle_t filter_win,
unsigned int first, unsigned int last, struct get_message_reply *reply ) unsigned int first, unsigned int last, struct get_message_reply *reply )
{ {
struct thread_input *input = thread->queue->input; struct thread_input *input = thread->queue->input;
......
...@@ -669,8 +669,8 @@ static void enum_key( const struct key *key, int index, int info_class, ...@@ -669,8 +669,8 @@ static void enum_key( const struct key *key, int index, int info_class,
{ {
int i; int i;
data_size_t len, namelen, classlen; data_size_t len, namelen, classlen;
int max_subkey = 0, max_class = 0; data_size_t max_subkey = 0, max_class = 0;
int max_value = 0, max_data = 0; data_size_t max_value = 0, max_data = 0;
char *data; char *data;
if (index != -1) /* -1 means use the specified key directly */ if (index != -1) /* -1 means use the specified key directly */
......
...@@ -419,7 +419,7 @@ static struct token *create_token( unsigned primary, const SID *user, ...@@ -419,7 +419,7 @@ static struct token *create_token( unsigned primary, const SID *user,
struct token *token = alloc_object( &token_ops ); struct token *token = alloc_object( &token_ops );
if (token) if (token)
{ {
int i; unsigned int i;
list_init( &token->privileges ); list_init( &token->privileges );
list_init( &token->groups ); list_init( &token->groups );
...@@ -623,8 +623,7 @@ static unsigned int token_adjust_privileges( struct token *token, const LUID_AND ...@@ -623,8 +623,7 @@ static unsigned int token_adjust_privileges( struct token *token, const LUID_AND
unsigned int count, LUID_AND_ATTRIBUTES *mod_privs, unsigned int count, LUID_AND_ATTRIBUTES *mod_privs,
unsigned int mod_privs_count ) unsigned int mod_privs_count )
{ {
int i; unsigned int i, modified_count = 0;
unsigned int modified_count = 0;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
...@@ -669,8 +668,7 @@ int token_check_privileges( struct token *token, int all_required, ...@@ -669,8 +668,7 @@ int token_check_privileges( struct token *token, int all_required,
const LUID_AND_ATTRIBUTES *reqprivs, const LUID_AND_ATTRIBUTES *reqprivs,
unsigned int count, LUID_AND_ATTRIBUTES *usedprivs) unsigned int count, LUID_AND_ATTRIBUTES *usedprivs)
{ {
int i; unsigned int i, enabled_count = 0;
unsigned int enabled_count = 0;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
...@@ -944,7 +942,7 @@ DECL_HANDLER(adjust_token_privileges) ...@@ -944,7 +942,7 @@ DECL_HANDLER(adjust_token_privileges)
if (req->get_modified_state && !req->disable_all) if (req->get_modified_state && !req->disable_all)
{ {
int i; unsigned int i;
/* count modified privs */ /* count modified privs */
for (i = 0; i < priv_count; i++) for (i = 0; i < priv_count; i++)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment