September 2016 - Wine-commits

André Hentschel : urlmon/tests: Mark data53 test as broken on Win10.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: b19e99397f39e72609b8924b3b2deaa120fdc124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b19e99397f39e72609b8924b3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 20 23:01:31 2016 +0200 urlmon/tests: Mark data53 test as broken on Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 40c0ca9..ba10e3a 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -641,7 +641,7 @@ static const struct { {data50, sizeof(data50), "video/mpeg"}, {data51, sizeof(data51), "video/mpeg"}, {data52, sizeof(data52), "application/octet-stream", "image/pjpeg"}, - {data53, sizeof(data53), "application/octet-stream", "image/pjpeg"}, + {data53, sizeof(data53), "application/octet-stream", "image/pjpeg", "image/x-icon"}, {data54, sizeof(data54), "text/html", "video/mpeg"}, {data55, sizeof(data55), "application/x-gzip-compressed"}, {data56, sizeof(data56), "text/plain"},

1 0

Alexandre Julliard : winex11: Merge converting the selection and importing it.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: 2215d770c5bff07f06756dab793936757cd8d9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2215d770c5bff07f06756dab7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 21 12:01:15 2016 +0900 winex11: Merge converting the selection and importing it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 62 ++++++++++++++++++++---------------------- dlls/winex11.drv/x11drv.h | 4 +-- dlls/winex11.drv/x11drv_main.c | 1 - dlls/winex11.drv/xdnd.c | 28 ++----------------- 4 files changed, 34 insertions(+), 61 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f2062f0..728d75c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1225,17 +1225,32 @@ static HANDLE import_data( Atom type, const void *data, size_t size ) /************************************************************************** * import_selection * - * Import a selection target, depending on its type. + * Import the specified format from the selection and return a global handle to the data. */ -static HANDLE import_selection( Display *display, Window win, Atom prop, struct clipboard_format *format ) +static HANDLE import_selection( Display *display, Window win, Atom selection, + struct clipboard_format *format ) { unsigned char *data; unsigned long size; - Atom type; + Atom prop, type; HANDLE ret; if (!format->import) return 0; - if (!X11DRV_CLIPBOARD_ReadProperty( display, win, prop, &type, &data, &size )) return 0; + + TRACE( "import %s from %s win %lx to format %s\n", + debugstr_xatom( format->atom ), debugstr_xatom( selection ), + win, debugstr_format( format->id ) ); + + if ((prop = convert_selection( display, win, selection, format->atom )) == None) + { + TRACE( "failed to convert selection\n" ); + return 0; + } + if (!X11DRV_CLIPBOARD_ReadProperty( display, win, prop, &type, &data, &size )) + { + TRACE( "failed to read property\n" ); + return 0; + } ret = format->import( type, data, size ); HeapFree( GetProcessHeap(), 0, data ); return ret; @@ -1247,12 +1262,13 @@ static HANDLE import_selection( Display *display, Window win, Atom prop, struct * * Import the X selection into the clipboard format registered for the given X target. */ -HANDLE X11DRV_CLIPBOARD_ImportSelection(Display *display, Atom target, Window win, Atom prop, UINT *windowsFormat) +HANDLE X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, + Atom target, UINT *windowsFormat ) { struct clipboard_format *format = X11DRV_CLIPBOARD_LookupProperty( NULL, target ); if (!format) return 0; *windowsFormat = format->id; - return import_selection( display, win, prop, format ); + return import_selection( display, win, selection, format ); } @@ -1872,9 +1888,7 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA lpData) { BOOL bRet = FALSE; - Atom prop; - - TRACE("%04x\n", lpData->wFormatID); + HANDLE hData; if (!lpData->lpFormat) { @@ -1892,28 +1906,9 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA return FALSE; } - TRACE("Requesting conversion of %s property %s from selection type %08x\n", - debugstr_format( lpData->lpFormat->id ), debugstr_xatom( lpData->lpFormat->atom ), - (UINT)selectionCacheSrc); - - 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 = import_selection( display, w, prop, lpData->lpFormat ); - if (hData) - bRet = X11DRV_CLIPBOARD_InsertClipboardData(lpData->wFormatID, hData, lpData->lpFormat, TRUE); - else - TRACE("Import function failed\n"); - } - else - { - TRACE("Failed to convert selection\n"); - } + hData = import_selection( display, w, selectionCacheSrc, lpData->lpFormat ); + if (hData) + bRet = X11DRV_CLIPBOARD_InsertClipboardData(lpData->wFormatID, hData, lpData->lpFormat, TRUE); } else { @@ -1937,8 +1932,6 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, unsigned long pos = 0, nitems, remain, count; unsigned char *val = NULL, *buffer; - TRACE( "Reading property %s from X window %lx\n", debugstr_xatom( prop ), w ); - for (;;) { if (XGetWindowProperty(display, w, prop, pos, INT_MAX / 4, False, @@ -1971,6 +1964,9 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, pos += count / sizeof(int); } + TRACE( "got property %s type %s format %u len %lu from window %lx\n", + debugstr_xatom( prop ), debugstr_xatom( *atype ), aformat, *datasize, w ); + /* Delete the property on the window now that we are done * This will send a PropertyNotify event to the selection owner. */ XDeleteProperty(display, w, prop); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2d37138..48f3999 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -239,7 +239,8 @@ extern void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) DECL extern void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; -extern HANDLE X11DRV_CLIPBOARD_ImportSelection(Display *d, Atom target, Window w, Atom prop, UINT *windowsFormat) DECLSPEC_HIDDEN; +extern HANDLE X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, + Atom target, UINT *windowsFormat ) DECLSPEC_HIDDEN; /************************************************************************** * X11 GDI driver @@ -453,7 +454,6 @@ enum x11drv_atoms XATOM_XdndActionAsk, XATOM_XdndActionPrivate, XATOM_XdndSelection, - XATOM_XdndTarget, XATOM_XdndTypeList, XATOM_HTML_Format, XATOM_WCF_BITMAP, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index c2e0969..142c9b1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -167,7 +167,6 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "XdndActionAsk", "XdndActionPrivate", "XdndSelection", - "XdndTarget", "XdndTypeList", "HTML Format", "WCF_BITMAP", diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index cbc917a..eb9b117 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -49,10 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(xdnd); -/* Maximum wait time for selection notify */ -#define SELECTION_RETRIES 500 /* wait for .1 seconds */ -#define SELECTION_WAIT 1000 /* us */ - typedef struct tagXDNDDATA { int cf_win; @@ -496,9 +492,7 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count) { - unsigned int i, j; - BOOL res; - XEvent xe; + unsigned int i; XDNDDATA *current, *next; BOOL haveHDROP = FALSE; @@ -516,24 +510,8 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, if (types[i] == 0) continue; - XConvertSelection(display, x11drv_atom(XdndSelection), types[i], - x11drv_atom(XdndTarget), xwin, /*tm*/CurrentTime); - - /* - * Wait for SelectionNotify - */ - for (j = 0; j < SELECTION_RETRIES; j++) - { - res = XCheckTypedWindowEvent(display, xwin, SelectionNotify, &xe); - if (res && xe.xselection.selection == x11drv_atom(XdndSelection)) break; - - usleep(SELECTION_WAIT); - } - - if (xe.xselection.property == None) - continue; - - contents = X11DRV_CLIPBOARD_ImportSelection(display, types[i], xwin, x11drv_atom(XdndTarget), &windowsFormat); + contents = X11DRV_CLIPBOARD_ImportSelection( display, xwin, x11drv_atom(XdndSelection), + types[i], &windowsFormat ); if (contents) X11DRV_XDND_InsertXDNDData(types[i], windowsFormat, contents); }

1 0

Alexandre Julliard : winex11: Use a standard export function to handle MULTIPLE requests.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: c6e787232ee61e3463519c0dad714ec7cb5cc6ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e787232ee61e3463519c0da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 21 12:03:23 2016 +0900 winex11: Use a standard export function to handle MULTIPLE requests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 213 +++++++++++++++---------------------------- 1 file changed, 73 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6e787232ee61e3463519…

1 0

Alexandre Julliard : winex11: Use a standard export function to handle TARGETS requests.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: d1f539ac0045bfd87e475f7a8d99cd293e432f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f539ac0045bfd87e475f7a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 21 12:04:07 2016 +0900 winex11: Use a standard export function to handle TARGETS requests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index e0fde76..62171d2 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -145,6 +145,7 @@ static BOOL export_metafile( Display *display, Window win, Atom prop, Atom targe static BOOL export_enhmetafile( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); +static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData); @@ -204,6 +205,7 @@ static const struct { PNGW, 0, XATOM_image_png, import_data, export_data }, { HTMLFormatW, 0, XATOM_HTML_Format, import_data, export_data }, { HTMLFormatW, 0, XATOM_text_html, import_data, export_text_html }, + { 0, 0, XATOM_TARGETS, NULL, export_targets }, { 0, 0, XATOM_MULTIPLE, NULL, export_multiple }, }; @@ -2483,11 +2485,11 @@ void X11DRV_ResetSelectionOwner(void) /*********************************************************************** - * X11DRV_SelectionRequest_TARGETS + * export_targets + * * Service a TARGETS selection request event */ -static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, - Atom target, Atom rprop ) +static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) { UINT i; Atom* targets; @@ -2507,7 +2509,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, */ cTargets = 1; /* Include TARGETS */ - if (!list_head( &data_list )) return None; + if (!list_head( &data_list )) return FALSE; LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) @@ -2519,7 +2521,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, /* Allocate temp buffer */ targets = HeapAlloc( GetProcessHeap(), 0, cTargets * sizeof(Atom)); if(targets == NULL) - return None; + return FALSE; i = 0; targets[i++] = x11drv_atom(TARGETS); @@ -2533,11 +2535,10 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, targets[i++] = format->atom; } - put_property( display, requestor, rprop, XA_ATOM, 32, targets, cTargets ); + put_property( display, win, prop, XA_ATOM, 32, targets, cTargets ); HeapFree(GetProcessHeap(), 0, targets); - - return rprop; + return TRUE; } @@ -2550,7 +2551,6 @@ BOOL X11DRV_SelectionRequest( HWND hwnd, XEvent *xev ) Display *display = event->display; XEvent result; Atom rprop = None; - Window request = event->requestor; X11DRV_expect_error( display, is_window_error, NULL ); @@ -2568,12 +2568,7 @@ BOOL X11DRV_SelectionRequest( HWND hwnd, XEvent *xev ) if( rprop == None ) rprop = event->target; - if(event->target == x11drv_atom(TARGETS)) /* Return a list of all supported targets */ - { - /* TARGETS selection request */ - rprop = X11DRV_SelectionRequest_TARGETS( display, request, event->target, rprop ); - } - else if (!export_selection( display, event->requestor, rprop, event->target )) + if (!export_selection( display, event->requestor, rprop, event->target )) rprop = None; /* report failure to client */ done:

