November 2013 - Wine-commits

Ken Thomases : winemac: Add support for the CF_METAFILEPICT clipboard format.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: cdad61369c94eb2d90fb330176fc6fd2c31885c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdad61369c94eb2d90fb33017… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:28 2013 -0600 winemac: Add support for the CF_METAFILEPICT clipboard format. --- dlls/winemac.drv/clipboard.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index a648fcc..9f4a81f 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -72,6 +72,7 @@ typedef struct static HANDLE import_clipboard_data(CFDataRef data); static HANDLE import_bmp_to_bitmap(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); +static HANDLE import_metafilepict(CFDataRef data); static HANDLE import_nsfilenames_to_hdrop(CFDataRef data); static HANDLE import_oemtext_to_text(CFDataRef data); static HANDLE import_oemtext_to_unicodetext(CFDataRef data); @@ -90,6 +91,7 @@ static CFDataRef export_clipboard_data(HANDLE data); static CFDataRef export_bitmap_to_bmp(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); +static CFDataRef export_metafilepict(HANDLE data); static CFDataRef export_oemtext_to_utf8(HANDLE data); static CFDataRef export_oemtext_to_utf16(HANDLE data); static CFDataRef export_text_to_utf8(HANDLE data); @@ -194,6 +196,8 @@ static const struct { CF_HDROP, CFSTR("org.winehq.builtin.hdrop"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_HDROP, CFSTR("NSFilenamesPboardType"), import_nsfilenames_to_hdrop, export_hdrop_to_filenames, TRUE }, + + { CF_METAFILEPICT, CFSTR("org.winehq.builtin.metafilepict"), import_metafilepict, export_metafilepict, FALSE }, }; static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; @@ -671,6 +675,33 @@ static HANDLE import_bmp_to_dib(CFDataRef data) /************************************************************************** + * import_metafilepict + * + * Import metafile picture data, converting it to CF_METAFILEPICT. + */ +static HANDLE import_metafilepict(CFDataRef data) +{ + HANDLE ret = 0; + CFIndex len = CFDataGetLength(data); + METAFILEPICT *mfp; + + TRACE("data %s\n", debugstr_cf(data)); + + if (len >= sizeof(*mfp) && (ret = GlobalAlloc(0, sizeof(*mfp)))) + { + const BYTE *bytes = (const BYTE*)CFDataGetBytePtr(data); + + mfp = GlobalLock(ret); + memcpy(mfp, bytes, sizeof(*mfp)); + mfp->hMF = SetMetaFileBitsEx(len - sizeof(*mfp), bytes + sizeof(*mfp)); + GlobalUnlock(ret); + } + + return ret; +} + + +/************************************************************************** * import_nsfilenames_to_hdrop * * Import NSFilenamesPboardType data, converting the property-list- @@ -1231,6 +1262,33 @@ done: /************************************************************************** + * export_metafilepict + * + * Export a metafile to data. + */ +static CFDataRef export_metafilepict(HANDLE data) +{ + CFMutableDataRef ret = NULL; + METAFILEPICT *mfp = GlobalLock(data); + unsigned int size = GetMetaFileBitsEx(mfp->hMF, 0, NULL); + + TRACE("data %p\n", data); + + ret = CFDataCreateMutable(NULL, sizeof(*mfp) + size); + if (ret) + { + CFDataAppendBytes(ret, (UInt8*)mfp, sizeof(*mfp)); + CFDataIncreaseLength(ret, size); + GetMetaFileBitsEx(mfp->hMF, size, (BYTE*)CFDataGetMutableBytePtr(ret) + sizeof(*mfp)); + } + + GlobalUnlock(data); + TRACE(" -> %s\n", debugstr_cf(ret)); + return ret; +} + + +/************************************************************************** * export_oemtext_to_utf8 * * Export CF_OEMTEXT to UTF-8.

1 0

Ken Thomases : winemac: Add support for the CF_ENHMETAFILE clipboard format .
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 29236cce4c3bb54fcd3e52b90e863036991ed34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29236cce4c3bb54fcd3e52b90… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:31 2013 -0600 winemac: Add support for the CF_ENHMETAFILE clipboard format. --- dlls/winemac.drv/clipboard.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 9f4a81f..71b9975 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -72,6 +72,7 @@ typedef struct static HANDLE import_clipboard_data(CFDataRef data); static HANDLE import_bmp_to_bitmap(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); +static HANDLE import_enhmetafile(CFDataRef data); static HANDLE import_metafilepict(CFDataRef data); static HANDLE import_nsfilenames_to_hdrop(CFDataRef data); static HANDLE import_oemtext_to_text(CFDataRef data); @@ -90,6 +91,7 @@ static HANDLE import_utf16_to_unicodetext(CFDataRef data); static CFDataRef export_clipboard_data(HANDLE data); static CFDataRef export_bitmap_to_bmp(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); +static CFDataRef export_enhmetafile(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); static CFDataRef export_metafilepict(HANDLE data); static CFDataRef export_oemtext_to_utf8(HANDLE data); @@ -197,6 +199,7 @@ static const struct { CF_HDROP, CFSTR("org.winehq.builtin.hdrop"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_HDROP, CFSTR("NSFilenamesPboardType"), import_nsfilenames_to_hdrop, export_hdrop_to_filenames, TRUE }, + { CF_ENHMETAFILE, CFSTR("org.winehq.builtin.enhmetafile"), import_enhmetafile, export_enhmetafile, FALSE }, { CF_METAFILEPICT, CFSTR("org.winehq.builtin.metafilepict"), import_metafilepict, export_metafilepict, FALSE }, }; @@ -675,6 +678,25 @@ static HANDLE import_bmp_to_dib(CFDataRef data) /************************************************************************** + * import_enhmetafile + * + * Import enhanced metafile data, converting it to CF_ENHMETAFILE. + */ +static HANDLE import_enhmetafile(CFDataRef data) +{ + HANDLE ret = 0; + CFIndex len = CFDataGetLength(data); + + TRACE("data %s\n", debugstr_cf(data)); + + if (len) + ret = SetEnhMetaFileBits(len, (const BYTE*)CFDataGetBytePtr(data)); + + return ret; +} + + +/************************************************************************** * import_metafilepict * * Import metafile picture data, converting it to CF_METAFILEPICT. @@ -1169,6 +1191,30 @@ static CFDataRef export_dib_to_bmp(HANDLE data) /************************************************************************** + * export_enhmetafile + * + * Export an enhanced metafile to data. + */ +static CFDataRef export_enhmetafile(HANDLE data) +{ + CFMutableDataRef ret = NULL; + unsigned int size = GetEnhMetaFileBits(data, 0, NULL); + + TRACE("data %p\n", data); + + ret = CFDataCreateMutable(NULL, size); + if (ret) + { + CFDataSetLength(ret, size); + GetEnhMetaFileBits(data, size, (BYTE*)CFDataGetMutableBytePtr(ret)); + } + + TRACE(" -> %s\n", debugstr_cf(ret)); + return ret; +} + + +/************************************************************************** * export_hdrop_to_filenames * * Export CF_HDROP to NSFilenamesPboardType data, which is a CFArray of

1 0

Ken Thomases : winemac: Synthesize CF_ENHMETAFILE from CF_METAFILEPICT.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: 53089bff2e3bea3e2b8b3620031c860a946b56e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53089bff2e3bea3e2b8b36200… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:33 2013 -0600 winemac: Synthesize CF_ENHMETAFILE from CF_METAFILEPICT. --- dlls/winemac.drv/clipboard.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 71b9975..24a75b9 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -74,6 +74,7 @@ static HANDLE import_bmp_to_bitmap(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); static HANDLE import_enhmetafile(CFDataRef data); static HANDLE import_metafilepict(CFDataRef data); +static HANDLE import_metafilepict_to_enhmetafile(CFDataRef data); static HANDLE import_nsfilenames_to_hdrop(CFDataRef data); static HANDLE import_oemtext_to_text(CFDataRef data); static HANDLE import_oemtext_to_unicodetext(CFDataRef data); @@ -200,7 +201,9 @@ static const struct { CF_HDROP, CFSTR("NSFilenamesPboardType"), import_nsfilenames_to_hdrop, export_hdrop_to_filenames, TRUE }, { CF_ENHMETAFILE, CFSTR("org.winehq.builtin.enhmetafile"), import_enhmetafile, export_enhmetafile, FALSE }, - { CF_METAFILEPICT, CFSTR("org.winehq.builtin.metafilepict"), import_metafilepict, export_metafilepict, FALSE }, + + { CF_METAFILEPICT, CFSTR("org.winehq.builtin.metafilepict"), import_metafilepict, export_metafilepict, FALSE }, + { CF_ENHMETAFILE, CFSTR("org.winehq.builtin.metafilepict"), import_metafilepict_to_enhmetafile, NULL, TRUE }, }; static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; @@ -724,6 +727,29 @@ static HANDLE import_metafilepict(CFDataRef data) /************************************************************************** + * import_metafilepict_to_enhmetafile + * + * Import metafile picture data, converting it to CF_ENHMETAFILE. + */ +static HANDLE import_metafilepict_to_enhmetafile(CFDataRef data) +{ + HANDLE ret = 0; + CFIndex len = CFDataGetLength(data); + const METAFILEPICT *mfp; + + TRACE("data %s\n", debugstr_cf(data)); + + if (len >= sizeof(*mfp)) + { + mfp = (const METAFILEPICT*)CFDataGetBytePtr(data); + ret = SetWinMetaFileBits(len - sizeof(*mfp), (const BYTE*)(mfp + 1), NULL, mfp); + } + + return ret; +} + + +/************************************************************************** * import_nsfilenames_to_hdrop * * Import NSFilenamesPboardType data, converting the property-list-

1 0

Ken Thomases : winemac: Synthesize CF_METAFILEPICT from CF_ENHMETAFILE.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: d98dbf8fbd17d53d060bb8b4350d5ce6ea373ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d98dbf8fbd17d53d060bb8b43… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:35 2013 -0600 winemac: Synthesize CF_METAFILEPICT from CF_ENHMETAFILE. --- dlls/winemac.drv/clipboard.c | 46 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 24a75b9..f9891e6 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -73,6 +73,7 @@ static HANDLE import_clipboard_data(CFDataRef data); static HANDLE import_bmp_to_bitmap(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); static HANDLE import_enhmetafile(CFDataRef data); +static HANDLE import_enhmetafile_to_metafilepict(CFDataRef data); static HANDLE import_metafilepict(CFDataRef data); static HANDLE import_metafilepict_to_enhmetafile(CFDataRef data); static HANDLE import_nsfilenames_to_hdrop(CFDataRef data); @@ -200,7 +201,8 @@ static const struct { CF_HDROP, CFSTR("org.winehq.builtin.hdrop"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_HDROP, CFSTR("NSFilenamesPboardType"), import_nsfilenames_to_hdrop, export_hdrop_to_filenames, TRUE }, - { CF_ENHMETAFILE, CFSTR("org.winehq.builtin.enhmetafile"), import_enhmetafile, export_enhmetafile, FALSE }, + { CF_ENHMETAFILE, CFSTR("org.winehq.builtin.enhmetafile"), import_enhmetafile, export_enhmetafile, FALSE }, + { CF_METAFILEPICT, CFSTR("org.winehq.builtin.enhmetafile"), import_enhmetafile_to_metafilepict, NULL, TRUE }, { CF_METAFILEPICT, CFSTR("org.winehq.builtin.metafilepict"), import_metafilepict, export_metafilepict, FALSE }, { CF_ENHMETAFILE, CFSTR("org.winehq.builtin.metafilepict"), import_metafilepict_to_enhmetafile, NULL, TRUE }, @@ -700,6 +702,48 @@ static HANDLE import_enhmetafile(CFDataRef data) /************************************************************************** + * import_enhmetafile_to_metafilepict + * + * Import enhanced metafile data, converting it to CF_METAFILEPICT. + */ +static HANDLE import_enhmetafile_to_metafilepict(CFDataRef data) +{ + HANDLE ret = 0, hmf; + HANDLE hemf; + METAFILEPICT *mfp; + + if ((hmf = GlobalAlloc(0, sizeof(*mfp))) && (hemf = import_enhmetafile(data))) + { + ENHMETAHEADER header; + HDC hdc = CreateCompatibleDC(0); + unsigned int size = GetWinMetaFileBits(hemf, 0, NULL, MM_ISOTROPIC, hdc); + BYTE *bytes; + + bytes = HeapAlloc(GetProcessHeap(), 0, size); + if (bytes && GetEnhMetaFileHeader(hemf, sizeof(header), &header) && + GetWinMetaFileBits(hemf, size, bytes, MM_ISOTROPIC, hdc)) + { + mfp = GlobalLock(hmf); + mfp->mm = MM_ISOTROPIC; + mfp->xExt = header.rclFrame.right - header.rclFrame.left; + mfp->yExt = header.rclFrame.bottom - header.rclFrame.top; + mfp->hMF = SetMetaFileBitsEx(size, bytes); + GlobalUnlock(hmf); + + ret = hmf; + } + + if (hdc) DeleteDC(hdc); + HeapFree(GetProcessHeap(), 0, bytes); + DeleteEnhMetaFile(hemf); + } + + if (!ret) GlobalFree(hmf); + return ret; +} + + +/************************************************************************** * import_metafilepict * * Import metafile picture data, converting it to CF_METAFILEPICT.

1 0

Ken Thomases : winemac: Synthesize text clipboard formats in CF_TEXT, CF_OEMTEXT, CF_UNICODETEXT order.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: a0061e0a30f0d9cbd339432e81f0cf4a4f0751af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0061e0a30f0d9cbd339432e8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:39 2013 -0600 winemac: Synthesize text clipboard formats in CF_TEXT, CF_OEMTEXT, CF_UNICODETEXT order. --- dlls/winemac.drv/clipboard.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index f9891e6..f428ab6 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -177,20 +177,20 @@ static const struct { CF_OEMTEXT, CFSTR("org.winehq.builtin.unicodetext"), import_unicodetext_to_oemtext, NULL, TRUE }, { CF_TEXT, CFSTR("org.winehq.builtin.text"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_UNICODETEXT, CFSTR("org.winehq.builtin.text"), import_text_to_unicodetext, NULL, TRUE }, { CF_OEMTEXT, CFSTR("org.winehq.builtin.text"), import_text_to_oemtext, NULL, TRUE }, + { CF_UNICODETEXT, CFSTR("org.winehq.builtin.text"), import_text_to_unicodetext, NULL, TRUE }, { CF_OEMTEXT, CFSTR("org.winehq.builtin.oemtext"), import_clipboard_data, export_clipboard_data, FALSE }, - { CF_UNICODETEXT, CFSTR("org.winehq.builtin.oemtext"), import_oemtext_to_unicodetext, NULL, TRUE }, { CF_TEXT, CFSTR("org.winehq.builtin.oemtext"), import_oemtext_to_text, NULL, TRUE }, + { CF_UNICODETEXT, CFSTR("org.winehq.builtin.oemtext"), import_oemtext_to_unicodetext, NULL, TRUE }, - { CF_UNICODETEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_unicodetext, export_unicodetext_to_utf8, TRUE }, { CF_TEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_text, export_text_to_utf8, TRUE }, { CF_OEMTEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_oemtext, export_oemtext_to_utf8, TRUE }, + { CF_UNICODETEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_unicodetext, export_unicodetext_to_utf8, TRUE }, - { CF_UNICODETEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_unicodetext, export_unicodetext_to_utf16,TRUE }, { CF_TEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_text, export_text_to_utf16, TRUE }, { CF_OEMTEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_oemtext, export_oemtext_to_utf16, TRUE }, + { CF_UNICODETEXT, CFSTR("public.utf16-plain-text"), import_utf16_to_unicodetext, export_unicodetext_to_utf16,TRUE }, { CF_DIB, CFSTR("org.winehq.builtin.dib"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_DIB, CFSTR("com.microsoft.bmp"), import_bmp_to_dib, export_dib_to_bmp, TRUE },

1 0

Ken Thomases : winemac: Add a function to find the "natural" clipboard format entry for a format ID.
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: ee53ea4b933f1c794d236d5424a3c6ded124a9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee53ea4b933f1c794d236d542… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:42 2013 -0600 winemac: Add a function to find the "natural" clipboard format entry for a format ID. --- dlls/winemac.drv/clipboard.c | 44 +++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index f428ab6..039cccd 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -394,6 +394,27 @@ done: /************************************************************************** + * natural_format_for_format + * + * Find the "natural" format for this format_id (the one which isn't + * synthesized from another type). + */ +static WINE_CLIPFORMAT* natural_format_for_format(UINT format_id) +{ + WINE_CLIPFORMAT *format; + + LIST_FOR_EACH_ENTRY(format, &format_list, WINE_CLIPFORMAT, entry) + if (format->format_id == format_id && !format->synthesized) break; + + if (&format->entry == &format_list) + format = NULL; + + TRACE("%s -> %p/%s\n", debugstr_format(format_id), format, debugstr_cf(format ? format->type : NULL)); + return format; +} + + +/************************************************************************** * convert_text * * Convert string data between code pages or to/from wide characters. The @@ -1984,12 +2005,8 @@ BOOL CDECL macdrv_SetClipboardData(UINT format_id, HANDLE data, BOOL owner) window = macdrv_get_cocoa_window(GetAncestor(hwnd_owner, GA_ROOT), FALSE); TRACE("format_id %s data %p owner %d hwnd_owner %p window %p)\n", debugstr_format(format_id), data, owner, hwnd_owner, window); - /* Find the "natural" format for this format_id (the one which isn't - synthesized from another type). */ - LIST_FOR_EACH_ENTRY(format, &format_list, WINE_CLIPFORMAT, entry) - if (format->format_id == format_id && !format->synthesized) break; - - if (&format->entry == &format_list && !(format = insert_clipboard_format(format_id, NULL))) + format = natural_format_for_format(format_id); + if (!format && !(format = insert_clipboard_format(format_id, NULL))) { WARN("Failed to register clipboard format %s\n", debugstr_format(format_id)); return FALSE; @@ -2165,16 +2182,13 @@ 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 "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. */ - LIST_FOR_EACH_ENTRY(base_format, &format_list, WINE_CLIPFORMAT, entry) + if ((base_format = natural_format_for_format(format->format_id)) && + CFArrayContainsValue(types, range, base_format->type)) { - if (base_format->format_id == format->format_id && !base_format->synthesized && - CFArrayContainsValue(types, range, base_format->type)) - { - TRACE("Sending WM_RENDERFORMAT message for format %s to hwnd %p\n", debugstr_format(base_format->format_id), hwnd); - SendMessageW(hwnd, WM_RENDERFORMAT, base_format->format_id, 0); - ret = TRUE; - goto done; - } + 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); + ret = TRUE; + goto done; } }

1 0

Ken Thomases : winemac: Cache the "natural" clipboard format entry associated with synthesized built-in entries at startup .
by Alexandre Julliard 22 Nov '13

22 Nov '13

Module: wine Branch: master Commit: b28a014c44e71f2be71daac62006e48fccd840fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28a014c44e71f2be71daac62… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 22 04:31:44 2013 -0600 winemac: Cache the "natural" clipboard format entry associated with synthesized built-in entries at startup. --- dlls/winemac.drv/clipboard.c | 51 +++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 039cccd..b65391d 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -49,14 +49,15 @@ typedef struct typedef HANDLE (*DRVIMPORTFUNC)(CFDataRef data); typedef CFDataRef (*DRVEXPORTFUNC)(HANDLE data); -typedef struct -{ - struct list entry; - UINT format_id; - CFStringRef type; - DRVIMPORTFUNC import_func; - DRVEXPORTFUNC export_func; - BOOL synthesized; +typedef struct _WINE_CLIPFORMAT +{ + struct list entry; + UINT format_id; + CFStringRef type; + DRVIMPORTFUNC import_func; + DRVEXPORTFUNC export_func; + BOOL synthesized; + struct _WINE_CLIPFORMAT *natural_format; } WINE_CLIPFORMAT; @@ -300,6 +301,7 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) format->import_func = import_clipboard_data; format->export_func = export_clipboard_data; format->synthesized = FALSE; + format->natural_format = NULL; if (type) format->type = CFStringCreateCopy(NULL, type); @@ -2109,23 +2111,31 @@ void macdrv_clipboard_process_attach(void) for (i = 0; i < sizeof(builtin_format_ids)/sizeof(builtin_format_ids[0]); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; - format->format_id = builtin_format_ids[i].id; - format->type = CFRetain(builtin_format_ids[i].type); - format->import_func = builtin_format_ids[i].import; - format->export_func = builtin_format_ids[i].export; - format->synthesized = builtin_format_ids[i].synthesized; + format->format_id = builtin_format_ids[i].id; + format->type = CFRetain(builtin_format_ids[i].type); + format->import_func = builtin_format_ids[i].import; + format->export_func = builtin_format_ids[i].export; + format->synthesized = builtin_format_ids[i].synthesized; + format->natural_format = NULL; 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 */ for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; - format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); - format->type = CFRetain(builtin_format_names[i].type); - format->import_func = builtin_format_names[i].import; - format->export_func = builtin_format_names[i].export; - format->synthesized = FALSE; + format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); + format->type = CFRetain(builtin_format_names[i].type); + format->import_func = builtin_format_names[i].import; + format->export_func = builtin_format_names[i].export; + format->synthesized = FALSE; + format->natural_format = NULL; list_add_tail(&format_list, &format->entry); } } @@ -2150,8 +2160,6 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) format = NULL; 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)); 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 "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. */ - if ((base_format = natural_format_for_format(format->format_id)) && - CFArrayContainsValue(types, range, base_format->type)) + if (format->natural_format && CFArrayContainsValue(types, range, format->natural_format->type)) { 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);

