system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 04:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

msvcrt: Use ctype definition from public header.

Browse source 
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-12-01 13:51:51 +01:00 committed by Alexandre Julliard
parent 2d471db92f
commit eabef91a97
4 changed files with 68 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
dlls/msvcrt/ctype.c
View file

@ -23,18 +23,18 @@
#include "winnls.h"
/* Some abbreviations to make the following table readable */
#define _C_ MSVCRT__CONTROL
#define _S_ MSVCRT__SPACE
#define _P_ MSVCRT__PUNCT
#define _D_ MSVCRT__DIGIT
#define _H_ MSVCRT__HEX
#define _U_ MSVCRT__UPPER
#define _L_ MSVCRT__LOWER
#define _C_ _CONTROL
#define _S_ _SPACE
#define _P_ _PUNCT
#define _D_ _DIGIT
#define _H_ _HEX
#define _U_ _UPPER
#define _L_ _LOWER
WORD MSVCRT__ctype [257] = {
0, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _S_|_C_, _S_|_C_,
_S_|_C_, _S_|_C_, _S_|_C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_,
_C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _S_|MSVCRT__BLANK,
_C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _S_|_BLANK,
_P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_,
_P_, _D_|_H_, _D_|_H_, _D_|_H_, _D_|_H_, _D_|_H_, _D_|_H_, _D_|_H_,
_D_|_H_, _D_|_H_, _D_|_H_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _U_|_H_,
@ -52,7 +52,7 @@ WORD MSVCRT__ctype [257] = {
};
#if _MSVCR_VER <= 110
# define B110 MSVCRT__BLANK
# define B110 _BLANK
#else
# define B110 0
#endif
@ -64,9 +64,9 @@ WORD MSVCRT__ctype [257] = {
#endif
#if _MSVCR_VER >= 140
# define S140 MSVCRT__SPACE
# define L140 MSVCRT__LOWER | 0x100
# define C140 MSVCRT__CONTROL
# define S140 _SPACE
# define L140 _LOWER | 0x100
# define C140 _CONTROL
#else
# define S140 0
# define L140 0
@ -164,7 +164,7 @@ int CDECL MSVCRT__isctype_l(int c, int type, _locale_t locale)
WORD typeInfo;
char convert[3], *pconv = convert;
if (locinfo->pctype[(UINT)c >> 8] & MSVCRT__LEADBYTE)
if (locinfo->pctype[(UINT)c >> 8] & _LEADBYTE)
*pconv++ = (UINT)c >> 8;
*pconv++ = c & 0xff;
*pconv = 0;
@ -189,7 +189,7 @@ int CDECL MSVCRT__isctype(int c, int type)
*/
int CDECL MSVCRT__isalnum_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT, locale );
return MSVCRT__isctype_l( c, _ALPHA | _DIGIT, locale );
}
/*********************************************************************
@ -197,7 +197,7 @@ int CDECL MSVCRT__isalnum_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_isalnum(int c)
{
return MSVCRT__isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT );
return MSVCRT__isctype( c, _ALPHA | _DIGIT );
}
/*********************************************************************
@ -205,7 +205,7 @@ int CDECL MSVCRT_isalnum(int c)
*/
int CDECL MSVCRT__isalpha_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__ALPHA, locale );
return MSVCRT__isctype_l( c, _ALPHA, locale );
}
/*********************************************************************
@ -213,7 +213,7 @@ int CDECL MSVCRT__isalpha_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_isalpha(int c)
{
return MSVCRT__isctype( c, MSVCRT__ALPHA );
return MSVCRT__isctype( c, _ALPHA );
}
/*********************************************************************
@ -221,7 +221,7 @@ int CDECL MSVCRT_isalpha(int c)
*/
int CDECL MSVCRT__iscntrl_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__CONTROL, locale );
return MSVCRT__isctype_l( c, _CONTROL, locale );
}
/*********************************************************************
@ -229,7 +229,7 @@ int CDECL MSVCRT__iscntrl_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_iscntrl(int c)
{
return MSVCRT__isctype( c, MSVCRT__CONTROL );
return MSVCRT__isctype( c, _CONTROL );
}
/*********************************************************************
@ -237,7 +237,7 @@ int CDECL MSVCRT_iscntrl(int c)
*/
int CDECL MSVCRT__isdigit_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__DIGIT, locale );
return MSVCRT__isctype_l( c, _DIGIT, locale );
}
/*********************************************************************
@ -245,7 +245,7 @@ int CDECL MSVCRT__isdigit_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_isdigit(int c)
{
return MSVCRT__isctype( c, MSVCRT__DIGIT );
return MSVCRT__isctype( c, _DIGIT );
}
/*********************************************************************
@ -253,7 +253,7 @@ int CDECL MSVCRT_isdigit(int c)
*/
int CDECL MSVCRT__isgraph_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT, locale );
return MSVCRT__isctype_l( c, _ALPHA | _DIGIT | _PUNCT, locale );
}
/*********************************************************************
@ -261,7 +261,7 @@ int CDECL MSVCRT__isgraph_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_isgraph(int c)
{
return MSVCRT__isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT );
return MSVCRT__isctype( c, _ALPHA | _DIGIT | _PUNCT );
}
/*********************************************************************
@ -269,7 +269,7 @@ int CDECL MSVCRT_isgraph(int c)
*/
int CDECL MSVCRT__isleadbyte_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__LEADBYTE, locale );
return MSVCRT__isctype_l( c, _LEADBYTE, locale );
}
/*********************************************************************
@ -277,7 +277,7 @@ int CDECL MSVCRT__isleadbyte_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_isleadbyte(int c)
{
return MSVCRT__isctype( c, MSVCRT__LEADBYTE );
return MSVCRT__isctype( c, _LEADBYTE );
}
/*********************************************************************
@ -285,7 +285,7 @@ int CDECL MSVCRT_isleadbyte(int c)
*/
int CDECL MSVCRT__islower_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__LOWER, locale );
return MSVCRT__isctype_l( c, _LOWER, locale );
}
/*********************************************************************
@ -293,7 +293,7 @@ int CDECL MSVCRT__islower_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_islower(int c)
{
return MSVCRT__isctype( c, MSVCRT__LOWER );
return MSVCRT__isctype( c, _LOWER );
}
/*********************************************************************
@ -301,7 +301,7 @@ int CDECL MSVCRT_islower(int c)
*/
int CDECL MSVCRT__isprint_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__BLANK | MSVCRT__PUNCT, locale );
return MSVCRT__isctype_l( c, _ALPHA | _DIGIT | _BLANK | _PUNCT, locale );
}
/*********************************************************************
@ -309,7 +309,7 @@ int CDECL MSVCRT__isprint_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_isprint(int c)
{
return MSVCRT__isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__BLANK | MSVCRT__PUNCT );
return MSVCRT__isctype( c, _ALPHA | _DIGIT | _BLANK | _PUNCT );
}
/*********************************************************************
@ -317,7 +317,7 @@ int CDECL MSVCRT_isprint(int c)
*/
int CDECL MSVCRT_ispunct(int c)
{
return MSVCRT__isctype( c, MSVCRT__PUNCT );
return MSVCRT__isctype( c, _PUNCT );
}
/*********************************************************************
@ -325,7 +325,7 @@ int CDECL MSVCRT_ispunct(int c)
*/
int CDECL MSVCRT__ispunct_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__PUNCT, locale );
return MSVCRT__isctype_l( c, _PUNCT, locale );
}
/*********************************************************************
@ -333,7 +333,7 @@ int CDECL MSVCRT__ispunct_l(int c, _locale_t locale)
*/
int CDECL MSVCRT__isspace_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__SPACE, locale );
return MSVCRT__isctype_l( c, _SPACE, locale );
}
/*********************************************************************
@ -341,7 +341,7 @@ int CDECL MSVCRT__isspace_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_isspace(int c)
{
return MSVCRT__isctype( c, MSVCRT__SPACE );
return MSVCRT__isctype( c, _SPACE );
}
/*********************************************************************
@ -349,7 +349,7 @@ int CDECL MSVCRT_isspace(int c)
*/
int CDECL MSVCRT__isupper_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__UPPER, locale );
return MSVCRT__isctype_l( c, _UPPER, locale );
}
/*********************************************************************
@ -357,7 +357,7 @@ int CDECL MSVCRT__isupper_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_isupper(int c)
{
return MSVCRT__isctype( c, MSVCRT__UPPER );
return MSVCRT__isctype( c, _UPPER );
}
/*********************************************************************
@ -365,7 +365,7 @@ int CDECL MSVCRT_isupper(int c)
*/
int CDECL MSVCRT__isxdigit_l(int c, _locale_t locale)
{
return MSVCRT__isctype_l( c, MSVCRT__HEX, locale );
return MSVCRT__isctype_l( c, _HEX, locale );
}
/*********************************************************************
@ -373,7 +373,7 @@ int CDECL MSVCRT__isxdigit_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_isxdigit(int c)
{
return MSVCRT__isctype( c, MSVCRT__HEX );
return MSVCRT__isctype( c, _HEX );
}
/*********************************************************************
@ -381,7 +381,7 @@ int CDECL MSVCRT_isxdigit(int c)
*/
int CDECL MSVCRT__isblank_l(int c, _locale_t locale)
{
return c == '\t' || MSVCRT__isctype_l( c, MSVCRT__BLANK, locale );
return c == '\t' || MSVCRT__isctype_l( c, _BLANK, locale );
}
/*********************************************************************
@ -389,7 +389,7 @@ int CDECL MSVCRT__isblank_l(int c, _locale_t locale)
*/
int CDECL MSVCRT_isblank(int c)
{
return c == '\t' || MSVCRT__isctype( c, MSVCRT__BLANK );
return c == '\t' || MSVCRT__isctype( c, _BLANK );
}
/*********************************************************************
@ -449,7 +449,7 @@ int CDECL MSVCRT__toupper_l(int c, _locale_t locale)
if((unsigned)c < 256)
return locinfo->pcumap[c];
if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE)
if(locinfo->pctype[(c>>8)&255] & _LEADBYTE)
*p++ = (c>>8) & 255;
else {
*_errno() = EILSEQ;
@ -503,7 +503,7 @@ int CDECL MSVCRT__tolower_l(int c, _locale_t locale)
if((unsigned)c < 256)
return locinfo->pclmap[c];
if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE)
if(locinfo->pctype[(c>>8)&255] & _LEADBYTE)
*p++ = (c>>8) & 255;
else {
*_errno() = EILSEQ;
@ -551,17 +551,17 @@ unsigned short __cdecl wctype(const char *property)
const char *name;
unsigned short mask;
} properties[] = {
{ "alnum", MSVCRT__DIGIT|MSVCRT__ALPHA },
{ "alpha", MSVCRT__ALPHA },
{ "cntrl", MSVCRT__CONTROL },
{ "digit", MSVCRT__DIGIT },
{ "graph", MSVCRT__DIGIT|MSVCRT__PUNCT|MSVCRT__ALPHA },
{ "lower", MSVCRT__LOWER },
{ "print", MSVCRT__DIGIT|MSVCRT__PUNCT|MSVCRT__BLANK|MSVCRT__ALPHA },
{ "punct", MSVCRT__PUNCT },
{ "space", MSVCRT__SPACE },
{ "upper", MSVCRT__UPPER },
{ "xdigit", MSVCRT__HEX }
{ "alnum", _DIGIT|_ALPHA },
{ "alpha", _ALPHA },
{ "cntrl", _CONTROL },
{ "digit", _DIGIT },
{ "graph", _DIGIT|_PUNCT|_ALPHA },
{ "lower", _LOWER },
{ "print", _DIGIT|_PUNCT|_BLANK|_ALPHA },
{ "punct", _PUNCT },
{ "space", _SPACE },
{ "upper", _UPPER },
{ "xdigit", _HEX }
};
unsigned int i;

4
dlls/msvcrt/locale.c
View file

@ -1430,10 +1430,10 @@ static pthreadlocinfo create_locinfo(int category,
for(i=0; cp_info.LeadByte[i+1]!=0; i+=2)
for(j=cp_info.LeadByte[i]; j<=cp_info.LeadByte[i+1]; j++)
locinfo->ctype1[j+1] |= MSVCRT__LEADBYTE;
locinfo->ctype1[j+1] |= _LEADBYTE;
for(i=0; i<256; i++) {
if(locinfo->pctype[i] & MSVCRT__LEADBYTE)
if(locinfo->pctype[i] & _LEADBYTE)
buf[i] = ' ';
else
buf[i] = i;

12
dlls/msvcrt/msvcrt.h
View file

@ -575,18 +575,6 @@ struct MSVCRT__stat64 {
#define MSVCRT__OUT_TO_MSGBOX 2
#define MSVCRT__REPORT_ERRMODE 3
/* ASCII char classification table - binary compatible */
#define MSVCRT__UPPER 0x0001 /* C1_UPPER */
#define MSVCRT__LOWER 0x0002 /* C1_LOWER */
#define MSVCRT__DIGIT 0x0004 /* C1_DIGIT */
#define MSVCRT__SPACE 0x0008 /* C1_SPACE */
#define MSVCRT__PUNCT 0x0010 /* C1_PUNCT */
#define MSVCRT__CONTROL 0x0020 /* C1_CNTRL */
#define MSVCRT__BLANK 0x0040 /* C1_BLANK */
#define MSVCRT__HEX 0x0080 /* C1_XDIGIT */
#define MSVCRT__LEADBYTE 0x8000
#define MSVCRT__ALPHA (0x0100|MSVCRT__UPPER|MSVCRT__LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */
#define MSVCRT__IOREAD 0x0001
#define MSVCRT__IOWRT 0x0002
#define MSVCRT__IOMYBUF 0x0008

