msvcrt: Add _ismbcpunct_l implementation.

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-07-16 15:33:38 +02:00 committed by Alexandre Julliard
parent 1750a6969b
commit 986aa52fc4
11 changed files with 20 additions and 12 deletions

View File

@ -51,7 +51,7 @@
@ cdecl _ismbcprint(long) ucrtbase._ismbcprint @ cdecl _ismbcprint(long) ucrtbase._ismbcprint
@ cdecl _ismbcprint_l(long ptr) ucrtbase._ismbcprint_l @ cdecl _ismbcprint_l(long ptr) ucrtbase._ismbcprint_l
@ cdecl _ismbcpunct(long) ucrtbase._ismbcpunct @ cdecl _ismbcpunct(long) ucrtbase._ismbcpunct
@ stub _ismbcpunct_l @ cdecl _ismbcpunct_l(long ptr) ucrtbase._ismbcpunct_l
@ cdecl _ismbcspace(long) ucrtbase._ismbcspace @ cdecl _ismbcspace(long) ucrtbase._ismbcspace
@ cdecl _ismbcspace_l(long ptr) ucrtbase._ismbcspace_l @ cdecl _ismbcspace_l(long ptr) ucrtbase._ismbcspace_l
@ cdecl _ismbcsymbol(long) ucrtbase._ismbcsymbol @ cdecl _ismbcsymbol(long) ucrtbase._ismbcsymbol

View File

@ -424,7 +424,7 @@
@ cdecl _o__ismbcprint(long) ucrtbase._o__ismbcprint @ cdecl _o__ismbcprint(long) ucrtbase._o__ismbcprint
@ cdecl _o__ismbcprint_l(long ptr) ucrtbase._o__ismbcprint_l @ cdecl _o__ismbcprint_l(long ptr) ucrtbase._o__ismbcprint_l
@ cdecl _o__ismbcpunct(long) ucrtbase._o__ismbcpunct @ cdecl _o__ismbcpunct(long) ucrtbase._o__ismbcpunct
@ stub _o__ismbcpunct_l @ cdecl _o__ismbcpunct_l(long ptr) ucrtbase._o__ismbcpunct_l
@ cdecl _o__ismbcspace(long) ucrtbase._o__ismbcspace @ cdecl _o__ismbcspace(long) ucrtbase._o__ismbcspace
@ cdecl _o__ismbcspace_l(long ptr) ucrtbase._o__ismbcspace_l @ cdecl _o__ismbcspace_l(long ptr) ucrtbase._o__ismbcspace_l
@ cdecl _o__ismbcsymbol(long) ucrtbase._o__ismbcsymbol @ cdecl _o__ismbcsymbol(long) ucrtbase._o__ismbcsymbol

View File

@ -999,7 +999,7 @@
@ cdecl _ismbcprint(long) @ cdecl _ismbcprint(long)
@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcprint_l(long ptr)
@ cdecl _ismbcpunct(long) @ cdecl _ismbcpunct(long)
@ stub _ismbcpunct_l @ cdecl _ismbcpunct_l(long ptr)
@ cdecl _ismbcspace(long) @ cdecl _ismbcspace(long)
@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcspace_l(long ptr)
@ cdecl _ismbcsymbol(long) @ cdecl _ismbcsymbol(long)

View File

@ -1345,7 +1345,7 @@
@ stub _ismbcprint(long) @ stub _ismbcprint(long)
@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcprint_l(long ptr)
@ cdecl _ismbcpunct(long) @ cdecl _ismbcpunct(long)
@ stub _ismbcpunct_l @ cdecl _ismbcpunct_l(long ptr)
@ cdecl _ismbcspace(long) @ cdecl _ismbcspace(long)
@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcspace_l(long ptr)
@ cdecl _ismbcsymbol(long) @ cdecl _ismbcsymbol(long)

View File

@ -1350,7 +1350,7 @@
@ cdecl _ismbcprint(long) @ cdecl _ismbcprint(long)
@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcprint_l(long ptr)
@ cdecl _ismbcpunct(long) @ cdecl _ismbcpunct(long)
@ stub _ismbcpunct_l @ cdecl _ismbcpunct_l(long ptr)
@ cdecl _ismbcspace(long) @ cdecl _ismbcspace(long)
@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcspace_l(long ptr)
@ cdecl _ismbcsymbol(long) @ cdecl _ismbcsymbol(long)

View File

@ -671,7 +671,7 @@
@ cdecl _ismbcprint(long) @ cdecl _ismbcprint(long)
@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcprint_l(long ptr)
@ cdecl _ismbcpunct(long) @ cdecl _ismbcpunct(long)
@ stub _ismbcpunct_l @ cdecl _ismbcpunct_l(long ptr)
@ cdecl _ismbcspace(long) @ cdecl _ismbcspace(long)
@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcspace_l(long ptr)
@ cdecl _ismbcsymbol(long) @ cdecl _ismbcsymbol(long)