1 0

Henri Verbeet : wined3d: Merge texture2d_unload() and texture3d_unload().
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 0d7b12696de77531061446880d341d6edea3a055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7b12696de77531061446880… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:21 2013 +0100 wined3d: Merge texture2d_unload() and texture3d_unload(). --- dlls/wined3d/texture.c | 53 ++++++++++++++--------------------------------- 1 files changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 52a2bf9..08638a5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -94,7 +94,7 @@ static void gltexture_delete(const struct wined3d_gl_info *gl_info, struct gl_te tex->name = 0; } -static void wined3d_texture_unload(struct wined3d_texture *texture) +static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) { struct wined3d_device *device = texture->resource.device; struct wined3d_context *context = NULL; @@ -132,7 +132,7 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) texture->texture_ops->texture_sub_resource_cleanup(sub_resource); } - wined3d_texture_unload(texture); + wined3d_texture_unload_gl_texture(texture); HeapFree(GetProcessHeap(), 0, texture->sub_resources); resource_cleanup(&texture->resource); } @@ -696,7 +696,14 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource wined3d_surface_decref(surface); } -static void texture2d_unload(struct wined3d_resource *resource) +static const struct wined3d_texture_ops texture2d_ops = +{ + texture2d_preload, + texture2d_sub_resource_add_dirty_region, + texture2d_sub_resource_cleanup, +}; + +static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); UINT sub_count = texture->level_count * texture->layer_count; @@ -711,19 +718,12 @@ static void texture2d_unload(struct wined3d_resource *resource) sub_resource->resource_ops->resource_unload(sub_resource); } - wined3d_texture_unload(texture); + wined3d_texture_unload_gl_texture(texture); } -static const struct wined3d_texture_ops texture2d_ops = -{ - texture2d_preload, - texture2d_sub_resource_add_dirty_region, - texture2d_sub_resource_cleanup, -}; - -static const struct wined3d_resource_ops texture2d_resource_ops = +static const struct wined3d_resource_ops texture_resource_ops = { - texture2d_unload, + wined3d_texture_unload, }; static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, @@ -794,7 +794,7 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi } if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, - desc, device, parent, parent_ops, &texture2d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x\n", hr); return hr; @@ -919,7 +919,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, - desc, device, parent, parent_ops, &texture2d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -1047,22 +1047,6 @@ static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource wined3d_volume_decref(volume); } -static void texture3d_unload(struct wined3d_resource *resource) -{ - struct wined3d_texture *texture = wined3d_texture_from_resource(resource); - UINT i; - - TRACE("texture %p.\n", texture); - - for (i = 0; i < texture->level_count; ++i) - { - struct wined3d_resource *sub_resource = texture->sub_resources[i]; - sub_resource->resource_ops->resource_unload(sub_resource); - } - - wined3d_texture_unload(texture); -} - static const struct wined3d_texture_ops texture3d_ops = { texture3d_preload, @@ -1070,11 +1054,6 @@ static const struct wined3d_texture_ops texture3d_ops = texture3d_sub_resource_cleanup, }; -static const struct wined3d_resource_ops texture3d_resource_ops = -{ - texture3d_unload, -}; - static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, UINT levels, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -1149,7 +1128,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, - desc, device, parent, parent_ops, &texture3d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr;

