October 2022 - Wine-Commits

Eric Pouech : dbghelp: Silence some FIXMEs.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 0c3d78269f9a463bf43bebdf08db368aef484cca URL: https://gitlab.winehq.org/wine/wine/-/commit/0c3d78269f9a463bf43bebdf08db36… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 19 17:27:43 2022 +0200 dbghelp: Silence some FIXMEs. In some 32bit modules, MingW/GCC generates in Dwarf debug information, a cfa address to be computed as: deref(register XX + offset) which is too complicated to be expressed through regular DbgHelp APIs. So silence the FIXME, and report a 'too complex' error (instead of 'internal'). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52790 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 8d365ba88f1..4671174d3bb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3028,7 +3028,7 @@ static const dwarf2_cuhead_t* get_cuhead_from_func(const struct symt_function* f return NULL; } -static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame); +static enum location_error compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame); static enum location_error loc_compute_frame(struct process* pcs, const struct module_format* modfmt, @@ -3071,7 +3071,8 @@ static enum location_error loc_compute_frame(struct process* pcs, } break; case loc_dwarf2_frame_cfa: - if (!compute_call_frame_cfa(modfmt->module, ip + ((struct symt_compiland*)func->container)->address, frame)) return loc_err_internal; + err = compute_call_frame_cfa(modfmt->module, ip + ((struct symt_compiland*)func->container)->address, frame); + if (err < 0) return err; break; default: WARN("Unsupported frame kind %d\n", pframe->kind); @@ -3866,11 +3867,11 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, return TRUE; } -static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame) +static enum location_error compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame) { struct frame_info info; - if (!dwarf2_fetch_frame_info(module, module->cpu, ip, &info)) return FALSE; + if (!dwarf2_fetch_frame_info(module, module->cpu, ip, &info)) return loc_err_internal; /* beginning of function, or no available dwarf information ? */ if (ip == info.ip || info.state.rules[info.retaddr_reg] == RULE_UNSET) @@ -3888,11 +3889,15 @@ static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct l switch (info.state.cfa_rule) { case RULE_EXPRESSION: - FIXME("Too complex expression for frame_CFA resolution (RULE_EXPRESSION)\n"); - return FALSE; + WARN("Too complex expression for frame_CFA resolution (RULE_EXPRESSION)\n"); + return loc_err_too_complex; case RULE_VAL_EXPRESSION: - FIXME("Too complex expression for frame_CFA resolution (RULE_VAL_EXPRESSION)\n"); - return FALSE; + /* unfortunately, we've seen at least construct like: + * cfa := 'breg_x + offset; deref' + * which is an indirection too much for the DbgHelp API. + */ + WARN("Too complex expression for frame_CFA resolution (RULE_VAL_EXPRESSION)\n"); + return loc_err_too_complex; default: frame->kind = loc_regrel; frame->reg = module->cpu->map_dwarf_register(info.state.cfa_reg, module, TRUE); @@ -3900,7 +3905,7 @@ static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct l break; } } - return TRUE; + return 0; } static void dwarf2_location_compute(struct process* pcs,

1 0

Piotr Caban : msvcrt: Fix error handling in _mbslwr_s_l.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: c54e0d93d9145055de2b2ea97bdb2c4af90055b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c54e0d93d9145055de2b2ea97bdb2c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 19 13:44:53 2022 +0200 msvcrt: Fix error handling in _mbslwr_s_l. --- dlls/msvcrt/mbcs.c | 15 ++++++--------- dlls/msvcrt/tests/string.c | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e275991343d..41a46f40495 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2114,15 +2114,12 @@ unsigned char* CDECL _mbslwr(unsigned char* s) */ int CDECL _mbslwr_s_l(unsigned char* s, size_t len, _locale_t locale) { + unsigned char *p = s; + if (!s && !len) - { return 0; - } - else if (!s || !len) - { - *_errno() = EINVAL; + if (!MSVCRT_CHECK_PMT(s && len)) return EINVAL; - } if (get_mbcinfo()->ismbcodepage) { @@ -2145,12 +2142,12 @@ int CDECL _mbslwr_s_l(unsigned char* s, size_t len, _locale_t locale) *s = _tolower_l(*s, locale); } - if (*s) + if (!MSVCRT_CHECK_PMT(len)) { - *s = '\0'; - *_errno() = EINVAL; + *p = 0; return EINVAL; } + *s = 0; return 0; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 7a3d4b636b3..df3f5fceef8 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2944,7 +2944,7 @@ static void test__mbslwr_s(void) memcpy(buffer, "ABCDEFGH", sizeof("ABCDEFGH")); errno = EBADF; - ret = p_mbslwr_s(buffer, 4); + ret = p_mbslwr_s(buffer, sizeof("ABCDEFGH") - 1); ok(ret == EINVAL, "Expected _mbslwr_s to return EINVAL, got %d\n", ret); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno);

