December 2023 - Wine-Commits

Rémi Bernon : imm32/tests: Fix HKL comparison when cleaning up preload list.
by Alexandre Julliard Dec. 19, 2023

Dec. 19, 2023

Module: wine Branch: master Commit: 54b8049de28710c0e6553ff7c1bbde814e5dd05a URL: https://gitlab.winehq.org/wine/wine/-/commit/54b8049de28710c0e6553ff7c1bbde… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 19 10:58:34 2023 +0100 imm32/tests: Fix HKL comparison when cleaning up preload list. --- dlls/imm32/tests/imm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 07caa054357..66ebbfd161d 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -3721,7 +3721,7 @@ static void ime_cleanup( HKL hkl, BOOL free ) { value_len = ARRAY_SIZE(value); buffer_len = sizeof(buffer); - if (hkl != UlongToHandle( wcstoul( buffer, NULL, 16 ) )) continue; + if (HandleToUlong( hkl ) != wcstoul( buffer, NULL, 16 )) continue; ret = RegDeleteValueW( hkey, value ); ok( !ret, "RegDeleteValueW returned %#lx, error %lu\n", ret, GetLastError() ); }

1 0

Zhiyi Zhang : win32u: Create a real bitmap object for display DCs.
by Alexandre Julliard Dec. 19, 2023

Dec. 19, 2023

Module: wine Branch: master Commit: 19229020416dd8a2c52071d1987130f05ee790de URL: https://gitlab.winehq.org/wine/wine/-/commit/19229020416dd8a2c52071d1987130… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 19 11:12:56 2023 +0800 win32u: Create a real bitmap object for display DCs. TightVNC viewer passes the bitmap object from display DCs to GetDIBits() and expect it to succeed. So merely a bitmap handle no longer suffices. Thus create a real bitmap instead. Fix a regression from 546cbdc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54381 --- dlls/user32/tests/monitor.c | 3 --- dlls/win32u/dc.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ff9c6f47ed7..e93a84242c4 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2276,9 +2276,7 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ /* Expect GetDIBits() to succeed */ bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); value = GetDIBits(hdc, hbmp, 0, 0, NULL, (LPBITMAPINFO)bmi, DIB_RGB_COLORS); - todo_wine ok(value, "GetDIBits failed, error %#lx.\n", GetLastError()); - todo_wine ok(bmi->bmiHeader.biCompression == BI_BITFIELDS, "Got unexpected biCompression %lu.\n", bmi->bmiHeader.biCompression); ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); @@ -2292,7 +2290,6 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ todo_wine ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); - todo_wine ok_(__FILE__, line)(bitmap.bmBitsPixel == 32, "Expected bmBitsPixel %d, got %d.\n", 32, bitmap.bmBitsPixel); ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 2b8a56de5bd..16920e08d33 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -278,7 +278,7 @@ void free_dc_ptr( DC *dc ) if (dc->hBitmap) { if (dc->is_display) - NtGdiDeleteClientObj( dc->hBitmap ); + NtGdiDeleteObjectApp( dc->hBitmap ); else GDI_dec_ref_count( dc->hBitmap ); } @@ -731,7 +731,7 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD hdc = dc->hSelf; if (is_display) - dc->hBitmap = NtGdiCreateClientObj( NTGDI_OBJ_SURF ); + dc->hBitmap = NtGdiCreateCompatibleBitmap( hdc, 1, 1 ); else dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP ));

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 19, 2023

Dec. 19, 2023

Module: wine Branch: master Commit: 1d412eaca82015bbd98afe7245401bd42fdea7a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d412eaca82015bbd98afe7245401b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 18 23:58:20 2023 -0700 po: Update Catalan translation. --- po/ca.po | 217 +++++++++++++++++++++------------------------------------------ 1 file changed, 73 insertions(+), 144 deletions(-)

1 0

Fabian Maurer : wineps: Don't leak memory in error case (Coverity).
by Alexandre Julliard Dec. 19, 2023

Dec. 19, 2023

Module: wine Branch: master Commit: 69b335b56bcb62350dfed6e70c6242a593b8c19d URL: https://gitlab.winehq.org/wine/wine/-/commit/69b335b56bcb62350dfed6e70c6242… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 10 19:26:43 2023 +0100 wineps: Don't leak memory in error case (Coverity). --- dlls/wineps.drv/ps.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 03c92aa00f0..59e245b9b6c 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -985,6 +985,12 @@ BOOL PSDRV_WriteDIBPatternDict(print_ctx *ctx, const BITMAPINFO *bmi, BYTE *bits return FALSE; } + if (usage > 2) + { + FIXME("wrong usage: %d\n", usage); + return FALSE; + } + w = bmi->bmiHeader.biWidth; h = abs_height; @@ -1025,11 +1031,7 @@ BOOL PSDRV_WriteDIBPatternDict(print_ctx *ctx, const BITMAPINFO *bmi, BYTE *bits map[0] = GetTextColor( ctx->hdc ); map[1] = GetBkColor( ctx->hdc ); } - else - { - FIXME("wrong usage: %d\n", usage); - return FALSE; - } + PSDRV_WriteRGB(ctx, map, 2); PSDRV_WriteIndexColorSpaceEnd(ctx);

