March 2013 - Wine-Commits - list.winehq.org

Ken Thomases : winemac: Extract new function from macdrv_IsClipboardFormatAvailable() parameterized by the target pasteboard.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: caf6db7bf981e929851e8807dda4f2fead3bdee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf6db7bf981e929851e8807d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:21 2013 -0500 winemac: Extract new function from macdrv_IsClipboardFormatAvailable() parameterized by the target pasteboard. --- dlls/winemac.drv/clipboard.c | 79 +++++++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 4197515..fa4857b 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1324,6 +1324,49 @@ static HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_form /************************************************************************** + * macdrv_pasteboard_has_format + */ +static BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_format) +{ + CFArrayRef types; + int count; + UINT i; + BOOL found = FALSE; + + TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(desired_format)); + + types = macdrv_copy_pasteboard_types(pasteboard); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return FALSE; + } + + count = CFArrayGetCount(types); + TRACE("got %d types\n", count); + + for (i = 0; !found && i < count; i++) + { + CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format; + + format = NULL; + while (!found && (format = format_for_type(format, type))) + { + TRACE("for type %s got format %s\n", debugstr_cf(type), debugstr_format(format->format_id)); + + if (format->format_id == desired_format) + found = TRUE; + } + } + + CFRelease(types); + TRACE(" -> %d\n", found); + return found; +} + + +/************************************************************************** * check_clipboard_ownership */ static void check_clipboard_ownership(HWND *owner) @@ -1558,42 +1601,8 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) */ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) { - CFArrayRef types; - int count; - UINT i; - BOOL found = FALSE; - - TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - - types = macdrv_copy_pasteboard_types(NULL); - if (!types) - { - WARN("Failed to copy pasteboard types\n"); - return FALSE; - } - - count = CFArrayGetCount(types); - TRACE("got %d types\n", count); - - for (i = 0; !found && i < count; i++) - { - CFStringRef type = CFArrayGetValueAtIndex(types, i); - WINE_CLIPFORMAT* format; - - format = NULL; - while (!found && (format = format_for_type(format, type))) - { - TRACE("for type %s got format %s\n", debugstr_cf(type), debugstr_format(format->format_id)); - - if (format->format_id == desired_format) - found = TRUE; - } - } - - CFRelease(types); - TRACE(" -> %d\n", found); - return found; + return macdrv_pasteboard_has_format(NULL, desired_format); }

1 0

Ken Thomases : winemac: Extract new function from macdrv_GetClipboardData() parameterized by the target pasteboard.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: c8e6bad15338252b5d93d542feda93b747189871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e6bad15338252b5d93d542f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:16 2013 -0500 winemac: Extract new function from macdrv_GetClipboardData() parameterized by the target pasteboard. --- dlls/winemac.drv/clipboard.c | 126 ++++++++++++++++++++++------------------- 1 files changed, 68 insertions(+), 58 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 4a6f859..4197515 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1257,6 +1257,73 @@ static BOOL release_ownership(void) /************************************************************************** + * macdrv_get_pasteboard_data + */ +static HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) +{ + CFArrayRef types; + CFIndex count; + CFIndex i; + CFStringRef type, best_type; + WINE_CLIPFORMAT* best_format = NULL; + HANDLE data = NULL; + + TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(desired_format)); + + types = macdrv_copy_pasteboard_types(pasteboard); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return NULL; + } + + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); + + for (i = 0; (!best_format || best_format->synthesized) && i < count; i++) + { + WINE_CLIPFORMAT* format; + + type = CFArrayGetValueAtIndex(types, i); + + format = NULL; + while ((!best_format || best_format->synthesized) && (format = format_for_type(format, type))) + { + TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format ? format->format_id : 0)); + + if (format->format_id == desired_format) + { + /* The best format is the matching one which is not synthesized. Failing that, + the best format is the first matching synthesized format. */ + if (!format->synthesized || !best_format) + { + best_type = type; + best_format = format; + } + } + } + } + + if (best_format) + { + CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(pasteboard, best_type); + + TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); + + if (pasteboard_data) + { + data = best_format->import_func(pasteboard_data); + CFRelease(pasteboard_data); + } + } + + CFRelease(types); + TRACE(" -> %p\n", data); + return data; +} + + +/************************************************************************** * check_clipboard_ownership */ static void check_clipboard_ownership(HWND *owner) @@ -1480,66 +1547,9 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) */ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) { - CFArrayRef types; - CFIndex count; - CFIndex i; - CFStringRef type, best_type; - WINE_CLIPFORMAT* best_format = NULL; - HANDLE data = NULL; - - TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(NULL); - if (!types) - { - WARN("Failed to copy pasteboard types\n"); - return NULL; - } - - count = CFArrayGetCount(types); - TRACE("got %ld types\n", count); - - for (i = 0; (!best_format || best_format->synthesized) && i < count; i++) - { - WINE_CLIPFORMAT* format; - - type = CFArrayGetValueAtIndex(types, i); - - format = NULL; - while ((!best_format || best_format->synthesized) && (format = format_for_type(format, type))) - { - TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format ? format->format_id : 0)); - - if (format->format_id == desired_format) - { - /* The best format is the matching one which is not synthesized. Failing that, - the best format is the first matching synthesized format. */ - if (!format->synthesized || !best_format) - { - best_type = type; - best_format = format; - } - } - } - } - - if (best_format) - { - CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(NULL, best_type); - - TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); - - if (pasteboard_data) - { - data = best_format->import_func(pasteboard_data); - CFRelease(pasteboard_data); - } - } - - CFRelease(types); - TRACE(" -> %p\n", data); - return data; + return macdrv_get_pasteboard_data(NULL, desired_format); }