1 0

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: f31f7db286087782704866ad21b914be279fdf7a URL: https://gitlab.winehq.org/wine/wine/-/commit/f31f7db286087782704866ad21b914… Author: Chilung Chan <eason066(a)gmail.com> Date: Mon Oct 17 16:39:12 2022 +0800 po: Update Traditional Chinese translation. --- po/zh_TW.po | 86 +++++++++---------------------------------------------------- 1 file changed, 12 insertions(+), 74 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 3837694efbc..53301e772aa 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-06-09 03:15+0800\n" +"PO-Revision-Date: 2022-10-17 16:35+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -1321,10 +1321,8 @@ msgid "Options" msgstr "選項" #: dlls/compstui/compstui.rc:31 -#, fuzzy -#| msgid "Defaults" msgid "Default" -msgstr "預設" +msgstr "預設值" #: dlls/credui/credui.rc:45 msgid "&User name:" @@ -14913,10 +14911,8 @@ msgid "&Replace...\tCtrl+H" msgstr "取代(&R)...\tCtrl+H" #: programs/notepad/notepad.rc:59 -#, fuzzy -#| msgid "&New...\tCtrl+N" msgid "&Go To...\tCtrl+G" -msgstr "新增(&N)...\tCtrl+N" +msgstr "移至(&G)...\tCtrl+G" #: programs/notepad/notepad.rc:63 programs/oleview/oleview.rc:68 #: programs/oleview/oleview.rc:90 programs/winefile/winefile.rc:67 @@ -14959,17 +14955,15 @@ msgstr "上(&T):" #: programs/notepad/notepad.rc:132 msgid "Go To Line" -msgstr "" +msgstr "移至行" #: programs/notepad/notepad.rc:134 -#, fuzzy -#| msgid "CRL Number" msgid "&Line Number:" -msgstr "CRL 號碼" +msgstr "行號(&L):" #: programs/notepad/notepad.rc:137 msgid "Go To" -msgstr "" +msgstr "移至" #: programs/notepad/notepad.rc:145 msgid "Encoding:" @@ -15035,7 +15029,7 @@ msgstr "Z" #: programs/notepad/notepad.rc:162 msgctxt "accelerator GoTo" msgid "G" -msgstr "" +msgstr "G" #: programs/notepad/notepad.rc:74 msgid "Page &p" @@ -15112,7 +15106,7 @@ msgstr "" #: programs/notepad/notepad.rc:90 msgid "Ln %ld, Col %ld" -msgstr "" +msgstr "第 %ld 列，第 %ld 行" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..." @@ -15719,56 +15713,6 @@ msgstr "" "\n" #: programs/reg/reg.rc:67 -#, fuzzy -#| msgid "" -#| "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" -#| "f]\n" -#| "\n" -#| " Adds a key to the registry or adds a new value to a given registry " -#| "key.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to add or, if either [/v] or [/ve] is specified,\n" -#| " the key in which to add the new registry data.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " /v <value_name>\n" -#| " The name of the registry value to add.\n" -#| "\n" -#| " /ve\n" -#| " Add an unnamed registry value. This option modifies the (Default)\n" -#| " registry value.\n" -#| "\n" -#| " /t <type>\n" -#| " The type of data to add to the registry. If [/t] is specified,\n" -#| " <type> must be one of the following:\n" -#| "\n" -#| " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -#| " REG_DWORD | REG_BINARY | REG_NONE\n" -#| "\n" -#| " If [/t] is not specified, the default data type is REG_SZ.\n" -#| "\n" -#| " /s <separator>\n" -#| " The character used to separate strings in REG_MULTI_SZ data.\n" -#| " If [/s] is not specified, the default separator is \\0.\n" -#| "\n" -#| " /d <data>\n" -#| " The data to add to the new registry value.\n" -#| "\n" -#| " /f\n" -#| " Modify the registry without prompting for confirmation.\n" -#| "\n" msgid "" "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" "\n" @@ -15849,7 +15793,7 @@ msgstr "" " <類型> 必須是下列的其中一個:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -" REG_DWORD | REG_BINARY | REG_NONE\n" +" REG_DWORD | REG_QWORD | REG_BINARY | REG_NONE\n" "\n" " 如果未指定 [/t]，資料類型將預設為 REG_SZ。\n" "\n" @@ -16288,10 +16232,8 @@ msgstr "DWORD 值(&D)" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:105 #: programs/regedit/regedit.rc:128 -#, fuzzy -#| msgid "&DWORD Value" msgid "&QWORD Value" -msgstr "DWORD 值(&D)" +msgstr "QWORD 值(&Q)" #: programs/regedit/regedit.rc:53 programs/regedit/regedit.rc:106 #: programs/regedit/regedit.rc:129 @@ -16840,16 +16782,12 @@ msgid "Collapse" msgstr "摺疊" #: programs/regedit/regedit.rc:178 -#, fuzzy -#| msgid "Adds a new 32-bit value" msgid "Adds a new 64-bit value" -msgstr "新增一個新的 32 位元值" +msgstr "新增一個新的 64 位元值" #: programs/regedit/regedit.rc:221 -#, fuzzy -#| msgid "Edit DWORD" msgid "Edit QWORD" -msgstr "編輯 DWORD" +msgstr "編輯 QWORD" #: programs/regsvr32/regsvr32.rc:33 msgid ""

