December 2023 - Wine-Commits

Huw Davies : dnsapi: Free the buffer in the early return paths.
by Alexandre Julliard Dec. 21, 2023

Dec. 21, 2023

Module: wine Branch: master Commit: 5b0430a178ec16f05967065df7160efec5ee2b3d URL: https://gitlab.winehq.org/wine/wine/-/commit/5b0430a178ec16f05967065df7160e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 21 14:07:54 2023 +0000 dnsapi: Free the buffer in the early return paths. --- dlls/dnsapi/libresolv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index d68ca1fd9bf..9034651ac6d 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -192,11 +192,16 @@ static NTSTATUS resolv_get_serverlist( void *args ) if (filter( buf[i].sin.sin_family, params->family )) continue; found++; } - if (!found) return DNS_ERROR_NO_DNS_SERVERS; + if (!found) + { + free( buf ); + return DNS_ERROR_NO_DNS_SERVERS; + } needed = FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[found]); if (!addrs || *params->len < needed) { + free( buf ); *params->len = needed; return !addrs ? ERROR_SUCCESS : ERROR_MORE_DATA; }

1 0

Huw Davies : dnsapi: Update the array ptr in the insufficient buffer case.
by Alexandre Julliard Dec. 21, 2023

Dec. 21, 2023

Module: wine Branch: master Commit: 55b3e6095b05ded653bb3a79af94d560e89cb222 URL: https://gitlab.winehq.org/wine/wine/-/commit/55b3e6095b05ded653bb3a79af94d5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 21 13:47:10 2023 +0000 dnsapi: Update the array ptr in the insufficient buffer case. Fixes a regression caused by da65aa5b747d. --- dlls/dnsapi/query.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index d5f46d0a32e..a28d98fc328 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -329,9 +329,9 @@ static DNS_STATUS get_hostname_w( COMPUTER_NAME_FORMAT format, PWSTR buffer, PDW static DNS_STATUS get_dns_server_list( IP4_ARRAY *out, DWORD *len ) { char buf[FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[3])]; - DNS_ADDR_ARRAY *servers = (DNS_ADDR_ARRAY *)buf; DWORD ret, needed, i, num, array_len = sizeof(buf); - struct get_serverlist_params params = { AF_INET, servers, &array_len }; + struct get_serverlist_params params = { AF_INET, (DNS_ADDR_ARRAY *)buf, &array_len }; + for (;;) { ret = RESOLV_CALL( get_serverlist, &params ); @@ -346,9 +346,9 @@ static DNS_STATUS get_dns_server_list( IP4_ARRAY *out, DWORD *len ) } if (!ret) break; - if ((char *)servers != buf) free( servers ); - servers = malloc( array_len ); - if (!servers) + if ((char *)params.addrs != buf) free( params.addrs ); + params.addrs = malloc( array_len ); + if (!params.addrs) { ret = ERROR_NOT_ENOUGH_MEMORY; goto err; @@ -357,12 +357,12 @@ static DNS_STATUS get_dns_server_list( IP4_ARRAY *out, DWORD *len ) out->AddrCount = num; for (i = 0; i < num; i++) - out->AddrArray[i] = ((SOCKADDR_IN *)servers->AddrArray[i].MaxSa)->sin_addr.s_addr; + out->AddrArray[i] = ((SOCKADDR_IN *)params.addrs->AddrArray[i].MaxSa)->sin_addr.s_addr; *len = needed; ret = ERROR_SUCCESS; err: - if ((char *)servers != buf) free( servers ); + if ((char *)params.addrs != buf) free( params.addrs ); return ret; }

1 0

Eric Pouech : winmm: Fill in pIOProc field in MMIOINFO.
by Alexandre Julliard Dec. 21, 2023

Dec. 21, 2023

