January 2023 - Wine-Commits

Rémi Bernon : schedsvc: Avoid mismatching heap in SchRpcEnumTasks.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 381e756a9b8c60a9010bbaf4579bb16c65ed3fe5 URL: https://gitlab.winehq.org/wine/wine/-/commit/381e756a9b8c60a9010bbaf4579bb1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 13 08:19:27 2023 +0100 schedsvc: Avoid mismatching heap in SchRpcEnumTasks. --- dlls/schedsvc/schedsvc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 671614a1bcf..784fc5d944d 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -768,7 +768,7 @@ HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_ind { TASK_NAMES new_list; allocated *= 2; - new_list = heap_realloc(list, allocated * sizeof(list[0])); + new_list = realloc(list, allocated * sizeof(list[0])); if (!new_list) { hr = E_OUTOFMEMORY;

1 0

Eric Pouech : winedbg: Use debuggee's bitness for 'examine /a' command.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 5fc54e32196276228cc8422e8371fc9eb4d7b6ca URL: https://gitlab.winehq.org/wine/wine/-/commit/5fc54e32196276228cc8422e8371fc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 23 11:19:35 2023 +0100 winedbg: Use debuggee's bitness for 'examine /a' command. Also fixes stack dump in crash summary and 'info stack' command. (We were using debugger's bitness instead). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index c1a714626b2..8237e719dae 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -248,13 +248,13 @@ void memory_examine(const struct dbg_lvalue *lvalue, int count, char format) case 'd': DO_DUMP(unsigned int, 4, " %4.4d"); break; case 'w': DO_DUMP(unsigned short, 8, " %04x"); break; case 'a': - if (sizeof(DWORD_PTR) == 4) + if (ADDRSIZE == 4) { - DO_DUMP(DWORD_PTR, 4, " %8.8Ix"); + DO_DUMP(DWORD, 4, " %8.8lx"); } else { - DO_DUMP(DWORD_PTR, 2, " %16.16Ix"); + DO_DUMP(DWORD64, 2, " %16.16I64x"); } break; case 'c': DO_DUMP2(char, 32, " %c", (_v < 0x20) ? ' ' : _v); break;

1 0

Alistair Leslie-Hughes : mountmgr.sys: Don't attempt to read from invalid media.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 90d50bc611b71688287d0ddf28c5babcb8e84e98 URL: https://gitlab.winehq.org/wine/wine/-/commit/90d50bc611b71688287d0ddf28c5ba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 19 12:49:28 2023 +1100 mountmgr.sys: Don't attempt to read from invalid media. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49615 --- dlls/mountmgr.sys/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 22c17025e87..33ce1f248e5 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -899,6 +899,14 @@ static BOOL get_volume_device_info( struct volume *volume ) } else { + if(GetLastError() == ERROR_NOT_READY) + { + TRACE( "%s: removable drive with no inserted media\n", debugstr_a(unix_device) ); + volume->fs_type = FS_UNKNOWN; + CloseHandle( handle ); + return TRUE; + } + volume->fs_type = VOLUME_ReadFATSuperblock( handle, superblock ); if (volume->fs_type == FS_UNKNOWN) volume->fs_type = VOLUME_ReadCDSuperblock( handle, superblock ); }

1 0

Eric Pouech : dbghelp: In dwarf debug info, use the same name of anonymous UDT as pdb.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 85fb74a672f527f920974d589f091a9dcedd6a83 URL: https://gitlab.winehq.org/wine/wine/-/commit/85fb74a672f527f920974d589f091a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 2 18:02:55 2023 +0100 dbghelp: In dwarf debug info, use the same name of anonymous UDT as pdb. It's hard coded by msvc in PDB information, so adapt dwarf to advertize the same. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 9ed63463513..1402ffcb941 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1764,7 +1764,7 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_debug_info_t* di, /* quirk... FIXME provide real support for anonymous UDTs */ if (!dwarf2_find_attribute(di, DW_AT_name, &name)) - name.u.string = "zz_anon_zz"; + name.u.string = "<unnamed-tag>"; if (!dwarf2_find_attribute(di, DW_AT_byte_size, &size)) size.u.uvalue = 0; di->symt = &symt_new_udt(di->unit_ctx->module_ctx->module, dwarf2_get_cpp_name(di, name.u.string),