1 0

Eric Pouech : dbghelp: Rework dwarf2_get_ranges() helper.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: aa29948966a904404ff8d118a82acbc0f1adc9ac URL: https://gitlab.winehq.org/wine/wine/-/commit/aa29948966a904404ff8d118a82acb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 18 17:33:30 2022 +0200 dbghelp: Rework dwarf2_get_ranges() helper. - split in two sub helpers (one to get size, the other to fill content in) (this avoids reallocating buffer) - return error in case no range is present (but range dwarf attribute is) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 83 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 27 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 8c57c211db4..37552afedb3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1280,55 +1280,75 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in } } -static struct addr_range* dwarf2_get_ranges(const dwarf2_debug_info_t* di, unsigned* num_ranges) +static unsigned dwarf2_get_num_ranges(const dwarf2_debug_info_t* di) { struct attribute range; - struct addr_range* ranges; - struct addr_range* new_ranges; if (dwarf2_find_attribute(di, DW_AT_ranges, &range)) { dwarf2_traverse_context_t traverse; - unsigned alloc = 16; - ranges = malloc(sizeof(struct addr_range) * alloc); - if (!ranges) return NULL; - *num_ranges = 0; + unsigned num_ranges = 0; traverse.data = di->unit_ctx->module_ctx->sections[section_ranges].address + range.u.uvalue; traverse.end_data = di->unit_ctx->module_ctx->sections[section_ranges].address + di->unit_ctx->module_ctx->sections[section_ranges].size; - while (traverse.data + 2 * di->unit_ctx->head.word_size < traverse.end_data) + for (num_ranges = 0; traverse.data + 2 * di->unit_ctx->head.word_size < traverse.end_data; num_ranges++) { ULONG_PTR low = dwarf2_parse_addr_head(&traverse, &di->unit_ctx->head); ULONG_PTR high = dwarf2_parse_addr_head(&traverse, &di->unit_ctx->head); if (low == 0 && high == 0) break; if (low == (di->unit_ctx->head.word_size == 8 ? (~(DWORD64)0u) : (DWORD64)(~0u))) FIXME("unsupported yet (base address selection)\n"); - if (*num_ranges >= alloc) - { - alloc *= 2; - new_ranges = realloc(ranges, sizeof(struct addr_range) * alloc); - if (!new_ranges) - { - free(ranges); - return NULL; - } - ranges = new_ranges; - } - ranges[*num_ranges].low = di->unit_ctx->compiland->address + low; - ranges[*num_ranges].high = di->unit_ctx->compiland->address + high; - (*num_ranges)++; } + return num_ranges; } else { struct attribute low_pc; struct attribute high_pc; - if (!dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc) || + return dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc) && + dwarf2_find_attribute(di, DW_AT_high_pc, &high_pc) ? 1 : 0; + } +} + +/* nun_ranges must have been gotten from dwarf2_get_num_ranges() */ +static BOOL dwarf2_fill_ranges(const dwarf2_debug_info_t* di, struct addr_range* ranges, unsigned num_ranges) +{ + struct attribute range; + + if (dwarf2_find_attribute(di, DW_AT_ranges, &range)) + { + dwarf2_traverse_context_t traverse; + unsigned index; + + traverse.data = di->unit_ctx->module_ctx->sections[section_ranges].address + range.u.uvalue; + traverse.end_data = di->unit_ctx->module_ctx->sections[section_ranges].address + + di->unit_ctx->module_ctx->sections[section_ranges].size; + + for (index = 0; traverse.data + 2 * di->unit_ctx->head.word_size < traverse.end_data; index++) + { + ULONG_PTR low = dwarf2_parse_addr_head(&traverse, &di->unit_ctx->head); + ULONG_PTR high = dwarf2_parse_addr_head(&traverse, &di->unit_ctx->head); + if (low == 0 && high == 0) break; + if (low == (di->unit_ctx->head.word_size == 8 ? (~(DWORD64)0u) : (DWORD64)(~0u))) + FIXME("unsupported yet (base address selection)\n"); + if (index >= num_ranges) return FALSE; /* sanity check */ + ranges[index].low = di->unit_ctx->compiland->address + low; + ranges[index].high = di->unit_ctx->compiland->address + high; + } + return index == num_ranges; /* sanity check */ + } + else + { + struct attribute low_pc; + struct attribute high_pc; + + if (num_ranges != 1 || /* sanity check */ + !dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc) || !dwarf2_find_attribute(di, DW_AT_high_pc, &high_pc)) - return NULL; + return FALSE; if (di->unit_ctx->head.version >= 4) switch (high_pc.form) { @@ -1347,12 +1367,21 @@ static struct addr_range* dwarf2_get_ranges(const dwarf2_debug_info_t* di, unsig FIXME("Unsupported class for high_pc\n"); break; } - ranges = malloc(sizeof(struct addr_range)); - if (!ranges) return NULL; ranges[0].low = di->unit_ctx->module_ctx->load_offset + low_pc.u.uvalue; ranges[0].high = di->unit_ctx->module_ctx->load_offset + high_pc.u.uvalue; - *num_ranges = 1; } + return TRUE; +} + +static struct addr_range* dwarf2_get_ranges(const dwarf2_debug_info_t* di, unsigned* num_ranges) +{ + unsigned nr = dwarf2_get_num_ranges(di); + struct addr_range* ranges; + + if (nr == 0) return NULL; + ranges = malloc(nr * sizeof(ranges[0])); + if (!ranges || !dwarf2_fill_ranges(di, ranges, nr)) return NULL; + *num_ranges = nr; return ranges; }

