January 2023 - Wine-commits

Paul Gofman : ntdll: Do not use extended context in RtlCopyContext() if extended state is not copied.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: a98319d0c58cc448b14037cae32d042adfedd94d URL: https://gitlab.winehq.org/wine/wine/-/commit/a98319d0c58cc448b14037cae32d04… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 11 12:32:58 2023 -0600 ntdll: Do not use extended context in RtlCopyContext() if extended state is not copied. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54289 --- dlls/ntdll/exception.c | 12 ++++++++++-- dlls/ntdll/tests/exception.c | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index fa30118f142..556b424ac6e 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -994,6 +994,7 @@ NTSTATUS WINAPI RtlCopyContext( CONTEXT *dst, DWORD context_flags, CONTEXT *src { DWORD context_size, arch_flag, flags_offset, dst_flags, src_flags; static const DWORD arch_mask = CONTEXT_i386 | CONTEXT_AMD64; + const struct context_parameters *p; BYTE *d, *s; TRACE("dst %p, context_flags %#lx, src %p.\n", dst, context_flags, src); @@ -1026,8 +1027,15 @@ NTSTATUS WINAPI RtlCopyContext( CONTEXT *dst, DWORD context_flags, CONTEXT *src context_flags &= src_flags; if (context_flags & ~dst_flags & 0x40) return STATUS_BUFFER_OVERFLOW; - return RtlCopyExtendedContext( (CONTEXT_EX *)(d + context_size), context_flags, - (CONTEXT_EX *)(s + context_size) ); + if (context_flags & 0x40) + return RtlCopyExtendedContext( (CONTEXT_EX *)(d + context_size), context_flags, + (CONTEXT_EX *)(s + context_size) ); + + if (!(p = context_get_parameters( context_flags ))) + return STATUS_INVALID_PARAMETER; + + context_copy_ranges( d, context_flags, s, p ); + return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a09beee2203..94b2ccf61a6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -10499,6 +10499,26 @@ static void test_copy_context(void) enabled_features = pRtlGetEnabledExtendedFeatures(~(ULONG64)0); + memset(dst_context_buffer, 0xdd, sizeof(dst_context_buffer)); + memset(src_context_buffer, 0xcc, sizeof(src_context_buffer)); + + status = pRtlInitializeExtendedContext(src_context_buffer, CONTEXT_ALL | CONTEXT_XSTATE, &src_ex); + if (!status) + { + src = pRtlLocateLegacyContext(src_ex, NULL); + dst = (CONTEXT *)dst_context_buffer; + dst->ContextFlags = CONTEXT_ALL; + status = pRtlCopyContext(dst, dst->ContextFlags, src); + ok(!status, "Got status %#lx.\n", status); + check_changes_in_range((BYTE *)dst, CONTEXT_ALL & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0], + CONTEXT_ALL, sizeof(CONTEXT)); + } + else + { + ok(status == STATUS_NOT_SUPPORTED, "Got status %#lx.\n", status); + skip("Extended context is not supported.\n"); + } + for (i = 0; i < ARRAY_SIZE(tests); ++i) { flags = tests[i];

1 0