1 0

Alexandre Julliard : winex11: Reimplement targets enumeration using standard clipboard APIs.
by Alexandre Julliard 21 Sep '16

21 Sep '16

Module: wine Branch: master Commit: 8e5ee4474f3a733c592b182a9778d1b5bc80af4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5ee4474f3a733c592b182a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 21 12:10:32 2016 +0900 winex11: Reimplement targets enumeration using standard clipboard APIs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 147 ++++++++++++++++++++++++------------------- 1 file changed, 82 insertions(+), 65 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 62171d2..f4c8866 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2,10 +2,11 @@ * X11 clipboard windows driver * * Copyright 1994 Martin Ayotte - * 1996 Alex Korobka - * 1999 Noel Borthwick - * 2003 Ulrich Czekalla for CodeWeavers - * 2014 Damjan Jovanovic + * Copyright 1996 Alex Korobka + * Copyright 1999 Noel Borthwick + * Copyright 2003 Ulrich Czekalla for CodeWeavers + * Copyright 2014 Damjan Jovanovic + * Copyright 2016 Alexandre Julliard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -211,6 +212,7 @@ static const struct static struct list format_list = LIST_INIT( format_list ); +#define NB_BUILTIN_FORMATS (sizeof(builtin_formats) / sizeof(builtin_formats[0])) #define GET_ATOM(prop) (((prop) < FIRST_XATOM) ? (Atom)(prop) : X11DRV_Atoms[(prop) - FIRST_XATOM]) @@ -306,13 +308,12 @@ static const char *debugstr_xatom( Atom atom ) */ void X11DRV_InitClipboard(void) { - static const unsigned int count = sizeof(builtin_formats) / sizeof(builtin_formats[0]); struct clipboard_format *formats; UINT i; - if (!(formats = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*formats)))) return; + if (!(formats = HeapAlloc( GetProcessHeap(), 0, NB_BUILTIN_FORMATS * sizeof(*formats)))) return; - for (i = 0; i < count; i++) + for (i = 0; i < NB_BUILTIN_FORMATS; i++) { if (builtin_formats[i].name) formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); @@ -1660,6 +1661,80 @@ failed: } +/*********************************************************************** + * get_clipboard_formats + * + * Return a list of all formats currently available on the Win32 clipboard. + * Helper for export_targets. + */ +static UINT *get_clipboard_formats( UINT *size ) +{ + UINT *ids; + + *size = 256; + for (;;) + { + if (!(ids = HeapAlloc( GetProcessHeap(), 0, *size * sizeof(*ids) ))) return NULL; + if (GetUpdatedClipboardFormats( ids, *size, size )) break; + HeapFree( GetProcessHeap(), 0, ids ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; + } + return ids; +} + + +/*********************************************************************** + * is_format_available + * + * Check if a clipboard format is included in the list. + * Helper for export_targets. + */ +static BOOL is_format_available( UINT format, const UINT *ids, unsigned int count ) +{ + while (count--) if (*ids++ == format) return TRUE; + return FALSE; +} + + +/*********************************************************************** + * export_targets + * + * Service a TARGETS selection request event + */ +static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) +{ + struct clipboard_format *format; + UINT pos, count, *formats; + Atom *targets; + + intern_atoms(); + + if (!(formats = get_clipboard_formats( &count ))) return FALSE; + + /* the builtin formats contain duplicates, so allocate some extra space */ + if (!(targets = HeapAlloc( GetProcessHeap(), 0, (count + NB_BUILTIN_FORMATS) * sizeof(*targets) ))) + { + HeapFree( GetProcessHeap(), 0, formats ); + return FALSE; + } + + pos = 0; + LIST_FOR_EACH_ENTRY( format, &format_list, struct clipboard_format, entry ) + { + if (!format->export) continue; + /* formats with id==0 are always exported */ + if (format->id && !is_format_available( format->id, formats, count )) continue; + TRACE( "%d: %s -> %s\n", pos, debugstr_format( format->id ), debugstr_xatom( format->atom )); + targets[pos++] = format->atom; + } + + put_property( display, win, prop, XA_ATOM, 32, targets, pos ); + HeapFree( GetProcessHeap(), 0, targets ); + HeapFree( GetProcessHeap(), 0, formats ); + return TRUE; +} + + /************************************************************************** * export_selection * @@ -2485,64 +2560,6 @@ void X11DRV_ResetSelectionOwner(void) /*********************************************************************** - * export_targets - * - * Service a TARGETS selection request event - */ -static BOOL export_targets( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) -{ - UINT i; - Atom* targets; - ULONG cTargets; - LPWINE_CLIPFORMAT format; - LPWINE_CLIPDATA lpData; - - /* Create X atoms for any clipboard types which don't have atoms yet. - * This avoids sending bogus zero atoms. - * Without this, copying might not have access to all clipboard types. - * FIXME: is it safe to call this here? - */ - intern_atoms(); - - /* - * Count the number of items we wish to expose as selection targets. - */ - cTargets = 1; /* Include TARGETS */ - - if (!list_head( &data_list )) return FALSE; - - LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) - LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if (format->id == lpData->wFormatID && format->export && format->atom) - cTargets++; - - TRACE(" found %d formats\n", cTargets); - - /* Allocate temp buffer */ - targets = HeapAlloc( GetProcessHeap(), 0, cTargets * sizeof(Atom)); - if(targets == NULL) - return FALSE; - - i = 0; - targets[i++] = x11drv_atom(TARGETS); - - LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) - LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if (format->id == lpData->wFormatID && format->export && format->atom) - { - TRACE( "%d: %s -> %s\n", i, debugstr_format( format->id ), - debugstr_xatom( format->atom )); - targets[i++] = format->atom; - } - - put_property( display, win, prop, XA_ATOM, 32, targets, cTargets ); - - HeapFree(GetProcessHeap(), 0, targets); - return TRUE; -} - - -/*********************************************************************** * X11DRV_HandleSelectionRequest */ BOOL X11DRV_SelectionRequest( HWND hwnd, XEvent *xev )