Module: wine Branch: master Commit: 6e9668450afebf19b20ae8472550cd90019db28b URL: https://gitlab.winehq.org/wine/wine/-/commit/6e9668450afebf19b20ae8472550cd… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Dec 21 09:56:30 2023 +0100 winmm: Fill in pIOProc field in MMIOINFO. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55942 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/winmm/mmio.c | 1 + dlls/winmm/tests/mmio.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 7b7dbc3bf67..78ad7da3cd7 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -693,6 +693,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, wm->ioProc->count++; wm->info.dwFlags = dwOpenFlags; + wm->info.pIOProc = wm->ioProc->pIOProc; if (dwOpenFlags & MMIO_ALLOCBUF) { refmminfo->wErrorRet = MMIO_SetBuffer(wm, refmminfo->pchBuffer, diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index b2c54e0b9cd..df4de55324b 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -753,6 +753,7 @@ static void test_mmioOpen_fourcc(void) mmioGetInfo(hmmio, &mmio, 0); ok(hmmio && mmio.fccIOProc == FOURCC_XYZ, "mmioOpenA error %u, got %4.4s\n", mmio.wErrorRet, (LPCSTR)&mmio.fccIOProc); + ok(mmio.pIOProc == mmio_test_IOProc, "Unexpected pIOProc %p\n", mmio.pIOProc); ok(mmio.adwInfo[1] == 0, "mmioOpenA sent MMIOM_SEEK, got %ld\n", mmio.adwInfo[1]); ok(mmio.lDiskOffset == 0, "mmioOpenA updated lDiskOffset, got %ld\n", @@ -765,6 +766,7 @@ static void test_mmioOpen_fourcc(void) mmioGetInfo(hmmio, &mmio, 0); ok(hmmio && mmio.fccIOProc == FOURCC_XYZ, "mmioOpenA error %u, got %4.4s\n", mmio.wErrorRet, (LPCSTR)&mmio.fccIOProc); + ok(mmio.pIOProc == mmio_test_IOProc, "Unexpected pIOProc %p\n", mmio.pIOProc); ok(mmio.adwInfo[1] == 0, "mmioOpenA sent MMIOM_SEEK, got %ld\n", mmio.adwInfo[1]); ok(mmio.lDiskOffset == 0, "mmioOpenA updated lDiskOffset, got %ld\n",

1 0

Rémi Bernon : wined3d: Add more padding to resource memory allocations.
by Alexandre Julliard Dec. 20, 2023

Dec. 20, 2023

