wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Józef Kucia : wined3d: Simplify remove_vbos().
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 6c5e1aff0421b8a56e686520b6f6d11a0408871b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5e1aff0421b8a56e686520b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 24 11:57:26 2016 +0200 wined3d: Simplify remove_vbos(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 4833845..bf035ae 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -391,18 +391,19 @@ static void remove_vbos(struct wined3d_context *context, { unsigned int i; - for (i = 0; i < (sizeof(s->elements) / sizeof(*s->elements)); ++i) + for (i = 0; i < ARRAY_SIZE(s->elements); ++i) { struct wined3d_stream_info_element *e; - if (!(s->use_map & (1u << i))) continue; + if (!(s->use_map & (1u << i))) + continue; e = &s->elements[i]; if (e->data.buffer_object) { struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; e->data.buffer_object = 0; - e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)wined3d_buffer_load_sysmem(vb, context)); + e->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(vb, context); } } }

1 0

Józef Kucia : wined3d: Introduce buffer_conversion_upload() helper function.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 6454242009715249b497fa7db9df21946b74d648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6454242009715249b497fa7db… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 24 11:57:25 2016 +0200 wined3d: Introduce buffer_conversion_upload() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 122 +++++++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d8b47fc..e0e62c5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -852,6 +852,69 @@ static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_con wined3d_buffer_validate_location(This, WINED3D_LOCATION_BUFFER); } +static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int i, j, start, end, len, vertex_count; + BYTE *data; + + /* This would potentially invalidate the element array buffer binding. */ + if (buffer->buffer_type_hint != GL_ARRAY_BUFFER) + ERR("Converting data in non-vertex buffer.\n"); + + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + + /* Now for each vertex in the buffer that needs conversion. */ + vertex_count = buffer->resource.size / buffer->stride; + + if (!(data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size))) + { + ERR("Out of memory.\n"); + return; + } + + while (buffer->modified_areas) + { + buffer->modified_areas--; + start = buffer->maps[buffer->modified_areas].offset; + len = buffer->maps[buffer->modified_areas].size; + end = start + len; + + memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); + for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) + { + for (j = 0; j < buffer->stride;) + { + switch (buffer->conversion_map[j]) + { + case CONV_NONE: + /* Done already */ + j += sizeof(DWORD); + break; + case CONV_D3DCOLOR: + j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); + break; + case CONV_POSITIONT: + j += fixup_transformed_pos((float *) (data + i * buffer->stride + j)); + break; + default: + FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]); + ++j; + } + } + } + + GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); + checkGLcall("glBindBuffer"); + GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, start, len, data + start)); + checkGLcall("glBufferSubData"); + } + + HeapFree(GetProcessHeap(), 0, data); + + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); +} + void buffer_mark_used(struct wined3d_buffer *buffer) { buffer->flags &= ~(WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); @@ -863,9 +926,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * { DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i, j, start, end, len, vertex_count; BOOL decl_changed = FALSE; - BYTE *data; TRACE("buffer %p.\n", buffer); @@ -980,64 +1041,11 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * return; buffer_direct_upload(buffer, context, flags); - return; } - - /* This would potentially invalidate the element array buffer binding. */ - if (buffer->buffer_type_hint != GL_ARRAY_BUFFER) - ERR("Converting data in non-vertex buffer.\n"); - - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - - /* Now for each vertex in the buffer that needs conversion */ - vertex_count = buffer->resource.size / buffer->stride; - - if (!(data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size))) + else { - ERR("Out of memory.\n"); - return; + buffer_conversion_upload(buffer, context); } - - while (buffer->modified_areas) - { - buffer->modified_areas--; - start = buffer->maps[buffer->modified_areas].offset; - len = buffer->maps[buffer->modified_areas].size; - end = start + len; - - memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); - for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) - { - for (j = 0; j < buffer->stride;) - { - switch (buffer->conversion_map[j]) - { - case CONV_NONE: - /* Done already */ - j += sizeof(DWORD); - break; - case CONV_D3DCOLOR: - j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); - break; - case CONV_POSITIONT: - j += fixup_transformed_pos((float *) (data + i * buffer->stride + j)); - break; - default: - FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]); - ++j; - } - } - } - - GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); - checkGLcall("glBindBuffer"); - GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, start, len, data + start)); - checkGLcall("glBufferSubData"); - } - - HeapFree(GetProcessHeap(), 0, data); - - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); } struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer)

1 0

Józef Kucia : wined3d: Replace wined3d_buffer_load_sysmem() calls with wined3d_buffer_load_location().
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 4a23e91462083db82058111977762532c86afcad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a23e91462083db8205811197… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 24 11:57:24 2016 +0200 wined3d: Replace wined3d_buffer_load_sysmem() calls with wined3d_buffer_load_location(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index eae55e1..d8b47fc 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -631,6 +631,7 @@ void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, static void buffer_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + DWORD flags = buffer->flags; TRACE("buffer %p.\n", buffer); @@ -641,12 +642,10 @@ static void buffer_unload(struct wined3d_resource *resource) context = context_acquire(device, NULL); - /* Download the buffer, but don't permanently enable double buffering */ - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) - { - wined3d_buffer_load_sysmem(buffer, context); + /* Download the buffer, but don't permanently enable double buffering. */ + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + if (!(flags & WINED3D_BUFFER_DOUBLEBUFFER)) buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; - } wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); delete_gl_buffer(buffer, context->gl_info); @@ -988,8 +987,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * if (buffer->buffer_type_hint != GL_ARRAY_BUFFER) ERR("Converting data in non-vertex buffer.\n"); - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) - wined3d_buffer_load_sysmem(buffer, context); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); /* Now for each vertex in the buffer that needs conversion */ vertex_count = buffer->resource.size / buffer->stride; @@ -1144,7 +1142,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI else { TRACE("Falling back to doublebuffered operation.\n"); - wined3d_buffer_load_sysmem(buffer, context); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); } TRACE("New pointer is %p.\n", buffer->resource.heap_memory); buffer->map_ptr = NULL;

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

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: 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: 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: 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: Simplify format_for_type() and callers since there 's at most one format for a given Mac pasteboard type.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 33b9494ecf3d744f3c316ca3a58f973af7697076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b9494ecf3d744f3c316ca3a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:29 2016 -0500 winemac: Simplify format_for_type() and callers since there's at most one format for a given Mac pasteboard type. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 216 +++++++++++++++++-------------------------- 1 file changed, 83 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33b9494ecf3d744f3c316…

1 0

Ken Thomases : winemac: Remove no-longer-called clipboard entry points.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 9cedf37205a1e0f1d36f00cd9a4f4e3521b2293f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cedf37205a1e0f1d36f00cd9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 23 13:03:28 2016 -0500 winemac: Remove no-longer-called clipboard entry points. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 294 -------------------------------------- dlls/winemac.drv/winemac.drv.spec | 7 - 2 files changed, 301 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9cedf37205a1e0f1d36f0…

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2016