ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemac: Cache the "natural" clipboard format entry associated with synthesized built-in entries at startup.

Browse Source
This commit is contained in:
Ken Thomases 2013-11-22 04:31:44 -06:00 committed by Alexandre Julliard
parent ee53ea4b93
commit b28a014c44
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/winemac.drv/clipboard.c
View File

@ -49,7 +49,7 @@ typedef struct
typedef HANDLE (*DRVIMPORTFUNC)(CFDataRef data); typedef HANDLE (*DRVIMPORTFUNC)(CFDataRef data);
typedef CFDataRef (*DRVEXPORTFUNC)(HANDLE data); typedef CFDataRef (*DRVEXPORTFUNC)(HANDLE data);
typedef struct typedef struct _WINE_CLIPFORMAT
{ {
struct list entry; struct list entry;
UINT format_id; UINT format_id;
@ -57,6 +57,7 @@ typedef struct
DRVIMPORTFUNC import_func; DRVIMPORTFUNC import_func;
DRVEXPORTFUNC export_func; DRVEXPORTFUNC export_func;
BOOL synthesized; BOOL synthesized;
struct _WINE_CLIPFORMAT *natural_format;
} WINE_CLIPFORMAT; } WINE_CLIPFORMAT;
@ -300,6 +301,7 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type)
format->import_func = import_clipboard_data; format->import_func = import_clipboard_data;
format->export_func = export_clipboard_data; format->export_func = export_clipboard_data;
format->synthesized = FALSE; format->synthesized = FALSE;
format->natural_format = NULL;
if (type) if (type)
format->type = CFStringCreateCopy(NULL, type); format->type = CFStringCreateCopy(NULL, type);
@ -2114,9 +2116,16 @@ void macdrv_clipboard_process_attach(void)
format->import_func = builtin_format_ids[i].import; format->import_func = builtin_format_ids[i].import;
format->export_func = builtin_format_ids[i].export; format->export_func = builtin_format_ids[i].export;
format->synthesized = builtin_format_ids[i].synthesized; format->synthesized = builtin_format_ids[i].synthesized;
format->natural_format = NULL;
list_add_tail(&format_list, &format->entry); list_add_tail(&format_list, &format->entry);
} }
LIST_FOR_EACH_ENTRY(format, &format_list, WINE_CLIPFORMAT, entry)
{
if (format->synthesized)
format->natural_format = natural_format_for_format(format->format_id);
}
/* Register known mappings between Windows formats and Mac types */ /* Register known mappings between Windows formats and Mac types */
for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++)
{ {
@ -2126,6 +2135,7 @@ void macdrv_clipboard_process_attach(void)
format->import_func = builtin_format_names[i].import; format->import_func = builtin_format_names[i].import;
format->export_func = builtin_format_names[i].export; format->export_func = builtin_format_names[i].export;
format->synthesized = FALSE; format->synthesized = FALSE;
format->natural_format = NULL;
list_add_tail(&format_list, &format->entry); list_add_tail(&format_list, &format->entry);
} }
} }
@ -2150,8 +2160,6 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type)
format = NULL; format = NULL;
while ((format = format_for_type(format, type))) while ((format = format_for_type(format, type)))
{ {
WINE_CLIPFORMAT* base_format;
TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id));
if (!format->synthesized) if (!format->synthesized)
@ -2182,8 +2190,7 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type)
pasteboard would also have data for "public.utf8-plain-text" and we wouldn't be here.) If pasteboard would also have data for "public.utf8-plain-text" and we wouldn't be here.) If
"org.winehq.builtin.text" is not on the pasteboard, then one of the other text formats is "org.winehq.builtin.text" is not on the pasteboard, then one of the other text formats is
presumably responsible for the promise that we're trying to satisfy, so we keep looking. */ presumably responsible for the promise that we're trying to satisfy, so we keep looking. */
if ((base_format = natural_format_for_format(format->format_id)) && if (format->natural_format && CFArrayContainsValue(types, range, format->natural_format->type))
CFArrayContainsValue(types, range, base_format->type))
{ {
TRACE("Sending WM_RENDERFORMAT message for format %s to hwnd %p\n", debugstr_format(format->format_id), hwnd); TRACE("Sending WM_RENDERFORMAT message for format %s to hwnd %p\n", debugstr_format(format->format_id), hwnd);
SendMessageW(hwnd, WM_RENDERFORMAT, format->format_id, 0); SendMessageW(hwnd, WM_RENDERFORMAT, format->format_id, 0);