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

Ken Thomases : winemac: Add clipboard formats which can or must be put on Mac pasteboard without transformation .
by Alexandre Julliard 14 Mar '13

14 Mar '13

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

Ken Thomases : winemac: Add support for CF_DIB and CF_BITMAP clipboard formats.
by Alexandre Julliard 14 Mar '13

14 Mar '13

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: Synthesize additional bitmap pasteboard types from any that Cocoa can convert .
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 95d5270a0d852b45198a6466aebcca94ee223798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d5270a0d852b45198a6466a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:43 2013 -0500 winemac: Synthesize additional bitmap pasteboard types from any that Cocoa can convert. Mac apps generally put TIFF on the pasteboard, but Windows programs are more likely to handle CF_DIB or CF_BITMAP which map to BMP. --- dlls/winemac.drv/cocoa_clipboard.m | 48 ++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 486cbd0..8d29326 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -25,6 +25,10 @@ static int owned_change_count = -1; +static NSArray* BitmapOutputTypes; +static NSDictionary* BitmapOutputTypeMap; +static dispatch_once_t BitmapOutputTypesInitOnce; + /*********************************************************************** * macdrv_is_pasteboard_owner @@ -54,11 +58,43 @@ CFArrayRef macdrv_copy_pasteboard_types(void) __block CFArrayRef ret = NULL; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + dispatch_once(&BitmapOutputTypesInitOnce, ^{ + NSArray* bitmapFileTypes = [NSArray arrayWithObjects: + [NSNumber numberWithUnsignedInteger:NSTIFFFileType], + [NSNumber numberWithUnsignedInteger:NSPNGFileType], + [NSNumber numberWithUnsignedInteger:NSBMPFileType], + [NSNumber numberWithUnsignedInteger:NSGIFFileType], + [NSNumber numberWithUnsignedInteger:NSJPEGFileType], + [NSNumber numberWithUnsignedInteger:NSJPEG2000FileType], + nil]; + + BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png", + @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg", + @"public.jpeg-2000", nil]; + + BitmapOutputTypeMap = [[NSDictionary alloc] initWithObjects:bitmapFileTypes + forKeys:BitmapOutputTypes]; + }); + OnMainThread(^{ @try { NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSArray* types = [pb types]; + + // If there are any types understood by NSBitmapImageRep, then we + // can offer all of the types that it can output, too. For example, + // if TIFF is on the pasteboard, we can offer PNG, BMP, etc. to the + // Windows program. We'll convert on demand. + if ([types firstObjectCommonWithArray:[NSBitmapImageRep imageTypes]] || + [types firstObjectCommonWithArray:[NSBitmapImageRep imagePasteboardTypes]]) + { + NSMutableArray* newTypes = [BitmapOutputTypes mutableCopy]; + [newTypes removeObjectsInArray:types]; + types = [types arrayByAddingObjectsFromArray:newTypes]; + [newTypes release]; + } + ret = (CFArrayRef)[types copy]; } @catch (id e) @@ -89,6 +125,18 @@ CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) NSPasteboard* pb = [NSPasteboard generalPasteboard]; if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) ret = [[pb dataForType:(NSString*)type] copy]; + else + { + NSNumber* bitmapType = [BitmapOutputTypeMap objectForKey:(NSString*)type]; + if (bitmapType) + { + NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:pb]; + ret = [NSBitmapImageRep representationOfImageRepsInArray:reps + usingType:[bitmapType unsignedIntegerValue] + properties:nil]; + ret = [ret copy]; + } + } } @catch (id e) {

1 0

Ken Thomases : winemac: Allow for processing Cocoa events while waiting for query results.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 761ad810d978168edf3fce62dd8aa12f9e945292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761ad810d978168edf3fce62d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:57 2013 -0500 winemac: Allow for processing Cocoa events while waiting for query results. --- dlls/winemac.drv/cocoa_app.h | 7 ++++++- dlls/winemac.drv/cocoa_app.m | 16 ++++++++++++++-- dlls/winemac.drv/cocoa_event.h | 1 + dlls/winemac.drv/cocoa_event.m | 22 ++++++++++++++++++++-- dlls/winemac.drv/event.c | 3 ++- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 67f75e1..e15d734 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -26,6 +26,11 @@ #define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) +enum { + WineApplicationEventWakeQuery, +}; + + @class WineEventQueue; @class WineWindow; @@ -87,7 +92,7 @@ - (void) windowGotFocus:(WineWindow*)window; - - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout; + - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(BOOL)processEvents; - (void) keyboardSelectionDidChange; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 5dc3008..7ee009d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -172,13 +172,25 @@ int macdrv_err_on; } } - - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout + - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(BOOL)processEvents { PerformRequest(NULL); do { - [[NSRunLoop currentRunLoop] runMode:WineAppWaitQueryResponseMode beforeDate:timeout]; + if (processEvents) + { + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask + untilDate:timeout + inMode:NSDefaultRunLoopMode + dequeue:YES]; + if (event) + [NSApp sendEvent:event]; + [pool release]; + } + else + [[NSRunLoop currentRunLoop] runMode:WineAppWaitQueryResponseMode beforeDate:timeout]; } while (!*done && [timeout timeIntervalSinceNow] >= 0); return *done; diff --git a/dlls/winemac.drv/cocoa_event.h b/dlls/winemac.drv/cocoa_event.h index 56964da..e74875e 100644 --- a/dlls/winemac.drv/cocoa_event.h +++ b/dlls/winemac.drv/cocoa_event.h @@ -36,6 +36,7 @@ - (void) postEvent:(const macdrv_event*)inEvent; - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window; + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout; @end diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index a5f1c1b..c95fac6 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -252,7 +252,7 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea [eventsLock unlock]; } - - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents { macdrv_event event; NSDate* timeoutDate = [NSDate dateWithTimeIntervalSinceNow:timeout]; @@ -264,10 +264,15 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea query->done = FALSE; [self postEvent:&event]; - timedout = ![NSApp waitUntilQueryDone:&query->done timeout:timeoutDate]; + timedout = ![NSApp waitUntilQueryDone:&query->done timeout:timeoutDate processEvents:processEvents]; return !timedout && query->status; } + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout + { + return [self query:query timeout:timeout processEvents:FALSE]; + } + /*********************************************************************** * OnMainThread @@ -470,8 +475,21 @@ void macdrv_set_query_done(macdrv_query *query) macdrv_retain_query(query); OnMainThreadAsync(^{ + NSEvent* event; + query->done = TRUE; macdrv_release_query(query); + + event = [NSEvent otherEventWithType:NSApplicationDefined + location:NSZeroPoint + modifierFlags:0 + timestamp:[[NSProcessInfo processInfo] systemUptime] + windowNumber:0 + context:nil + subtype:WineApplicationEventWakeQuery + data1:0 + data2:0]; + [NSApp postEvent:event atStart:TRUE]; }); } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 512d99e..1fba681 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -240,7 +240,8 @@ DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handle timeout, flags & MWMO_ALERTABLE); } - if (data->current_event) event_mask = 0; /* don't process nested events */ + if (data->current_event && data->current_event->type != QUERY_EVENT) + event_mask = 0; /* don't process nested events */ if (process_events(data->queue, event_mask)) ret = count - 1; else if (count || timeout)