1 0

Zhiyi Zhang : comctl32/syslink: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: ff514c110433312c4e7f337118b66e9fad4073d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff514c110433312c4e7f337118b66e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:23:39 2022 +0800 comctl32/syslink: Don't repaint when handling WM_STYLECHANGED. --- dlls/comctl32/syslink.c | 4 ---- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 011c8bdb8b2..8130bf19641 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1676,11 +1676,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case WM_STYLECHANGED: if (wParam == GWL_STYLE) - { infoPtr->Style = ((LPSTYLESTRUCT)lParam)->styleNew; - - InvalidateRect(infoPtr->Self, NULL, TRUE); - } return 0; case WM_CREATE: diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index f9ec53d4ea9..203d0857ee9 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1104,7 +1104,7 @@ static void test_WM_STYLECHANGED(void) {REBARCLASSNAMEA, wm_stylechanged_seq}, {WC_STATICA, wm_stylechanged_seq}, {STATUSCLASSNAMEA, wm_stylechanged_seq}, - {"SysLink", wm_stylechanged_seq, TRUE}, + {"SysLink", wm_stylechanged_seq}, {WC_TABCONTROLA, wm_stylechanged_seq, TRUE}, {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, {TOOLTIPS_CLASSA, wm_stylechanged_seq},

1 0