1 0

Alexandre Julliard : msvcrt: Use -arch=i386 everywhere for consistency.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 866034c1ef16b8b2eb52c2d03d4a088bbc07b93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=866034c1ef16b8b2eb52c2d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:17:52 2013 +0100 msvcrt: Use -arch=i386 everywhere for consistency. --- dlls/msvcrt/msvcrt.spec | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d5cc428..b6ae261 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -164,7 +164,7 @@ # stub _CrtSetReportHook2 # stub _CrtSetReportMode @ stdcall _CxxThrowException(long long) -@ cdecl -i386 -norelay _EH_prolog() +@ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() @ cdecl _Gettnames() @@ -181,7 +181,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler -@ stdcall -i386 __CxxLongjmpUnwind(ptr) +@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() # stub __CxxRegisterExceptionObject # stub __CxxUnregisterExceptionObject @@ -352,7 +352,7 @@ @ cdecl _chdrive(long) MSVCRT__chdrive @ cdecl _chgsign(double) MSVCRT__chgsign @ cdecl -arch=arm,x86_64 _chgsignf(float) MSVCRT__chgsignf -@ cdecl -i386 -norelay _chkesp() +@ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize # stub _chsize_s(long int64) @@ -412,9 +412,9 @@ @ extern _environ MSVCRT__environ @ cdecl _eof(long) MSVCRT__eof @ cdecl _errno() MSVCRT__errno -@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) -@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) -@ cdecl -i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) @ varargs _execl(str str) @ varargs _execle(str str) @ varargs _execlp(str str) @@ -532,7 +532,7 @@ # stub _getwch() # stub _getwche() @ cdecl _getws(ptr) MSVCRT__getws -@ cdecl -i386 _global_unwind2(ptr) +@ cdecl -arch=i386 _global_unwind2(ptr) @ cdecl _gmtime32(ptr) MSVCRT__gmtime32 @ cdecl _gmtime32_s(ptr ptr) MSVCRT__gmtime32_s @ cdecl _gmtime64(ptr) MSVCRT__gmtime64 @@ -654,8 +654,8 @@ # stub _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) @ cdecl -arch=x86_64 _local_unwind(ptr ptr) -@ cdecl -i386 _local_unwind2(ptr long) -@ cdecl -i386 _local_unwind4(ptr ptr long) +@ cdecl -arch=i386 _local_unwind2(ptr long) +@ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) MSVCRT__localtime32 @ cdecl _localtime32_s(ptr ptr) @ cdecl _localtime64(ptr) MSVCRT__localtime64 @@ -665,7 +665,7 @@ @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb @ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf -@ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp +@ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @ cdecl _lsearch(ptr ptr ptr long ptr) @@ -885,8 +885,8 @@ # stub _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) MSVCRT__searchenv @ cdecl _searchenv_s(str str ptr long) -@ stdcall -i386 _seh_longjmp_unwind4(ptr) -@ stdcall -i386 _seh_longjmp_unwind(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long)