1 0

Alexandre Julliard : winex11: Move common code out of the import functions and simplify their usage.
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: f88b632142d1c8bbb6bf90658e7781278a44c071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88b632142d1c8bbb6bf90658… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 13:17:30 2016 +0900 winex11: Move common code out of the import functions and simplify their usage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 414 +++++++++++++++---------------------------- 1 file changed, 146 insertions(+), 268 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f88b632142d1c8bbb6bf9…

1 0

Henri Verbeet : d3d11: Use wine_rb_remove() in state object cleanup.
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: 3962fb5d40b2fbf994e20cf796fb9e7536824f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3962fb5d40b2fbf994e20cf79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 20 11:41:35 2016 +0200 d3d11: Use wine_rb_remove() in state object cleanup. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 1aa9af5..77c8e55 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -78,7 +78,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface { struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); - wine_rb_remove_key(&device->blend_states, &state->desc); + wine_rb_remove(&device->blend_states, &state->entry); ID3D11Device_Release(state->device); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); @@ -379,7 +379,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc { struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); - wine_rb_remove_key(&device->depthstencil_states, &state->desc); + wine_rb_remove(&device->depthstencil_states, &state->entry); ID3D11Device_Release(state->device); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); @@ -663,7 +663,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt { struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); - wine_rb_remove_key(&device->rasterizer_states, &state->desc); + wine_rb_remove(&device->rasterizer_states, &state->entry); wined3d_rasterizer_state_decref(state->wined3d_state); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); @@ -963,7 +963,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i wined3d_mutex_lock(); wined3d_sampler_decref(state->wined3d_sampler); - wine_rb_remove_key(&device->sampler_states, &state->desc); + wine_rb_remove(&device->sampler_states, &state->entry); ID3D11Device_Release(state->device); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock();

