wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard 19 Oct '22

19 Oct '22

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

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

19 Oct '22

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 19 Oct '22

19 Oct '22

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

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

19 Oct '22

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/datetime: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard 19 Oct '22

19 Oct '22

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/animate: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard 19 Oct '22

19 Oct '22

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 _mbslwr_s_l.
by Alexandre Julliard 19 Oct '22

19 Oct '22

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

Piotr Caban : msvcrt: Fix error handling in _mbsupr_s_l.
by Alexandre Julliard 19 Oct '22

19 Oct '22

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

Piotr Caban : msvcrt: Add support for multi-byte characters in _mbctoupper_l.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 71144728cfebd8a5b2f355fefa1a7fe6be8d9174 URL: https://gitlab.winehq.org/wine/wine/-/commit/71144728cfebd8a5b2f355fefa1a7f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 19 13:16:17 2022 +0200 msvcrt: Add support for multi-byte characters in _mbctoupper_l. --- dlls/msvcrt/mbcs.c | 30 ++++++++++++++++++++++++++---- dlls/msvcrt/tests/string.c | 8 ++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 1c747ac1573..d098f5b23f4 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -494,12 +494,34 @@ unsigned int CDECL _mbctolower(unsigned int c) */ unsigned int CDECL _mbctoupper_l(unsigned int c, _locale_t locale) { - if (_ismbblead_l(c, locale)) + unsigned char str[2], ret[2]; + pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if (c > 0xff) { - FIXME("Handle MBC chars\n"); - return c; + if (!_ismbblead_l((c >> 8) & 0xff, locale)) + return c; + + str[0] = c >> 8; + str[1] = c; + switch(__crtLCMapStringA(mbcinfo->mblcid, LCMAP_UPPERCASE, + (char*)str, 2, (char*)ret, 2, mbcinfo->mbcodepage, 0)) + { + case 0: + return c; + case 1: + return ret[0]; + default: + return ret[1] + (ret[0] << 8); + } } - return _toupper_l(c, locale); /* ASCII CP or SB char */ + + return mbcinfo->mbctype[c + 1] & _SBLOW ? mbcinfo->mbcasemap[c] : c; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 14c0adf0efc..905607e416d 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2839,6 +2839,7 @@ static void test__mbsupr_s(void) { errno_t ret; unsigned char buffer[20]; + int cp = _getmbcp(); if (!p_mbsupr_s) { @@ -2890,6 +2891,13 @@ static void test__mbsupr_s(void) "Expected the output buffer to be \"ABCDEFGH\\0ijklmnop\", got \"%s\"\n", buffer); + _setmbcp(936); + memcpy(buffer, "\xa2\xa1\xa2\xa2q", sizeof("\xa2\xa1\xa2\xa2q")); + ret = p_mbsupr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "\xa2\xf1\xa2\xf2Q", sizeof("\xa2\xf1\xa2\xf2Q")), + "got %s\n", debugstr_a((char*)buffer)); + _setmbcp(cp); } static void test__mbslwr_s(void)

1 0

Piotr Caban : msvcrt: Add support for multi-byte characters in _mbctolower_l.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 3861c1e36ac835eb3584fe71b8294816e1ed7a85 URL: https://gitlab.winehq.org/wine/wine/-/commit/3861c1e36ac835eb3584fe71b82948… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 19 13:14:44 2022 +0200 msvcrt: Add support for multi-byte characters in _mbctolower_l. --- dlls/msvcrt/mbcs.c | 30 ++++++++++++++++++++++++++---- dlls/msvcrt/tests/string.c | 9 +++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index f1d82b5e268..1c747ac1573 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -451,12 +451,34 @@ unsigned int CDECL _mbsnextc(const unsigned char* str) */ unsigned int CDECL _mbctolower_l(unsigned int c, _locale_t locale) { - if (_ismbblead_l(c, locale)) + unsigned char str[2], ret[2]; + pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if (c > 0xff) { - FIXME("Handle MBC chars\n"); - return c; + if (!_ismbblead_l((c >> 8) & 0xff, locale)) + return c; + + str[0] = c >> 8; + str[1] = c; + switch(__crtLCMapStringA(mbcinfo->mblcid, LCMAP_LOWERCASE, + (char*)str, 2, (char*)ret, 2, mbcinfo->mbcodepage, 0)) + { + case 0: + return c; + case 1: + return ret[0]; + default: + return ret[1] + (ret[0] << 8); + } } - return _tolower_l(c, locale); /* ASCII CP or SB char */ + + return mbcinfo->mbctype[c + 1] & _SBUP ? mbcinfo->mbcasemap[c] : c; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4e525193ced..14c0adf0efc 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2896,6 +2896,7 @@ static void test__mbslwr_s(void) { errno_t ret; unsigned char buffer[20]; + int cp = _getmbcp(); if (!p_mbslwr_s) { @@ -2946,6 +2947,14 @@ static void test__mbslwr_s(void) ok(!memcmp(buffer, "abcdefgh\0IJKLMNOP", sizeof("abcdefgh\0IJKLMNOP")), "Expected the output buffer to be \"abcdefgh\\0IJKLMNOP\", got \"%s\"\n", buffer); + + _setmbcp(936); + memcpy(buffer, "\xa2\xf1\xa2\xf2Q", sizeof("\xa2\xf1\xa2\xf2Q")); + ret = p_mbslwr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "\xa2\xa1\xa2\xa2q", sizeof("\xa2\xa1\xa2\xa2q")), + "got %s\n", debugstr_a((char*)buffer)); + _setmbcp(cp); } static void test__mbstok(void)

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2022