1 0

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

14 Mar '13

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

Ken Thomases : winemac: Enable pasteboard functions to operate on arbitrary pasteboards.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 4ae5b106f80eb29ed0b05b74edf054b622fb7ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae5b106f80eb29ed0b05b74e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:04 2013 -0500 winemac: Enable pasteboard functions to operate on arbitrary pasteboards. ... not just the general pasteboard (although the general pasteboard is still the default). --- dlls/winemac.drv/clipboard.c | 12 ++++++------ dlls/winemac.drv/cocoa_clipboard.m | 22 ++++++++++++++-------- dlls/winemac.drv/macdrv_cocoa.h | 4 ++-- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 2219df6..4a6f859 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1326,7 +1326,7 @@ INT CDECL macdrv_CountClipboardFormats(void) return 0; } - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1396,7 +1396,7 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) TRACE("prev_format %s\n", debugstr_format(prev_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1490,7 +1490,7 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1526,7 +1526,7 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) if (best_format) { - CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(best_type); + 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)); @@ -1556,7 +1556,7 @@ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1758,7 +1758,7 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) if (!types) { - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 8d29326..b8ca796 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -53,8 +53,9 @@ int macdrv_is_pasteboard_owner(void) * the pasteboard, or NULL on error. The caller is responsible for * releasing the returned array with CFRelease(). */ -CFArrayRef macdrv_copy_pasteboard_types(void) +CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) { + NSPasteboard* pb = (NSPasteboard*)pasteboard; __block CFArrayRef ret = NULL; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -79,8 +80,11 @@ CFArrayRef macdrv_copy_pasteboard_types(void) OnMainThread(^{ @try { - NSPasteboard* pb = [NSPasteboard generalPasteboard]; - NSArray* types = [pb types]; + NSPasteboard* local_pb = pb; + NSArray* types; + + if (!local_pb) local_pb = [NSPasteboard generalPasteboard]; + types = [local_pb types]; // If there are any types understood by NSBitmapImageRep, then we // can offer all of the types that it can output, too. For example, @@ -115,22 +119,24 @@ CFArrayRef macdrv_copy_pasteboard_types(void) * if there's no such type on the pasteboard. The caller is responsible * for releasing the returned data object with CFRelease(). */ -CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) +CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) { + NSPasteboard* pb = (NSPasteboard*)pasteboard; __block NSData* ret = nil; OnMainThread(^{ @try { - NSPasteboard* pb = [NSPasteboard generalPasteboard]; - if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) - ret = [[pb dataForType:(NSString*)type] copy]; + NSPasteboard* local_pb = pb; + if (!local_pb) local_pb = [NSPasteboard generalPasteboard]; + if ([local_pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) + ret = [[local_pb dataForType:(NSString*)type] copy]; else { NSNumber* bitmapType = [BitmapOutputTypeMap objectForKey:(NSString*)type]; if (bitmapType) { - NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:pb]; + NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:local_pb]; ret = [NSBitmapImageRep representationOfImageRepsInArray:reps usingType:[bitmapType unsignedIntegerValue] properties:nil]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index bbd3424..95a3720 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -304,8 +304,8 @@ extern CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard /* clipboard */ -extern CFArrayRef macdrv_copy_pasteboard_types(void) DECLSPEC_HIDDEN; -extern CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) DECLSPEC_HIDDEN; +extern CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) DECLSPEC_HIDDEN; +extern CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) DECLSPEC_HIDDEN; extern int macdrv_is_pasteboard_owner(void) DECLSPEC_HIDDEN; extern void macdrv_clear_pasteboard(void) DECLSPEC_HIDDEN; extern int macdrv_set_pasteboard_data(CFStringRef type, CFDataRef data, macdrv_window w) DECLSPEC_HIDDEN;

1 0

Ken Thomases : winemac: Extract new function from macdrv_GetClipboardData() parameterized by the target pasteboard.
by Alexandre Julliard 14 Mar '13

14 Mar '13

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

Ken Thomases : winemac: Extract new function from macdrv_IsClipboardFormatAvailable() parameterized by the target pasteboard.
by Alexandre Julliard 14 Mar '13

14 Mar '13

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_EnumClipboardFormats() parameterized by the target pasteboard.
by Alexandre Julliard 14 Mar '13

14 Mar '13

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: Implement support for drag-and-drop.
by Alexandre Julliard 14 Mar '13

14 Mar '13

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