1 0

Henri Verbeet : wined3d: Use wine_rb_remove() in delete_glsl_program_entry ().
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: 60833cb39aba6b7354d7c0de263be017bca24a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60833cb39aba6b7354d7c0de2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 20 11:41:36 2016 +0200 wined3d: Use wine_rb_remove() in delete_glsl_program_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e605cb9..fbba284 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5384,12 +5384,7 @@ static struct glsl_shader_prog_link *get_glsl_program_entry(const struct shader_ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struct wined3d_gl_info *gl_info, struct glsl_shader_prog_link *entry) { - struct glsl_program_key key; - - key.vs_id = entry->vs.id; - key.gs_id = entry->gs.id; - key.ps_id = entry->ps.id; - wine_rb_remove_key(&priv->program_lookup, &key); + wine_rb_remove(&priv->program_lookup, &entry->program_lookup_entry); GL_EXTCALL(glDeleteProgram(entry->id)); if (entry->vs.id)

1 0

Henri Verbeet : wined3d: Implement the initial texture data upload on top of wined3d_device_update_sub_resource ().
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: e58689a3981fae5b312b12e9f6801adf289d04c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58689a3981fae5b312b12e9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 20 11:41:37 2016 +0200 wined3d: Implement the initial texture data upload on top of wined3d_device_update_sub_resource(). The idea is that wined3d_device_update_sub_resource() would get sent through the command stream, while the current implementation wouldn't. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a13f2c6..8e5a5f1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2821,7 +2821,6 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct if (data) { unsigned int sub_count = level_count * layer_count; - struct wined3d_context *context; unsigned int i; for (i = 0; i < sub_count; ++i) @@ -2835,21 +2834,11 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct } } - context = context_acquire(device, NULL); - - wined3d_texture_prepare_texture(object, context, FALSE); - wined3d_texture_bind_and_dirtify(object, context, FALSE); - for (i = 0; i < sub_count; ++i) { - const struct wined3d_const_bo_address addr = {0, data[i].data}; - - wined3d_texture_upload_data(object, i, context, &addr, data[i].row_pitch, data[i].slice_pitch); - wined3d_texture_validate_location(object, i, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(object, i, ~WINED3D_LOCATION_TEXTURE_RGB); + wined3d_device_update_sub_resource(device, &object->resource, + i, NULL, data[i].data, data[i].row_pitch, data[i].slice_pitch); } - - context_release(context); } TRACE("Created texture %p.\n", object);

1 0

Henri Verbeet : wined3d: Implement the initial buffer data upload on top of wined3d_device_update_sub_resource ().
by Alexandre Julliard 20 Sep '16

20 Sep '16

Module: wine Branch: master Commit: 84db05620f2318b8a088b92da83a95e042cb28ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=84db05620f2318b8a088b92da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 20 11:41:38 2016 +0200 wined3d: Implement the initial buffer data upload on top of wined3d_device_update_sub_resource(). Mostly for consistency with the initial texture data upload. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7dc33c7..b927105 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1347,15 +1347,9 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device } buffer->maps_size = 1; - if (data && FAILED(hr = wined3d_buffer_upload_data(buffer, NULL, data->data))) - { - ERR("Failed to upload data, hr %#x.\n", hr); - buffer_unload(&buffer->resource); - resource_cleanup(&buffer->resource); - wined3d_resource_wait_idle(&buffer->resource); - HeapFree(GetProcessHeap(), 0, buffer->maps); - return hr; - } + if (data) + wined3d_device_update_sub_resource(device, &buffer->resource, + 0, NULL, data->data, data->row_pitch, data->slice_pitch); return WINED3D_OK; }

1 0