1 0

Francois Gouget : po: Remove an extraneous full stop in an error message.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: a81e58f38ee966bdcddeef89c92a06095c6ab63c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81e58f38ee966bdcddeef89c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 11:21:41 2013 +0100 po: Remove an extraneous full stop in an error message. --- po/uk.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/uk.po b/po/uk.po index ac6d271..faf49b9 100644 --- a/po/uk.po +++ b/po/uk.po @@ -13880,7 +13880,7 @@ msgstr "Помилка: Командний рядок не підтримуєт #: wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "Помилка: Псевдонім не знайдено.\n" +msgstr "Помилка: Псевдонім не знайдено\n" #: wmic.rc:30 msgid "Error: Invalid query\n"

1 0

Huw Davies : riched20: Simplify the code by using an ME_Paragraph pointer.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 0d8800d4672ee5d2ccf8998861a01001f6278beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8800d4672ee5d2ccf899886… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 21 12:26:52 2013 +0000 riched20: Simplify the code by using an ME_Paragraph pointer. --- dlls/riched20/wrap.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 52722db..73edb98 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -168,13 +168,12 @@ static void ME_BeginRow(ME_WrapContext *wc) static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) { - ME_DisplayItem *p, *row, *para; + ME_DisplayItem *p, *row; + ME_Paragraph *para = &wc->pPara->member.para; BOOL bSkippingSpaces = TRUE; int ascent = 0, descent = 0, width=0, shift = 0, align = 0; - PARAFORMAT2 *pFmt; + /* wrap text */ - para = wc->pPara; - pFmt = para->member.para.pFmt; for (p = pEnd->prev; p!=wc->pRowStart->prev; p = p->prev) { @@ -208,10 +207,10 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) } } - para->member.para.nWidth = max(para->member.para.nWidth, width); + para->nWidth = max(para->nWidth, width); row = ME_MakeRow(ascent+descent, ascent, width); if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ - pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) + (para->pFmt->dwMask & PFM_TABLE) && (para->pFmt->wEffects & PFE_TABLE)) { /* The text was shifted down in ME_BeginRow so move the wrap context * back to where it should be. */ @@ -222,8 +221,8 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) row->member.row.pt = wc->pt; row->member.row.nLMargin = (!wc->nRow ? wc->nFirstMargin : wc->nLeftMargin); row->member.row.nRMargin = wc->nRightMargin; - assert(para->member.para.pFmt->dwMask & PFM_ALIGNMENT); - align = para->member.para.pFmt->wAlignment; + assert(para->pFmt->dwMask & PFM_ALIGNMENT); + align = para->pFmt->wAlignment; if (align == PFA_CENTER) shift = max((wc->nAvailWidth-width)/2, 0); if (align == PFA_RIGHT)

1 0