1 0

Dmitry Timoshkov : gdiplus: Add more GdipMeasureString/ GdipMeasureCharacterRanges clipping and alignment tests.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 4b19b618f5e202ed8a0ea121869a3bb3a2d2f20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b19b618f5e202ed8a0ea1218… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 14 16:35:11 2013 +0900 gdiplus: Add more GdipMeasureString/GdipMeasureCharacterRanges clipping and alignment tests. --- dlls/gdiplus/tests/graphics.c | 201 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 193 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e41751a..fe525b6 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3909,7 +3909,7 @@ static void test_measure_string(void) static const WCHAR string[] = { 'A','0','1',0 }; HDC hdc; GpStringFormat *format; - CharacterRange range = { 0, 3 }; + CharacterRange range; GpRegion *region; GpGraphics *graphics; GpFontFamily *family; @@ -3923,8 +3923,7 @@ static void test_measure_string(void) status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); expect(Ok, status); expect(Ok, status); - status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); - expect(Ok, status); + status = GdipCreateRegion(&region); expect(Ok, status); @@ -3964,8 +3963,123 @@ static void test_measure_string(void) todo_wine expectf(height / 2.0, bounds.Height); + range.First = 0; + range.Length = lstrlenW(string); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf_(width - margin_x*2.0, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + + width_rgn = bounds.Width; + height_rgn = bounds.Height; + + range.First = 0; + range.Length = 1; + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + set_rect_empty(&rect); + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, 1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(margin_x, bounds.X, 1.0); + expectf(0.0, bounds.Y); + ok(bounds.Width < width_rgn / 2.0, "width of 1 glyph is wrong\n"); + expectf(height_rgn, bounds.Height); + width_1 = bounds.Width; + + range.First = 0; + range.Length = lstrlenW(string); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(0.0, bounds.Width); + expectf(0.0, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn / 2.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + margin_x, bounds.X, 1.0); +todo_wine + expectf(5.0, bounds.Y); +todo_wine + expectf_(width_1, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + status = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap | StringFormatFlagsNoClip); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + margin_x, bounds.X, 1.0); +todo_wine + expectf(5.0, bounds.Y); +todo_wine + expectf(width_rgn, bounds.Width); +todo_wine + expectf(height_rgn, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn / 2.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + margin_x, bounds.X, 1.0); +todo_wine + expectf(5.0, bounds.Y); +todo_wine + expectf_(width_1, bounds.Width, 1.0); +todo_wine + expectf(height_rgn, bounds.Height); + set_rect_empty(&rect); rect.Height = height / 2.0; set_rect_empty(&bounds); @@ -3975,7 +4089,7 @@ todo_wine expect(1, lines); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); todo_wine expectf(height, bounds.Height); @@ -4042,6 +4156,7 @@ todo_wine expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); + /* Default (Near) alignment */ rect.X = 5.0; rect.Y = 5.0; rect.Width = width * 2.0; @@ -4053,7 +4168,7 @@ todo_wine expect(1, lines); expectf(5.0, bounds.X); expectf(5.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4074,6 +4189,7 @@ todo_wine width_rgn = bounds.Width; height_rgn = bounds.Height; + /* Center alignment */ GdipSetStringFormatAlign(format, StringAlignmentCenter); GdipSetStringFormatLineAlign(format, StringAlignmentCenter); @@ -4090,7 +4206,23 @@ todo_wine expectf_(5.0 + width/2.0, bounds.X, 0.01); todo_wine expectf(5.0 + height/2.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 - width/2.0, bounds.X, 0.01); +todo_wine + expectf(5.0 - height/2.0, bounds.Y); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4108,6 +4240,25 @@ todo_wine expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 - width_rgn/2.0, bounds.X, 1.0); +todo_wine + expectf_(5.0 - height_rgn/2.0, bounds.Y, 1.0); +todo_wine + expectf_(width_rgn, bounds.Width, 1.0); +todo_wine + expectf_(height_rgn, bounds.Height, 1.0); + + /* Far alignment */ GdipSetStringFormatAlign(format, StringAlignmentFar); GdipSetStringFormatLineAlign(format, StringAlignmentFar); @@ -4121,10 +4272,26 @@ todo_wine expect(3, glyphs); expect(1, lines); todo_wine - expectf(5.0 + width, bounds.X); + expectf_(5.0 + width, bounds.X, 0.01); todo_wine expectf(5.0 + height, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 - width, bounds.X, 0.01); +todo_wine + expectf(5.0 - height, bounds.Y); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4143,6 +4310,24 @@ todo_wine expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 - width_rgn, bounds.X, 2.0); +todo_wine + expectf_(5.0 - height_rgn, bounds.Y, 1.0); +todo_wine + expectf_(width_rgn, bounds.Width, 1.0); +todo_wine + expectf_(height_rgn, bounds.Height, 1.0); + status = GdipDeleteFont(font); expect(Ok, status);

