July 2020 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Don't use tolowerW.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: bc47bff4a888872363005da93fe0b714493c835b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc47bff4a888872363005da9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:47:03 2020 +0200 msvcrt: Don't use tolowerW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d5c227190c..d20fa8e6a2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3179,8 +3179,8 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu /* executable? */ if (plen > 6 && path[plen-4] == '.') /* shortest exe: "\x.exe" */ { - ULONGLONG ext = tolowerW(path[plen-1]) | (tolowerW(path[plen-2]) << 16) | - ((ULONGLONG)tolowerW(path[plen-3]) << 32); + ULONGLONG ext = MSVCRT_towlower(path[plen-1]) | (MSVCRT_towlower(path[plen-2]) << 16) | + ((ULONGLONG)MSVCRT_towlower(path[plen-3]) << 32); if (ext == WCEXE || ext == WCBAT || ext == WCCMD || ext == WCCOM) mode |= ALL_S_IEXEC; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index cc4541ccee..7c92abc4fd 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1199,6 +1199,7 @@ char* __cdecl MSVCRT__itoa(int, char*, int); double parse_double(MSVCRT_wchar_t (*)(void*), void (*)(void*), void*, MSVCRT_pthreadlocinfo, int*); int __cdecl MSVCRT_wcsncmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t); int __cdecl MSVCRT__wcsnicmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t); +int __cdecl MSVCRT_towlower(MSVCRT_wint_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f715832c26..ec59990496 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -411,7 +411,7 @@ int CDECL MSVCRT__wcslwr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, MSVCRT__loca while (n--) { if (!*ptr) return 0; - *ptr = tolowerW(*ptr); + *ptr = MSVCRT__towlower_l(*ptr, locale); ptr++; } @@ -2345,7 +2345,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && wctoint(*nptr, 1)==0 && tolowerW(*(nptr+1))=='x') { + if((base==0 || base==16) && wctoint(*nptr, 1)==0 && (nptr[1]=='x' || nptr[1]=='X')) { base = 16; nptr += 2; } @@ -2518,7 +2518,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && wctoint(*nptr, 1)==0 && tolowerW(*(nptr+1))=='x') { + if((base==0 || base==16) && wctoint(*nptr, 1)==0 && (nptr[1]=='x' || nptr[1]=='X')) { base = 16; nptr += 2; }

1 0

Piotr Caban : msvcrt: Don't use toupperW in _towupper_l.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 55c1a16259ed4190ffe07deeb4b6dfc274eb9a9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=55c1a16259ed4190ffe07dee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:47:10 2020 +0200 msvcrt: Don't use toupperW in _towupper_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ec59990496..5f1d5f8e8c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2604,6 +2604,7 @@ MSVCRT_size_t CDECL MSVCRT_wcsnlen(const MSVCRT_wchar_t *s, MSVCRT_size_t maxlen int CDECL MSVCRT__towupper_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; + MSVCRT_wchar_t ret; if(!locale) locinfo = get_locinfo(); @@ -2616,7 +2617,9 @@ int CDECL MSVCRT__towupper_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) return c; } - return toupperW(c); + if(!LCMapStringW(locinfo->lc_handle[MSVCRT_LC_CTYPE], LCMAP_UPPERCASE, &c, 1, &ret, 1)) + return c; + return ret; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use toupperW.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: a81f55093e11a12c25938dada2e3d7f0c8dfe86c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a81f55093e11a12c25938dad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:47:26 2020 +0200 msvcrt: Don't use toupperW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 2 +- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 5e84e38a00..aaf2f8a414 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -828,7 +828,7 @@ int CDECL MSVCRT__getdrive(void) WCHAR buffer[MAX_PATH]; if (GetCurrentDirectoryW( MAX_PATH, buffer ) && buffer[0] >= 'A' && buffer[0] <= 'z' && buffer[1] == ':') - return toupperW(buffer[0]) - 'A' + 1; + return MSVCRT_towupper(buffer[0]) - 'A' + 1; return 0; } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d20fa8e6a2..9c42aa5699 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3166,7 +3166,7 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu /* FIXME: rdev isn't drive num, despite what the docs says-what is it? */ if (MSVCRT_iswalpha(*path) && path[1] == ':') - buf->st_dev = buf->st_rdev = toupperW(*path) - 'A'; /* drive num */ + buf->st_dev = buf->st_rdev = MSVCRT_towupper(*path) - 'A'; /* drive num */ else buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7c92abc4fd..4a13501993 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1200,6 +1200,7 @@ double parse_double(MSVCRT_wchar_t (*)(void*), void (*)(void*), void*, MSVCRT_pt int __cdecl MSVCRT_wcsncmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t); int __cdecl MSVCRT__wcsnicmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t); int __cdecl MSVCRT_towlower(MSVCRT_wint_t); +int __cdecl MSVCRT_towupper(MSVCRT_wint_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5f1d5f8e8c..5188d4f860 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -356,8 +356,7 @@ int CDECL MSVCRT__wcsupr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, while (n--) { if (!*ptr) return 0; - /* FIXME: add locale support */ - *ptr = toupperW(*ptr); + *ptr = MSVCRT__towupper_l(*ptr, locale); ptr++; }

1 0

Piotr Caban : msvcrt: Add _ismbcalpha_l implementation.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 5f294e34d6eab6a217991994443c347aa44684b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f294e34d6eab6a217991994… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 15:33:09 2020 +0200 msvcrt: Add _ismbcalpha_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 11 +++++++++-- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 0137c7e649..4d63b2fa59 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -27,7 +27,7 @@ @ cdecl _ismbcalnum(long) ucrtbase._ismbcalnum @ cdecl _ismbcalnum_l(long ptr) ucrtbase._ismbcalnum_l @ cdecl _ismbcalpha(long) ucrtbase._ismbcalpha -@ stub _ismbcalpha_l +@ cdecl _ismbcalpha_l(long ptr) ucrtbase._ismbcalpha_l @ stub _ismbcblank @ stub _ismbcblank_l @ cdecl _ismbcdigit(long) ucrtbase._ismbcdigit diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 6ddcbe2c7a..264d695496 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -400,7 +400,7 @@ @ cdecl _o__ismbcalnum(long) ucrtbase._o__ismbcalnum @ cdecl _o__ismbcalnum_l(long ptr) ucrtbase._o__ismbcalnum_l @ cdecl _o__ismbcalpha(long) ucrtbase._o__ismbcalpha -@ stub _o__ismbcalpha_l +@ cdecl _o__ismbcalpha_l(long ptr) ucrtbase._o__ismbcalpha_l @ stub _o__ismbcblank @ stub _o__ismbcblank_l @ cdecl _o__ismbcdigit(long) ucrtbase._o__ismbcdigit diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9d78aa042f..c308e0d9ae 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -977,7 +977,7 @@ @ cdecl _ismbcalnum(long) @ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) -@ stub _ismbcalpha_l +@ cdecl _ismbcalpha_l(long ptr) @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1512804543..1d01c624a6 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1323,7 +1323,7 @@ @ cdecl _ismbcalnum(long) @ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) -@ stub _ismbcalpha_l +@ cdecl _ismbcalpha_l(long ptr) @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d8be0af00d..7548f62b6d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1326,7 +1326,7 @@ @ cdecl _ismbcalnum(long) @ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) -@ stub _ismbcalpha_l +@ cdecl _ismbcalpha_l(long ptr) @ stub _ismbcblank @ stub _ismbcblank_l @ cdecl _ismbcdigit(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 513ed375e1..322fcfb679 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -649,7 +649,7 @@ @ cdecl _ismbcalnum(long) @ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) -@ stub _ismbcalpha_l +@ cdecl _ismbcalpha_l(long ptr) @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e39ecb900d..d6bd5fbfa5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -627,7 +627,7 @@ @ cdecl _ismbcalnum(long) @ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) -@ stub _ismbcalpha_l +@ cdecl _ismbcalpha_l(long ptr) @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 813092a12f..73bc45c63b 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1459,13 +1459,20 @@ int CDECL _ismbcgraph(unsigned int ch) return _ismbcgraph_l( ch, NULL ); } +/********************************************************************* + * _ismbcalpha_l (MSVCRT.@) + */ +int CDECL _ismbcalpha_l(unsigned int ch, MSVCRT__locale_t locale) +{ + return MSVCRT__iswalpha_l( msvcrt_mbc_to_wc_l(ch, locale), locale ); +} + /********************************************************************* * _ismbcalpha (MSVCRT.@) */ int CDECL _ismbcalpha(unsigned int ch) { - MSVCRT_wchar_t wch = msvcrt_mbc_to_wc( ch ); - return (get_char_typeW( wch ) & C1_ALPHA); + return _ismbcalpha_l( ch, NULL ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ffd417be4e..dc51dfa926 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1204,6 +1204,7 @@ int __cdecl MSVCRT_towupper(MSVCRT_wint_t); int __cdecl MSVCRT__iswalnum_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswdigit_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswgraph_l(MSVCRT_wchar_t, MSVCRT__locale_t); +int __cdecl MSVCRT__iswalpha_l(MSVCRT_wchar_t, MSVCRT__locale_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 477afdd252..e347367c75 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -595,7 +595,7 @@ @ cdecl _ismbcalnum(long) @ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) -# stub _ismbcalpha_l(long ptr) +@ cdecl _ismbcalpha_l(long ptr) @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 9d4f557c32..55bca3c414 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -465,7 +465,7 @@ @ cdecl _ismbcalnum(long) @ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) -@ stub _ismbcalpha_l +@ cdecl _ismbcalpha_l(long ptr) @ stub _ismbcblank @ stub _ismbcblank_l @ cdecl _ismbcdigit(long) @@ -1064,7 +1064,7 @@ @ cdecl _o__ismbcalnum(long) _ismbcalnum @ cdecl _o__ismbcalnum_l(long ptr) _ismbcalnum_l @ cdecl _o__ismbcalpha(long) _ismbcalpha -@ stub _o__ismbcalpha_l +@ cdecl _o__ismbcalpha_l(long ptr) _ismbcalpha_l @ stub _o__ismbcblank @ stub _o__ismbcblank_l @ cdecl _o__ismbcdigit(long) _ismbcdigit

1 0

Piotr Caban : msvcrt: Don't use tolowerW in _tolower_l.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 0b35b779151d766f6741bc32d3b6d3c8d81f1cc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b35b779151d766f6741bc32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:46:47 2020 +0200 msvcrt: Don't use tolowerW in _tolower_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 20 ++++++-------------- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 9e2d029950..7322ea47c2 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -425,8 +425,7 @@ int CDECL MSVCRT__toupper(int c) int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; - unsigned char str[2], *p = str; - WCHAR wide, lower; + unsigned char str[2], *p = str, ret[2]; if(!locale) locinfo = get_locinfo(); @@ -444,22 +443,15 @@ int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) } *p++ = c & 255; - if(!MultiByteToWideChar(locinfo->lc_codepage, - MB_ERR_INVALID_CHARS, (char*)str, p-str, &wide, 1)) - return c; - - lower = tolowerW(wide); - if(lower == wide) - return str[0] + (str[1]<<8); - - switch(WideCharToMultiByte(locinfo->lc_codepage, 0, - &lower, 1, (char*)str, 2, NULL, NULL)) { + switch(__crtLCMapStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], LCMAP_LOWERCASE, + (char*)str, p-str, (char*)ret, 2, locinfo->lc_codepage, 0)) + { case 0: return c; case 1: - return str[0]; + return ret[0]; default: - return str[0] + (str[1]<<8); + return ret[0] + (ret[1]<<8); } } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ef1154ce76..cc4541ccee 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1130,6 +1130,7 @@ void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); void free_locinfo(MSVCRT_pthreadlocinfo) DECLSPEC_HIDDEN; void free_mbcinfo(MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; +int __cdecl __crtLCMapStringA(LCID, DWORD, const char*, int, char*, int, unsigned int, int) DECLSPEC_HIDDEN; #ifndef __WINE_MSVCRT_TEST int __cdecl MSVCRT__write(int,const void*,unsigned int);

1 0

Piotr Caban : msvcrt: Add _ismbcdigit_l implementation.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: fd74aeb726e65c62a9e110bdbf282549cb8afce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd74aeb726e65c62a9e110bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 15:32:58 2020 +0200 msvcrt: Add _ismbcdigit_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 11 +++++++++-- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 991ad90a92..06467a76d2 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -31,7 +31,7 @@ @ stub _ismbcblank @ stub _ismbcblank_l @ cdecl _ismbcdigit(long) ucrtbase._ismbcdigit -@ stub _ismbcdigit_l +@ cdecl _ismbcdigit_l(long ptr) ucrtbase._ismbcdigit_l @ cdecl _ismbcgraph(long) ucrtbase._ismbcgraph @ stub _ismbcgraph_l @ cdecl _ismbchira(long) ucrtbase._ismbchira diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index afcac3bacb..90ae182635 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -404,7 +404,7 @@ @ stub _o__ismbcblank @ stub _o__ismbcblank_l @ cdecl _o__ismbcdigit(long) ucrtbase._o__ismbcdigit -@ stub _o__ismbcdigit_l +@ cdecl _o__ismbcdigit_l(long ptr) ucrtbase._o__ismbcdigit_l @ cdecl _o__ismbcgraph(long) ucrtbase._o__ismbcgraph @ stub _o__ismbcgraph_l @ cdecl _o__ismbchira(long) ucrtbase._o__ismbchira diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index acf8601def..6a0a54aee2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -979,7 +979,7 @@ @ cdecl _ismbcalpha(long) @ stub _ismbcalpha_l @ cdecl _ismbcdigit(long) -@ stub _ismbcdigit_l +@ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) @ stub _ismbcgraph_l @ cdecl _ismbchira(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 477b5a4a00..a2e63aab46 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1325,7 +1325,7 @@ @ cdecl _ismbcalpha(long) @ stub _ismbcalpha_l @ cdecl _ismbcdigit(long) -@ stub _ismbcdigit_l +@ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) @ stub _ismbcgraph_l @ cdecl _ismbchira(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b3207ad086..073741e76f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1330,7 +1330,7 @@ @ stub _ismbcblank @ stub _ismbcblank_l @ cdecl _ismbcdigit(long) -@ stub _ismbcdigit_l +@ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) @ stub _ismbcgraph_l @ cdecl _ismbchira(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fa6c7186f7..5280a38b87 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -651,7 +651,7 @@ @ cdecl _ismbcalpha(long) @ stub _ismbcalpha_l @ cdecl _ismbcdigit(long) -@ stub _ismbcdigit_l +@ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) @ stub _ismbcgraph_l @ cdecl _ismbchira(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 566e9431be..fefcfa76b0 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -629,7 +629,7 @@ @ cdecl _ismbcalpha(long) @ stub _ismbcalpha_l @ cdecl _ismbcdigit(long) -@ stub _ismbcdigit_l +@ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) @ stub _ismbcgraph_l @ cdecl _ismbchira(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 5b07e13bba..c6caab19f8 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1427,13 +1427,20 @@ int CDECL _ismbbkana(unsigned int c) return _ismbbkana_l( c, NULL ); } +/********************************************************************* + * _ismbcdigit_l(MSVCRT.@) + */ +int CDECL _ismbcdigit_l(unsigned int ch, MSVCRT__locale_t locale) +{ + return MSVCRT__iswdigit_l( msvcrt_mbc_to_wc_l(ch, locale), locale ); +} + /********************************************************************* * _ismbcdigit(MSVCRT.@) */ int CDECL _ismbcdigit(unsigned int ch) { - MSVCRT_wchar_t wch = msvcrt_mbc_to_wc( ch ); - return (get_char_typeW( wch ) & C1_DIGIT); + return _ismbcdigit_l( ch, NULL ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a0fbeb7ebe..973b928888 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1202,6 +1202,7 @@ int __cdecl MSVCRT__wcsnicmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCR int __cdecl MSVCRT_towlower(MSVCRT_wint_t); int __cdecl MSVCRT_towupper(MSVCRT_wint_t); int __cdecl MSVCRT__iswalnum_l(MSVCRT_wchar_t, MSVCRT__locale_t); +int __cdecl MSVCRT__iswdigit_l(MSVCRT_wchar_t, MSVCRT__locale_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dc3048469d..273ced9cd7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -597,7 +597,7 @@ @ cdecl _ismbcalpha(long) # stub _ismbcalpha_l(long ptr) @ cdecl _ismbcdigit(long) -# stub _ismbcdigit_l(long ptr) +@ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) # stub _ismbcgraph_l(long ptr) @ cdecl _ismbchira(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b6d3a033e5..9bd4832443 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -469,7 +469,7 @@ @ stub _ismbcblank @ stub _ismbcblank_l @ cdecl _ismbcdigit(long) -@ stub _ismbcdigit_l +@ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) @ stub _ismbcgraph_l @ cdecl _ismbchira(long) @@ -1068,7 +1068,7 @@ @ stub _o__ismbcblank @ stub _o__ismbcblank_l @ cdecl _o__ismbcdigit(long) _ismbcdigit -@ stub _o__ismbcdigit_l +@ cdecl _o__ismbcdigit_l(long ptr) _ismbcdigit_l @ cdecl _o__ismbcgraph(long) _ismbcgraph @ stub _o__ismbcgraph_l @ cdecl _o__ismbchira(long) _ismbchira

1 0

Piotr Caban : msvcrt: Add _ismbcalnum_l implementation.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 19c05e60a3cbb7dfa040b919e8783d571fc6ae01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c05e60a3cbb7dfa040b919… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 15:32:53 2020 +0200 msvcrt: Add _ismbcalnum_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 58 ++++++++++++++-------- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +- 11 files changed, 49 insertions(+), 30 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 2e20080ea3..991ad90a92 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -25,7 +25,7 @@ @ cdecl _ismbbtrail(long) ucrtbase._ismbbtrail @ cdecl _ismbbtrail_l(long ptr) ucrtbase._ismbbtrail_l @ cdecl _ismbcalnum(long) ucrtbase._ismbcalnum -@ stub _ismbcalnum_l +@ cdecl _ismbcalnum_l(long ptr) ucrtbase._ismbcalnum_l @ cdecl _ismbcalpha(long) ucrtbase._ismbcalpha @ stub _ismbcalpha_l @ stub _ismbcblank diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index b428f26edb..afcac3bacb 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -398,7 +398,7 @@ @ cdecl _o__ismbbtrail(long) ucrtbase._o__ismbbtrail @ cdecl _o__ismbbtrail_l(long ptr) ucrtbase._o__ismbbtrail_l @ cdecl _o__ismbcalnum(long) ucrtbase._o__ismbcalnum -@ stub _o__ismbcalnum_l +@ cdecl _o__ismbcalnum_l(long ptr) ucrtbase._o__ismbcalnum_l @ cdecl _o__ismbcalpha(long) ucrtbase._o__ismbcalpha @ stub _o__ismbcalpha_l @ stub _o__ismbcblank diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5f38a7a3fb..acf8601def 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -975,7 +975,7 @@ @ cdecl _ismbbtrail(long) @ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) -@ stub _ismbcalnum_l +@ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) @ stub _ismbcalpha_l @ cdecl _ismbcdigit(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9589d62c71..477b5a4a00 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1321,7 +1321,7 @@ @ cdecl _ismbbtrail(long) @ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) -@ stub _ismbcalnum_l +@ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) @ stub _ismbcalpha_l @ cdecl _ismbcdigit(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2ca13a6cdc..b3207ad086 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1324,7 +1324,7 @@ @ cdecl _ismbbtrail(long) @ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) -@ stub _ismbcalnum_l +@ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) @ stub _ismbcalpha_l @ stub _ismbcblank diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 17376db528..fa6c7186f7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -647,7 +647,7 @@ @ cdecl _ismbbtrail(long) @ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) -@ stub _ismbcalnum_l +@ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) @ stub _ismbcalpha_l @ cdecl _ismbcdigit(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 602f1449ac..566e9431be 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -625,7 +625,7 @@ @ cdecl _ismbbtrail(long) @ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) -@ stub _ismbcalnum_l +@ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) @ stub _ismbcalpha_l @ cdecl _ismbcdigit(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 8376fe2098..5b07e13bba 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -84,26 +84,37 @@ static const unsigned char mbctombb_932_kana[] = { 0xd2,0xd3,0xac,0xd4,0xad,0xd5,0xae,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,0xdc,0xb2, 0xb4,0xa6,0xdd,0xb3,0xb6,0xb9}; -static MSVCRT_wchar_t msvcrt_mbc_to_wc(unsigned int ch) +static MSVCRT_wchar_t msvcrt_mbc_to_wc_l(unsigned int ch, MSVCRT__locale_t locale) { - MSVCRT_wchar_t chW; - char mbch[2]; - int n_chars; + MSVCRT_pthreadmbcinfo mbcinfo; + MSVCRT_wchar_t chW; + char mbch[2]; + int n_chars; - if (ch <= 0xff) { - mbch[0] = ch; - n_chars = 1; - } else { - mbch[0] = (ch >> 8) & 0xff; - mbch[1] = ch & 0xff; - n_chars = 2; - } - if (!MultiByteToWideChar(get_mbcinfo()->mbcodepage, 0, mbch, n_chars, &chW, 1)) - { - WARN("MultiByteToWideChar failed on %x\n", ch); - return 0; - } - return chW; + if(locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + + if (ch <= 0xff) { + mbch[0] = ch; + n_chars = 1; + } else { + mbch[0] = (ch >> 8) & 0xff; + mbch[1] = ch & 0xff; + n_chars = 2; + } + if (!MultiByteToWideChar(mbcinfo->mbcodepage, 0, mbch, n_chars, &chW, 1)) + { + WARN("MultiByteToWideChar failed on %x\n", ch); + return 0; + } + return chW; +} + +static MSVCRT_wchar_t msvcrt_mbc_to_wc(unsigned int ch) +{ + return msvcrt_mbc_to_wc_l(ch, NULL); } static inline MSVCRT_size_t u_strlen( const unsigned char *str ) @@ -1476,13 +1487,20 @@ int CDECL _ismbcsymbol(unsigned int ch) return ((ctype & C3_SYMBOL) != 0); } +/********************************************************************* + * _ismbcalnum_l (MSVCRT.@) + */ +int CDECL _ismbcalnum_l(unsigned int ch, MSVCRT__locale_t locale) +{ + return MSVCRT__iswalnum_l( msvcrt_mbc_to_wc_l(ch, locale), locale ); +} + /********************************************************************* * _ismbcalnum (MSVCRT.@) */ int CDECL _ismbcalnum(unsigned int ch) { - MSVCRT_wchar_t wch = msvcrt_mbc_to_wc( ch ); - return (get_char_typeW( wch ) & (C1_ALPHA | C1_DIGIT)); + return _ismbcalnum_l( ch, NULL ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4a13501993..a0fbeb7ebe 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1201,6 +1201,7 @@ int __cdecl MSVCRT_wcsncmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_ int __cdecl MSVCRT__wcsnicmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t); int __cdecl MSVCRT_towlower(MSVCRT_wint_t); int __cdecl MSVCRT_towupper(MSVCRT_wint_t); +int __cdecl MSVCRT__iswalnum_l(MSVCRT_wchar_t, MSVCRT__locale_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0d0221461a..dc3048469d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -593,7 +593,7 @@ @ cdecl _ismbbtrail(long) @ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) -# stub _ismbcalnum_l(long ptr) +@ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) # stub _ismbcalpha_l(long ptr) @ cdecl _ismbcdigit(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5436d4cac2..b6d3a033e5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -463,7 +463,7 @@ @ cdecl _ismbbtrail(long) @ cdecl _ismbbtrail_l(long ptr) @ cdecl _ismbcalnum(long) -@ stub _ismbcalnum_l +@ cdecl _ismbcalnum_l(long ptr) @ cdecl _ismbcalpha(long) @ stub _ismbcalpha_l @ stub _ismbcblank @@ -1062,7 +1062,7 @@ @ cdecl _o__ismbbtrail(long) _ismbbtrail @ cdecl _o__ismbbtrail_l(long ptr) _ismbbtrail_l @ cdecl _o__ismbcalnum(long) _ismbcalnum -@ stub _o__ismbcalnum_l +@ cdecl _o__ismbcalnum_l(long ptr) _ismbcalnum_l @ cdecl _o__ismbcalpha(long) _ismbcalpha @ stub _o__ismbcalpha_l @ stub _o__ismbcblank

1 0

Piotr Caban : msvcrt: Add _ismbbkana_l implementation.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: fbbcd3f8f86bbf745f22b962f0825de3bb2eb2c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbbcd3f8f86bbf745f22b962… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 15:32:46 2020 +0200 msvcrt: Add _ismbbkana_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 30 ++++++++++++++++------ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +-- 11 files changed, 33 insertions(+), 19 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index f25dfb7d8f..2e20080ea3 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -11,7 +11,7 @@ @ cdecl _ismbbkalnum(long) ucrtbase._ismbbkalnum @ stub _ismbbkalnum_l @ cdecl _ismbbkana(long) ucrtbase._ismbbkana -@ stub _ismbbkana_l +@ cdecl _ismbbkana_l(long ptr) ucrtbase._ismbbkana_l @ cdecl _ismbbkprint(long) ucrtbase._ismbbkprint @ stub _ismbbkprint_l @ cdecl _ismbbkpunct(long) ucrtbase._ismbbkpunct diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index c5ed1db00f..b428f26edb 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -384,7 +384,7 @@ @ stub _o__ismbbkalnum @ stub _o__ismbbkalnum_l @ cdecl _o__ismbbkana(long) ucrtbase._o__ismbbkana -@ stub _o__ismbbkana_l +@ cdecl _o__ismbbkana_l(long ptr) ucrtbase._o__ismbbkana_l @ stub _o__ismbbkprint @ stub _o__ismbbkprint_l @ stub _o__ismbbkpunct diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 534889b195..5f38a7a3fb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -961,7 +961,7 @@ @ stub _ismbbkalnum(long) @ stub _ismbbkalnum_l @ cdecl _ismbbkana(long) -@ stub _ismbbkana_l +@ cdecl _ismbbkana_l(long ptr) @ stub _ismbbkprint(long) @ stub _ismbbkprint_l @ stub _ismbbkpunct(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 820fb973f7..9589d62c71 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1307,7 +1307,7 @@ @ stub _ismbbkalnum(long) @ stub _ismbbkalnum_l @ cdecl _ismbbkana(long) -@ stub _ismbbkana_l +@ cdecl _ismbbkana_l(long ptr) @ stub _ismbbkprint(long) @ stub _ismbbkprint_l @ stub _ismbbkpunct(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1d9662a5c2..2ca13a6cdc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1310,7 +1310,7 @@ @ stub _ismbbkalnum(long) @ stub _ismbbkalnum_l @ cdecl _ismbbkana(long) -@ stub _ismbbkana_l +@ cdecl _ismbbkana_l(long ptr) @ stub _ismbbkprint(long) @ stub _ismbbkprint_l @ stub _ismbbkpunct(long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index af3d1b5231..e622f95af1 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1213,7 +1213,7 @@ @ cdecl _ismbbkalnum(long) msvcr120._ismbbkalnum @ stub _ismbbkalnum_l @ cdecl _ismbbkana(long) msvcr120._ismbbkana -@ stub _ismbbkana_l +@ cdecl _ismbbkana_l(long ptr) msvcr120._ismbbkana_l @ cdecl _ismbbkprint(long) msvcr120._ismbbkprint @ stub _ismbbkprint_l @ cdecl _ismbbkpunct(long) msvcr120._ismbbkpunct diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0d805c87b1..17376db528 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -633,7 +633,7 @@ @ stub _ismbbkalnum(long) @ stub _ismbbkalnum_l @ cdecl _ismbbkana(long) -@ stub _ismbbkana_l +@ cdecl _ismbbkana_l(long ptr) @ stub _ismbbkprint(long) @ stub _ismbbkprint_l @ stub _ismbbkpunct(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 460ae6cf89..602f1449ac 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -611,7 +611,7 @@ @ stub _ismbbkalnum(long) @ stub _ismbbkalnum_l @ cdecl _ismbbkana(long) -@ stub _ismbbkana_l +@ cdecl _ismbbkana_l(long ptr) @ stub _ismbbkprint(long) @ stub _ismbbkprint_l @ stub _ismbbkpunct(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index f9868635e1..8376fe2098 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1389,17 +1389,31 @@ int CDECL _mbbtype(unsigned char c, int type) } /********************************************************************* - * _ismbbkana(MSVCRT.@) + * _ismbbkana_l(MSVCRT.@) + */ +int CDECL _ismbbkana_l(unsigned int c, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + + if(mbcinfo->mbcodepage == 932) + { + /* Japanese/Katakana, CP 932 */ + return (c >= 0xa1 && c <= 0xdf); + } + return 0; +} + +/********************************************************************* + * _ismbbkana(MSVCRT.@) */ int CDECL _ismbbkana(unsigned int c) { - /* FIXME: use lc_ctype when supported, not lc_all */ - if(get_mbcinfo()->mbcodepage == 932) - { - /* Japanese/Katakana, CP 932 */ - return (c >= 0xa1 && c <= 0xdf); - } - return 0; + return _ismbbkana_l( c, NULL ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index cc2f257d6a..0d0221461a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -579,7 +579,7 @@ @ stub _ismbbkalnum(long) # stub _ismbbkalnum_l(long ptr) @ cdecl _ismbbkana(long) -# stub _ismbbkana_l(long ptr) +@ cdecl _ismbbkana_l(long ptr) @ stub _ismbbkprint(long) # stub _ismbbkprint_l(long ptr) @ stub _ismbbkpunct(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6a919a823f..5436d4cac2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -449,7 +449,7 @@ @ stub _ismbbkalnum(long) @ stub _ismbbkalnum_l @ cdecl _ismbbkana(long) -@ stub _ismbbkana_l +@ cdecl _ismbbkana_l(long ptr) @ stub _ismbbkprint(long) @ stub _ismbbkprint_l @ stub _ismbbkpunct(long) @@ -1048,7 +1048,7 @@ @ stub _o__ismbbkalnum @ stub _o__ismbbkalnum_l @ cdecl _o__ismbbkana(long) _ismbbkana -@ stub _o__ismbbkana_l +@ cdecl _o__ismbbkana_l(long ptr) _ismbbkana_l @ stub _o__ismbbkprint @ stub _o__ismbbkprint_l @ stub _o__ismbbkpunct

1 0

Piotr Caban : msvcrt: Don't use tolowerW and toupperW in _setmbcp_l.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 4f5a4b83b6b5df5585770c3ac1e2d28de8fe01a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f5a4b83b6b5df5585770c3a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:46:57 2020 +0200 msvcrt: Don't use tolowerW and toupperW in _setmbcp_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 5215eff0e3..f9868635e1 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -209,7 +209,7 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) BYTE *bytes; WORD chartypes[256]; char bufA[256]; - WCHAR bufW[256]; + WCHAR bufW[256], lowW[256], upW[256]; int charcount; int ret; int i; @@ -310,6 +310,8 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) ERR("MultiByteToWideChar of chars failed for cp %d, ret=%d (exp %d), error=%d\n", newcp, ret, charcount, GetLastError()); GetStringTypeW(CT_CTYPE1, bufW, charcount, chartypes); + LCMapStringW(lcid, LCMAP_LOWERCASE, bufW, charcount, lowW, charcount); + LCMapStringW(lcid, LCMAP_UPPERCASE, bufW, charcount, upW, charcount); charcount = 0; for (i = 0; i < 256; i++) @@ -318,12 +320,12 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) if (chartypes[charcount] & C1_UPPER) { mbcinfo->mbctype[i + 1] |= _SBUP; - bufW[charcount] = tolowerW(bufW[charcount]); + bufW[charcount] = lowW[charcount]; } else if (chartypes[charcount] & C1_LOWER) { mbcinfo->mbctype[i + 1] |= _SBLOW; - bufW[charcount] = toupperW(bufW[charcount]); + bufW[charcount] = upW[charcount]; } charcount++; }

1 0

Daniel Lehman : ucrtbase/tests: Check errno in strtod tests.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 3fc33a4282b04a06b08bc158be439841f9d3d9f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fc33a4282b04a06b08bc158… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Jul 16 13:10:45 2020 +0200 ucrtbase/tests: Check errno in strtod tests. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index f85f9abf73..5857a02773 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -77,12 +77,18 @@ static BOOL local_isnan(double d) return d != d; } -#define test_strtod_str(string, value, length) _test_strtod_str(__LINE__, string, value, length) -static void _test_strtod_str(int line, const char* string, double value, int length) +#define test_strtod_str_errno(string, value, length, err) _test_strtod_str(__LINE__, string, value, length, err) +#define test_strtod_str(string, value, length) _test_strtod_str(__LINE__, string, value, length, 0) +static void _test_strtod_str(int line, const char* string, double value, int length, int err) { char *end; double d; + errno = 0xdeadbeef; d = strtod(string, &end); + if(!err) + ok_(__FILE__, line)(errno == 0xdeadbeef, "errno = %d\n", errno); + else + ok_(__FILE__, line)(errno == err, "errno = %d\n", errno); if (local_isnan(value)) ok_(__FILE__, line)(local_isnan(d), "d = %.16le (\"%s\")\n", d, string); else @@ -102,6 +108,8 @@ static void test_strtod(void) test_strtod_str("infini", INFINITY, 3); test_strtod_str("input", 0, 0); test_strtod_str("-input", 0, 0); + test_strtod_str_errno("1.7976931348623159e+308", INFINITY, 23, ERANGE); + test_strtod_str_errno("-1.7976931348623159e+308", -INFINITY, 24, ERANGE); test_strtod_str("NAN", NAN, 3); test_strtod_str("nan", NAN, 3); @@ -137,6 +145,7 @@ static void test_strtod(void) test_strtod_str("4.0621786324484881721115322e-53", 4.0621786324484881721115322e-53, 31); test_strtod_str("1.8905590910042396899370942", 1.8905590910042396899370942, 27); + test_strtod_str("1.7976931348623158e+308", 1.7976931348623158e+308, 23); test_strtod_str("2.2250738585072014e-308", 2.2250738585072014e-308, 23); test_strtod_str("4.9406564584124654e-324", 4.9406564584124654e-324, 23); }

1 0