Module: wine Branch: master Commit: e7d7ac77087ed33958047dae34a2e9d66c473c21 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7d7ac77087ed33958047dae34a2e9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 18:46:17 2023 +0100 wined3d: Add more padding to resource memory allocations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55773 --- dlls/wined3d/resource.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 9d3fd0a426d..5351fbd3025 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -332,7 +332,11 @@ void CDECL wined3d_resource_preload(struct wined3d_resource *resource) static BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) { void **p; - SIZE_T align = RESOURCE_ALIGNMENT - 1 + sizeof(*p); + /* Overallocate and add padding to the allocated pointer, to guard against + * games (for instance Railroad Tycoon 2) writing before the locked resource + * memory pointer. + */ + SIZE_T align = RESOURCE_ALIGNMENT + sizeof(*p); void *mem; if (!(mem = heap_alloc_zero(resource->size + align)))

1 0

Rémi Bernon : wined3d: Store the resource heap memory pointer separately.
by Alexandre Julliard Dec. 20, 2023

Dec. 20, 2023

Module: wine Branch: master Commit: a6e969560b02ca776f987319db37e6550a1ecfec URL: https://gitlab.winehq.org/wine/wine/-/commit/a6e969560b02ca776f987319db37e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 14 19:34:01 2023 +0100 wined3d: Store the resource heap memory pointer separately. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55773 --- dlls/wined3d/resource.c | 19 ++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 5351fbd3025..9f27a9100e6 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -208,6 +208,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->parent_ops = parent_ops; resource->resource_ops = resource_ops; resource->map_binding = WINED3D_LOCATION_SYSMEM; + resource->heap_pointer = NULL; resource->heap_memory = NULL; /* Check that we have enough video ram left */ @@ -331,12 +332,11 @@ void CDECL wined3d_resource_preload(struct wined3d_resource *resource) static BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) { - void **p; /* Overallocate and add padding to the allocated pointer, to guard against * games (for instance Railroad Tycoon 2) writing before the locked resource * memory pointer. */ - SIZE_T align = RESOURCE_ALIGNMENT + sizeof(*p); + static const SIZE_T align = RESOURCE_ALIGNMENT; void *mem; if (!(mem = heap_alloc_zero(resource->size + align))) @@ -345,10 +345,8 @@ static BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) return FALSE; } - p = (void **)(((ULONG_PTR)mem + align) & ~(RESOURCE_ALIGNMENT - 1)) - 1; - *p = mem; - - resource->heap_memory = ++p; + resource->heap_memory = (void *)(((ULONG_PTR)mem + align) & ~(RESOURCE_ALIGNMENT - 1)); + resource->heap_pointer = mem; return TRUE; } @@ -363,13 +361,12 @@ BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource) void wined3d_resource_free_sysmem(struct wined3d_resource *resource) { - void **p = resource->heap_memory; - - if (!p) + if (!resource->heap_memory) return; - - heap_free(*(--p)); resource->heap_memory = NULL; + + heap_free(resource->heap_pointer); + resource->heap_pointer = NULL; } GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *resource) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c17e29cddf2..238456e78d8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3199,6 +3199,7 @@ struct wined3d_resource UINT depth; UINT size; unsigned int priority; + void *heap_pointer; void *heap_memory; uint32_t pin_sysmem : 1;

1 0

Zebediah Figura : qcap/audiorecord: Do not leak the sample when pausing or stopping.
by Alexandre Julliard Dec. 20, 2023

Dec. 20, 2023

Module: wine Branch: master Commit: 73072be1e68c1996c2c32a9ef7ea6f2ce9094049 URL: https://gitlab.winehq.org/wine/wine/-/commit/73072be1e68c1996c2c32a9ef7ea6f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 30 13:14:08 2023 -0500 qcap/audiorecord: Do not leak the sample when pausing or stopping. --- dlls/qcap/audiorecord.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index eefac79b409..775d942f8f8 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -602,14 +602,15 @@ static DWORD WINAPI stream_thread(void *arg) IMediaSample_SetTime(sample, &start_pts, &end_pts); TRACE("Sending buffer %p.\n", sample); - hr = IMemInputPin_Receive(filter->source.pMemInputPin, sample); - IMediaSample_Release(sample); - if (FAILED(hr)) + if (FAILED(hr = IMemInputPin_Receive(filter->source.pMemInputPin, sample))) { ERR("IMemInputPin::Receive() returned %#lx.\n", hr); + IMediaSample_Release(sample); break; } } + + IMediaSample_Release(sample); } LeaveCriticalSection(&filter->state_cs);

1 0

Alex Henrie : comctl32/listview: Ignore the lParam to WM_PRINTCLIENT and add tests.
by Alexandre Julliard Dec. 20, 2023

Dec. 20, 2023

Module: wine Branch: master Commit: 4e95553a2d1e442218cf94168b6258e3f5ba255b URL: https://gitlab.winehq.org/wine/wine/-/commit/4e95553a2d1e442218cf94168b6258… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 14 21:12:42 2023 -0700 comctl32/listview: Ignore the lParam to WM_PRINTCLIENT and add tests. Based on simliar patch for comctl32/treeview: 231199bc46 WM_PRINTCLIENT paints the items of a listview, including the item backgrounds, but never the listview background. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54878 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55005 Co-authored-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/comctl32/listview.c | 12 ++------- dlls/comctl32/tests/listview.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7972be9669d..c82473b6205 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10832,17 +10832,9 @@ static inline LRESULT LISTVIEW_WMPaint(LISTVIEW_INFO *infoPtr, HDC hdc) */ static LRESULT LISTVIEW_PrintClient(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD options) { - if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwndSelf)) - return 0; - - if (options & ~(PRF_ERASEBKGND|PRF_CLIENT)) - FIXME("(hdc=%p options %#lx) partial stub\n", hdc, options); - - if (options & PRF_ERASEBKGND) - LISTVIEW_EraseBkgnd(infoPtr, hdc); + FIXME("(hdc=%p options=%#lx) partial stub\n", hdc, options); - if (options & PRF_CLIENT) - LISTVIEW_Paint(infoPtr, hdc); + LISTVIEW_Paint(infoPtr, hdc); return 0; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b1cb0ef16c2..ad60fa5b6b6 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5978,6 +5978,60 @@ static void test_LVM_REDRAWITEMS(void) DestroyWindow(list); } +static void test_WM_PRINTCLIENT(void) +{ + static const int states[] = {SW_HIDE, SW_SHOW}; + static const LPARAM params[] = {0, PRF_CHECKVISIBLE, PRF_NONCLIENT, PRF_CLIENT, PRF_ERASEBKGND, + PRF_CHILDREN, PRF_OWNED}; + const DWORD list_background = RGB(255, 0, 0); + const DWORD text_background = RGB(0, 0, 255); + HWND hList; + COLORREF clr; + LONG ret; + RECT rc; + HDC hdc; + int i, j; + + hList = create_listview_control(LVS_LIST); + insert_item(hList, 0); + + ret = SendMessageA(hList, LVM_SETBKCOLOR, 0, list_background); + ok(ret == TRUE, "got 0x%lx, expected 0x%x\n", ret, TRUE); + + ret = SendMessageA(hList, LVM_SETTEXTBKCOLOR, 0, text_background); + ok(ret == TRUE, "got 0x%lx, expected 0x%x\n", ret, TRUE); + + hdc = GetDC(hwndparent); + GetClientRect(hwndparent, &rc); + + for (i = 0; i < ARRAY_SIZE(states); i++) + { + ShowWindow(hList, states[i]); + + for (j = 0; j < ARRAY_SIZE(params); j++) + { + winetest_push_context("state=%d lParam=0x%Ix", states[i], params[j]); + + FillRect(hdc, &rc, GetStockObject(BLACK_BRUSH)); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(0, 0, 0), "got 0x%lx\n", clr); + clr = GetPixel(hdc, 50, 1); + ok(clr == RGB(0, 0, 0), "got 0x%lx\n", clr); + ret = SendMessageA(hList, WM_PRINTCLIENT, (WPARAM)hdc, params[j]); + ok(ret == 0, "got %ld\n", ret); + clr = GetPixel(hdc, 1, 1); + ok(clr == text_background, "got 0x%lx\n", clr); + clr = GetPixel(hdc, 50, 1); + ok(clr == RGB(0, 0, 0), "got 0x%lx\n", clr); + + winetest_pop_context(); + } + } + + ReleaseDC(hwndparent, hdc); + DestroyWindow(hList); +} + static void test_imagelists(void) { HWND hwnd, header; @@ -7153,6 +7207,7 @@ START_TEST(listview) test_dispinfo(); test_LVM_SETITEMTEXT(); test_LVM_REDRAWITEMS(); + test_WM_PRINTCLIENT(); test_imagelists(); test_deleteitem(); test_insertitem(); @@ -7205,6 +7260,7 @@ START_TEST(listview) test_dispinfo(); test_LVM_SETITEMTEXT(); test_LVM_REDRAWITEMS(); + test_WM_PRINTCLIENT(); test_oneclickactivate(); test_state_image(); test_LVSCW_AUTOSIZE();

1 0

Alistair Leslie-Hughes : msdasql/tests: Add missing carriage returns.
by Alexandre Julliard Dec. 20, 2023

Dec. 20, 2023

Module: wine Branch: master Commit: af45d28625de3b7188c7db3a28648710176c9d11 URL: https://gitlab.winehq.org/wine/wine/-/commit/af45d28625de3b7188c7db3a286487… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 20 09:08:53 2023 +1100 msdasql/tests: Add missing carriage returns. --- dlls/msdasql/tests/provider.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 706d5a13ef9..0e407b725e8 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -939,18 +939,18 @@ static void test_enumeration(void) for( i = 0; i < columns; i++ ) { if (!dbcolumninfo[i].pwszName || !colinfo_data[i].pwszName) - ok (dbcolumninfo[i].pwszName == colinfo_data[i].pwszName, "got %p/%p", dbcolumninfo[i].pwszName, colinfo_data[i].pwszName); + ok (dbcolumninfo[i].pwszName == colinfo_data[i].pwszName, "got %p/%p\n", dbcolumninfo[i].pwszName, colinfo_data[i].pwszName); else - ok ( !wcscmp(dbcolumninfo[i].pwszName, colinfo_data[i].pwszName), "got %p/%p", + ok ( !wcscmp(dbcolumninfo[i].pwszName, colinfo_data[i].pwszName), "got %p/%p\n", debugstr_w(dbcolumninfo[i].pwszName), debugstr_w(colinfo_data[i].pwszName)); - ok (dbcolumninfo[i].pTypeInfo == colinfo_data[i].pTypeInfo, "got %p/%p", dbcolumninfo[i].pTypeInfo, colinfo_data[i].pTypeInfo); - ok (dbcolumninfo[i].iOrdinal == colinfo_data[i].iOrdinal, "got %Id/%Id", dbcolumninfo[i].iOrdinal, colinfo_data[i].iOrdinal); - ok (dbcolumninfo[i].dwFlags == colinfo_data[i].dwFlags, "got 0x%08lx/0x%08lx", dbcolumninfo[i].dwFlags, colinfo_data[i].dwFlags); - ok (dbcolumninfo[i].ulColumnSize == colinfo_data[i].ulColumnSize, "got %Iu/%Iu", dbcolumninfo[i].ulColumnSize, colinfo_data[i].ulColumnSize); - ok (dbcolumninfo[i].wType == colinfo_data[i].wType, "got %d/%d", dbcolumninfo[i].wType, colinfo_data[i].wType); - ok (dbcolumninfo[i].bPrecision == colinfo_data[i].bPrecision, "got %d/%d", dbcolumninfo[i].bPrecision, colinfo_data[i].bPrecision); - ok (dbcolumninfo[i].bScale == colinfo_data[i].bScale, "got %d/%d", dbcolumninfo[i].bScale, colinfo_data[i].bScale); + ok (dbcolumninfo[i].pTypeInfo == colinfo_data[i].pTypeInfo, "got %p/%p\n", dbcolumninfo[i].pTypeInfo, colinfo_data[i].pTypeInfo); + ok (dbcolumninfo[i].iOrdinal == colinfo_data[i].iOrdinal, "got %Id/%Id\n", dbcolumninfo[i].iOrdinal, colinfo_data[i].iOrdinal); + ok (dbcolumninfo[i].dwFlags == colinfo_data[i].dwFlags, "got 0x%08lx/0x%08lx\n", dbcolumninfo[i].dwFlags, colinfo_data[i].dwFlags); + ok (dbcolumninfo[i].ulColumnSize == colinfo_data[i].ulColumnSize, "got %Iu/%Iu\n", dbcolumninfo[i].ulColumnSize, colinfo_data[i].ulColumnSize); + ok (dbcolumninfo[i].wType == colinfo_data[i].wType, "got %d/%d\n", dbcolumninfo[i].wType, colinfo_data[i].wType); + ok (dbcolumninfo[i].bPrecision == colinfo_data[i].bPrecision, "got %d/%d\n", dbcolumninfo[i].bPrecision, colinfo_data[i].bPrecision); + ok (dbcolumninfo[i].bScale == colinfo_data[i].bScale, "got %d/%d\n", dbcolumninfo[i].bScale, colinfo_data[i].bScale); } CoTaskMemFree(buffer);

1 0

Alexandre Julliard : comctl32: Fix string comparison for listbox inexact matches.
by Alexandre Julliard Dec. 20, 2023

Dec. 20, 2023

Module: wine Branch: master Commit: b724a79e36bbe84563f2aa3c16ff87ca52977b24 URL: https://gitlab.winehq.org/wine/wine/-/commit/b724a79e36bbe84563f2aa3c16ff87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 20 12:23:48 2023 +0100 comctl32: Fix string comparison for listbox inexact matches. Same as 343398d23e8d10cc3931ff3fc98ec438c54fac74. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55446 --- dlls/comctl32/listbox.c | 18 +++++----- dlls/comctl32/tests/listbox.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index f2f42c1d533..951b85856aa 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -880,9 +880,9 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL return len; } -static inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 ) +static inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2, int len ) { - INT ret = CompareStringW( lcid, NORM_IGNORECASE, str1, -1, str2, -1 ); + INT ret = CompareStringW( lcid, NORM_IGNORECASE, str1, len, str2, len ); if (ret == CSTR_LESS_THAN) return -1; if (ret == CSTR_EQUAL) @@ -910,7 +910,7 @@ static INT LISTBOX_FindStringPos( LB_DESCR *descr, LPCWSTR str, BOOL exact ) { index = (min + max) / 2; if (HAS_STRINGS(descr)) - res = LISTBOX_lstrcmpiW( descr->locale, get_item_string(descr, index), str ); + res = LISTBOX_lstrcmpiW( descr->locale, get_item_string(descr, index), str, -1 ); else { COMPAREITEMSTRUCT cis; @@ -965,13 +965,13 @@ static INT LISTBOX_FindFileStrPos( LB_DESCR *descr, LPCWSTR str ) else /* directory */ { if (str[1] == '-') res = 1; - else res = LISTBOX_lstrcmpiW( descr->locale, str, p ); + else res = LISTBOX_lstrcmpiW( descr->locale, str, p, -1 ); } } else /* filename */ { if (*str == '[') res = 1; - else res = LISTBOX_lstrcmpiW( descr->locale, str, p ); + else res = LISTBOX_lstrcmpiW( descr->locale, str, p, -1 ); } if (!res) return index; if (res < 0) max = index; @@ -1002,7 +1002,7 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa for (i = 0, index = start; i < descr->nb_items; i++, index++) { if (index == descr->nb_items) index = 0; - if (!LISTBOX_lstrcmpiW(descr->locale, str, get_item_string(descr, index))) + if (!LISTBOX_lstrcmpiW(descr->locale, str, get_item_string(descr, index), -1)) return index; } } @@ -1017,11 +1017,11 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa if (index == descr->nb_items) index = 0; item_str = get_item_string(descr, index); - if (!wcsnicmp(str, item_str, len)) return index; + if (!LISTBOX_lstrcmpiW(descr->locale, str, item_str, len)) return index; if (item_str[0] == '[') { - if (!wcsnicmp(str, item_str + 1, len)) return index; - if (item_str[1] == '-' && !wcsnicmp(str, item_str + 2, len)) return index; + if (!LISTBOX_lstrcmpiW(descr->locale, str, item_str + 1, len)) return index; + if (item_str[1] == '-' && !LISTBOX_lstrcmpiW(descr->locale, str, item_str + 2, len)) return index; } } } diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 16c546852a1..aba91384d15 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -2675,6 +2675,83 @@ static void test_LBS_NODATA(void) DestroyWindow(parent); } +static void test_LB_FINDSTRING(void) +{ + static const WCHAR *strings[] = + { + L"abci", + L"AbCI", + L"abcI", + L"abc\xcdzz", + L"abc\xedzz", + L"abc\xcd", + L"abc\xed", + L"abcO", + L"abc\xd8", + L"abcP", + }; + static const struct { const WCHAR *str; LRESULT from, res, exact, alt_res, alt_exact; } tests[] = + { + { L"ab", -1, 0, -1, 0, -1 }, + { L"abc", -1, 0, -1, 0, -1 }, + { L"abci", -1, 0, 0, 0, 0 }, + { L"ABCI", -1, 0, 0, 0, 0 }, + { L"ABC\xed", -1, 3, 3, 3, 3 }, + { L"ABC\xcd", 4, 5, 3, 5, 3 }, + { L"abcp", -1, 9, 9, 8, 8 }, + }; + HWND listbox; + unsigned int i; + LRESULT ret; + + listbox = CreateWindowW( L"listbox", L"TestList", LBS_HASSTRINGS | LBS_SORT, + 0, 0, 100, 100, NULL, NULL, NULL, 0 ); + ok( listbox != NULL, "Failed to create listbox\n" ); + SendMessageW( listbox, LB_SETLOCALE, MAKELANGID( LANG_FRENCH, SUBLANG_DEFAULT ), 0 ); + for (i = 0; i < ARRAY_SIZE(strings); i++) SendMessageW( listbox, LB_ADDSTRING, 0, (LPARAM)strings[i] ); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + ret = SendMessageW( listbox, LB_FINDSTRING, tests[i].from, (LPARAM)tests[i].str ); + ok( ret == tests[i].res, "%u: wrong result %Id / %Id\n", i, ret, tests[i].res ); + ret = SendMessageW( listbox, LB_FINDSTRINGEXACT, tests[i].from, (LPARAM)tests[i].str ); + ok( ret == tests[i].exact, "%u: wrong result %Id / %Id\n", i, ret, tests[i].exact ); + } + + SendMessageW( listbox, LB_RESETCONTENT, 0, 0 ); + SendMessageW( listbox, LB_SETLOCALE, MAKELANGID( LANG_SWEDISH, SUBLANG_DEFAULT ), 0 ); + for (i = 0; i < ARRAY_SIZE(strings); i++) SendMessageW( listbox, LB_ADDSTRING, 0, (LPARAM)strings[i] ); + ret = SendMessageW( listbox, LB_FINDSTRING, -1, (LPARAM)L"abcp" ); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + ret = SendMessageW( listbox, LB_FINDSTRING, tests[i].from, (LPARAM)tests[i].str ); + ok( ret == tests[i].alt_res, "%u: wrong result %Id / %Id\n", i, ret, tests[i].alt_res ); + ret = SendMessageW( listbox, LB_FINDSTRINGEXACT, tests[i].from, (LPARAM)tests[i].str ); + ok( ret == tests[i].alt_exact, "%u: wrong result %Id / %Id\n", i, ret, tests[i].alt_exact ); + } + + SendMessageW( listbox, LB_RESETCONTENT, 0, 0 ); + SendMessageW( listbox, LB_ADDSTRING, 0, (LPARAM)L"abc" ); + SendMessageW( listbox, LB_ADDSTRING, 0, (LPARAM)L"[abc]" ); + SendMessageW( listbox, LB_ADDSTRING, 0, (LPARAM)L"[-abc-]" ); + ret = SendMessageW( listbox, LB_FINDSTRING, -1, (LPARAM)L"abc" ); + ok( ret == 0, "wrong result %Id\n", ret ); + ret = SendMessageW( listbox, LB_FINDSTRINGEXACT, -1, (LPARAM)L"abc" ); + todo_wine + ok( ret == 0, "wrong result %Id\n", ret ); + ret = SendMessageW( listbox, LB_FINDSTRING, 0, (LPARAM)L"abc" ); + ok( ret == 1, "wrong result %Id\n", ret ); + ret = SendMessageW( listbox, LB_FINDSTRINGEXACT, 0, (LPARAM)L"abc" ); + todo_wine + ok( ret == 0, "wrong result %Id\n", ret ); + ret = SendMessageW( listbox, LB_FINDSTRING, 1, (LPARAM)L"abc" ); + ok( ret == 2, "wrong result %Id\n", ret ); + ret = SendMessageW( listbox, LB_FINDSTRINGEXACT, 1, (LPARAM)L"abc" ); + todo_wine + ok( ret == 0, "wrong result %Id\n", ret ); + DestroyWindow( listbox ); +} + START_TEST(listbox) { ULONG_PTR ctx_cookie; @@ -2704,6 +2781,7 @@ START_TEST(listbox) test_WM_MEASUREITEM(); test_LB_SETSEL(); test_LBS_NODATA(); + test_LB_FINDSTRING(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Bernhard Übelacker : winedbg: Retrieve module architecture before sorting.
by Alexandre Julliard Dec. 19, 2023

Dec. 19, 2023

Module: wine Branch: master Commit: b0db6cfd4d92d892e4ea58b47c3f2f674e0b57ab URL: https://gitlab.winehq.org/wine/wine/-/commit/b0db6cfd4d92d892e4ea58b47c3f2f… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun Dec 17 15:12:57 2023 +0100 winedbg: Retrieve module architecture before sorting. This should avoid getting i386 when the process really is x86_64, with just a single i386 module loaded. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56048 --- programs/winedbg/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index d95b286454a..f97b122ed5b 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -287,8 +287,8 @@ void info_win32_module(DWORD64 base, BOOL multi_machine) if (!im.num_used) return; - qsort(im.modules, im.num_used, sizeof(im.modules[0]), module_compare); machine = im.modules[0].mi.MachineType; + qsort(im.modules, im.num_used, sizeof(im.modules[0]), module_compare); if (multi_machine) dbg_printf("%-8s%-40s%-16s%-16sName (%d modules)\n", "Module", "Address", "Machine", "Debug info", im.num_used);

1 0