Zhiyi Zhang : comctl32/animate: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 07685c37aaf91828f1104b353812177630042ae4 URL: https://gitlab.winehq.org/wine/wine/-/commit/07685c37aaf91828f1104b35381217… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:11:57 2022 +0800 comctl32/animate: Don't repaint when handling WM_STYLECHANGED. --- dlls/comctl32/animate.c | 2 -- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index fff963a6baa..adac333b663 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -866,8 +866,6 @@ static LRESULT ANIMATE_StyleChanged(ANIMATE_INFO *infoPtr, WPARAM wStyleType, co if (wStyleType != GWL_STYLE) return 0; infoPtr->dwStyle = lpss->styleNew; - - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index d9f07570fd0..5c2b0445fed 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1086,7 +1086,7 @@ static void test_WM_STYLECHANGED(void) } tests[] = { - {ANIMATE_CLASSA, wm_stylechanged_seq, TRUE}, + {ANIMATE_CLASSA, wm_stylechanged_seq}, {WC_BUTTONA, wm_stylechanged_seq}, {WC_COMBOBOXA, wm_stylechanged_combox_seq, TRUE}, {WC_COMBOBOXEXA, wm_stylechanged_seq},

1 0

Piotr Caban : msvcrt: Fix error handling in _mbsupr_s_l.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 25bbc7e9964d9248afb73cb002a990bee8a441ae URL: https://gitlab.winehq.org/wine/wine/-/commit/25bbc7e9964d9248afb73cb002a990… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 19 13:41:44 2022 +0200 msvcrt: Fix error handling in _mbsupr_s_l. --- dlls/msvcrt/mbcs.c | 15 ++++++--------- dlls/msvcrt/tests/string.c | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d098f5b23f4..e275991343d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2194,15 +2194,12 @@ unsigned char* CDECL _mbsupr(unsigned char* s) */ int CDECL _mbsupr_s_l(unsigned char* s, size_t len, _locale_t locale) { + unsigned char *p = s; + if (!s && !len) - { return 0; - } - else if (!s || !len) - { - *_errno() = EINVAL; + if (!MSVCRT_CHECK_PMT(s && len)) return EINVAL; - } if (get_mbcinfo()->ismbcodepage) { @@ -2225,12 +2222,12 @@ int CDECL _mbsupr_s_l(unsigned char* s, size_t len, _locale_t locale) *s = _toupper_l(*s, locale); } - if (*s) + if (!MSVCRT_CHECK_PMT(len)) { - *s = '\0'; - *_errno() = EINVAL; + *p = 0; return EINVAL; } + *s = 0; return 0; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 905607e416d..7a3d4b636b3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2879,7 +2879,7 @@ static void test__mbsupr_s(void) memcpy(buffer, "abcdefgh", sizeof("abcdefgh")); errno = EBADF; - ret = p_mbsupr_s(buffer, 4); + ret = p_mbsupr_s(buffer, sizeof("abcdefgh") - 1); ok(ret == EINVAL, "Expected _mbsupr_s to return EINVAL, got %d\n", ret); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno);

