September 2016 - Wine-commits

Henri Verbeet : wined3d: Don' t require a specific context in wined3d_device_init_3d().
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: d82cbea6291f0d19565792b7aa4d08c32ff24698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82cbea6291f0d19565792b7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 20 11:41:39 2016 +0200 wined3d: Don't require a specific context in wined3d_device_init_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8f24506..2db1af8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1075,7 +1075,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device->swapchains[0] = swapchain; device_init_swapchain_state(device, swapchain); - context = context_acquire(device, swapchain->front_buffer->sub_resources[0].u.surface); + context = context_acquire(device, NULL); create_dummy_textures(device, context); create_default_samplers(device);

1 0

Henri Verbeet : wined3d: Wait for the resource to become idle when destroying user memory textures.
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: 6fc546114b660f7c26208a617a37e826a4173908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc546114b660f7c26208a617… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 20 11:41:40 2016 +0200 wined3d: Wait for the resource to become idle when destroying user memory textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8e5a5f1..1c44a5d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -871,6 +871,12 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) if (!refcount) { + /* Wait for the texture to become idle if it's using user memory, + * since the application is allowed to free that memory once the + * texture is destroyed. Note that this implies that + * wined3d_texture_destroy_object() can't access that memory either. */ + if (texture->user_memory) + wined3d_resource_wait_idle(&texture->resource); wined3d_texture_sub_resources_destroyed(texture); texture->resource.parent_ops->wined3d_object_destroyed(texture->resource.parent); resource_cleanup(&texture->resource);

1 0

Henri Verbeet : wined3d: Wait for the texture to become idle before modifying it in wined3d_texture_update_desc ().
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: 9cfaa83e92fe88b77557692940aadd171b13aee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cfaa83e92fe88b7755769294… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 20 11:41:41 2016 +0200 wined3d: Wait for the texture to become idle before modifying it in wined3d_texture_update_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1c44a5d..c82016e5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1137,6 +1137,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT if (device->d3d_initialized) wined3d_cs_emit_unload_resource(device->cs, &texture->resource); + wined3d_resource_wait_idle(&texture->resource); sub_resource = &texture->sub_resources[0]; surface = sub_resource->u.surface;

1 0

Austin English : advapi32: Add EventWriteTransfer stub.
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: e6e8ed47e6d6d245e4bbda13691eb714cf95a675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e8ed47e6d6d245e4bbda136… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Sep 17 00:45:51 2016 -0500 advapi32: Add EventWriteTransfer stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 11 +++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-eventing-provider-l1-1-0.spec | 2 +- include/evntprov.h | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index adb6d7e..c2a8d01 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -280,7 +280,7 @@ # @ stub EventWriteEx # @ stub EventWriteStartScenario # @ stub EventWriteString -# @ stub EventWriteTransfer +@ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 7274d98..f947511 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -875,6 +875,17 @@ ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG } /****************************************************************************** + * EventWriteTransfer [ADVAPI32.@] + */ +ULONG WINAPI EventWriteTransfer( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, LPCGUID activity, + LPCGUID related, ULONG count, PEVENT_DATA_DESCRIPTOR data ) +{ + FIXME("%s, %p, %s, %s, %u, %p: stub\n", wine_dbgstr_longlong(handle), descriptor, + debugstr_guid(activity), debugstr_guid(related), count, data); + return ERROR_SUCCESS; +} + +/****************************************************************************** * EventSetInformation [ADVAPI32.@] */ ULONG WINAPI EventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, PVOID info, diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index cfe2261..d5bc3e6 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -45,7 +45,7 @@ @ stdcall EventUnregister(int64) advapi32.EventUnregister @ stdcall EventWrite(int64 ptr long ptr) advapi32.EventWrite @ stub EventWriteString -@ stub EventWriteTransfer +@ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) advapi32.EventWriteTransfer @ stdcall FindFirstFreeAce(ptr ptr) advapi32.FindFirstFreeAce @ stdcall FreeSid(ptr) advapi32.FreeSid @ stdcall GetAce(ptr long ptr) advapi32.GetAce diff --git a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec index 82c6e69..bd4e7a3 100644 --- a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec @@ -7,4 +7,4 @@ @ stdcall EventWrite(int64 ptr long ptr) advapi32.EventWrite @ stub EventWriteEx @ stub EventWriteString -@ stub EventWriteTransfer +@ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) advapi32.EventWriteTransfer diff --git a/include/evntprov.h b/include/evntprov.h index 7f086b9..a49fa79 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -73,6 +73,7 @@ ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); ULONG WINAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); ULONG WINAPI EventUnregister(REGHANDLE); ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); +ULONG WINAPI EventWriteTransfer(REGHANDLE,PCEVENT_DESCRIPTOR,LPCGUID,LPCGUID,ULONG,PEVENT_DATA_DESCRIPTOR); #ifdef __cplusplus }

1 0

Vincent Povirk : gdiplus: Add clipping to GDI32_GdipFillRegion.
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: 3fd47e1be1dff3f27b060045abaf1e0f4eae2fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd47e1be1dff3f27b060045a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 19 15:07:00 2016 -0500 gdiplus: Add clipping to GDI32_GdipFillRegion. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4ae1f48..964fa9f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3942,6 +3942,23 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + DeleteObject(hrgn); + + hrgn = NULL; + status = get_clip_hrgn(graphics, &hrgn); + + if (status != Ok) + { + RestoreDC(graphics->hdc, save_state); + return status; + } + + if (hrgn) + { + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + DeleteObject(hrgn); + } + if (GetClipBox(graphics->hdc, &rc) != NULLREGION) { BeginPath(graphics->hdc); @@ -3953,7 +3970,6 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, RestoreDC(graphics->hdc, save_state); - DeleteObject(hrgn); return Ok; }

1 0

Vincent Povirk : gdiplus: Add clipping to GDI32_GdipDrawDriverString.
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: c6afa50db6fb2fefcd349a52728cea2479bf0392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6afa50db6fb2fefcd349a527… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 19 15:07:01 2016 -0500 gdiplus: Add clipping to GDI32_GdipDrawDriverString. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 964fa9f..894503e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6321,6 +6321,8 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 GpPointF pt; HFONT hfont; UINT eto_flags=0; + GpStatus status; + HRGN hrgn; if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); @@ -6332,6 +6334,14 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 SetBkMode(graphics->hdc, TRANSPARENT); SetTextColor(graphics->hdc, get_gdi_brush_color(brush)); + status = get_clip_hrgn(graphics, &hrgn); + + if (status == Ok && hrgn) + { + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + DeleteObject(hrgn); + } + pt = positions[0]; GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &pt, 1);

