Mike McCormack : server:
Cast user handles to unsigned long for win64 compatibility.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jun 15 07:12:28 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: e65349d4eb29168f41902705e92198f48a417c97
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e65349d4eb29168f41902705e92198f48a417c97
Author: Mike McCormack <mike at codeweavers.com>
Date: Thu Jun 15 17:10:31 2006 +0900
server: Cast user handles to unsigned long for win64 compatibility.
---
server/user.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/user.c b/server/user.c
index ff5b670..716ca58 100644
--- a/server/user.c
+++ b/server/user.c
@@ -36,10 +36,10 @@ static int allocated_handles;
static struct user_handle *handle_to_entry( user_handle_t handle )
{
unsigned short generation;
- int index = (((unsigned int)handle & 0xffff) - FIRST_USER_HANDLE) >> 1;
+ int index = (((unsigned long)handle & 0xffff) - FIRST_USER_HANDLE) >> 1;
if (index < 0 || index >= nb_handles) return NULL;
if (!handles[index].type) return NULL;
- generation = (unsigned int)handle >> 16;
+ generation = (unsigned long)handle >> 16;
if (generation == handles[index].generation || !generation || generation == 0xffff)
return &handles[index];
return NULL;
@@ -48,7 +48,7 @@ static struct user_handle *handle_to_ent
inline static user_handle_t entry_to_handle( struct user_handle *ptr )
{
int index = ptr - handles;
- return (user_handle_t)(((index << 1) + FIRST_USER_HANDLE) + (ptr->generation << 16));
+ return (user_handle_t)((((unsigned long)index << 1) + FIRST_USER_HANDLE) + (ptr->generation << 16));
}
inline static struct user_handle *alloc_user_entry(void)
@@ -113,7 +113,7 @@ user_handle_t get_user_full_handle( user
{
struct user_handle *entry;
- if ((unsigned int)handle >> 16) return handle;
+ if ((unsigned long)handle >> 16) return handle;
if (!(entry = handle_to_entry( handle ))) return handle;
return entry_to_handle( entry );
}
@@ -149,7 +149,7 @@ void *next_user_handle( user_handle_t *h
if (!*handle) entry = handles;
else
{
- int index = (((unsigned int)*handle & 0xffff) - FIRST_USER_HANDLE) >> 1;
+ int index = (((unsigned long)*handle & 0xffff) - FIRST_USER_HANDLE) >> 1;
if (index < 0 || index >= nb_handles) return NULL;
entry = handles + index + 1; /* start from the next one */
}
More information about the wine-cvs
mailing list