1 0

Zhiyi Zhang : user32/tests: Add more display DC tests.
by Alexandre Julliard Dec. 19, 2023

Dec. 19, 2023

Module: wine Branch: master Commit: a47e2a5e1fffa1e8e02f7ea4738260b60aa3c13d URL: https://gitlab.winehq.org/wine/wine/-/commit/a47e2a5e1fffa1e8e02f7ea4738260… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 19 11:11:08 2023 +0800 user32/tests: Add more display DC tests. Test that passing the bitmap object from display DCs to GetDIBits() should succeed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54381 --- dlls/user32/tests/monitor.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index d172eb900df..ff9c6f47ed7 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2227,6 +2227,9 @@ static void test_handles(void) #define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) { + unsigned char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])] = {0}; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; + DIBSECTION dib; BITMAP bitmap; HBITMAP hbmp; INT value; @@ -2265,6 +2268,19 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ hbmp = GetCurrentObject(hdc, OBJ_BITMAP); ok_(__FILE__, line)(!!hbmp, "GetCurrentObject failed, error %#lx.\n", GetLastError()); + + /* Expect hbmp to be a bitmap, not a DIB when GetObjectA() succeeds */ + value = GetObjectA(hbmp, sizeof(dib), &dib); + ok(!value || value == sizeof(BITMAP), "GetObjectA failed, value %d.\n", value); + + /* Expect GetDIBits() to succeed */ + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + value = GetDIBits(hdc, hbmp, 0, 0, NULL, (LPBITMAPINFO)bmi, DIB_RGB_COLORS); + todo_wine + ok(value, "GetDIBits failed, error %#lx.\n", GetLastError()); + todo_wine + ok(bmi->bmiHeader.biCompression == BI_BITFIELDS, "Got unexpected biCompression %lu.\n", bmi->bmiHeader.biCompression); + ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); /* GetObjectA fails on Win7 and older */ if (ret)

1 0

Alexandre Julliard : ntdll: Add a more explicit failure for 32-bit prefix in wow64 mode.
by Alexandre Julliard Dec. 19, 2023

Dec. 19, 2023

Module: wine Branch: master Commit: 443e49084ed2a85cba0b559eaf7921d503638911 URL: https://gitlab.winehq.org/wine/wine/-/commit/443e49084ed2a85cba0b559eaf7921… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 19 13:58:23 2023 +0100 ntdll: Add a more explicit failure for 32-bit prefix in wow64 mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56039 --- dlls/ntdll/unix/server.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 7211457387c..53fcc61ccf3 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1565,6 +1565,8 @@ size_t server_init_process(void) { const char *arch = getenv( "WINEARCH" ); + if (is_win64 && arch && !strcmp( arch, "win32" )) + fatal_error( "WINEARCH is set to 'win32' but this is not supported in wow64 mode.\n" ); if (arch && strcmp( arch, "win32" ) && strcmp( arch, "win64" )) fatal_error( "WINEARCH set to invalid value '%s', it must be either win32 or win64.\n", arch );

1 0

Alexandre Julliard : winecfg: Support all Windows versions also in 64-bit mode.
by Alexandre Julliard Dec. 19, 2023

Dec. 19, 2023

Module: wine Branch: master Commit: 3fb882167f1699f0235cb8fd306eb1c010014279 URL: https://gitlab.winehq.org/wine/wine/-/commit/3fb882167f1699f0235cb8fd306eb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 19 14:12:38 2023 +0100 winecfg: Support all Windows versions also in 64-bit mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56039 --- programs/winecfg/appdefaults.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index da4fc93c06f..71eb9f36fef 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -58,9 +58,7 @@ static const struct win_version win_versions[] = { L"win2008", L"Windows 2008", NULL, 6, 0, 6002, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"ServerNT"}, { L"vista", L"Windows Vista", NULL, 6, 0, 6002, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"WinNT"}, { L"win2003", L"Windows 2003", NULL, 5, 2, 3790, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"ServerNT"}, -#ifdef _WIN64 - { L"winxp64", L"Windows XP", NULL, 5, 2, 3790, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"WinNT"}, -#else + { L"winxp64", L"Windows XP 64", NULL, 5, 2, 3790, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"WinNT"}, { L"winxp", L"Windows XP", NULL, 5, 1, 2600, VER_PLATFORM_WIN32_NT, L"Service Pack 3", 3, 0, L"WinNT"}, { L"win2k", L"Windows 2000", NULL, 5, 0, 2195, VER_PLATFORM_WIN32_NT, L"Service Pack 4", 4, 0, L"WinNT"}, { L"winme", L"Windows ME", NULL, 4, 90, 3000, VER_PLATFORM_WIN32_WINDOWS, L" ", 0, 0, L""}, @@ -71,7 +69,6 @@ static const struct win_version win_versions[] = { L"win31", L"Windows 3.1", NULL, 3, 10, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""}, { L"win30", L"Windows 3.0", NULL, 3, 0, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""}, { L"win20", L"Windows 2.0", NULL, 2, 0, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""} -#endif }; #define DEFAULT_WIN_VERSION L"win10"

