October 2016 - Wine-commits

Ken Thomases : winemac: Reimplement query_pasteboard_data() using the user32 clipboard API.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 019983e2c6d65a887d12c46f39fc13b533b39a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019983e2c6d65a887d12c46f3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:30 2016 -0500 winemac: Reimplement query_pasteboard_data() using the user32 clipboard API. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 81 ++++++++++---------------------------------- 1 file changed, 17 insertions(+), 64 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 414ad6a..c196e93 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -40,12 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); * Types **************************************************************************/ -typedef struct -{ - HWND hwnd_owner; - UINT flags; -} CLIPBOARDINFO, *LPCLIPBOARDINFO; - typedef HANDLE (*DRVIMPORTFUNC)(CFDataRef data); typedef CFDataRef (*DRVEXPORTFUNC)(HANDLE data); @@ -1198,35 +1192,6 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) /************************************************************************** - * get_clipboard_info - */ -static BOOL get_clipboard_info(LPCLIPBOARDINFO cbinfo) -{ - BOOL ret = FALSE; - - SERVER_START_REQ(set_clipboard_info) - { - req->flags = 0; - - if (wine_server_call_err(req)) - { - ERR("Failed to get clipboard owner.\n"); - } - else - { - cbinfo->hwnd_owner = wine_server_ptr_handle(reply->old_owner); - cbinfo->flags = reply->flags; - - ret = TRUE; - } - } - SERVER_END_REQ; - - return ret; -} - - -/************************************************************************** * macdrv_get_pasteboard_data */ HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) @@ -1488,47 +1453,35 @@ void macdrv_clipboard_process_attach(void) */ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) { + WINE_CLIPFORMAT *format; BOOL ret = FALSE; - CLIPBOARDINFO cbinfo; - WINE_CLIPFORMAT* format; - CFArrayRef types = NULL; - - TRACE("hwnd %p type %s\n", hwnd, debugstr_cf(type)); + HANDLE handle; - if (get_clipboard_info(&cbinfo)) - hwnd = cbinfo.hwnd_owner; + TRACE("win %p type %s\n", hwnd, debugstr_cf(type)); format = format_for_type(type); - if (!format) goto done; + if (!format) return FALSE; - TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - - if (!format->synthesized) + if (!OpenClipboard(NULL)) { - 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; + ERR("failed to open clipboard for %s\n", debugstr_cf(type)); + return FALSE; } - types = macdrv_copy_pasteboard_types(NULL); - if (!types) + if ((handle = GetClipboardData(format->format_id))) { - WARN("Failed to copy pasteboard types\n"); - goto done; - } + CFDataRef data; - if (format->natural_format && - CFArrayContainsValue(types, CFRangeMake(0, CFArrayGetCount(types)), 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); - ret = TRUE; - goto done; + TRACE("exporting %s %p\n", debugstr_format(format->format_id), handle); + + if ((data = format->export_func(handle))) + { + ret = macdrv_set_pasteboard_data(format->type, data, macdrv_get_cocoa_window(hwnd, FALSE)); + CFRelease(data); + } } -done: - if (types) CFRelease(types); + CloseClipboard(); return ret; }

1 0