View File

@ -649,7 +649,7 @@
@ cdecl _ismbcprint(long) @ cdecl _ismbcprint(long)
@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcprint_l(long ptr)
@ cdecl _ismbcpunct(long) @ cdecl _ismbcpunct(long)
@ stub _ismbcpunct_l @ cdecl _ismbcpunct_l(long ptr)
@ cdecl _ismbcspace(long) @ cdecl _ismbcspace(long)
@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcspace_l(long ptr)
@ cdecl _ismbcsymbol(long) @ cdecl _ismbcsymbol(long)

View File

@ -1570,13 +1570,20 @@ int CDECL _ismbcprint(unsigned int ch)
return _ismbcprint_l( ch, NULL ); return _ismbcprint_l( ch, NULL );
} }
/*********************************************************************
* _ismbcpunct_l (MSVCRT.@)
*/
int CDECL _ismbcpunct_l(unsigned int ch, MSVCRT__locale_t locale)
{
return MSVCRT__iswpunct_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
}
/********************************************************************* /*********************************************************************
* _ismbcpunct(MSVCRT.@) * _ismbcpunct(MSVCRT.@)
*/ */
int CDECL _ismbcpunct(unsigned int ch) int CDECL _ismbcpunct(unsigned int ch)
{ {
MSVCRT_wchar_t wch = msvcrt_mbc_to_wc( ch ); return _ismbcpunct_l( ch, NULL );
return (get_char_typeW( wch ) & C1_PUNCT);
} }
/********************************************************************* /*********************************************************************

View File

@ -1208,6 +1208,7 @@ int __cdecl MSVCRT__iswalpha_l(MSVCRT_wchar_t, MSVCRT__locale_t);
int __cdecl MSVCRT__iswlower_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswlower_l(MSVCRT_wchar_t, MSVCRT__locale_t);
int __cdecl MSVCRT__iswupper_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswupper_l(MSVCRT_wchar_t, MSVCRT__locale_t);
int __cdecl MSVCRT__iswprint_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswprint_l(MSVCRT_wchar_t, MSVCRT__locale_t);
int __cdecl MSVCRT__iswpunct_l(MSVCRT_wchar_t, MSVCRT__locale_t);
/* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) /* 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) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0)

View File

@ -617,7 +617,7 @@
@ cdecl _ismbcprint(long) @ cdecl _ismbcprint(long)
@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcprint_l(long ptr)
@ cdecl _ismbcpunct(long) @ cdecl _ismbcpunct(long)
# stub _ismbcpunct_l(long ptr) @ cdecl _ismbcpunct_l(long ptr)
@ cdecl _ismbcspace(long) @ cdecl _ismbcspace(long)
@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcspace_l(long ptr)
@ cdecl _ismbcsymbol(long) @ cdecl _ismbcsymbol(long)

View File

@ -489,7 +489,7 @@
@ cdecl _ismbcprint(long) @ cdecl _ismbcprint(long)
@ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcprint_l(long ptr)
@ cdecl _ismbcpunct(long) @ cdecl _ismbcpunct(long)
@ stub _ismbcpunct_l @ cdecl _ismbcpunct_l(long ptr)
@ cdecl _ismbcspace(long) @ cdecl _ismbcspace(long)
@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcspace_l(long ptr)
@ cdecl _ismbcsymbol(long) @ cdecl _ismbcsymbol(long)
@ -1088,7 +1088,7 @@
@ cdecl _o__ismbcprint(long) _ismbcprint @ cdecl _o__ismbcprint(long) _ismbcprint
@ cdecl _o__ismbcprint_l(long ptr) _ismbcprint_l @ cdecl _o__ismbcprint_l(long ptr) _ismbcprint_l
@ cdecl _o__ismbcpunct(long) _ismbcpunct @ cdecl _o__ismbcpunct(long) _ismbcpunct
@ stub _o__ismbcpunct_l @ cdecl _o__ismbcpunct_l(long ptr) _ismbcpunct_l
@ cdecl _o__ismbcspace(long) _ismbcspace @ cdecl _o__ismbcspace(long) _ismbcspace
@ cdecl _o__ismbcspace_l(long ptr) _ismbcspace_l @ cdecl _o__ismbcspace_l(long ptr) _ismbcspace_l
@ cdecl _o__ismbcsymbol(long) _ismbcsymbol @ cdecl _o__ismbcsymbol(long) _ismbcsymbol