28
dlls/msvcrt/wcs.c
View file

@ -2100,7 +2100,7 @@ INT CDECL MSVCRT_iswctype( wchar_t wc, wctype_t type )
*/
int CDECL MSVCRT__iswalnum_l( wchar_t wc, _locale_t locale )
{
return MSVCRT__iswctype_l( wc, MSVCRT__ALPHA | MSVCRT__DIGIT, locale );
return MSVCRT__iswctype_l( wc, _ALPHA | _DIGIT, locale );
}
/*********************************************************************
@ -2116,7 +2116,7 @@ INT CDECL MSVCRT_iswalnum( wchar_t wc )
*/
INT CDECL MSVCRT__iswalpha_l( wchar_t wc, _locale_t locale )
{
return MSVCRT__iswctype_l( wc, MSVCRT__ALPHA, locale );
return MSVCRT__iswctype_l( wc, _ALPHA, locale );
}
/*********************************************************************
@ -2132,7 +2132,7 @@ INT CDECL MSVCRT_iswalpha( wchar_t wc )
*/
int CDECL MSVCRT__iswcntrl_l( wchar_t wc, _locale_t locale )
{
return MSVCRT__iswctype_l( wc, MSVCRT__CONTROL, locale );
return MSVCRT__iswctype_l( wc, _CONTROL, locale );
}
/*********************************************************************
@ -2148,7 +2148,7 @@ INT CDECL MSVCRT_iswcntrl( wchar_t wc )
*/
INT CDECL MSVCRT__iswdigit_l( wchar_t wc, _locale_t locale )
{
return MSVCRT__iswctype_l( wc, MSVCRT__DIGIT, locale );
return MSVCRT__iswctype_l( wc, _DIGIT, locale );
}
/*********************************************************************
@ -2164,7 +2164,7 @@ INT CDECL MSVCRT_iswdigit( wchar_t wc )
*/
int CDECL MSVCRT__iswgraph_l( wchar_t wc, _locale_t locale )
{
return MSVCRT__iswctype_l( wc, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT, locale );
return MSVCRT__iswctype_l( wc, _ALPHA | _DIGIT | _PUNCT, locale );
}
/*********************************************************************
@ -2180,7 +2180,7 @@ INT CDECL MSVCRT_iswgraph( wchar_t wc )
*/
int CDECL MSVCRT__iswlower_l( wchar_t wc, _locale_t locale )
{
return MSVCRT__iswctype_l( wc, MSVCRT__LOWER, locale );
return MSVCRT__iswctype_l( wc, _LOWER, locale );
}
/*********************************************************************
@ -2196,8 +2196,8 @@ INT CDECL MSVCRT_iswlower( wchar_t wc )
*/
int CDECL MSVCRT__iswprint_l( wchar_t wc, _locale_t locale )
{
return MSVCRT__iswctype_l( wc, MSVCRT__ALPHA | MSVCRT__BLANK |
MSVCRT__DIGIT | MSVCRT__PUNCT, locale );
return MSVCRT__iswctype_l( wc, _ALPHA | _BLANK |
_DIGIT | _PUNCT, locale );
}
/*********************************************************************
@ -2213,7 +2213,7 @@ INT CDECL MSVCRT_iswprint( wchar_t wc )
*/
INT CDECL MSVCRT__iswpunct_l( wchar_t wc, _locale_t locale )
{
return MSVCRT__iswctype_l( wc, MSVCRT__PUNCT, locale );
return MSVCRT__iswctype_l( wc, _PUNCT, locale );
}
/*********************************************************************
@ -2229,7 +2229,7 @@ INT CDECL MSVCRT_iswpunct( wchar_t wc )
*/
INT CDECL MSVCRT__iswspace_l( wchar_t wc, _locale_t locale )
{
return MSVCRT__iswctype_l( wc, MSVCRT__SPACE, locale );
return MSVCRT__iswctype_l( wc, _SPACE, locale );
}
/*********************************************************************
@ -2245,7 +2245,7 @@ INT CDECL MSVCRT_iswspace( wchar_t wc )
*/
int CDECL MSVCRT__iswupper_l( wchar_t wc, _locale_t locale )
{
return MSVCRT__iswctype_l( wc, MSVCRT__UPPER, locale );
return MSVCRT__iswctype_l( wc, _UPPER, locale );
}
/*********************************************************************
@ -2261,7 +2261,7 @@ INT CDECL MSVCRT_iswupper( wchar_t wc )
*/
int CDECL MSVCRT__iswxdigit_l( wchar_t wc, _locale_t locale )
{
return MSVCRT__iswctype_l( wc, MSVCRT__HEX, locale );
return MSVCRT__iswctype_l( wc, _HEX, locale );
}
/*********************************************************************
@ -2277,7 +2277,7 @@ INT CDECL MSVCRT_iswxdigit( wchar_t wc )
*/
INT CDECL MSVCRT__iswblank_l( wchar_t wc, _locale_t locale )
{
return wc == '\t' || MSVCRT__iswctype_l( wc, MSVCRT__BLANK, locale );
return wc == '\t' || MSVCRT__iswctype_l( wc, _BLANK, locale );
}
/*********************************************************************
@ -2285,7 +2285,7 @@ INT CDECL MSVCRT__iswblank_l( wchar_t wc, _locale_t locale )
*/
INT CDECL MSVCRT_iswblank( wchar_t wc )
{
return wc == '\t' || MSVCRT__iswctype_l( wc, MSVCRT__BLANK, NULL );
return wc == '\t' || MSVCRT__iswctype_l( wc, _BLANK, NULL );
}
/*********************************************************************