1 0

Vincent Povirk : gdiplus: Add clipping to GdipDrawImage.
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: f696e431adcc55a72b3b3a02233ae2d01750e0ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f696e431adcc55a72b3b3a022… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 19 15:07:02 2016 -0500 gdiplus: Add clipping to GdipDrawImage. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 894503e..076ed81 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3083,6 +3083,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image HDC hdc; BOOL temp_hdc = FALSE, temp_bitmap = FALSE; HBITMAP hbitmap, old_hbm=NULL; + HRGN hrgn; + INT save_state; if (!(bitmap->format == PixelFormat16bppRGB555 || bitmap->format == PixelFormat24bppRGB || @@ -3143,6 +3145,16 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image old_hbm = SelectObject(hdc, hbitmap); } + save_state = SaveDC(graphics->hdc); + + stat = get_clip_hrgn(graphics, &hrgn); + + if (stat == Ok && hrgn) + { + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + DeleteObject(hrgn); + } + if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha)) { gdi_alpha_blend(graphics, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, @@ -3154,6 +3166,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image hdc, srcx, srcy, srcwidth, srcheight, SRCCOPY); } + RestoreDC(graphics->hdc, save_state); + if (temp_hdc) { SelectObject(hdc, old_hbm);

1 0

Vincent Povirk : iprop: Add dll.
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: 4e1514127b28be59af472d59c5d78466432636bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1514127b28be59af472d59c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 19 14:16:26 2016 -0500 iprop: Add dll. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/iprop/Makefile.in | 1 + dlls/iprop/iprop.spec | 8 ++++++++ tools/make_specfiles | 1 + 5 files changed, 13 insertions(+) diff --git a/configure b/configure index f842c82..58fb32f 100755 --- a/configure +++ b/configure @@ -1179,6 +1179,7 @@ enable_initpki enable_inkobj enable_inseng enable_iphlpapi +enable_iprop enable_irprops_cpl enable_itircl enable_itss @@ -17929,6 +17930,7 @@ wine_fn_config_dll inkobj enable_inkobj wine_fn_config_dll inseng enable_inseng clean wine_fn_config_dll iphlpapi enable_iphlpapi implib wine_fn_config_test dlls/iphlpapi/tests iphlpapi_test +wine_fn_config_dll iprop enable_iprop wine_fn_config_dll irprops.cpl enable_irprops_cpl wine_fn_config_dll itircl enable_itircl wine_fn_config_dll itss enable_itss clean diff --git a/configure.ac b/configure.ac index 7a29dc4..a6c9c6d 100644 --- a/configure.ac +++ b/configure.ac @@ -3037,6 +3037,7 @@ WINE_CONFIG_DLL(inkobj) WINE_CONFIG_DLL(inseng,,[clean]) WINE_CONFIG_DLL(iphlpapi,,[implib]) WINE_CONFIG_TEST(dlls/iphlpapi/tests) +WINE_CONFIG_DLL(iprop) WINE_CONFIG_DLL(irprops.cpl) WINE_CONFIG_DLL(itircl) WINE_CONFIG_DLL(itss,,[clean]) diff --git a/dlls/iprop/Makefile.in b/dlls/iprop/Makefile.in new file mode 100644 index 0000000..e402cd0 --- /dev/null +++ b/dlls/iprop/Makefile.in @@ -0,0 +1 @@ +MODULE = iprop.dll diff --git a/dlls/iprop/iprop.spec b/dlls/iprop/iprop.spec new file mode 100644 index 0000000..0036a72 --- /dev/null +++ b/dlls/iprop/iprop.spec @@ -0,0 +1,8 @@ +@ stdcall FmtIdToPropStgName(ptr wstr) ole32.FmtIdToPropStgName +@ stdcall FreePropVariantArray(long ptr) ole32.FreePropVariantArray +@ stdcall PropStgNameToFmtId(wstr ptr) ole32.PropStgNameToFmtId +@ stdcall PropVariantClear(ptr) ole32.PropVariantClear +@ stdcall PropVariantCopy(ptr ptr) ole32.PropVariantCopy +@ stdcall StgCreatePropSetStg(ptr long ptr) ole32.StgCreatePropSetStg +@ stdcall StgCreatePropStg(ptr ptr ptr long long ptr) ole32.StgCreatePropStg +@ stdcall StgOpenPropStg(ptr ptr long long ptr) ole32.StgOpenPropStg diff --git a/tools/make_specfiles b/tools/make_specfiles index 66476df..07266d4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -222,6 +222,7 @@ my @dll_groups = "api-ms-win-core-com-l1-1-0", "api-ms-win-core-com-l1-1-1", "combase", + "iprop", ], [ "shell32",

1 0

Alexandre Julliard : winex11: Add a helper function to store property data.
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: 2df558af9c75dbb23061af2af972d2643113bc24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df558af9c75dbb23061af2af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 11:32:08 2016 +0900 winex11: Add a helper function to store property data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 45 +++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ae49f4b..bb11819 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -655,6 +655,33 @@ static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpDa } +/************************************************************************** + * put_property + * + * Put data as a property on the specified window. + */ +static void put_property( Display *display, Window win, Atom prop, Atom type, int format, + const void *ptr, size_t size ) +{ + const unsigned char *data = ptr; + int mode = PropModeReplace; + size_t width = (format == 32) ? sizeof(long) : format / 8; + size_t max_size = XExtendedMaxRequestSize( display ) * 4; + + if (!max_size) max_size = XMaxRequestSize( display ) * 4; + max_size -= 64; /* request overhead */ + + do + { + size_t count = min( size, max_size / width ); + XChangeProperty( display, win, prop, type, format, mode, data, count ); + mode = PropModeAppend; + size -= count; + data += count * width; + } while (size > 0); +} + + /*********************************************************************** * bitmap_info_size * @@ -2781,10 +2808,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, targets[i++] = format->atom; } - /* We may want to consider setting the type to xaTargets instead, - * in case some apps expect this instead of XA_ATOM */ - XChangeProperty(display, requestor, rprop, XA_ATOM, 32, - PropModeReplace, (unsigned char *)targets, cTargets); + put_property( display, requestor, rprop, XA_ATOM, 32, targets, cTargets ); HeapFree(GetProcessHeap(), 0, targets); @@ -2950,19 +2974,10 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev if (hClipData && (lpClipData = GlobalLock(hClipData))) { - int mode = PropModeReplace; - TRACE("\tUpdating property %s, %d bytes\n", debugstr_format(lpFormat->id), cBytes); - do - { - int nelements = min(cBytes, 65536); - XChangeProperty(display, request, rprop, event->target, - 8, mode, lpClipData, nelements); - mode = PropModeAppend; - cBytes -= nelements; - lpClipData += nelements; - } while (cBytes > 0); + + put_property( display, request, rprop, event->target, 8, lpClipData, cBytes ); GlobalUnlock(hClipData); GlobalFree(hClipData);

1 0

Alexandre Julliard : winex11: Add a helper function to convert the selection.
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: 7d0ddff2d89587e1c5606f14785d78c8e25a4e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0ddff2d89587e1c5606f147… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 14:13:24 2016 +0900 winex11: Add a helper function to convert the selection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 100 ++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 68 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index bb11819..3b3812a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -682,6 +682,28 @@ static void put_property( Display *display, Window win, Atom prop, Atom type, in } +/************************************************************************** + * convert_selection + */ +static Atom convert_selection( Display *display, Window win, Atom selection, Atom target ) +{ + int i; + XEvent event; + + XConvertSelection( display, selection, target, x11drv_atom(SELECTION_DATA), win, CurrentTime ); + + for (i = 0; i < SELECTION_RETRIES; i++) + { + Bool res = XCheckTypedWindowEvent( display, win, SelectionNotify, &event ); + if (res && event.xselection.selection == selection && event.xselection.target == target) + return event.xselection.property; + usleep( SELECTION_WAIT ); + } + ERR( "Timed out waiting for SelectionNotify event\n" ); + return None; +} + + /*********************************************************************** * bitmap_info_size * @@ -1933,44 +1955,6 @@ failed: } -/************************************************************************** - * X11DRV_CLIPBOARD_QueryTargets - */ -static BOOL X11DRV_CLIPBOARD_QueryTargets(Display *display, Window w, Atom selection, - Atom target, XEvent *xe) -{ - INT i; - - XConvertSelection(display, selection, target, x11drv_atom(SELECTION_DATA), w, CurrentTime); - - /* - * Wait until SelectionNotify is received - */ - for (i = 0; i < SELECTION_RETRIES; i++) - { - Bool res = XCheckTypedWindowEvent(display, w, SelectionNotify, xe); - if (res && xe->xselection.selection == selection) break; - - usleep(SELECTION_WAIT); - } - - if (i == SELECTION_RETRIES) - { - ERR("Timed out waiting for SelectionNotify event\n"); - return FALSE; - } - /* Verify that the selection returned a valid TARGETS property */ - if ((xe->xselection.target != target) || (xe->xselection.property == None)) - { - /* Selection owner failed to respond or we missed the SelectionNotify */ - WARN("Failed to retrieve TARGETS for selection %ld.\n", selection); - return FALSE; - } - - return TRUE; -} - - static int is_atom_error( Display *display, XErrorEvent *event, void *arg ) { return (event->error_code == BadAtom); @@ -2070,13 +2054,13 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p */ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) { - XEvent xe; Atom atype=AnyPropertyType; int aformat; unsigned long remain; Atom* targetList=NULL; Window w; unsigned long cSelectionTargets = 0; + Atom prop; if (selectionAcquired & (S_PRIMARY | S_CLIPBOARD)) { @@ -2098,22 +2082,22 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) if ((use_primary_selection && XGetSelectionOwner(display,XA_PRIMARY)) || XGetSelectionOwner(display,x11drv_atom(CLIPBOARD))) { - if (use_primary_selection && (X11DRV_CLIPBOARD_QueryTargets(display, w, XA_PRIMARY, x11drv_atom(TARGETS), &xe))) + if (use_primary_selection && (prop = convert_selection( display, w, XA_PRIMARY, x11drv_atom(TARGETS) ))) selectionCacheSrc = XA_PRIMARY; - else if (X11DRV_CLIPBOARD_QueryTargets(display, w, x11drv_atom(CLIPBOARD), x11drv_atom(TARGETS), &xe)) + else if ((prop = convert_selection( display, w, x11drv_atom(CLIPBOARD), x11drv_atom(TARGETS) ))) selectionCacheSrc = x11drv_atom(CLIPBOARD); else { Atom xstr = XA_STRING; /* Selection Owner doesn't understand TARGETS, try retrieving XA_STRING */ - if (X11DRV_CLIPBOARD_QueryTargets(display, w, XA_PRIMARY, XA_STRING, &xe)) + if (convert_selection( display, w, XA_PRIMARY, XA_STRING )) { X11DRV_CLIPBOARD_InsertSelectionProperties(display, &xstr, 1); selectionCacheSrc = XA_PRIMARY; return 1; } - else if (X11DRV_CLIPBOARD_QueryTargets(display, w, x11drv_atom(CLIPBOARD), XA_STRING, &xe)) + else if (convert_selection( display, w, x11drv_atom(CLIPBOARD), XA_STRING )) { X11DRV_CLIPBOARD_InsertSelectionProperties(display, &xstr, 1); selectionCacheSrc = x11drv_atom(CLIPBOARD); @@ -2129,7 +2113,7 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) else return 0; /* No selection owner so report 0 targets available */ /* Read the TARGETS property contents */ - if (!XGetWindowProperty(display, xe.xselection.requestor, xe.xselection.property, + if (!XGetWindowProperty(display, w, prop, 0, 0x3FFF, True, AnyPropertyType/*XA_ATOM*/, &atype, &aformat, &cSelectionTargets, &remain, (unsigned char**)&targetList)) { @@ -2175,10 +2159,8 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) */ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA lpData) { - Bool res; - DWORD i; - XEvent xe; BOOL bRet = FALSE; + Atom prop; TRACE("%04x\n", lpData->wFormatID); @@ -2202,33 +2184,15 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA debugstr_format( lpData->lpFormat->id ), debugstr_xatom( lpData->lpFormat->atom ), (UINT)selectionCacheSrc); - XConvertSelection(display, selectionCacheSrc, lpData->lpFormat->atom, - x11drv_atom(SELECTION_DATA), w, CurrentTime); - - /* wait until SelectionNotify is received */ - for (i = 0; i < SELECTION_RETRIES; i++) - { - res = XCheckTypedWindowEvent(display, w, SelectionNotify, &xe); - if (res && xe.xselection.selection == selectionCacheSrc) break; - - usleep(SELECTION_WAIT); - } - - if (i == SELECTION_RETRIES) - { - ERR("Timed out waiting for SelectionNotify event\n"); - } - /* Verify that the selection returned a valid TARGETS property */ - else if (xe.xselection.property != None) + prop = convert_selection( display, w, selectionCacheSrc, lpData->lpFormat->atom ); + if (prop != None) { /* * Read the contents of the X selection property * into WINE's clipboard cache and converting the * data format if necessary. */ - HANDLE hData = lpData->lpFormat->lpDrvImportFunc(display, xe.xselection.requestor, - xe.xselection.property); - + HANDLE hData = lpData->lpFormat->lpDrvImportFunc(display, w, prop ); if (hData) bRet = X11DRV_CLIPBOARD_InsertClipboardData(lpData->wFormatID, hData, lpData->lpFormat, TRUE); else

1 0