winemac: Use ULongToPtr() to cast format ids to void ptrs.
This avoids compiler warnings on 64-bit. Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
860a5f69b8
commit
fb0af5d9ad
|
@ -1514,7 +1514,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT
|
|||
if (!format->synthesized)
|
||||
{
|
||||
TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id));
|
||||
CFSetAddValue(seen_formats, (void*)format->format_id);
|
||||
CFSetAddValue(seen_formats, ULongToPtr(format->format_id));
|
||||
formats[pos++] = format;
|
||||
}
|
||||
else if (format->natural_format &&
|
||||
|
@ -1523,7 +1523,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT
|
|||
TRACE("for type %s deferring synthesized formats because type %s is also present\n",
|
||||
debugstr_cf(type), debugstr_cf(format->natural_format->type));
|
||||
}
|
||||
else if (CFSetContainsValue(seen_formats, (void*)format->format_id))
|
||||
else if (CFSetContainsValue(seen_formats, ULongToPtr(format->format_id)))
|
||||
{
|
||||
TRACE("for type %s got duplicate synthesized format %p/%s; skipping\n", debugstr_cf(type), format,
|
||||
debugstr_format(format->format_id));
|
||||
|
@ -1531,7 +1531,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT
|
|||
else
|
||||
{
|
||||
TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id));
|
||||
CFSetAddValue(seen_formats, (void*)format->format_id);
|
||||
CFSetAddValue(seen_formats, ULongToPtr(format->format_id));
|
||||
formats[pos++] = format;
|
||||
}
|
||||
}
|
||||
|
@ -1546,10 +1546,10 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT
|
|||
if (!format->synthesized) continue;
|
||||
|
||||
/* Don't duplicate a real value with a synthesized value. */
|
||||
if (CFSetContainsValue(seen_formats, (void*)format->format_id)) continue;
|
||||
if (CFSetContainsValue(seen_formats, ULongToPtr(format->format_id))) continue;
|
||||
|
||||
TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id));
|
||||
CFSetAddValue(seen_formats, (void*)format->format_id);
|
||||
CFSetAddValue(seen_formats, ULongToPtr(format->format_id));
|
||||
formats[pos++] = format;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue