Alexandre Julliard : conhost: Fix some pointer cast warnings.
Alexandre Julliard
julliard at winehq.org
Fri Aug 28 15:17:59 CDT 2020
Module: wine
Branch: master
Commit: 58f2326410dd5574e52ab3362b67ab345674c3b1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=58f2326410dd5574e52ab3362b67ab345674c3b1
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Aug 28 21:27:12 2020 +0200
conhost: Fix some pointer cast warnings.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/conhost/conhost.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c
index d17a8f4e68..4853a6d8b2 100644
--- a/programs/conhost/conhost.c
+++ b/programs/conhost/conhost.c
@@ -115,7 +115,7 @@ static void *alloc_ioctl_buffer( size_t size )
static int screen_buffer_compare_id( const void *key, const struct wine_rb_entry *entry )
{
struct screen_buffer *screen_buffer = WINE_RB_ENTRY_VALUE( entry, struct screen_buffer, entry );
- return (unsigned int)key - screen_buffer->id;
+ return PtrToLong(key) - screen_buffer->id;
}
static struct wine_rb_tree screen_buffer_map = { screen_buffer_compare_id };
@@ -165,7 +165,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int
memcpy( &screen_buffer->data[i * screen_buffer->width], screen_buffer->data,
screen_buffer->width * sizeof(char_info_t) );
- if (wine_rb_put( &screen_buffer_map, (const void *)id, &screen_buffer->entry ))
+ if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry ))
{
ERR( "id %x already exists\n", id );
return NULL;
@@ -898,7 +898,7 @@ static NTSTATUS process_console_ioctls( struct console *console )
else
{
struct wine_rb_entry *entry;
- if (!(entry = wine_rb_get( &screen_buffer_map, (const void *)output )))
+ if (!(entry = wine_rb_get( &screen_buffer_map, LongToPtr(output) )))
{
ERR( "invalid screen buffer id %x\n", output );
status = STATUS_INVALID_HANDLE;
More information about the wine-cvs
mailing list