April 2022 - Wine-commits - list.winehq.org

Alexandre Julliard : winecrt0: Avoid A->W conversion in initialization code.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 7c6f6d27756687c3e2a3b8ca743f886e694142a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c6f6d27756687c3e2a3b8ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 27 15:52:42 2022 +0200 winecrt0: Avoid A->W conversion in initialization code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/debug.c | 2 +- dlls/winecrt0/unix_lib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 6e1866c7568..918fb67b140 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -51,7 +51,7 @@ static void load_func( void **func, const char *name, void *def ) if (!*func) { DWORD err = GetLastError(); - HMODULE module = GetModuleHandleA( "ntdll.dll" ); + HMODULE module = GetModuleHandleW( L"ntdll.dll" ); void *proc = GetProcAddress( module, name ); InterlockedExchangePointer( func, proc ? proc : def ); SetLastError( err ); diff --git a/dlls/winecrt0/unix_lib.c b/dlls/winecrt0/unix_lib.c index 2e9b521a1e7..c86897b9905 100644 --- a/dlls/winecrt0/unix_lib.c +++ b/dlls/winecrt0/unix_lib.c @@ -35,7 +35,7 @@ static void load_func( void **func, const char *name, void *def ) { if (!*func) { - HMODULE module = GetModuleHandleA( "ntdll.dll" ); + HMODULE module = GetModuleHandleW( L"ntdll.dll" ); void *proc = GetProcAddress( module, name ); InterlockedExchangePointer( func, proc ? proc : def ); }

1 0

Alexandre Julliard : user32/tests: Use the standard INPUT type definition.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: b67d66f58304db1da73d0f7eda9027f5939178e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67d66f58304db1da73d0f7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 27 15:37:30 2022 +0200 user32/tests: Use the standard INPUT type definition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 132 +++++++++++++++++++++------------------------- dlls/user32/tests/menu.c | 37 +++++-------- 2 files changed, 72 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b67d66f58304db1da73d…

1 0

Fabian Maurer : mfplay: Prevent usage of uninitialized pointer in error case (Coverity).
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 312e0d518f37065fb566a7f17efd49cdaa3f3e27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=312e0d518f37065fb566a7f1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Apr 27 14:44:40 2022 +0300 mfplay: Prevent usage of uninitialized pointer in error case (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 7d9a4da8649..c500717b8d0 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1378,7 +1378,6 @@ static HRESULT media_item_create_sink_node(IUnknown *sink, IMFTopologyNode **nod static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) { - IMFTopologyNode *src_node, *sink_node; BOOL selected, video_added = FALSE; IMFStreamDescriptor *sd; IMFTopology *topology; @@ -1421,6 +1420,8 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me if (sink) { + IMFTopologyNode *src_node = NULL, *sink_node = NULL; + hr = media_item_create_source_node(item, sd, &src_node); if (SUCCEEDED(hr)) hr = media_item_create_sink_node(sink, &sink_node);

1 0

Fabian Maurer : mfplat: Prevent use after free (Coverity).
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: f5d41f28f6442bd7e074efa17785b40ad3c65ba4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5d41f28f6442bd7e074efa1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Apr 26 21:03:22 2022 +0200 mfplat: Prevent use after free (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 71d55e2d232..b36a44d1e1c 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -976,6 +976,7 @@ static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMedia TRACE("%p.\n", iface); CoTaskMemFree(media_type->video_format); + media_type->video_format = NULL; if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->video_format, &size))) WARN("Failed to create format description, hr %#lx.\n", hr); @@ -1376,6 +1377,7 @@ static const WAVEFORMATEX * WINAPI audio_mediatype_GetAudioFormat(IMFAudioMediaT TRACE("%p.\n", iface); CoTaskMemFree(media_type->audio_format); + media_type->audio_format = NULL; if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->audio_format, &size, MFWaveFormatExConvertFlag_Normal))) {

1 0

Jacek Caban : winex11: Use NtUserSetClipboardData to import clipboard data.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 3c05f3b24704cb09389960b8c6ee584db9a61759 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c05f3b24704cb09389960b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:12 2022 +0100 winex11: Use NtUserSetClipboardData to import clipboard data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 192 ++++++++++++++++++++++--------------------- 1 file changed, 100 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c05f3b24704cb093899…

1 0

Jacek Caban : winex11: Directly use win32u in import_image_bmp.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: bfa51809e44439586eb1cce1390162f17d3f164c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfa51809e44439586eb1cce1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:13 2022 +0100 winex11: Directly use win32u in import_image_bmp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> 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 7640308fadd..b36b9a002a3 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -511,7 +511,7 @@ static void *create_dib_from_bitmap( HBITMAP hBmp, size_t *size ) int nLinesCopied; char *ret; - if (!GetObjectW( hBmp, sizeof(bmp), &bmp )) return 0; + if (!NtGdiExtGetObjectW( hBmp, sizeof(bmp), &bmp )) return 0; /* * A packed DIB contains a BITMAPINFO structure followed immediately by @@ -551,15 +551,10 @@ static void *create_dib_from_bitmap( HBITMAP hBmp, size_t *size ) /* Retrieve the DIB bits from the bitmap and fill in the * DIB color table if present */ - hdc = GetDC( 0 ); - nLinesCopied = GetDIBits(hdc, /* Handle to device context */ - hBmp, /* Handle to bitmap */ - 0, /* First scan line to set in dest bitmap */ - bmp.bmHeight, /* Number of scan lines to copy */ - ret + OffsetBits, /* [out] Address of array for bitmap bits */ - (LPBITMAPINFO) pbmiHeader, /* [out] Address of BITMAPINFO structure */ - 0); /* RGB or palette index */ - ReleaseDC( 0, hdc ); + hdc = NtUserGetDCEx( 0, 0, DCX_CACHE | DCX_WINDOW ); + nLinesCopied = NtGdiGetDIBitsInternal( hdc, hBmp, 0, bmp.bmHeight, ret + OffsetBits, + (LPBITMAPINFO) pbmiHeader, 0, 0, 0 ); + NtUserReleaseDC( 0, hdc ); /* Cleanup if GetDIBits failed */ if (nLinesCopied != bmp.bmHeight) @@ -845,16 +840,36 @@ static void *import_image_bmp( Atom type, const void *data, size_t size, size_t bfh->bfType == 0x4d42 /* "BM" */) { const BITMAPINFO *bmi = (const BITMAPINFO *)(bfh + 1); + int width, height; HBITMAP hbmp; - HDC hdc = GetDC(0); + HDC hdc; - if ((hbmp = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, - (const BYTE *)data + bfh->bfOffBits, bmi, DIB_RGB_COLORS ))) + if (bmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)bmi; + width = core->bcWidth; + height = core->bcHeight; + } + else if (bmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) + { + const BITMAPINFOHEADER *header = &bmi->bmiHeader; + if (header->biCompression == BI_JPEG || header->biCompression == BI_PNG) return 0; + width = header->biWidth; + height = header->biHeight; + } + else return NULL; + if (!width || !height) return NULL; + + hdc = NtUserGetDCEx( 0, 0, DCX_CACHE | DCX_WINDOW ); + + if ((hbmp = NtGdiCreateDIBitmapInternal( hdc, width, height, CBM_INIT, + (const BYTE *)data + bfh->bfOffBits, bmi, + DIB_RGB_COLORS, 0, 0, 0, 0 ))) { ret = create_dib_from_bitmap( hbmp, ret_size ); - DeleteObject(hbmp); + NtGdiDeleteObjectApp( hbmp ); } - ReleaseDC(0, hdc); + NtUserReleaseDC(0, hdc); } return ret; }