1 0

Ken Thomases : winemac: Implement support for drag-and-drop.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 7993bd3d9010d752704fd25e16ea775852540b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7993bd3d9010d752704fd25e1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:32 2013 -0500 winemac: Implement support for drag-and-drop. --- dlls/winemac.drv/Makefile.in | 4 +- dlls/winemac.drv/clipboard.c | 8 +- dlls/winemac.drv/cocoa_event.m | 17 +- dlls/winemac.drv/cocoa_window.m | 74 +++++ dlls/winemac.drv/dragdrop.c | 635 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 12 + dlls/winemac.drv/macdrv.h | 8 + dlls/winemac.drv/macdrv_cocoa.h | 29 ++ 8 files changed, 780 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7993bd3d9010d752704fd…

1 0

Ken Thomases : winemac: Extract new function from macdrv_EnumClipboardFormats() parameterized by the target pasteboard.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: fb5794a764b302bce91f938d8fdef396ac8d6922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5794a764b302bce91f938d8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:27 2013 -0500 winemac: Extract new function from macdrv_EnumClipboardFormats() parameterized by the target pasteboard. --- dlls/winemac.drv/clipboard.c | 159 +++++++++++++++++++++++++----------------- 1 files changed, 96 insertions(+), 63 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index fa4857b..40445f6 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1367,6 +1367,79 @@ static BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_form /************************************************************************** + * macdrv_copy_pasteboard_formats + */ +static CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) +{ + CFArrayRef types; + CFIndex count; + CFMutableArrayRef formats; + CFIndex i; + + TRACE("pasteboard %p\n", pasteboard); + + types = macdrv_copy_pasteboard_types(pasteboard); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return NULL; + } + + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); + + if (!count) + { + CFRelease(types); + return NULL; + } + + formats = CFArrayCreateMutable(NULL, 0, NULL); + if (!formats) + { + WARN("Failed to allocate formats array\n"); + CFRelease(types); + return NULL; + } + + for (i = 0; i < count; i++) + { + CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format; + + format = NULL; + while ((format = format_for_type(format, type))) + { + TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); + + if (format->synthesized) + { + /* Don't override a real value with a synthesized value. */ + if (!CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) + CFArrayAppendValue(formats, (void*)format->format_id); + } + else + { + /* If the type was already in the array, it must have been synthesized + because this one's real. Remove the synthesized entry in favor of + this one. */ + CFIndex index = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), + (void*)format->format_id); + if (index != kCFNotFound) + CFArrayRemoveValueAtIndex(formats, index); + CFArrayAppendValue(formats, (void*)format->format_id); + } + } + } + + CFRelease(types); + + TRACE(" -> %s\n", debugstr_cf(formats)); + return formats; +} + + +/************************************************************************** * check_clipboard_ownership */ static void check_clipboard_ownership(HWND *owner) @@ -1498,88 +1571,48 @@ void CDECL macdrv_EndClipboardUpdate(void) */ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) { - CFArrayRef types; CFIndex count; CFIndex i; - UINT ret; + UINT ret = 0; TRACE("prev_format %s\n", debugstr_format(prev_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(NULL); - if (!types) - { - WARN("Failed to copy pasteboard types\n"); - return 0; - } - - count = CFArrayGetCount(types); - TRACE("got %ld types\n", count); - - if (!count) - { - CFRelease(types); - return 0; - } - if (prev_format) { - CFMutableArrayRef formats = CFArrayCreateMutable(NULL, 0, NULL); - if (!formats) + CFArrayRef formats = macdrv_copy_pasteboard_formats(NULL); + if (formats) { - WARN("Failed to allocate array to track formats\n"); - CFRelease(types); - return 0; - } + count = CFArrayGetCount(formats); + i = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, count), (void*)prev_format); + if (i != kCFNotFound && i + 1 < count) + ret = (UINT)CFArrayGetValueAtIndex(formats, i + 1); - for (i = 0; i < count; i++) + CFRelease(formats); + } + } + else + { + CFArrayRef types = macdrv_copy_pasteboard_types(NULL); + if (types) { - CFStringRef type = CFArrayGetValueAtIndex(types, i); - WINE_CLIPFORMAT* format; + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); - format = NULL; - while ((format = format_for_type(format, type))) + if (count) { - TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); + CFStringRef type = CFArrayGetValueAtIndex(types, 0); + WINE_CLIPFORMAT *format = format_for_type(NULL, type); - if (format->synthesized) - { - /* Don't override a real value with a synthesized value. */ - if (!CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) - CFArrayAppendValue(formats, (void*)format->format_id); - } - else - { - /* If the type was already in the array, it must have been synthesized - because this one's real. Remove the synthesized entry in favor of - this one. */ - CFIndex index = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), - (void*)format->format_id); - if (index != kCFNotFound) - CFArrayRemoveValueAtIndex(formats, index); - CFArrayAppendValue(formats, (void*)format->format_id); - } + ret = format ? format->format_id : 0; } - } - count = CFArrayGetCount(formats); - i = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, count), (void*)prev_format); - if (i == kCFNotFound || i + 1 >= count) - ret = 0; + CFRelease(types); + } else - ret = (UINT)CFArrayGetValueAtIndex(formats, i + 1); - - CFRelease(formats); + WARN("Failed to copy pasteboard types\n"); } - else - { - CFStringRef type = CFArrayGetValueAtIndex(types, 0); - WINE_CLIPFORMAT *format = format_for_type(NULL, type); - ret = format ? format->format_id : 0; - } - - CFRelease(types); TRACE(" -> %u\n", ret); return ret; }