1 0

Eric Pouech : dbghelp: Don't use dbghelp_current_cpu.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: ad21db2e1ee32a94bbea5767d2c11e93694d6cd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad21db2e1ee32a94bbea5767d2c11e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 23 11:20:39 2023 +0100 dbghelp: Don't use dbghelp_current_cpu. It's bound to debugger's CPU not debuggee's. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index ebacfc49bfd..9debc34e77c 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2862,7 +2862,7 @@ static void pdb_location_compute(struct process* pcs, case S_DEFRANGE_FRAMEPOINTER_REL: case S_DEFRANGE_FRAMEPOINTER_REL_FULL_SCOPE: loc->kind = loc_regrel; - loc->reg = dbghelp_current_cpu->frame_regno; + loc->reg = modfmt->module->cpu->frame_regno; loc->offset = locinfo->offset; return; }

1 0

Akihiro Sagawa : user32/tests: Add DBCS WM_CHAR tests for edit control.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: cbe3a39b647e029df16faf1dcce2958f1ee418d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbe3a39b647e029df16faf1dcce295… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 20 23:51:36 2023 +0900 user32/tests: Add DBCS WM_CHAR tests for edit control. --- dlls/user32/tests/edit.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index b70cf2d6e06..0409b3fde7c 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -3366,6 +3366,58 @@ static void test_wordbreak_proc(void) DestroyWindow(hwnd); } +static void test_dbcs_WM_CHAR(void) +{ + WCHAR textW[] = { 0x4e00, 0x4e8c, 0x4e09, 0 }; /* one, two, three */ + unsigned char bytes[7]; + HWND hwnd[2]; + int i; + + WideCharToMultiByte(CP_ACP, 0, textW, -1, (char *)bytes, ARRAY_SIZE(bytes), NULL, NULL); + if (!IsDBCSLeadByte(bytes[0])) + { + skip("Skipping DBCS WM_CHAR test in this codepage\n"); + return; + } + hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hwnd[1] = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + for (i = 0; i < ARRAY_SIZE(hwnd); i++) + { + const unsigned char* p; + WCHAR strW[4]; + char str[7]; + MSG msg; + BOOL r; + int n; + + winetest_push_context("%c", i ? 'W' : 'A'); + + r = SetWindowTextA(hwnd[i], ""); + ok(r, "SetWindowText failed\n"); + + for (p = bytes; *p; p++) + PostMessageA(hwnd[i], WM_CHAR, *p, 1); + + while (PeekMessageA(&msg, hwnd[i], 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + + n = GetWindowTextW(hwnd[i], strW, ARRAY_SIZE(strW)); + ok(n > 0, "GetWindowTextW failed\n"); + todo_wine ok(!wcscmp(strW, textW), "got %s, expected %s\n", + wine_dbgstr_w(strW), wine_dbgstr_w(textW)); + + n = GetWindowTextA(hwnd[i], str, ARRAY_SIZE(str)); + ok(n > 0, "GetWindowText failed\n"); + todo_wine ok(!strcmp(str, (char*)bytes), "got %s, expected %s\n", + wine_dbgstr_a(str), wine_dbgstr_a((char *)bytes)); + + DestroyWindow(hwnd[i]); + + winetest_pop_context(); + } +} + START_TEST(edit) { BOOL b; @@ -3403,6 +3455,7 @@ START_TEST(edit) test_paste(); test_EM_GETLINE(); test_wordbreak_proc(); + test_dbcs_WM_CHAR(); UnregisterWindowClasses(); }

1 0

Akihiro Sagawa : user32/edit: Fix WM_CHAR handler for double-byte characters.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: c385b6475e6ad07227a1ef29593170af1c3cbf99 URL: https://gitlab.winehq.org/wine/wine/-/commit/c385b6475e6ad07227a1ef29593170… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 20 23:55:59 2023 +0900 user32/edit: Fix WM_CHAR handler for double-byte characters. After commit 2aa54a90bd24f6aa422a2eb832a54d9afe585259, a double-byte character is sent to the edit control by double WM_CHAR messages. However, its WM_CHAR handler (ANSI version) can't process a double- byte character properly because the handler converts WM_CHAR to WCHAR one by one. This fix queues the double-byte lead byte as it comes in and then uses it afterwards for the WCHAR conversion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54337 --- dlls/user32/edit.c | 21 +++++++++++++++++++-- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 74411d385e2..47c61f59c24 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -113,6 +113,7 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ + BYTE lead_byte; /* DBCS lead byte store for WM_CHAR */ /* * only for multi line controls */ @@ -4975,8 +4976,24 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B charW = wParam; else { - CHAR charA = wParam; - MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1); + BYTE low = wParam; + DWORD cp = get_input_codepage(); + if (es->lead_byte) + { + char ch[2]; + ch[0] = es->lead_byte; + ch[1] = low; + MultiByteToWideChar(cp, 0, ch, 2, &charW, 1); + } + else if (IsDBCSLeadByteEx(cp, low)) + { + es->lead_byte = low; + result = 1; + break; + } + else + MultiByteToWideChar(cp, 0, (char *)&low, 1, &charW, 1); + es->lead_byte = 0; } if (es->hwndListBox) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0409b3fde7c..78328ee1729 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -3404,12 +3404,12 @@ static void test_dbcs_WM_CHAR(void) n = GetWindowTextW(hwnd[i], strW, ARRAY_SIZE(strW)); ok(n > 0, "GetWindowTextW failed\n"); - todo_wine ok(!wcscmp(strW, textW), "got %s, expected %s\n", + ok(!wcscmp(strW, textW), "got %s, expected %s\n", wine_dbgstr_w(strW), wine_dbgstr_w(textW)); n = GetWindowTextA(hwnd[i], str, ARRAY_SIZE(str)); ok(n > 0, "GetWindowText failed\n"); - todo_wine ok(!strcmp(str, (char*)bytes), "got %s, expected %s\n", + ok(!strcmp(str, (char*)bytes), "got %s, expected %s\n", wine_dbgstr_a(str), wine_dbgstr_a((char *)bytes)); DestroyWindow(hwnd[i]);

1 0

Rémi Bernon : dwrite: Statically init the system_fallback locale list.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 17ac4059a586cdfaa7cabf734396905f04ce80af URL: https://gitlab.winehq.org/wine/wine/-/commit/17ac4059a586cdfaa7cabf73439690… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 15:34:59 2023 +0100 dwrite: Statically init the system_fallback locale list. To avoid a crash on DLL unload if it wasn't initialized. --- dlls/dwrite/analyzer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5489efa93b8..4e503eb8b5c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -551,7 +551,10 @@ struct dwrite_fontfallback_builder size_t mappings_size; }; -static struct fallback_data system_fallback; +static struct fallback_data system_fallback = +{ + .locales = LIST_INIT(system_fallback.locales), +}; static void release_fallback_mapping(struct fallback_mapping *mapping) {

1 0

Nikolay Sivov : windows.globalization: Implement ILanguage::get_LanguageTag().
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: c38aa80ed4292e94e0f9ccec497a2585156c59c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c38aa80ed4292e94e0f9ccec497a25… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 19 21:22:36 2023 +0300 windows.globalization: Implement ILanguage::get_LanguageTag(). --- dlls/windows.globalization/classes.idl | 12 + dlls/windows.globalization/main.c | 291 ++++++++++++++++++++++- dlls/windows.globalization/tests/globalization.c | 87 +++++++ include/windows.globalization.idl | 2 + include/windows.system.userprofile.idl | 2 + 5 files changed, 390 insertions(+), 4 deletions(-)

1 0

Alex Henrie : include: Add RTL_CONSTANT_STRING.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 7ada8b96fb1dc305028a29fd3f4d1b0f019da75c URL: https://gitlab.winehq.org/wine/wine/-/commit/7ada8b96fb1dc305028a29fd3f4d1b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 12 22:49:24 2022 -0700 include: Add RTL_CONSTANT_STRING. --- include/ntdef.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ntdef.h b/include/ntdef.h index 92366c3f3bb..8d04f83da5d 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -84,4 +84,6 @@ typedef struct _RTL_BALANCED_NODE #define RTL_BALANCED_NODE_RESERVED_PARENT_MASK 3 +#define RTL_CONSTANT_STRING(s) { sizeof(s) - sizeof(s[0]), sizeof(s), (void*)s } + #endif /* _NTDEF_ */

1 0