1 0

Jacek Caban : winex11: Directly use ntdll in clipboard.c.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 0e5ad562c51ef5f46fd3ada0d5d9920ed8bc747d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e5ad562c51ef5f46fd3ada0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:14 2022 +0100 winex11: Directly use ntdll in clipboard.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index b36b9a002a3..ec69778fc3c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -191,7 +191,7 @@ static Window selection_window; static Window import_window; static Atom current_selection; static UINT rendered_formats; -static ULONG64 last_clipboard_update; +static ULONG last_clipboard_update; static struct clipboard_format **current_x11_formats; static unsigned int nb_current_x11_formats; static BOOL use_xfixes; @@ -281,6 +281,14 @@ static struct clipboard_format *find_x11_format( Atom atom ) } +static ATOM register_clipboard_format( const WCHAR *name ) +{ + ATOM atom; + if (NtAddAtom( name, lstrlenW( name ) * sizeof(WCHAR), &atom )) return 0; + return atom; +} + + /************************************************************************** * register_builtin_formats */ @@ -294,7 +302,7 @@ static void register_builtin_formats(void) for (i = 0; i < ARRAY_SIZE(builtin_formats); i++) { if (builtin_formats[i].name) - formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); + formats[i].id = register_clipboard_format( builtin_formats[i].name ); else formats[i].id = builtin_formats[i].id; @@ -398,7 +406,7 @@ static void register_x11_formats( const Atom *atoms, UINT size ) for (i = pos = 0; i < count; i++) { if (MultiByteToWideChar( CP_UNIXCP, 0, names[i], -1, buffer, 256 ) && - (ids[pos] = RegisterClipboardFormatW( buffer ))) + (ids[pos] = register_clipboard_format( buffer ))) new_atoms[pos++] = new_atoms[i]; XFree( names[i] ); } @@ -1915,7 +1923,7 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_type = type; last_data = data; last_size = size; - last_clipboard_update = GetTickCount64(); + last_clipboard_update = NtGetTickCount(); NtUserCloseClipboard(); if (!use_xfixes) NtUserSetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL, TIMERV_DEFAULT_COALESCING ); @@ -1933,7 +1941,7 @@ BOOL update_clipboard( HWND hwnd ) if (use_xfixes) return TRUE; if (hwnd != clipboard_hwnd) return TRUE; if (!is_clipboard_owner) return TRUE; - if (GetTickCount64() - last_clipboard_update <= SELECTION_UPDATE_DELAY) return TRUE; + if (NtGetTickCount() - last_clipboard_update <= SELECTION_UPDATE_DELAY) return TRUE; return request_selection_contents( thread_display(), FALSE ); } @@ -2131,7 +2139,7 @@ void X11DRV_UpdateClipboard(void) if (use_xfixes) return; if (GetCurrentThreadId() == clipboard_thread_id) return; - now = GetTickCount(); + now = NtGetTickCount(); if ((int)(now - last_update) <= SELECTION_UPDATE_DELAY) return; if (SendMessageTimeoutW( GetClipboardOwner(), WM_X11DRV_UPDATE_CLIPBOARD, 0, 0, SMTO_ABORTIFHUNG, 5000, &ret ) && ret)

