diff --git a/reactos/ntoskrnl/rtl/ctype.c b/reactos/ntoskrnl/rtl/ctype.c index 3438b3b8460..3f1bd5a654a 100644 --- a/reactos/ntoskrnl/rtl/ctype.c +++ b/reactos/ntoskrnl/rtl/ctype.c @@ -1,88 +1,441 @@ -/* - * linux/lib/ctype.c +/* $Id: ctype.c,v 1.4 2000/01/11 01:16:50 ekohl Exp $ * - * Copyright (C) 1991, 1992 Linus Torvalds + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/rtl/ctype.c + * PURPOSE: Character type and conversion functions + * PROGRAMMERS: ??? + * Eric Kohl + * HISTORY: ???: Created + * 10/01/2000: Added missing functions and changed + * all functions to use ctype table */ #include -#if 0 -char _ctmp; -unsigned char _ctype[] = {0x00, /* EOF */ -_C,_C,_C,_C,_C,_C,_C,_C, /* 0-7 */ -_C,_C|_S,_C|_S,_C|_S,_C|_S,_C|_S,_C,_C, /* 8-15 */ -_C,_C,_C,_C,_C,_C,_C,_C, /* 16-23 */ -_C,_C,_C,_C,_C,_C,_C,_C, /* 24-31 */ -_S|_SP,_P,_P,_P,_P,_P,_P,_P, /* 32-39 */ -_P,_P,_P,_P,_P,_P,_P,_P, /* 40-47 */ -_D,_D,_D,_D,_D,_D,_D,_D, /* 48-55 */ -_D,_D,_P,_P,_P,_P,_P,_P, /* 56-63 */ -_P,_U|_X,_U|_X,_U|_X,_U|_X,_U|_X,_U|_X,_U, /* 64-71 */ -_U,_U,_U,_U,_U,_U,_U,_U, /* 72-79 */ -_U,_U,_U,_U,_U,_U,_U,_U, /* 80-87 */ -_U,_U,_U,_P,_P,_P,_P,_P, /* 88-95 */ -_P,_L|_X,_L|_X,_L|_X,_L|_X,_L|_X,_L|_X,_L, /* 96-103 */ -_L,_L,_L,_L,_L,_L,_L,_L, /* 104-111 */ -_L,_L,_L,_L,_L,_L,_L,_L, /* 112-119 */ -_L,_L,_L,_P,_P,_P,_P,_C, /* 120-127 */ -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 128-143 */ -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 144-159 */ -_S|_SP,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P, /* 160-175 */ -_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P,_P, /* 176-191 */ -_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U,_U, /* 192-207 */ -_U,_U,_U,_U,_U,_U,_U,_P,_U,_U,_U,_U,_U,_U,_U,_L, /* 208-223 */ -_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L, /* 224-239 */ -_L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L}; /* 240-255 */ -#endif +#define upalpha ('A' - 'a') + + +unsigned short _ctype[] = { + 0, /* , 0xFFFF */ + _CONTROL, /* CTRL+@, 0x00 */ + _CONTROL, /* CTRL+A, 0x01 */ + _CONTROL, /* CTRL+B, 0x02 */ + _CONTROL, /* CTRL+C, 0x03 */ + _CONTROL, /* CTRL+D, 0x04 */ + _CONTROL, /* CTRL+E, 0x05 */ + _CONTROL, /* CTRL+F, 0x06 */ + _CONTROL, /* CTRL+G, 0x07 */ + _CONTROL, /* CTRL+H, 0x08 */ + _CONTROL | _SPACE, /* CTRL+I, 0x09 */ + _CONTROL | _SPACE, /* CTRL+J, 0x0a */ + _CONTROL | _SPACE, /* CTRL+K, 0x0b */ + _CONTROL | _SPACE, /* CTRL+L, 0x0c */ + _CONTROL | _SPACE, /* CTRL+M, 0x0d */ + _CONTROL, /* CTRL+N, 0x0e */ + _CONTROL, /* CTRL+O, 0x0f */ + _CONTROL, /* CTRL+P, 0x10 */ + _CONTROL, /* CTRL+Q, 0x11 */ + _CONTROL, /* CTRL+R, 0x12 */ + _CONTROL, /* CTRL+S, 0x13 */ + _CONTROL, /* CTRL+T, 0x14 */ + _CONTROL, /* CTRL+U, 0x15 */ + _CONTROL, /* CTRL+V, 0x16 */ + _CONTROL, /* CTRL+W, 0x17 */ + _CONTROL, /* CTRL+X, 0x18 */ + _CONTROL, /* CTRL+Y, 0x19 */ + _CONTROL, /* CTRL+Z, 0x1a */ + _CONTROL, /* CTRL+[, 0x1b */ + _CONTROL, /* CTRL+\, 0x1c */ + _CONTROL, /* CTRL+], 0x1d */ + _CONTROL, /* CTRL+^, 0x1e */ + _CONTROL, /* CTRL+_, 0x1f */ + _SPACE | _BLANK, /* ` ', 0x20 */ + _PUNCT, /* `!', 0x21 */ + _PUNCT, /* 0x22 */ + _PUNCT, /* `#', 0x23 */ + _PUNCT, /* `$', 0x24 */ + _PUNCT, /* `%', 0x25 */ + _PUNCT, /* `&', 0x26 */ + _PUNCT, /* 0x27 */ + _PUNCT, /* `(', 0x28 */ + _PUNCT, /* `)', 0x29 */ + _PUNCT, /* `*', 0x2a */ + _PUNCT, /* `+', 0x2b */ + _PUNCT, /* `,', 0x2c */ + _PUNCT, /* `-', 0x2d */ + _PUNCT, /* `.', 0x2e */ + _PUNCT, /* `/', 0x2f */ + _DIGIT | _HEX, /* `0', 0x30 */ + _DIGIT | _HEX, /* `1', 0x31 */ + _DIGIT | _HEX, /* `2', 0x32 */ + _DIGIT | _HEX, /* `3', 0x33 */ + _DIGIT | _HEX, /* `4', 0x34 */ + _DIGIT | _HEX, /* `5', 0x35 */ + _DIGIT | _HEX, /* `6', 0x36 */ + _DIGIT | _HEX, /* `7', 0x37 */ + _DIGIT | _HEX, /* `8', 0x38 */ + _DIGIT | _HEX, /* `9', 0x39 */ + _PUNCT, /* `:', 0x3a */ + _PUNCT, /* `;', 0x3b */ + _PUNCT, /* `<', 0x3c */ + _PUNCT, /* `=', 0x3d */ + _PUNCT, /* `>', 0x3e */ + _PUNCT, /* `?', 0x3f */ + _PUNCT, /* `@', 0x40 */ + _UPPER | _HEX, /* `A', 0x41 */ + _UPPER | _HEX, /* `B', 0x42 */ + _UPPER | _HEX, /* `C', 0x43 */ + _UPPER | _HEX, /* `D', 0x44 */ + _UPPER | _HEX, /* `E', 0x45 */ + _UPPER | _HEX, /* `F', 0x46 */ + _UPPER, /* `G', 0x47 */ + _UPPER, /* `H', 0x48 */ + _UPPER, /* `I', 0x49 */ + _UPPER, /* `J', 0x4a */ + _UPPER, /* `K', 0x4b */ + _UPPER, /* `L', 0x4c */ + _UPPER, /* `M', 0x4d */ + _UPPER, /* `N', 0x4e */ + _UPPER, /* `O', 0x4f */ + _UPPER, /* `P', 0x50 */ + _UPPER, /* `Q', 0x51 */ + _UPPER, /* `R', 0x52 */ + _UPPER, /* `S', 0x53 */ + _UPPER, /* `T', 0x54 */ + _UPPER, /* `U', 0x55 */ + _UPPER, /* `V', 0x56 */ + _UPPER, /* `W', 0x57 */ + _UPPER, /* `X', 0x58 */ + _UPPER, /* `Y', 0x59 */ + _UPPER, /* `Z', 0x5a */ + _PUNCT, /* `[', 0x5b */ + _PUNCT, /* 0x5c */ + _PUNCT, /* `]', 0x5d */ + _PUNCT, /* `^', 0x5e */ + _PUNCT, /* `_', 0x5f */ + _PUNCT, /* 0x60 */ + _LOWER | _HEX, /* `a', 0x61 */ + _LOWER | _HEX, /* `b', 0x62 */ + _LOWER | _HEX, /* `c', 0x63 */ + _LOWER | _HEX, /* `d', 0x64 */ + _LOWER | _HEX, /* `e', 0x65 */ + _LOWER | _HEX, /* `f', 0x66 */ + _LOWER, /* `g', 0x67 */ + _LOWER, /* `h', 0x68 */ + _LOWER, /* `i', 0x69 */ + _LOWER, /* `j', 0x6a */ + _LOWER, /* `k', 0x6b */ + _LOWER, /* `l', 0x6c */ + _LOWER, /* `m', 0x6d */ + _LOWER, /* `n', 0x6e */ + _LOWER, /* `o', 0x6f */ + _LOWER, /* `p', 0x70 */ + _LOWER, /* `q', 0x71 */ + _LOWER, /* `r', 0x72 */ + _LOWER, /* `s', 0x73 */ + _LOWER, /* `t', 0x74 */ + _LOWER, /* `u', 0x75 */ + _LOWER, /* `v', 0x76 */ + _LOWER, /* `w', 0x77 */ + _LOWER, /* `x', 0x78 */ + _LOWER, /* `y', 0x79 */ + _LOWER, /* `z', 0x7a */ + _PUNCT, /* `{', 0x7b */ + _PUNCT, /* `|', 0x7c */ + _PUNCT, /* `}', 0x7d */ + _PUNCT, /* `~', 0x7e */ + _CONTROL, /* 0x7f */ + 0, /* 0x80 */ + 0, /* 0x81 */ + 0, /* 0x82 */ + 0, /* 0x83 */ + 0, /* 0x84 */ + 0, /* 0x85 */ + 0, /* 0x86 */ + 0, /* 0x87 */ + 0, /* 0x88 */ + 0, /* 0x89 */ + 0, /* 0x8a */ + 0, /* 0x8b */ + 0, /* 0x8c */ + 0, /* 0x8d */ + 0, /* 0x8e */ + 0, /* 0x8f */ + 0, /* 0x90 */ + 0, /* 0x91 */ + 0, /* 0x92 */ + 0, /* 0x93 */ + 0, /* 0x94 */ + 0, /* 0x95 */ + 0, /* 0x96 */ + 0, /* 0x97 */ + 0, /* 0x98 */ + 0, /* 0x99 */ + 0, /* 0x9a */ + 0, /* 0x9b */ + 0, /* 0x9c */ + 0, /* 0x9d */ + 0, /* 0x9e */ + 0, /* 0x9f */ + 0, /* 0xa0 */ + 0, /* 0xa1 */ + 0, /* 0xa2 */ + 0, /* 0xa3 */ + 0, /* 0xa4 */ + 0, /* 0xa5 */ + 0, /* 0xa6 */ + 0, /* 0xa7 */ + 0, /* 0xa8 */ + 0, /* 0xa9 */ + 0, /* 0xaa */ + 0, /* 0xab */ + 0, /* 0xac */ + 0, /* 0xad */ + 0, /* 0xae */ + 0, /* 0xaf */ + 0, /* 0xb0 */ + 0, /* 0xb1 */ + 0, /* 0xb2 */ + 0, /* 0xb3 */ + 0, /* 0xb4 */ + 0, /* 0xb5 */ + 0, /* 0xb6 */ + 0, /* 0xb7 */ + 0, /* 0xb8 */ + 0, /* 0xb9 */ + 0, /* 0xba */ + 0, /* 0xbb */ + 0, /* 0xbc */ + 0, /* 0xbd */ + 0, /* 0xbe */ + 0, /* 0xbf */ + 0, /* 0xc0 */ + 0, /* 0xc1 */ + 0, /* 0xc2 */ + 0, /* 0xc3 */ + 0, /* 0xc4 */ + 0, /* 0xc5 */ + 0, /* 0xc6 */ + 0, /* 0xc7 */ + 0, /* 0xc8 */ + 0, /* 0xc9 */ + 0, /* 0xca */ + 0, /* 0xcb */ + 0, /* 0xcc */ + 0, /* 0xcd */ + 0, /* 0xce */ + 0, /* 0xcf */ + 0, /* 0xd0 */ + 0, /* 0xd1 */ + 0, /* 0xd2 */ + 0, /* 0xd3 */ + 0, /* 0xd4 */ + 0, /* 0xd5 */ + 0, /* 0xd6 */ + 0, /* 0xd7 */ + 0, /* 0xd8 */ + 0, /* 0xd9 */ + 0, /* 0xda */ + 0, /* 0xdb */ + 0, /* 0xdc */ + 0, /* 0xdd */ + 0, /* 0xde */ + 0, /* 0xdf */ + 0, /* 0xe0 */ + 0, /* 0xe1 */ + 0, /* 0xe2 */ + 0, /* 0xe3 */ + 0, /* 0xe4 */ + 0, /* 0xe5 */ + 0, /* 0xe6 */ + 0, /* 0xe7 */ + 0, /* 0xe8 */ + 0, /* 0xe9 */ + 0, /* 0xea */ + 0, /* 0xeb */ + 0, /* 0xec */ + 0, /* 0xed */ + 0, /* 0xee */ + 0, /* 0xef */ + 0, /* 0xf0 */ + 0, /* 0xf1 */ + 0, /* 0xf2 */ + 0, /* 0xf3 */ + 0, /* 0xf4 */ + 0, /* 0xf5 */ + 0, /* 0xf6 */ + 0, /* 0xf7 */ + 0, /* 0xf8 */ + 0, /* 0xf9 */ + 0, /* 0xfa */ + 0, /* 0xfb */ + 0, /* 0xfc */ + 0, /* 0xfd */ + 0, /* 0xfe */ + 0 /* 0xff */ +}; + +unsigned short *_pctype = _ctype + 1; +unsigned short *_pwctype = _ctype + 1; + +int _isctype (int c, int ctypeFlags) +{ + return (_pctype[(unsigned char)(c & 0xFF)] & ctypeFlags); +} + +int iswctype(wint_t wc, wctype_t wctypeFlags) +{ + return (_pwctype[(unsigned char)(wc & 0xFF)] & wctypeFlags); +} + +/* +int isalpha(int c) +{ + return(_isctype(c, _ALPHA)); +} + +int isalnum(int c) +{ + return(_isctype(c, _ALPHA | _DIGIT)); +} + +int __isascii(int c) +{ + return ((unsigned char)c <= 0x7f); +} + +int iscntrl(int c) +{ + return(_isctype(c, _CONTROL)); +} + +int __iscsym(int c) +{ + return(isalnum(c)||(c == '_')); +} + +int __iscsymf(int c) +{ + return(isalpha(c)||(c == '_')); +} +*/ int isdigit(int c) { - return((c >= '0' && c <= '9')); + return(_isctype(c, _DIGIT)); } +/* +int isgraph(int c) +{ + return (_isctype (c, _PUNCT | _ALPHA | _DIGIT)); +} +*/ + int islower(int c) { - return((c >= 'a' && c <= 'z')); + return (_isctype (c, _LOWER)); } int isprint(int c) { - return((c >= ' ' && c <= '~')); + return (_isctype (c, _BLANK | _PUNCT | _ALPHA | _DIGIT)); } +/* +int ispunct(int c) +{ + return (_isctype (c, _PUNCT)); +} +*/ + int isspace(int c) { - return((c == ' ' || c == '\t')); + return (_isctype (c, _SPACE)); } int isupper(int c) { - return((c >= 'A') && (c <= 'Z')); + return (_isctype (c, _UPPER)); } int isxdigit(int c) { - return(('0' <= c && '9' >= c) || ('a' <= 'c' && 'f' >= 'c') || - ('A' <= c && 'Z' >= c)); + return (_isctype (c, _HEX)); } +/* +int iswalpha(wint_t c) +{ + return (iswctype (c, _ALPHA)); +} +*/ + +int iswdigit(wint_t c) +{ + return (iswctype (c, _DIGIT)); +} + +int iswlower(wint_t c) +{ + return (iswctype (c, _LOWER)); +} + +int iswxdigit(wint_t c) +{ + return (iswctype (c, _HEX)); +} + + +/* +int __toascii(int c) +{ + return((unsigned)(c) & 0x7f); +} + +int _tolower(int c) +{ + if (_isctype (c, _UPPER)) + return (c - upalpha); + return(c); +} + +int _toupper(int c) +{ + if (_isctype (c, _LOWER)) + return (c + upalpha); + return(c); +} +*/ + int tolower(int c) { - return (c >= 'A' && c <= 'Z') ? c - ( 'A' - 'a' ) : c; + if (_isctype (c, _UPPER)) + return (c - upalpha); + return(c); } int toupper(int c) { - return (c >= 'a' && c <= 'z') ? c + 'A' - 'a' : c; + if (_isctype (c, _LOWER)) + return (c + upalpha); + return(c); } wchar_t towlower(wchar_t c) { - return (c >= 'A' && c <= 'Z') ? c - ( 'A' - 'a' ) : c; + if (iswctype (c, _UPPER)) + return (c - upalpha); + return(c); } wchar_t towupper(wchar_t c) { - return (c >= 'a' && c <= 'z') ? c + 'A' - 'a' : c; + if (iswctype (c, _LOWER)) + return (c + upalpha); + return(c); } + +/* EOF */ diff --git a/reactos/ntoskrnl/rtl/unicode.c b/reactos/ntoskrnl/rtl/unicode.c index 7a71e1f9d57..38d22418638 100644 --- a/reactos/ntoskrnl/rtl/unicode.c +++ b/reactos/ntoskrnl/rtl/unicode.c @@ -1,4 +1,4 @@ -/* $Id: unicode.c,v 1.11 1999/12/10 17:49:21 ekohl Exp $ +/* $Id: unicode.c,v 1.12 2000/01/11 01:16:50 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -11,13 +11,11 @@ #include //#include +#include #define NDEBUG #include -extern unsigned long simple_strtoul(const char *cp, char **endp, - unsigned int base); - /* FUNCTIONS *****************************************************************/ @@ -238,7 +236,36 @@ NTSTATUS STDCALL RtlCharToInteger(IN PCSZ String, IN ULONG Base, IN OUT PULONG Value) { - *Value=simple_strtoul((const char *)String, NULL, Base); + ULONG Val; + + *Value = 0; + + if (Base == 0) + { + Base = 10; + if (*String == '0') + { + Base = 8; + String++; + if ((*String == 'x') && isxdigit (String[1])) + { + String++; + Base = 16; + } + } + } + + if (!isxdigit (*String)) + return STATUS_INVALID_PARAMETER; + + while (isxdigit (*String) && + (Val = isdigit (*String) ? * String - '0' : (islower (*String) + ? toupper (*String) : *String) - 'A' + 10) < Base) + { + *Value = *Value * Base + Val; + String++; + } + return STATUS_SUCCESS; } @@ -912,8 +939,9 @@ RtlUnicodeStringToAnsiString ( if (AllocateDestinationString == TRUE) { DestinationString->MaximumLength = Length + sizeof(CHAR); - DestinationString->Buffer = ExAllocatePool (NonPagedPool, - DestinationString->MaximumLength); + DestinationString->Buffer = + ExAllocatePool (NonPagedPool, + DestinationString->MaximumLength); if (DestinationString->Buffer == NULL) return STATUS_NO_MEMORY; } @@ -958,63 +986,87 @@ RtlUnicodeStringToInteger ( OUT PULONG Value ) { - return STATUS_NOT_IMPLEMENTED; -#if 0 - char *str; - unsigned long i, lenmin=0; - BOOLEAN addneg=FALSE; + PWCHAR Str; + ULONG lenmin = 0; + ULONG i; + ULONG Val; + BOOLEAN addneg = FALSE; - str=ExAllocatePool(NonPagedPool, String->Length+1); - - for(i=0; iLength; i++) + Str = String->Buffer; + for (i = 0; i < String->Length; i++) { - *str=*String->Buffer; + if (*Str == L'b') + { + Base = 2; + lenmin++; + } + else if (*Str == L'o') + { + Base = 8; + lenmin++; + } + else if (*Str == L'd') + { + Base = 10; + lenmin++; + } + else if (*Str == L'x') + { + Base = 16; + lenmin++; + } + else if (*Str == L'+') + { + lenmin++; + } + else if (*Str == L'-') + { + addneg = TRUE; + lenmin++; + } + else if ((*Str > L'1') && (Base == 2)) + { + *Value = 0; + return STATUS_INVALID_PARAMETER; + } + else if (((*Str > L'7') || (*Str < L'0')) && (Base == 8)) + { + *Value = 0; + return STATUS_INVALID_PARAMETER; + } + else if (((*Str > L'9') || (*Str < L'0')) && (Base == 10)) + { + *Value = 0; + return STATUS_INVALID_PARAMETER; + } + else if ((((*Str > L'9') || (*Str < L'0')) || + ((towupper (*Str) > L'F') || + (towupper (*Str) < L'A'))) && (Base == 16)) + { + *Value = 0; + return STATUS_INVALID_PARAMETER; + } + else + Str++; + } - if(*str=='b') { Base=2; lenmin++; } else - if(*str=='o') { Base=8; lenmin++; } else - if(*str=='d') { Base=10; lenmin++; } else - if(*str=='x') { Base=16; lenmin++; } else - if(*str=='+') { lenmin++; } else - if(*str=='-') { addneg=TRUE; lenmin++; } else - if((*str>'1') && (Base==2)) { - String->Buffer-=i; - *Value=0; - return STATUS_INVALID_PARAMETER; - } else - if(((*str>'7') || (*str<'0')) && (Base==8)) { - String->Buffer-=i; - *Value=0; - return STATUS_INVALID_PARAMETER; - } else - if(((*str>'9') || (*str<'0')) && (Base==10)) { - String->Buffer-=i; - *Value=0; - return STATUS_INVALID_PARAMETER; - } else - if((((*str>'9') || (*str<'0')) || - ((RtlUpperChar(*str)>'F') || (RtlUpperChar(*str)<'A'))) && (Base==16)) - { - String->Buffer-=i; - *Value=0; - return STATUS_INVALID_PARAMETER; - } else - str++; + Str = String->Buffer + lenmin; - String->Buffer++; - } + if (Base == 0) + Base = 10; - *str=0; - String->Buffer-=String->Length; - str-=(String->Length-lenmin); + while (iswxdigit (*Str) && + (Val = iswdigit (*Str) ? *Str - L'0' : (iswlower (*Str) + ? toupper (*Str) : *Str) - L'A' + 10) < Base) + { + *Value = *Value * Base + Val; + Str++; + } - if(addneg==TRUE) { - *Value=simple_strtoul(str, NULL, Base)*-1; - } else - *Value=simple_strtoul(str, NULL, Base); + if (addneg == TRUE) + *Value *= -1; - ExFreePool(str); - return(STATUS_SUCCESS); -#endif + return STATUS_SUCCESS; }