1 0

Zhiyi Zhang : comctl32/datetime: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: 5267d32d6718e86f88284eea8cf8fb870081a7cd URL: https://gitlab.winehq.org/wine/wine/-/commit/5267d32d6718e86f88284eea8cf8fb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:17:47 2022 +0800 comctl32/datetime: Don't repaint when handling WM_STYLECHANGED. --- dlls/comctl32/datetime.c | 2 -- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 53c17798668..ce154aacbea 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1528,8 +1528,6 @@ DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRU DestroyWindow(infoPtr->hUpdown); infoPtr->hUpdown = 0; } - - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5c2b0445fed..f9ec53d4ea9 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1090,7 +1090,7 @@ static void test_WM_STYLECHANGED(void) {WC_BUTTONA, wm_stylechanged_seq}, {WC_COMBOBOXA, wm_stylechanged_combox_seq, TRUE}, {WC_COMBOBOXEXA, wm_stylechanged_seq}, - {DATETIMEPICK_CLASSA, wm_stylechanged_seq, TRUE}, + {DATETIMEPICK_CLASSA, wm_stylechanged_seq}, {WC_EDITA, wm_stylechanged_seq}, {WC_HEADERA, wm_stylechanged_repaint_seq, TRUE}, {HOTKEY_CLASSA, wm_stylechanged_seq},

1 0

Zhiyi Zhang : comctl32/updown: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: cacb60cb6df3825ac3e60a4340f675c9c70b9d34 URL: https://gitlab.winehq.org/wine/wine/-/commit/cacb60cb6df3825ac3e60a4340f675… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:32:54 2022 +0800 comctl32/updown: Don't repaint when handling WM_STYLECHANGED. --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/updown.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index c04e37ca2f3..5613fba15f5 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1110,7 +1110,7 @@ static void test_WM_STYLECHANGED(void) {TOOLTIPS_CLASSA, wm_stylechanged_seq}, {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE}, {WC_TREEVIEWA, wm_stylechanged_seq}, - {UPDOWN_CLASSA, wm_stylechanged_seq, TRUE}, + {UPDOWN_CLASSA, wm_stylechanged_seq}, {WC_SCROLLBARA, wm_stylechanged_seq}, }; diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index e07f9e7a9f2..1d00db275f2 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -955,10 +955,8 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L break; case WM_STYLECHANGED: - if (wParam == GWL_STYLE) { + if (wParam == GWL_STYLE) infoPtr->dwStyle = ((LPSTYLESTRUCT)lParam)->styleNew; - InvalidateRect (infoPtr->Self, NULL, FALSE); - } break; case WM_THEMECHANGED:

1 0

Zhiyi Zhang : comctl32/tab: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard Oct. 22, 2022

Oct. 22, 2022

Module: wine Branch: master Commit: b7624fb4eda0c1a1662e21c95401003f9595c09e URL: https://gitlab.winehq.org/wine/wine/-/commit/b7624fb4eda0c1a1662e21c9540100… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:30:11 2022 +0800 comctl32/tab: Don't repaint when handling WM_STYLECHANGED. --- dlls/comctl32/tab.c | 1 - dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 1275381489a..8943d9dce7c 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -3247,7 +3247,6 @@ static INT TAB_StyleChanged(TAB_INFO *infoPtr, WPARAM wStyleType, infoPtr->dwStyle = lpss->styleNew; TAB_SetItemBounds (infoPtr); - InvalidateRect(infoPtr->hwnd, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 203d0857ee9..c04e37ca2f3 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1105,7 +1105,7 @@ static void test_WM_STYLECHANGED(void) {WC_STATICA, wm_stylechanged_seq}, {STATUSCLASSNAMEA, wm_stylechanged_seq}, {"SysLink", wm_stylechanged_seq}, - {WC_TABCONTROLA, wm_stylechanged_seq, TRUE}, + {WC_TABCONTROLA, wm_stylechanged_seq}, {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, {TOOLTIPS_CLASSA, wm_stylechanged_seq}, {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE},

1 0