1 0

Alexandre Julliard : wow64: Initialize the syscall dispatcher in the 32-bit TEB.
by Alexandre Julliard Dec. 19, 2023

Dec. 19, 2023

Module: wine Branch: master Commit: 3e0c21bed182782dfced05b591b972806a2d1727 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e0c21bed182782dfced05b591b972… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 19 11:57:40 2023 +0100 wow64: Initialize the syscall dispatcher in the 32-bit TEB. --- dlls/wow64/syscall.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 2af7bf75de2..db51948057f 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -827,8 +827,10 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex */ static void thread_init(void) { + TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset); void *cpu_area_ctx; + teb32->WOW32Reserved = PtrToUlong( pBTCpuGetBopCode() ); RtlWow64GetCurrentCpuArea( NULL, &cpu_area_ctx, NULL ); NtCurrentTeb()->TlsSlots[WOW64_TLS_WOW64INFO] = wow64info; if (pBTCpuThreadInit) pBTCpuThreadInit();

1 0

Alexandre Julliard : user32: Fix string comparison for listbox inexact matches.
by Alexandre Julliard Dec. 19, 2023

Dec. 19, 2023

Module: wine Branch: master Commit: 343398d23e8d10cc3931ff3fc98ec438c54fac74 URL: https://gitlab.winehq.org/wine/wine/-/commit/343398d23e8d10cc3931ff3fc98ec4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 19 12:42:49 2023 +0100 user32: Fix string comparison for listbox inexact matches. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55446 --- dlls/user32/listbox.c | 18 +++++------ dlls/user32/tests/listbox.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 9 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 0e925973e84..d3ca2ccb951 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -891,9 +891,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) @@ -921,7 +921,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; @@ -976,13 +976,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; @@ -1017,7 +1017,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; } } @@ -1032,11 +1032,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/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 88bf2cc0801..c78171ff4d8 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -2421,6 +2421,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) { const struct listbox_test SS = @@ -2520,4 +2597,5 @@ START_TEST(listbox) test_WM_MEASUREITEM(); test_LB_SETSEL(); test_LBS_NODATA(); + test_LB_FINDSTRING(); }

1 0

Eric Pouech : dbghelp: Fix some tests for SymLoadModule*().
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: 7b0d974439ed69f2323cd64685bc96d370ec6531 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b0d974439ed69f2323cd64685bc96… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Dec 16 15:25:51 2023 +0100 dbghelp: Fix some tests for SymLoadModule*(). On top of being closer to native behavior, this helps some games where: - they use dbghelp to gather information of where they generate exceptions, - they generate exception in the game play, - and refresh their list of loaded modules in dbghelp. This can generate some delays (~2ms per module), which affects game play (freeze, slugginess...). Credit to Paul Gofman for triaging this. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/module.c | 18 ++++++++++++++++-- dlls/dbghelp/tests/dbghelp.c | 1 - 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index b12007d270e..f21733c7be9 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -943,6 +943,19 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & ~(SLMFLAG_VIRTUAL)) FIXME("Unsupported Flags %08lx for %s\n", Flags, debugstr_w(wImageName)); + /* Trying to load a new module at the same address of an existing one, + * native simply keeps the old one in place. + */ + if (BaseOfDll) + for (altmodule = pcs->lmodules; altmodule; altmodule = altmodule->next) + { + if (altmodule->type == DMT_PE && BaseOfDll == altmodule->module.BaseOfImage) + { + SetLastError(ERROR_SUCCESS); + return 0; + } + } + pcs->loader->synchronize_module_list(pcs); /* this is a Wine extension to the API just to redo the synchronisation */ @@ -974,6 +987,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (!module) { WARN("Couldn't locate %s\n", debugstr_w(wImageName)); + SetLastError(ERROR_NO_MORE_FILES); return 0; } /* by default module_new fills module.ModuleName from a derivation @@ -997,11 +1011,11 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam * (it's hidden by altmodule). * We need to decide which one the two modules we need to get rid of. */ - /* loading same module at same address... don't change anything */ + /* loading same module at same address... we can only get here when BaseOfDll is 0 */ if (module->module.BaseOfImage == altmodule->module.BaseOfImage) { module_remove(pcs, module); - SetLastError(ERROR_SUCCESS); + SetLastError(ERROR_INVALID_ADDRESS); return 0; } /* replace old module with new one */ diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 0259aaac81a..13cd173e761 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -605,7 +605,6 @@ static void test_modules_overlap(void) if (tests[i].error_code != ~0) { ok(base[1] == 0, "SymLoadModuleEx should have failed\n"); - todo_wine_if((i >= 8 && i < 12) || (i >= 20 && i < 32)) ok(GetLastError() == tests[i].error_code || /* Win8 returns this */ (tests[i].error_code == ERROR_NO_MORE_FILES && broken(GetLastError() == ERROR_INVALID_HANDLE)),

1 0