Rémi Bernon : schedsvc: Avoid mismatching heap in SchRpcEnumFolders.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: d59e89dab1301ea5a0178f84d4592d574d0141e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d59e89dab1301ea5a0178f84d4592d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 13 08:19:27 2023 +0100 schedsvc: Avoid mismatching heap in SchRpcEnumFolders. --- 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 c670c8b1cbb..671614a1bcf 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -660,7 +660,7 @@ HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_i { 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

Rémi Bernon : dwrite: Statically init the system_fallback locale list.
by Alexandre Julliard 24 Jan '23

24 Jan '23

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

Akihiro Sagawa : user32/tests: Add DBCS WM_CHAR tests for edit control.
by Alexandre Julliard 24 Jan '23

24 Jan '23

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 24 Jan '23

24 Jan '23

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

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

24 Jan '23

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 24 Jan '23

24 Jan '23

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

Eric Pouech : winedbg: Use debuggee's bitness for 'examine /a' command.
by Alexandre Julliard 24 Jan '23

24 Jan '23

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

Eric Pouech : dbghelp: Expose the real path to the module in SymGetModuleInfo*().
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: a89975f731b5cfe822bd7f8d33da0a9481b1c151 URL: https://gitlab.winehq.org/wine/wine/-/commit/a89975f731b5cfe822bd7f8d33da0a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 5 12:58:24 2023 +0100 dbghelp: Expose the real path to the module in SymGetModuleInfo*(). Expose the real path of a loaded module (potentially read from WINEDLLDIR or WINEBUILDDIR or overriden load order or ...). This improves gdb integration by passing the real path to the loaded modules (instead of the paths in c:\windows\ system subdirectories). Introduce new Wine only dbghelp's extended option to enable the feature. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54250 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp.c | 7 +++++++ dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 3 +++ include/dbghelp.h | 1 + programs/winedbg/gdbproxy.c | 9 ++++++--- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 2facc58585e..432e9c6b248 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -67,6 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); unsigned dbghelp_options = SYMOPT_UNDNAME; BOOL dbghelp_opt_native = FALSE; +BOOL dbghelp_opt_real_path = FALSE; SYSTEM_INFO sysinfo; static struct process* process_first /* = NULL */; @@ -602,6 +603,10 @@ BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value) old = dbghelp_opt_native; dbghelp_opt_native = value; break; + case SYMOPT_EX_WINE_MODULE_REAL_PATH: + old = dbghelp_opt_real_path; + dbghelp_opt_real_path = value; + break; default: FIXME("Unsupported option %d with value %d\n", option, value); } @@ -619,6 +624,8 @@ BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option) { case SYMOPT_EX_WINE_NATIVE_MODULES: return dbghelp_opt_native; + case SYMOPT_EX_WINE_MODULE_REAL_PATH: + return dbghelp_opt_real_path; default: FIXME("Unsupported option %d\n", option); } diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 319a3b81047..a8ef5bfff84 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -111,6 +111,7 @@ void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN; extern unsigned dbghelp_options DECLSPEC_HIDDEN; extern BOOL dbghelp_opt_native DECLSPEC_HIDDEN; +extern BOOL dbghelp_opt_real_path DECLSPEC_HIDDEN; extern SYSTEM_INFO sysinfo DECLSPEC_HIDDEN; /* FIXME: this could be optimized later on by using relative offsets and smaller integral sizes */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index d590877497d..51ade962937 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1439,6 +1439,9 @@ BOOL WINAPI SymGetModuleInfoW64(HANDLE hProcess, DWORD64 dwAddr, miw64 = module->module; + if (dbghelp_opt_real_path && module->real_path) + lstrcpynW(miw64.LoadedImageName, module->real_path, ARRAY_SIZE(miw64.LoadedImageName)); + /* update debug information from container if any */ if (module->module.SymType == SymNone) { diff --git a/include/dbghelp.h b/include/dbghelp.h index e56d8de0d5d..31600d99429 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1098,6 +1098,7 @@ typedef enum #ifdef __WINESRC__ SYMOPT_EX_WINE_NATIVE_MODULES = 1000, + SYMOPT_EX_WINE_MODULE_REAL_PATH, #endif } IMAGEHLP_EXTENDED_OPTIONS; diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 6b523b30337..68875a6d0fa 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1765,7 +1765,7 @@ static BOOL CALLBACK packet_query_libraries_cb(PCSTR mod_name, DWORD64 base, PVO static enum packet_return packet_query_libraries(struct gdb_context* gdbctx) { struct reply_buffer* reply = &gdbctx->qxfer_buffer; - BOOL opt; + BOOL opt_native, opt_real_path; if (!gdbctx->process) return packet_error; @@ -1776,9 +1776,12 @@ static enum packet_return packet_query_libraries(struct gdb_context* gdbctx) SymLoadModule(gdbctx->process->handle, 0, 0, 0, 0, 0); reply_buffer_append_str(reply, "<library-list>"); - opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); + /* request also ELF modules, and also real path to loaded modules */ + opt_native = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); + opt_real_path = SymSetExtendedOption(SYMOPT_EX_WINE_MODULE_REAL_PATH, TRUE); SymEnumerateModules64(gdbctx->process->handle, packet_query_libraries_cb, gdbctx); - SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt_native); + SymSetExtendedOption(SYMOPT_EX_WINE_MODULE_REAL_PATH, opt_real_path); reply_buffer_append_str(reply, "</library-list>"); return packet_send_buffer;

1 0

Alex Henrie : dwrite: Handle memory allocation failure in bidi_compute_bracket_pairs (cppcheck).
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 08643dc4d5b43e206059bcd0b4c2ae058355c642 URL: https://gitlab.winehq.org/wine/wine/-/commit/08643dc4d5b43e206059bcd0b4c2ae… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 16 22:21:29 2022 -0700 dwrite: Handle memory allocation failure in bidi_compute_bracket_pairs (cppcheck). --- dlls/dwrite/bidi.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 142c82f19d0..796f276e2e9 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -632,23 +632,27 @@ static BracketPair *bidi_compute_bracket_pairs(IsolatedRun *iso_run) WCHAR *open_stack; int *stack_index; int stack_top = iso_run->length; - BracketPair *out = NULL; + BracketPair *out; int pair_count = 0; int i; open_stack = malloc(sizeof(WCHAR) * iso_run->length); stack_index = malloc(sizeof(int) * iso_run->length); + out = malloc(sizeof(BracketPair) * iso_run->length); + + if (!open_stack || !stack_index || !out) { + free(open_stack); + free(stack_index); + free(out); + return NULL; + } + + out[0].start = -1; for (i = 0; i < iso_run->length; i++) { unsigned short ubv = get_table_entry_16(bidi_bracket_table, iso_run->item[i].ch); if (ubv) { - if (!out) - { - out = malloc(sizeof(BracketPair)); - out[0].start = -1; - } - if ((ubv >> 8) == 0) { stack_top--; open_stack[stack_top] = iso_run->item[i].ch + (signed char)(ubv & 0xff); @@ -668,7 +672,6 @@ static BracketPair *bidi_compute_bracket_pairs(IsolatedRun *iso_run) out[pair_count].start = stack_index[j]; out[pair_count].end = i; pair_count++; - out = realloc(out, sizeof(BracketPair) * (pair_count+1)); out[pair_count].start = -1; stack_top = j+1; break;

1 0