1 0

Jacek Caban : winex11: Return selection data as a single buffer from import_xdnd_selection.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: fa9e9b5c562a6bd2263a06490e5bb047b72140aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa9e9b5c562a6bd2263a0649… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:15 2022 +0100 winex11: Return selection data as a single buffer from import_xdnd_selection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 29 +++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 14 +++++++++++--- dlls/winex11.drv/xdnd.c | 26 ++++++++++++++++++++++++-- 3 files changed, 52 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ec69778fc3c..92284d436dd 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1096,21 +1096,21 @@ static void *import_selection( Display *display, Window win, Atom selection, /************************************************************************** - * X11DRV_CLIPBOARD_ImportSelection + * import_xdnd_selection * * Import the X selection into the clipboard format registered for the given X target. */ -void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, - Atom *targets, UINT count, - void (*callback)( UINT, HANDLE )) +struct format_entry *import_xdnd_selection( Display *display, Window win, Atom selection, + Atom *targets, UINT count, size_t *ret_size ) { + size_t size, buf_size = 0, entry_size; UINT i; - HANDLE handle; void *data; - size_t size; struct clipboard_format *format; + struct format_entry *ret = NULL, *entry; register_x11_formats( targets, count ); + *ret_size = 0; for (i = 0; i < count; i++) { @@ -1118,16 +1118,21 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select if (!format->id) continue; if (!(data = import_selection( display, win, selection, format, &size ))) continue; - if ((handle = GlobalAlloc( GMEM_FIXED, size ))) + entry_size = (FIELD_OFFSET( struct format_entry, data[size] ) + 7) & ~7; + if (buf_size < size + entry_size) { - void *ptr; - ptr = GlobalLock( handle ); - memcpy( ptr, data, size ); - GlobalUnlock( handle ); - callback( format->id, handle ); + if (!(ret = realloc( ret, *ret_size + entry_size + 1024 ))) continue; + buf_size = *ret_size + entry_size + 1024; /* extra space for following entries */ } + entry = (struct format_entry *)((char *)ret + *ret_size); + entry->format = format->id; + entry->size = size; + if (size) memcpy( entry->data, data, size ); + *ret_size += entry_size; free( data ); } + + return ret; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a8d2f78aa6b..f6d28122fc3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -297,9 +297,17 @@ 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 void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, - Atom *targets, UINT count, - void (*callback)( UINT, HANDLE )) DECLSPEC_HIDDEN; + +struct format_entry +{ + UINT format; + UINT size; + char data[1]; +}; + +extern struct format_entry *import_xdnd_selection( Display *display, Window win, Atom selection, + Atom *targets, UINT count, + size_t *size ) DECLSPEC_HIDDEN; /************************************************************************** * X11 GDI driver diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index b9bba1ff872..aa46467f6f7 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -79,6 +79,12 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION xdnd_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static struct format_entry *next_format( struct format_entry *entry ) +{ + return (struct format_entry *)&entry->data[(entry->size + 7) & ~7]; +} + + /* Based on functions in dlls/ole32/ole2.c */ static HANDLE get_droptarget_local_handle(HWND hwnd) { @@ -523,15 +529,31 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count) { + struct format_entry *formats, *formats_end, *iter; XDNDDATA *current, *next; BOOL haveHDROP = FALSE; + size_t size; TRACE("count(%ld)\n", count); X11DRV_XDND_FreeDragDropOp(); /* Clear previously cached data */ - X11DRV_CLIPBOARD_ImportSelection( display, xwin, x11drv_atom(XdndSelection), - types, count, X11DRV_XDND_InsertXDNDData ); + formats = import_xdnd_selection( display, xwin, x11drv_atom(XdndSelection), types, count, &size ); + if (formats) + { + formats_end = (struct format_entry *)((char *)formats + size); + for (iter = formats; iter < formats_end; iter = next_format( iter )) + { + HANDLE handle; + if ((handle = GlobalAlloc( GMEM_FIXED, iter->size ))) + { + void *ptr = GlobalLock( handle ); + memcpy( ptr, iter->data, iter->size ); + GlobalUnlock( handle ); + X11DRV_XDND_InsertXDNDData( iter->format, handle ); + } + } + } /* On Windows when there is a CF_HDROP, there are no other CF_ formats. * foobar2000 relies on this (spaces -> %20's without it).

1 0

Jacek Caban : winex11: Move CF_HDROP filtering to import_xdnd_selection.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: f7ac2c7833ceaa015501aef76b8f10f5fbd9cd92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ac2c7833ceaa015501aef7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:16 2022 +0100 winex11: Move CF_HDROP filtering to import_xdnd_selection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 11 +++++++++++ dlls/winex11.drv/xdnd.c | 26 -------------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 92284d436dd..6baa87c5ce1 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1108,14 +1108,25 @@ struct format_entry *import_xdnd_selection( Display *display, Window win, Atom s void *data; struct clipboard_format *format; struct format_entry *ret = NULL, *entry; + BOOL have_hdrop = FALSE; register_x11_formats( targets, count ); *ret_size = 0; + for (i = 0; i < count; i++) + { + if (!(format = find_x11_format( targets[i] ))) continue; + if (format->id != CF_HDROP) continue; + have_hdrop = TRUE; + break; + } + for (i = 0; i < count; i++) { if (!(format = find_x11_format( targets[i] ))) continue; if (!format->id) continue; + if (have_hdrop && format->id != CF_HDROP && format->id < CF_MAX) continue; + if (!(data = import_selection( display, win, selection, format, &size ))) continue; entry_size = (FIELD_OFFSET( struct format_entry, data[size] ) + 7) & ~7; diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index aa46467f6f7..b892a70949a 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -530,8 +530,6 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count) { struct format_entry *formats, *formats_end, *iter; - XDNDDATA *current, *next; - BOOL haveHDROP = FALSE; size_t size; TRACE("count(%ld)\n", count); @@ -554,30 +552,6 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, } } } - - /* On Windows when there is a CF_HDROP, there are no other CF_ formats. - * foobar2000 relies on this (spaces -> %20's without it). - */ - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) - { - if (current->cf_win == CF_HDROP) - { - haveHDROP = TRUE; - break; - } - } - if (haveHDROP) - { - LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) - { - if (current->cf_win != CF_HDROP && current->cf_win < CF_MAX) - { - list_remove(&current->entry); - GlobalFree(current->contents); - HeapFree(GetProcessHeap(), 0, current); - } - } - } }