1 0

Ken Thomases : winemac: Add support for CF_DIB and CF_BITMAP clipboard formats.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 6528619494264d2659039c04ba8a5fa626c99982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6528619494264d2659039c04b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:36 2013 -0500 winemac: Add support for CF_DIB and CF_BITMAP clipboard formats. --- dlls/winemac.drv/clipboard.c | 242 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 242 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6528619494264d2659039…

1 0

Ken Thomases : winemac: Add clipboard formats which can or must be put on Mac pasteboard without transformation .
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: a8d55288de3add7e568d6177bd9dd6ed0c59cef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d55288de3add7e568d6177b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:31 2013 -0500 winemac: Add clipboard formats which can or must be put on Mac pasteboard without transformation. --- dlls/winemac.drv/clipboard.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 3e5e9b3..36e0759 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -141,6 +141,21 @@ static const struct BOOL synthesized; } builtin_format_ids[] = { + { CF_DIBV5, CFSTR("org.winehq.builtin.dibv5"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DIF, CFSTR("org.winehq.builtin.dif"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPBITMAP, CFSTR("org.winehq.builtin.dspbitmap"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPENHMETAFILE, CFSTR("org.winehq.builtin.dspenhmetafile"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPMETAFILEPICT, CFSTR("org.winehq.builtin.dspmetafilepict"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPTEXT, CFSTR("org.winehq.builtin.dsptext"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_LOCALE, CFSTR("org.winehq.builtin.locale"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_OWNERDISPLAY, CFSTR("org.winehq.builtin.ownerdisplay"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_PALETTE, CFSTR("org.winehq.builtin.palette"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_PENDATA, CFSTR("org.winehq.builtin.pendata"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_RIFF, CFSTR("org.winehq.builtin.riff"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_SYLK, CFSTR("org.winehq.builtin.sylk"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_TIFF, CFSTR("public.tiff"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_WAVE, CFSTR("com.microsoft.waveform-audio"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_UNICODETEXT, CFSTR("org.winehq.builtin.unicodetext"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_TEXT, CFSTR("org.winehq.builtin.unicodetext"), import_unicodetext_to_text, NULL, TRUE }, { CF_OEMTEXT, CFSTR("org.winehq.builtin.unicodetext"), import_unicodetext_to_oemtext, NULL, TRUE }, @@ -158,6 +173,24 @@ static const struct { CF_OEMTEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_oemtext, export_oemtext_to_utf8, TRUE }, }; +static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; +static const WCHAR wszGIF[] = {'G','I','F',0}; +static const WCHAR wszJFIF[] = {'J','F','I','F',0}; +static const WCHAR wszPNG[] = {'P','N','G',0}; +static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; +static const struct +{ + LPCWSTR name; + CFStringRef type; +} builtin_format_names[] = +{ + { wszRichTextFormat, CFSTR("public.rtf") }, + { wszGIF, CFSTR("com.compuserve.gif") }, + { wszJFIF, CFSTR("public.jpeg") }, + { wszPNG, CFSTR("public.png") }, + { wszHTMLFormat, CFSTR("public.html") }, +}; + /* The prefix prepended to an external Mac pasteboard type to make a Win32 clipboard format name. org.winehq.mac-type. */ static const WCHAR mac_type_name_prefix[] = {'o','r','g','.','w','i','n','e','h','q','.','m','a','c','-','t','y','p','e','.',0}; @@ -1224,6 +1257,11 @@ void macdrv_clipboard_process_attach(void) format->synthesized = builtin_format_ids[i].synthesized; list_add_tail(&format_list, &format->entry); } + + /* Register known mappings between Windows formats and Mac types */ + for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) + insert_clipboard_format(RegisterClipboardFormatW(builtin_format_names[i].name), + builtin_format_names[i].type); }

1 0

Jactry Zeng : atl100: Added AtlSetPerUserRegistration stub implementation.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 50e323502eba519c1d1d45bf33857646dee406a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e323502eba519c1d1d45bf3… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Mar 14 00:36:14 2013 +0800 atl100: Added AtlSetPerUserRegistration stub implementation. --- dlls/atl100/atl.c | 9 +++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index ebb47a1..0e21963 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -743,6 +743,15 @@ HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown *unk, GUID *libid, IID *iid, } /*********************************************************************** + * AtlSetPerUserRegistration [atl100.67] + */ +HRESULT WINAPI AtlSetPerUserRegistration(cpp_bool bEnable) +{ + FIXME("stub: bEnable: %d\n", bEnable); + return E_NOTIMPL; +} + +/*********************************************************************** * AtlGetPerUserRegistration [atl100.68] */ HRESULT WINAPI AtlGetPerUserRegistration(cpp_bool *pbEnabled) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index fa5d251..183ab7b 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -48,5 +48,5 @@ 64 stdcall AtlCallTermFunc(ptr) 65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm -67 stub AtlSetPerUserRegistration +67 stdcall AtlSetPerUserRegistration(long) 68 stdcall AtlGetPerUserRegistration(ptr) diff --git a/include/atlbase.h b/include/atlbase.h index 1036b10..1f91f55 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -259,6 +259,7 @@ HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE*,DWORD,DWORD); HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*); +HRESULT WINAPI AtlSetPerUserRegistration(unsigned char /*bool*/); HRESULT WINAPI AtlGetPerUserRegistration(unsigned char /*bool*/ *); #endif /* __WINE_ATLBASE_H__ */

1 0

Ken Thomases : winemac: Add support for CF_HDROP clipboard format, mapped to/from Cocoa's NSFilenamesPboardType.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: bff19b173904392e6c64fdfa78df5695e591d41e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff19b173904392e6c64fdfa7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:50 2013 -0500 winemac: Add support for CF_HDROP clipboard format, mapped to/from Cocoa's NSFilenamesPboardType. --- dlls/winemac.drv/clipboard.c | 218 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 218 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 5829ca2..2219df6 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -26,6 +26,8 @@ #include "macdrv.h" #include "winuser.h" +#include "shellapi.h" +#include "shlobj.h" #include "wine/list.h" #include "wine/server.h" #include "wine/unicode.h" @@ -70,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_nsfilenames_to_hdrop(CFDataRef data); static HANDLE import_oemtext_to_text(CFDataRef data); static HANDLE import_oemtext_to_unicodetext(CFDataRef data); static HANDLE import_text_to_oemtext(CFDataRef data); @@ -83,6 +86,7 @@ static HANDLE import_utf8_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_hdrop_to_filenames(HANDLE data); static CFDataRef export_oemtext_to_utf8(HANDLE data); static CFDataRef export_text_to_utf8(HANDLE data); static CFDataRef export_unicodetext_to_utf8(HANDLE data); @@ -181,6 +185,9 @@ static const struct { CF_BITMAP, CFSTR("org.winehq.builtin.bitmap"), import_bmp_to_bitmap, export_bitmap_to_bmp, FALSE }, { CF_BITMAP, CFSTR("com.microsoft.bmp"), import_bmp_to_bitmap, export_bitmap_to_bmp, TRUE }, + + { 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 }, }; static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; @@ -671,6 +678,124 @@ static HANDLE import_bmp_to_dib(CFDataRef data) /************************************************************************** + * import_nsfilenames_to_hdrop + * + * Import NSFilenamesPboardType data, converting the property-list- + * serialized array of path strings to CF_HDROP. + */ +static HANDLE import_nsfilenames_to_hdrop(CFDataRef data) +{ + HDROP hdrop = NULL; + CFArrayRef names; + CFIndex count, i; + size_t len; + char *buffer = NULL; + WCHAR **paths = NULL; + DROPFILES* dropfiles; + UniChar* p; + + TRACE("data %s\n", debugstr_cf(data)); + + names = (CFArrayRef)CFPropertyListCreateWithData(NULL, data, kCFPropertyListImmutable, + NULL, NULL); + if (!names || CFGetTypeID(names) != CFArrayGetTypeID()) + { + WARN("failed to interpret data as a CFArray\n"); + goto done; + } + + count = CFArrayGetCount(names); + + len = 0; + for (i = 0; i < count; i++) + { + CFIndex this_len; + CFStringRef name = (CFStringRef)CFArrayGetValueAtIndex(names, i); + TRACE(" %s\n", debugstr_cf(name)); + if (CFGetTypeID(name) != CFStringGetTypeID()) + { + WARN("non-string in array\n"); + goto done; + } + + this_len = CFStringGetMaximumSizeOfFileSystemRepresentation(name); + if (this_len > len) + len = this_len; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, len); + if (!buffer) + { + WARN("failed to allocate buffer for file-system representations\n"); + goto done; + } + + paths = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * sizeof(paths[0])); + if (!paths) + { + WARN("failed to allocate array of DOS paths\n"); + goto done; + } + + for (i = 0; i < count; i++) + { + CFStringRef name = (CFStringRef)CFArrayGetValueAtIndex(names, i); + if (!CFStringGetFileSystemRepresentation(name, buffer, len)) + { + WARN("failed to get file-system representation for %s\n", debugstr_cf(name)); + goto done; + } + paths[i] = wine_get_dos_file_name(buffer); + if (!paths[i]) + { + WARN("failed to get DOS path for %s\n", debugstr_a(buffer)); + goto done; + } + } + + len = 1; /* for the terminating null */ + for (i = 0; i < count; i++) + len += strlenW(paths[i]) + 1; + + hdrop = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, sizeof(*dropfiles) + len * sizeof(WCHAR)); + if (!hdrop || !(dropfiles = GlobalLock(hdrop))) + { + WARN("failed to allocate HDROP\n"); + GlobalFree(hdrop); + hdrop = NULL; + goto done; + } + + dropfiles->pFiles = sizeof(*dropfiles); + dropfiles->pt.x = 0; + dropfiles->pt.y = 0; + dropfiles->fNC = FALSE; + dropfiles->fWide = TRUE; + + p = (WCHAR*)(dropfiles + 1); + for (i = 0; i < count; i++) + { + strcpyW(p, paths[i]); + p += strlenW(p) + 1; + } + *p = 0; + + GlobalUnlock(hdrop); + +done: + if (paths) + { + for (i = 0; i < count; i++) + HeapFree(GetProcessHeap(), 0, paths[i]); + HeapFree(GetProcessHeap(), 0, paths); + } + HeapFree(GetProcessHeap(), 0, buffer); + if (names) CFRelease(names); + return hdrop; +} + + +/************************************************************************** * import_oemtext_to_text * * Import CF_OEMTEXT data, converting the string to CF_TEXT. @@ -924,6 +1049,99 @@ static CFDataRef export_dib_to_bmp(HANDLE data) /************************************************************************** + * export_hdrop_to_filenames + * + * Export CF_HDROP to NSFilenamesPboardType data, which is a CFArray of + * CFStrings (holding Unix paths) which is serialized as a property list. + */ +static CFDataRef export_hdrop_to_filenames(HANDLE data) +{ + CFDataRef ret = NULL; + DROPFILES *dropfiles; + CFMutableArrayRef filenames = NULL; + void *p; + WCHAR *buffer = NULL; + size_t buffer_len = 0; + + TRACE("data %p\n", data); + + if (!(dropfiles = GlobalLock(data))) + { + WARN("failed to lock data %p\n", data); + goto done; + } + + filenames = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks); + if (!filenames) + { + WARN("failed to create filenames array\n"); + goto done; + } + + p = (char*)dropfiles + dropfiles->pFiles; + while (dropfiles->fWide ? *(WCHAR*)p : *(char*)p) + { + char *unixname; + CFStringRef filename; + + TRACE(" %s\n", dropfiles->fWide ? debugstr_w(p) : debugstr_a(p)); + + if (dropfiles->fWide) + unixname = wine_get_unix_file_name(p); + else + { + int len = MultiByteToWideChar(CP_ACP, 0, p, -1, NULL, 0); + if (len) + { + if (len > buffer_len) + { + HeapFree(GetProcessHeap(), 0, buffer); + buffer_len = len * 2; + buffer = HeapAlloc(GetProcessHeap(), 0, buffer_len * sizeof(*buffer)); + } + + MultiByteToWideChar(CP_ACP, 0, p, -1, buffer, buffer_len); + unixname = wine_get_unix_file_name(buffer); + } + else + unixname = NULL; + } + if (!unixname) + { + WARN("failed to convert DOS path to Unix: %s\n", + dropfiles->fWide ? debugstr_w(p) : debugstr_a(p)); + goto done; + } + + if (dropfiles->fWide) + p = (WCHAR*)p + strlenW(p) + 1; + else + p = (char*)p + strlen(p) + 1; + + filename = CFStringCreateWithFileSystemRepresentation(NULL, unixname); + HeapFree(GetProcessHeap(), 0, unixname); + if (!filename) + { + WARN("failed to create CFString from Unix path %s\n", debugstr_a(unixname)); + goto done; + } + + CFArrayAppendValue(filenames, filename); + CFRelease(filename); + } + + ret = CFPropertyListCreateData(NULL, filenames, kCFPropertyListXMLFormat_v1_0, 0, NULL); + +done: + HeapFree(GetProcessHeap(), 0, buffer); + GlobalUnlock(data); + if (filenames) CFRelease(filenames); + TRACE(" -> %s\n", debugstr_cf(ret)); + return ret; +} + + +/************************************************************************** * export_oemtext_to_utf8 * * Export CF_OEMTEXT to UTF-8.

1 0