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

[PATCH] po: Fix a typo in the Asturian translation.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- All the other instances of 'invalid' translate to 'nun ye válidu' (or válida). So there does not seem to be any reason to add an 's' to 'válidu'. Thus I think the 's' is just an extra character that should not be there. --- po/ast.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] kernel32/tests: Fix the spelling of a comment.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index e3c75fbfe0a..88781aa376c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -338,7 +338,7 @@ static void test_HeapCreate(void) ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); - /* theshold between failure and success varies, and w7pro64 has a much larger overhead. */ + /* threshold between failure and success varies, and w7pro64 has a much larger overhead. */ ptr = HeapAlloc( heap, 0, alloc_size - (0x400 + 0x100 * sizeof(void *)) ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); -- 2.30.2

1 0

[PATCH] user32/tests: Trace monitor information with 'monitor info'.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Just running user32:monitor does not provide useful information about how many monitors are present, their resolution, etc. I can manually check this information by starting a VM, connecting to it with virt-viewer and using the GUI. But multi-monitor setups are a bit finicky so I'm never really sure if they really get the same configuration when they run tests. This issue is exacerbated by the fact that Libvirt's screenshotting functionality is particularly buggy for Windows guests and seems to only capture the primary monitor. So I'm hoping to use this patch to get more accurate monitor + resolution information (at least until client-side screenshotting). I can also keep it locally if it is deemed not suitable for Wine. --- dlls/user32/tests/monitor.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 02bc6651dd3..94cb7e60382 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2530,9 +2530,38 @@ static void test_display_dc(void) } } +BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, + LPRECT lprcMonitor, LPARAM dwData) +{ + MONITORINFOEXW info; + static int index; + + info.cbSize = sizeof(info); + if (GetMonitorInfoW(hMonitor, (MONITORINFO*)&info)) + { + printf("Monitor %d %7s [%02lx] %s %s\n", index, + (info.dwFlags & MONITORINFOF_PRIMARY) ? "primary" : "", + info.dwFlags, wine_dbgstr_rect(&info.rcMonitor), + wine_dbgstr_w(info.szDevice)); + } + index++; + return TRUE; +} + START_TEST(monitor) { + char** myARGV; + int myARGC = winetest_get_mainargs(&myARGV); + init_function_pointers(); + + if (myARGC >= 3 && strcmp(myARGV[2], "info") == 0) + { + printf("Monitor information:\n"); + EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, 0); + return; + } + test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); test_DisplayConfigSetDeviceInfo(); -- 2.30.2

1 0

[PATCH] oleaut32/tests: The EUR abbreviation is not recognized as a currency.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 4fc0e4e0221..cdbb836b041 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2151,6 +2151,12 @@ static void test_VarParseNumFromStrFr(void) EXPECT2(1,2); EXPECTRGB(2,FAILDIG); + /* The three-letter Euro abbreviation is not allowed */ + WCONVERT(L"12EUR", NUMPRS_CURRENCY); + EXPECT(2,NUMPRS_CURRENCY,0,2,0,0); + EXPECT2(1,2); + EXPECTRGB(2,FAILDIG); + /* With flag and decimal flag, consumes decimal point and following digits */ WCONVERT(L"12,1\x20ac", NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL); EXPECT(3,NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,5,0,-1); -- 2.30.2

1 0

[PATCH] oleau32/tests: Show that spaces are not allowed before exponents.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 9456b56eb26..4fc0e4e0221 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1837,6 +1837,11 @@ static void test_VarParseNumFromStrEn(void) EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,3,0,1); EXPECT2(1,FAILDIG); + /* Spaces are not allowed before the exponent */ + CONVERT("1 e1", NUMPRS_EXPONENT|NUMPRS_TRAILING_WHITE); + EXPECT(1,NUMPRS_EXPONENT|NUMPRS_TRAILING_WHITE,NUMPRS_TRAILING_WHITE,2,0,0); + EXPECT2(1,FAILDIG); + /* With flag, incompatible with NUMPRS_HEX_OCT */ CONVERT("&o1e1", NUMPRS_HEX_OCT|NUMPRS_EXPONENT); EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_EXPONENT,NUMPRS_HEX_OCT,3,3,0); @@ -2013,6 +2018,11 @@ static void test_VarParseNumFromStrFr(void) EXPECTFAIL; } + /* No space of any type is allowed before the exponent... */ + wsprintfW(wstr, L"1%ce1", spaces[i]); + WCONVERT(wstr, NUMPRS_EXPONENT|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL); + EXPECTFAIL; + winetest_pop_context(); } -- 2.30.2

1 0

[PATCH] comctl32/tests: Use winetest_push_context() in test_combo_dropdown_size().
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/comctl32/tests/combo.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 0dd05befa06..3eceeb55bd5 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1272,6 +1272,7 @@ static void test_combo_dropdown_size(DWORD style) RECT rect_list_client; int min_visible_expected; + winetest_push_context("Test %d", test); hCombo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN | WS_VISIBLE | WS_CHILD | style, 5, 5, 100, info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); @@ -1297,8 +1298,8 @@ static void test_combo_dropdown_size(DWORD style) ret = SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0); ok(ret, "Failed to set visible limit.\n"); min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); - ok(min_visible_expected == min_visible_actual, "test %d: unexpected number of items %d.\n", - test, min_visible_actual); + ok(min_visible_expected == min_visible_actual, "unexpected number of items %d.\n", + min_visible_actual); } ret = SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE,0); @@ -1333,18 +1334,19 @@ static void test_combo_dropdown_size(DWORD style) if (expected_height_list < 0) expected_height_list = 0; - ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", - test, expected_height_list, height_list); + ok(expected_height_list == height_list, "expected list height to be %d, got %d\n", + expected_height_list, height_list); } else { expected_height_list = min(info_test->num_items, min_visible_expected) * height_item; - ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", - test, expected_height_list, height_list); + ok(expected_height_list == height_list, "expected list height to be %d, got %d\n", + expected_height_list, height_list); } DestroyWindow(hCombo); + winetest_pop_context(); } } -- 2.30.2

1 0

[PATCH] kernel32/tests: Remove a couple of unnecessary NULL casts.
by Francois Gouget 27 Apr '22

27 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 88781aa376c..fded1c69f1e 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1915,7 +1915,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0xdeadbeef; ret = pRtlGetUserInfoHeap( heap, 0, ptr0, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - ok( tmp_ptr == (void *)NULL, "got ptr %p\n", tmp_ptr ); + ok( tmp_ptr == NULL, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0xc00, "got flags %#lx\n", tmp_flags ); @@ -1923,7 +1923,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0xdeadbeef; ret = pRtlGetUserInfoHeap( heap, 0, ptr1, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - ok( tmp_ptr == (void *)NULL, "got ptr %p\n", tmp_ptr ); + ok( tmp_ptr == NULL, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0x200, "got flags %#lx\n", tmp_flags ); -- 2.30.2

1 0

[PATCH 1/6] win32u: Use NtUserSetClipboardData to import clipboard data.
by Jacek Caban 27 Apr '22

27 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 192 ++++++++++++++++++----------------- 1 file changed, 100 insertions(+), 92 deletions(-)

2 1

[PATCH v2 6/6] winex11: Use format_entry to store cached XDND formats data.
by Huw Davies 27 Apr '22

27 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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; -- 2.25.1

1 0

[PATCH v2 5/6] winex11: Move CF_HDROP filtering to import_xdnd_selection.
by Huw Davies 27 Apr '22

27 Apr '22

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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); - } - } - } } -- 2.25.1

1 0