1 0

Jacek Caban : winex11: Use format_entry to store cached XDND formats data.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: d25c8c5770f99b29c05168855c368f7fe4583876 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25c8c5770f99b29c0516885… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:17 2022 +0100 winex11: Use format_entry to store cached XDND formats data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 107 +++++++++++++++--------------------------------- 1 file changed, 32 insertions(+), 75 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index b892a70949a..34cb2a47081 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -45,14 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xdnd); -typedef struct tagXDNDDATA -{ - int cf_win; - HANDLE contents; - struct list entry; -} XDNDDATA, *LPXDNDDATA; - -static struct list xdndData = LIST_INIT(xdndData); +static struct format_entry *xdnd_formats, *xdnd_formats_end; static POINT XDNDxy = { 0, 0 }; static IDataObject XDNDDataObject; static BOOL XDNDAccepted = FALSE; @@ -62,7 +55,6 @@ static HWND XDNDLastTargetWnd; /* might be an ancestor of XDNDLastTargetWnd */ static HWND XDNDLastDropTargetWnd; -static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents ); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); static BOOL X11DRV_XDND_HasHDROP(void); @@ -529,7 +521,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) { - struct format_entry *formats, *formats_end, *iter; + struct format_entry *formats; size_t size; TRACE("count(%ld)\n", count); @@ -537,41 +529,14 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, X11DRV_XDND_FreeDragDropOp(); /* Clear previously cached data */ formats = import_xdnd_selection( display, xwin, x11drv_atom(XdndSelection), types, count, &size ); - if (formats) - { - formats_end = (struct format_entry *)((char *)formats + size); - for (iter = formats; iter < formats_end; iter = next_format( iter )) - { - HANDLE handle; - if ((handle = GlobalAlloc( GMEM_FIXED, iter->size ))) - { - void *ptr = GlobalLock( handle ); - memcpy( ptr, iter->data, iter->size ); - GlobalUnlock( handle ); - X11DRV_XDND_InsertXDNDData( iter->format, handle ); - } - } - } -} - + if (!formats) return; -/************************************************************************** - * X11DRV_XDND_InsertXDNDData - * - * Cache available XDND property - */ -static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents ) -{ - LPXDNDDATA current = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(XDNDDATA)); - - if (current) + if ((xdnd_formats = HeapAlloc( GetProcessHeap(), 0, size ))) { - EnterCriticalSection(&xdnd_cs); - current->cf_win = format; - current->contents = contents; - list_add_tail(&xdndData, &current->entry); - LeaveCriticalSection(&xdnd_cs); + memcpy( xdnd_formats, formats, size ); + xdnd_formats_end = (struct format_entry *)((char *)xdnd_formats + size); } + free( formats ); } @@ -580,15 +545,15 @@ static void X11DRV_XDND_InsertXDNDData( UINT format, HANDLE contents ) */ static BOOL X11DRV_XDND_HasHDROP(void) { - LPXDNDDATA current = NULL; + struct format_entry *iter; BOOL found = FALSE; EnterCriticalSection(&xdnd_cs); /* Find CF_HDROP type if any */ - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == CF_HDROP) + if (iter->format == CF_HDROP) { found = TRUE; break; @@ -605,15 +570,15 @@ static BOOL X11DRV_XDND_HasHDROP(void) */ static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) { + struct format_entry *iter; HRESULT hr; - LPXDNDDATA current = NULL; BOOL found = FALSE; EnterCriticalSection(&xdnd_cs); - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == CF_HDROP) + if (iter->format == CF_HDROP) { found = TRUE; break; @@ -621,13 +586,12 @@ static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) } if (found) { - HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, GlobalSize(current->contents)); + HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, iter->size); if (dropHandle) { RECT rect; DROPFILES *lpDrop = GlobalLock(dropHandle); - memcpy(lpDrop, GlobalLock(current->contents), GlobalSize(current->contents)); - GlobalUnlock(current->contents); + memcpy(lpDrop, iter->data, iter->size); lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; lpDrop->fNC = !(ScreenToClient(hwnd, &lpDrop->pt) && @@ -662,20 +626,12 @@ static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) */ static void X11DRV_XDND_FreeDragDropOp(void) { - LPXDNDDATA next; - LPXDNDDATA current; - TRACE("\n"); EnterCriticalSection(&xdnd_cs); - /** Free data cache */ - LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) - { - list_remove(&current->entry); - GlobalFree(current->contents); - HeapFree(GetProcessHeap(), 0, current); - } + HeapFree( GetProcessHeap(), 0, xdnd_formats ); + xdnd_formats = xdnd_formats_end = NULL; XDNDxy.x = XDNDxy.y = 0; XDNDLastTargetWnd = NULL; @@ -772,18 +728,18 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetData(IDataObject *dataObject, hr = IDataObject_QueryGetData(dataObject, formatEtc); if (SUCCEEDED(hr)) { - XDNDDATA *current; - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + struct format_entry *iter; + + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == formatEtc->cfFormat) + if (iter->format == formatEtc->cfFormat) { pMedium->tymed = TYMED_HGLOBAL; - pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, GlobalSize(current->contents)); + pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, iter->size); if (pMedium->u.hGlobal == NULL) return E_OUTOFMEMORY; - memcpy(GlobalLock(pMedium->u.hGlobal), GlobalLock(current->contents), GlobalSize(current->contents)); + memcpy(GlobalLock(pMedium->u.hGlobal), iter->data, iter->size); GlobalUnlock(pMedium->u.hGlobal); - GlobalUnlock(current->contents); pMedium->pUnkForRelease = 0; return S_OK; } @@ -803,8 +759,8 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetDataHere(IDataObject *dataObject, static HRESULT WINAPI XDNDDATAOBJECT_QueryGetData(IDataObject *dataObject, FORMATETC *formatEtc) { + struct format_entry *iter; char formatDesc[1024]; - XDNDDATA *current; TRACE("(%p, %p={.tymed=0x%x, .dwAspect=%d, .cfFormat=%d}\n", dataObject, formatEtc, formatEtc->tymed, formatEtc->dwAspect, formatEtc->cfFormat); @@ -819,9 +775,9 @@ static HRESULT WINAPI XDNDDATAOBJECT_QueryGetData(IDataObject *dataObject, * and we have no way to implement them on XDnD anyway, so ignore them too. */ - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - if (current->cf_win == formatEtc->cfFormat) + if (iter->format == formatEtc->cfFormat) { TRACE("application found %s\n", formatDesc); return S_OK; @@ -853,7 +809,8 @@ static HRESULT WINAPI XDNDDATAOBJECT_EnumFormatEtc(IDataObject *dataObject, DWORD dwDirection, IEnumFORMATETC **ppEnumFormatEtc) { - DWORD count; + struct format_entry *iter; + DWORD count = 0; FORMATETC *formats; TRACE("(%p, %u, %p)\n", dataObject, dwDirection, ppEnumFormatEtc); @@ -864,16 +821,16 @@ static HRESULT WINAPI XDNDDATAOBJECT_EnumFormatEtc(IDataObject *dataObject, return E_NOTIMPL; } - count = list_count(&xdndData); + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) count++; + formats = HeapAlloc(GetProcessHeap(), 0, count * sizeof(FORMATETC)); if (formats) { - XDNDDATA *current; DWORD i = 0; HRESULT hr; - LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + for (iter = xdnd_formats; iter < xdnd_formats_end; iter = next_format( iter )) { - formats[i].cfFormat = current->cf_win; + formats[i].cfFormat = iter->format; formats[i].ptd = NULL; formats[i].dwAspect = DVASPECT_CONTENT; formats[i].lindex = -1;

1 0