Ken Thomases : winemac: Change macdrv_copy_pasteboard_formats() to return a C array instead of a CFArray.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 782959168abb12142a1c3b677742283484c3bd1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=782959168abb12142a1c3b677… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:31 2016 -0500 winemac: Change macdrv_copy_pasteboard_formats() to return a C array instead of a CFArray. Renamed it to macdrv_get_pasteboard_formats(), since the "copy" was meant to convey Core Foundation ownership semantics which no longer apply. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 83 +++++++++++++++++++++++++++++++++++--------- dlls/winemac.drv/dragdrop.c | 9 +++-- dlls/winemac.drv/macdrv.h | 2 +- 3 files changed, 72 insertions(+), 22 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index c196e93..eba426a 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1303,17 +1303,17 @@ BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_format) /************************************************************************** - * macdrv_copy_pasteboard_formats + * get_formats_for_pasteboard */ -CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) +static WINE_CLIPFORMAT** get_formats_for_pasteboard(CFTypeRef pasteboard, UINT *num_formats) { CFArrayRef types; - CFIndex count; - CFMutableArrayRef formats; - CFIndex i; - WINE_CLIPFORMAT* format; + CFIndex count, i; + CFMutableSetRef seen_formats; + WINE_CLIPFORMAT** formats; + UINT pos; - TRACE("pasteboard %p\n", pasteboard); + TRACE("pasteboard %s\n", debugstr_cf(pasteboard)); types = macdrv_copy_pasteboard_types(pasteboard); if (!types) @@ -1331,19 +1331,29 @@ CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) return NULL; } - formats = CFArrayCreateMutable(NULL, 0, NULL); + seen_formats = CFSetCreateMutable(NULL, count, NULL); + if (!seen_formats) + { + WARN("Failed to allocate seen formats set\n"); + CFRelease(types); + return NULL; + } + + formats = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*formats)); if (!formats) { WARN("Failed to allocate formats array\n"); CFRelease(types); + CFRelease(seen_formats); return NULL; } + pos = 0; for (i = 0; i < count; i++) { CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format = format_for_type(type); - format = format_for_type(type); if (!format) { TRACE("ignoring type %s\n", debugstr_cf(type)); @@ -1353,7 +1363,8 @@ CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) if (!format->synthesized) { TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFArrayAppendValue(formats, (void*)format->format_id); + CFSetAddValue(seen_formats, (void*)format->format_id); + formats[pos++] = format; } else if (format->natural_format && CFArrayContainsValue(types, CFRangeMake(0, count), format->natural_format->type)) @@ -1361,7 +1372,7 @@ CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) TRACE("for type %s deferring synthesized formats because type %s is also present\n", debugstr_cf(type), debugstr_cf(format->natural_format->type)); } - else if (CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) + else if (CFSetContainsValue(seen_formats, (void*)format->format_id)) { TRACE("for type %s got duplicate synthesized format %p/%s; skipping\n", debugstr_cf(type), format, debugstr_format(format->format_id)); @@ -1369,7 +1380,8 @@ CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) else { TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFArrayAppendValue(formats, (void*)format->format_id); + CFSetAddValue(seen_formats, (void*)format->format_id); + formats[pos++] = format; } } @@ -1377,26 +1389,65 @@ CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) for (i = 0; i < count; i++) { CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format = format_for_type(type); - format = format_for_type(type); if (!format) continue; if (!format->synthesized) continue; /* Don't duplicate a real value with a synthesized value. */ - if (CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) continue; + if (CFSetContainsValue(seen_formats, (void*)format->format_id)) continue; TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFArrayAppendValue(formats, (void*)format->format_id); + CFSetAddValue(seen_formats, (void*)format->format_id); + formats[pos++] = format; } CFRelease(types); + CFRelease(seen_formats); - TRACE(" -> %s\n", debugstr_cf(formats)); + if (!pos) + { + HeapFree(GetProcessHeap(), 0, formats); + formats = NULL; + } + + *num_formats = pos; return formats; } /************************************************************************** + * macdrv_get_pasteboard_formats + */ +UINT* macdrv_get_pasteboard_formats(CFTypeRef pasteboard, UINT* num_formats) +{ + WINE_CLIPFORMAT** formats; + UINT count, i; + UINT* format_ids; + + formats = get_formats_for_pasteboard(pasteboard, &count); + if (!formats) + return NULL; + + format_ids = HeapAlloc(GetProcessHeap(), 0, count); + if (!format_ids) + { + WARN("Failed to allocate formats IDs array\n"); + HeapFree(GetProcessHeap(), 0, formats); + return NULL; + } + + for (i = 0; i < count; i++) + format_ids[i] = formats[i]->format_id; + + HeapFree(GetProcessHeap(), 0, formats); + + *num_formats = count; + return format_ids; +} + + +/************************************************************************** * Mac User Driver Clipboard Exports **************************************************************************/ diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index ad0bc8c..e089018 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -185,7 +185,7 @@ static HRESULT WINAPI dddo_EnumFormatEtc(IDataObject* iface, DWORD direction, IEnumFORMATETC** enumFormatEtc) { DragDropDataObject *This = impl_from_IDataObject(iface); - CFArrayRef formats; + UINT *formats, count; HRESULT hr; TRACE("This %p direction %u enumFormatEtc %p\n", This, direction, enumFormatEtc); @@ -196,10 +196,9 @@ static HRESULT WINAPI dddo_EnumFormatEtc(IDataObject* iface, DWORD direction, return E_NOTIMPL; } - formats = macdrv_copy_pasteboard_formats(This->pasteboard); + formats = macdrv_get_pasteboard_formats(This->pasteboard, &count); if (formats) { - INT count = CFArrayGetCount(formats); FORMATETC *formatEtcs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(FORMATETC)); if (formatEtcs) { @@ -207,7 +206,7 @@ static HRESULT WINAPI dddo_EnumFormatEtc(IDataObject* iface, DWORD direction, for (i = 0; i < count; i++) { - formatEtcs[i].cfFormat = (UINT)CFArrayGetValueAtIndex(formats, i); + formatEtcs[i].cfFormat = formats[i]; formatEtcs[i].ptd = NULL; formatEtcs[i].dwAspect = DVASPECT_CONTENT; formatEtcs[i].lindex = -1; @@ -220,7 +219,7 @@ static HRESULT WINAPI dddo_EnumFormatEtc(IDataObject* iface, DWORD direction, else hr = E_OUTOFMEMORY; - CFRelease(formats); + HeapFree(GetProcessHeap(), 0, formats); } else hr = SHCreateStdEnumFmtEtc(0, NULL, enumFormatEtc); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index bfdffc8..c29ea15 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -199,7 +199,7 @@ extern BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) DECLSPEC_HIDDEN; extern const char *debugstr_format(UINT id) DECLSPEC_HIDDEN; extern HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; extern BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; -extern CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) DECLSPEC_HIDDEN; +extern UINT* macdrv_get_pasteboard_formats(CFTypeRef pasteboard, UINT* num_formats) DECLSPEC_HIDDEN; extern BOOL query_drag_operation(macdrv_query* query) DECLSPEC_HIDDEN; extern BOOL query_drag_exited(macdrv_query* query) DECLSPEC_HIDDEN;

1 0

Ken Thomases : winemac: Run a single clipboard manager thread per window station, inside the explorer process.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: fa573553bc52154487396d9d0009a5d8a36bbbcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa573553bc52154487396d9d0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:32 2016 -0500 winemac: Run a single clipboard manager thread per window station, inside the explorer process. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 377 +++++++++++++++++++++++++++++++++++------ dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 - dlls/winemac.drv/window.c | 2 + 4 files changed, 325 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa573553bc52154487396…

1 0

Ken Thomases : winemac: Implement the UpdateClipboard entry point to have the clipboard manager update its status.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: e7568d342a37ad9406e173389b6cf2450e119a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7568d342a37ad9406e173389… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:33 2016 -0500 winemac: Implement the UpdateClipboard entry point to have the clipboard manager update its status. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 291 +++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 290 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7568d342a37ad9406e17…

1 0

Ken Thomases : winemac: Detect loss of ownership of the Mac pasteboard and update the clipboard manager status.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: eba417a47721975a475a01367e3e21dd5fb3356b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba417a47721975a475a01367… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:34 2016 -0500 winemac: Detect loss of ownership of the Mac pasteboard and update the clipboard manager status. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 17 +++++++++++++++-- dlls/winemac.drv/cocoa_clipboard.m | 20 ++++++++++++++++---- dlls/winemac.drv/cocoa_window.m | 7 +++++++ dlls/winemac.drv/event.c | 5 +++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 5 +++-- 6 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 358794d..fc0d60c 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1551,7 +1551,7 @@ static void set_mac_pasteboard_types_from_win32_clipboard(void) if (!(formats = get_clipboard_formats(&count))) return; - macdrv_clear_pasteboard(); + macdrv_clear_pasteboard(clipboard_cocoa_window); for (i = 0; i < count; i++) { @@ -1657,7 +1657,7 @@ static BOOL update_clipboard(void) if (GetTickCount64() - last_clipboard_update > CLIPBOARD_UPDATE_DELAY) ret = grab_win32_clipboard(); } - else if (!macdrv_is_pasteboard_owner()) + else if (!macdrv_is_pasteboard_owner(clipboard_cocoa_window)) ret = grab_win32_clipboard(); updating = FALSE; @@ -2080,6 +2080,19 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) /************************************************************************** + * macdrv_lost_pasteboard_ownership + * + * Handler for the LOST_PASTEBOARD_OWNERSHIP event. + */ +void macdrv_lost_pasteboard_ownership(HWND hwnd) +{ + TRACE("win %p\n", hwnd); + if (!macdrv_is_pasteboard_owner(clipboard_cocoa_window)) + grab_win32_clipboard(); +} + + +/************************************************************************** * macdrv_init_clipboard */ void macdrv_init_clipboard(void) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 1d1cb88..3b6ec41 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -21,6 +21,7 @@ #include "macdrv_cocoa.h" #import "cocoa_app.h" #import "cocoa_event.h" +#import "cocoa_window.h" static int owned_change_count = -1; @@ -29,17 +30,23 @@ static NSArray* BitmapOutputTypes; static NSDictionary* BitmapOutputTypeMap; static dispatch_once_t BitmapOutputTypesInitOnce; +static NSString* const OwnershipSentinel = @"org.winehq.wine.winemac.pasteboard-ownership-sentinel"; + /*********************************************************************** * macdrv_is_pasteboard_owner */ -int macdrv_is_pasteboard_owner(void) +int macdrv_is_pasteboard_owner(macdrv_window w) { __block int ret; + WineWindow* window = (WineWindow*)w; OnMainThread(^{ NSPasteboard* pb = [NSPasteboard generalPasteboard]; ret = ([pb changeCount] == owned_change_count); + + [window.queue discardEventsMatchingMask:event_mask_for_type(LOST_PASTEBOARD_OWNERSHIP) + forWindow:window]; }); return ret; @@ -157,13 +164,18 @@ CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) * * Takes ownership of the Mac pasteboard and clears it of all data types. */ -void macdrv_clear_pasteboard(void) +void macdrv_clear_pasteboard(macdrv_window w) { - OnMainThreadAsync(^{ + WineWindow* window = (WineWindow*)w; + + OnMainThread(^{ @try { NSPasteboard* pb = [NSPasteboard generalPasteboard]; - owned_change_count = [pb declareTypes:[NSArray array] owner:nil]; + owned_change_count = [pb declareTypes:[NSArray arrayWithObject:OwnershipSentinel] + owner:window]; + [window.queue discardEventsMatchingMask:event_mask_for_type(LOST_PASTEBOARD_OWNERSHIP) + forWindow:window]; } @catch (id e) { diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e638991..a68ba03 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2824,6 +2824,13 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_release_query(query); } + - (void) pasteboardChangedOwner:(NSPasteboard*)sender + { + macdrv_event* event = macdrv_create_event(LOST_PASTEBOARD_OWNERSHIP, self); + [queue postEvent:event]; + macdrv_release_event(event); + } + /* * ---------- NSDraggingDestination methods ---------- diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 2b3d6ce..7d3aab3 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -40,6 +40,7 @@ static const char *dbgstr_event(int type) "KEY_PRESS", "KEY_RELEASE", "KEYBOARD_CHANGED", + "LOST_PASTEBOARD_OWNERSHIP", "MOUSE_BUTTON", "MOUSE_MOVED", "MOUSE_MOVED_ABSOLUTE", @@ -107,6 +108,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(APP_QUIT_REQUESTED); event_mask |= event_mask_for_type(DISPLAYS_CHANGED); event_mask |= event_mask_for_type(IM_SET_TEXT); + event_mask |= event_mask_for_type(LOST_PASTEBOARD_OWNERSHIP); event_mask |= event_mask_for_type(STATUS_ITEM_MOUSE_BUTTON); event_mask |= event_mask_for_type(STATUS_ITEM_MOUSE_MOVE); event_mask |= event_mask_for_type(WINDOW_DID_UNMINIMIZE); @@ -230,6 +232,9 @@ void macdrv_handle_event(const macdrv_event *event) case KEYBOARD_CHANGED: macdrv_keyboard_changed(event); break; + case LOST_PASTEBOARD_OWNERSHIP: + macdrv_lost_pasteboard_ownership(hwnd); + break; case MOUSE_BUTTON: macdrv_mouse_button(hwnd, event); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 8afd064..a3ded73 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -196,6 +196,7 @@ extern void macdrv_displays_changed(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_init_clipboard(void) DECLSPEC_HIDDEN; extern BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) DECLSPEC_HIDDEN; +extern void macdrv_lost_pasteboard_ownership(HWND hwnd) DECLSPEC_HIDDEN; extern const char *debugstr_format(UINT id) DECLSPEC_HIDDEN; extern HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; extern BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_format) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index b3e9106..21e9565 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -267,6 +267,7 @@ enum { KEY_PRESS, KEY_RELEASE, KEYBOARD_CHANGED, + LOST_PASTEBOARD_OWNERSHIP, MOUSE_BUTTON, MOUSE_MOVED, MOUSE_MOVED_ABSOLUTE, @@ -539,8 +540,8 @@ extern int macdrv_layout_list_needs_update DECLSPEC_HIDDEN; /* clipboard */ 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_is_pasteboard_owner(macdrv_window w) DECLSPEC_HIDDEN; +extern void macdrv_clear_pasteboard(macdrv_window w) DECLSPEC_HIDDEN; extern int macdrv_set_pasteboard_data(CFStringRef type, CFDataRef data, macdrv_window w) DECLSPEC_HIDDEN;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.21
by Jeremy Newman 24 Oct '16

24 Oct '16

Module: website Branch: master Commit: 2da94add40af21d950dec6924a7ee50e11fa52a6 URL: http://source.winehq.org/git/website.git/?a=commit;h=2da94add40af21d950dec6… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 22 07:32:39 2016 +0200 Polish translation for release 1.9.21 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016101401.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2016101401.xml b/news/pl/2016101401.xml new file mode 100644 index 0000000..bd68ea2 --- /dev/null +++ b/news/pl/2016101401.xml @@ -0,0 +1,15 @@ +<news> +<date>Październik 14, 2016</date> +<title>Wydano Wine 1.9.21</title> +<body> + Wydanie rozwojowe Wine 1.9.21 jest już dostępne. + <a href="{$root}/announce/1.9.21">Co nowego</a> w tym wydaniu: +<ul> + <li>Początkowa wersja mini sterownika HID.</li> + <li>Obsługa list w elemenie RichEdit.</li> + <li>Ulepszenia do tacki systemowej.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.21.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Michael Stefaniuc : mshtml/tests: Use EqualRect() to compare RECTs.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: d930b57ded7b80c2a77d546ae2959bd1e918a60a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d930b57ded7b80c2a77d546ae… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 20 10:19:08 2016 +0200 mshtml/tests: Use EqualRect() to compare RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/activex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index bd1a0cd..78602b7 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -1149,8 +1149,8 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms ok(ip_frame != NULL, "ip_frame == NULL\n"); ok(ip_uiwindow != NULL, "ip_uiwindow == NULL\n"); ok((IOleInPlaceUIWindow*)ip_frame != ip_uiwindow, "ip_frame == ip_uiwindow\n"); - ok(!memcmp(&pos_rect, lprcPosRect, sizeof(RECT)), "pos_rect != lpecPosRect\n"); - ok(!memcmp(&clip_rect, lprcPosRect, sizeof(RECT)), "clip_rect != lpecPosRect\n"); + ok(EqualRect(&pos_rect, lprcPosRect), "pos_rect != lpecPosRect\n"); + ok(EqualRect(&clip_rect, lprcPosRect), "clip_rect != lpecPosRect\n"); ok(frame_info.cb == sizeof(frame_info), "frame_info.cb = %d\n", frame_info.cb); ok(!frame_info.fMDIApp, "frame_info.fMDIApp = %x\n", frame_info.fMDIApp); ok(frame_info.hwndFrame != NULL, "frame_info.hwnd == NULL\n");

1 0

Michael Stefaniuc : mshtml: Use EqualRect() to compare RECTs.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 41992ae38d1d0371b9ee70066f701a1fdae88d7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41992ae38d1d0371b9ee70066… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 20 10:24:06 2016 +0200 mshtml: Use EqualRect() to compare RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/pluginhost.c | 2 +- dlls/mshtml/view.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 712f7e0..0fbbf6c 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -311,7 +311,7 @@ void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) TRACE("%p %s\n", hwnd, wine_dbgstr_rect(rect)); - if(memcmp(rect, &host->rect, sizeof(RECT))) { + if(!EqualRect(rect, &host->rect)) { host->rect = *rect; rect_changed = TRUE; } diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 2a55938..15f39f4 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -507,7 +507,7 @@ static HRESULT WINAPI OleDocumentView_SetRect(IOleDocumentView *iface, LPRECT pr if(This->doc_obj->hwnd) { GetClientRect(This->doc_obj->hwnd, &rect); - if(memcmp(prcView, &rect, sizeof(RECT))) { + if(!EqualRect(prcView, &rect)) { InvalidateRect(This->doc_obj->hwnd, NULL, TRUE); SetWindowPos(This->doc_obj->hwnd, NULL, prcView->left, prcView->top, prcView->right, prcView->bottom, SWP_NOZORDER | SWP_NOACTIVATE);

1 0

Iván Matellanes : msvcirt: Add a partial implementation of class strstream.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 4df13fff82a75eb59105e61cafb3a0961379a5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df13fff82a75eb59105e61ca… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 21 19:34:01 2016 +0200 msvcirt: Add a partial implementation of class strstream. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 46 +++++++++++++++--------------- dlls/msvcrt20/msvcrt20.spec | 46 +++++++++++++++--------------- dlls/msvcrt40/msvcrt40.spec | 46 +++++++++++++++--------------- 4 files changed, 138 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4df13fff82a75eb59105e…

1 0

Iván Matellanes : msvcirt: Implement strstream constructors.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 95018e68874c7ad67ea08253298b66d70227000f URL: http://source.winehq.org/git/wine.git/?a=commit;h=95018e68874c7ad67ea082532… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 21 19:34:02 2016 +0200 msvcirt: Implement strstream constructors. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 59 ++++++- dlls/msvcirt/tests/msvcirt.c | 356 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 409 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95018e68874c7ad67ea08…

1 0