diff --git a/reactos/lib/ntdll/dbg/brkpoint.c b/reactos/lib/ntdll/dbg/brkpoint.c new file mode 100644 index 00000000000..eb3507ae672 --- /dev/null +++ b/reactos/lib/ntdll/dbg/brkpoint.c @@ -0,0 +1,29 @@ +/* $Id: brkpoint.c,v 1.1 1999/12/29 17:12:28 ekohl Exp $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ntdll/dbg/brkpoint.c + * PURPOSE: Handles breakpoints + * PROGRAMMER: Eric Kohl + * UPDATE HISTORY: + * Created 28/12/1999 + */ + +/* INCLUDES *****************************************************************/ + +#include + + +/* FUNCTIONS *****************************************************************/ + +VOID DbgBreakPoint(VOID) +{ + __asm__("int $3\n\t"); +} + +VOID DbgUserBreakPoint(VOID) +{ + __asm__("int $3\n\t"); +} + +/* EOF */ diff --git a/reactos/lib/ntdll/def/ntdll.def b/reactos/lib/ntdll/def/ntdll.def index b76c405b3ca..cf90d4d55e7 100644 --- a/reactos/lib/ntdll/def/ntdll.def +++ b/reactos/lib/ntdll/def/ntdll.def @@ -1,4 +1,4 @@ -; $Id: ntdll.def,v 1.32 1999/12/27 15:06:13 ekohl Exp $ +; $Id: ntdll.def,v 1.33 1999/12/29 17:10:41 ekohl Exp $ ; ; ReactOS Operating System ; @@ -527,10 +527,10 @@ RtlxAnsiStringToUnicodeSize@4 RtlxOemStringToUnicodeSize@4 RtlxUnicodeStringToAnsiSize@4 RtlxUnicodeStringToOemSize@4 -;__isascii -;__iscsym -;__iscsymf -;__toascii +__isascii +__iscsym +__iscsymf +__toascii ;_alldiv ;_allmul ;_alloca_probe @@ -573,13 +573,13 @@ _wcsupr ;_wtoi64 ;_wtol abs -;atan +atan atoi atol -;ceil -;cos -;fabs -;floor +ceil +cos +fabs +floor isalnum isalpha iscntrl @@ -590,22 +590,22 @@ isprint ispunct isspace isupper -;iswalpha -;iswctype +iswalpha +iswctype isxdigit labs -;log +log ;mbstowcs memchr memcmp memcpy memmove memset -;pow +pow ;qsort -;sin +sin sprintf -;sqrt +sqrt ;sscanf strcat strchr @@ -623,7 +623,7 @@ strstr strtol strtoul ;swprintf -;tan +tan tolower toupper towlower diff --git a/reactos/lib/ntdll/def/ntdll.edf b/reactos/lib/ntdll/def/ntdll.edf index 7046965f3b6..17390551f60 100644 --- a/reactos/lib/ntdll/def/ntdll.edf +++ b/reactos/lib/ntdll/def/ntdll.edf @@ -1,4 +1,4 @@ -; $Id: ntdll.edf,v 1.22 1999/12/27 15:06:13 ekohl Exp $ +; $Id: ntdll.edf,v 1.23 1999/12/29 17:10:41 ekohl Exp $ ; ; ReactOS Operating System ; @@ -519,6 +519,10 @@ RtlxAnsiStringToUnicodeSize=RtlxAnsiStringToUnicodeSize@4 RtlxOemStringToUnicodeSize=RtlxOemStringToUnicodeSize@4 RtlxUnicodeStringToAnsiSize=RtlxUnicodeStringToAnsiSize@4 RtlxUnicodeStringToOemSize=RtlxUnicodeStringToOemSize@4 +__isascii +__iscsym +__iscsymf +__toascii _memccpy _memicmp _splitpath @@ -534,8 +538,13 @@ _wcslwr _wcsnicmp _wcsupr abs +atan atoi atol +ceil +cos +fabs +floor isalpha isalnum iscntrl @@ -546,14 +555,20 @@ isprint ispunct isspace isupper +iswalpha +iswctype isxdigit labs +log memchr memcmp memcpy memmove memset +pow +sin sprintf +sqrt strcat strchr strcmp @@ -569,6 +584,7 @@ strspn strstr strtol strtoul +tan tolower toupper towlower diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile index baec8b96a00..0079379db69 100644 --- a/reactos/lib/ntdll/makefile +++ b/reactos/lib/ntdll/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.29 1999/12/12 00:20:29 ekohl Exp $ +# $Id: makefile,v 1.30 1999/12/29 17:10:23 ekohl Exp $ # # ReactOS Operating System # @@ -23,8 +23,10 @@ endif all: $(DLLTARGET) +DBG_OBJECTS = dbg/brkpoint.o + RTL_OBJECTS = rtl/critical.o rtl/error.o rtl/heap.o rtl/largeint.o \ - rtl/mem.o rtl/nls.o rtl/process.o rtl/security.o \ + rtl/math.o rtl/mem.o rtl/nls.o rtl/process.o rtl/security.o \ rtl/thread.o rtl/unicode.o rtl/env.o STDLIB_OBJECTS = stdlib/abs.o stdlib/atoi.o stdlib/atol.o stdlib/labs.o \ @@ -40,18 +42,18 @@ STRING_OBJECTS = string/ctype.o string/memccpy.o string/memchr.o \ string/strpbrk.o string/strrchr.o string/strspn.o \ string/strstr.o string/strupr.o string/wstring.o -OBJECTS = napi.o ldr/startup.o $(RTL_OBJECTS) \ +OBJECTS = napi.o ldr/startup.o $(DBG_OBJECTS) $(RTL_OBJECTS) \ stdio/vsprintf.o $(STDLIB_OBJECTS) $(STRING_OBJECTS) \ stubs/stubs.o ldr/utils.o $(TARGET).coff ifeq ($(DOSCLI),yes) CLEAN_FILES = napi.o ldr\*.o rtl\*.o stdio\*.o stdlib\*.o string\*.o stubs\*.o \ $(TARGET).a main\dllmain.o $(TARGET).o $(TARGET).dll junk.tmp \ - base.tmp temp.exp $(TARGET).sym $(TARGET).coff + base.tmp temp.exp $(TARGET).sym $(TARGET).coff else CLEAN_FILES = napi.o ldr/*.o rtl/*.o stdio/*.o stdlib/*.o string/*.o stubs/*.o \ $(TARGET).a main/dllmain.o $(TARGET).o $(TARGET).dll junk.tmp \ - base.tmp temp.exp $(TARGET).sym $(TARGET).coff + base.tmp temp.exp $(TARGET).sym $(TARGET).coff endif $(TARGET).coff: $(TARGET).rc ../../include/reactos/resource.h diff --git a/reactos/lib/ntdll/rtl/math.c b/reactos/lib/ntdll/rtl/math.c new file mode 100644 index 00000000000..bb098e61c6a --- /dev/null +++ b/reactos/lib/ntdll/rtl/math.c @@ -0,0 +1,191 @@ +/* Math functions for i387. + Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by John C. Bowman , 1995. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + + +double atan (double __x); +double ceil (double __x); +double cos (double __x); +double fabs (double __x); +double floor (double __x); +double log (double __x); +double __log2 (double __x); +double pow (double __x, double __y); +double sin (double __x); +double sqrt (double __x); +double tan (double __x); + + +double atan (double __x) +{ + register double __value; + __asm __volatile__ + ("fld1\n\t" + "fpatan" + : "=t" (__value) : "0" (__x)); + + return __value; +} + +double ceil (double __x) +{ + register double __value; + __volatile unsigned short int __cw, __cwtmp; + + __asm __volatile ("fnstcw %0" : "=m" (__cw)); + __cwtmp = (__cw & 0xf3ff) | 0x0800; /* rounding up */ + __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); + __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); + __asm __volatile ("fldcw %0" : : "m" (__cw)); + + return __value; +} + +double cos (double __x) +{ + register double __value; + __asm __volatile__ + ("fcos" + : "=t" (__value): "0" (__x)); + + return __value; +} + +double fabs (double __x) +{ + register double __value; + __asm __volatile__ + ("fabs" + : "=t" (__value) : "0" (__x)); + + return __value; +} + +double floor (double __x) +{ + register double __value; + __volatile unsigned short int __cw, __cwtmp; + + __asm __volatile ("fnstcw %0" : "=m" (__cw)); + __cwtmp = (__cw & 0xf3ff) | 0x0400; /* rounding down */ + __asm __volatile ("fldcw %0" : : "m" (__cwtmp)); + __asm __volatile ("frndint" : "=t" (__value) : "0" (__x)); + __asm __volatile ("fldcw %0" : : "m" (__cw)); + + return __value; +} + +double log (double __x) +{ + register double __value; + __asm __volatile__ + ("fldln2\n\t" + "fxch\n\t" + "fyl2x" + : "=t" (__value) : "0" (__x)); + + return __value; +} + +double __log2 (double __x) +{ + register double __value; + __asm __volatile__ + ("fld1\n\t" + "fxch\n\t" + "fyl2x" + : "=t" (__value) : "0" (__x)); + + return __value; +} + +double pow (double __x, double __y) +{ + register double __value, __exponent; + long __p = (long) __y; + + if (__x == 0.0 && __y > 0.0) + return 0.0; + if (__y == (double) __p) + { + double __r = 1.0; + if (__p == 0) + return 1.0; + if (__p < 0) + { + __p = -__p; + __x = 1.0 / __x; + } + while (1) + { + if (__p & 1) + __r *= __x; + __p >>= 1; + if (__p == 0) + return __r; + __x *= __x; + } + /* NOTREACHED */ + } + __asm __volatile__ + ("fmul %%st(1) # y * log2(x)\n\t" + "fst %%st(1)\n\t" + "frndint # int(y * log2(x))\n\t" + "fxch\n\t" + "fsub %%st(1) # fract(y * log2(x))\n\t" + "f2xm1 # 2^(fract(y * log2(x))) - 1\n\t" + : "=t" (__value), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); + __value += 1.0; + __asm __volatile__ + ("fscale" + : "=t" (__value) : "0" (__value), "u" (__exponent)); + + return __value; +} + +double sin (double __x) +{ + register double __value; + __asm __volatile__ + ("fsin" + : "=t" (__value) : "0" (__x)); + + return __value; +} + +double sqrt (double __x) +{ + register double __value; + __asm __volatile__ + ("fsqrt" + : "=t" (__value) : "0" (__x)); + + return __value; +} + +double tan (double __x) +{ + register double __value; + register double __value2 __attribute__ ((unused)); + __asm __volatile__ + ("fptan" + : "=t" (__value2), "=u" (__value) : "0" (__x)); + + return __value; +} diff --git a/reactos/lib/ntdll/string/ctype.c b/reactos/lib/ntdll/string/ctype.c index d6eeacd2e9e..dd7a4727a55 100644 --- a/reactos/lib/ntdll/string/ctype.c +++ b/reactos/lib/ntdll/string/ctype.c @@ -1,11 +1,299 @@ +/* $Id: ctype.c,v 1.5 1999/12/29 17:13:14 ekohl Exp $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ntdll/rtl/ctype.c + * PURPOSE: Character type and conversion functions + * PROGRAMMERS: ??? + * Eric Kohl + * HISTORY: ???: Created + * 29/12/1999: Added missing functions and changed + * all functions to use ctype table + */ #include #define upalpha ('A' - 'a') +#define _GRAPH 0x0200 +#define _PRINT 0x0400 + + +unsigned short _pctype_dll[] = { + _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 */ + _PRINT | _SPACE, /* ` ', 0x20 */ + _GRAPH | _PRINT | _PUNCT, /* `!', 0x21 */ + _GRAPH | _PRINT | _PUNCT, /* 0x22 */ + _GRAPH | _PRINT | _PUNCT, /* `#', 0x23 */ + _GRAPH | _PRINT | _PUNCT, /* `$', 0x24 */ + _GRAPH | _PRINT | _PUNCT, /* `%', 0x25 */ + _GRAPH | _PRINT | _PUNCT, /* `&', 0x26 */ + _GRAPH | _PRINT | _PUNCT, /* 0x27 */ + _GRAPH | _PRINT | _PUNCT, /* `(', 0x28 */ + _GRAPH | _PRINT | _PUNCT, /* `)', 0x29 */ + _GRAPH | _PRINT | _PUNCT, /* `*', 0x2a */ + _GRAPH | _PRINT | _PUNCT, /* `+', 0x2b */ + _GRAPH | _PRINT | _PUNCT, /* `,', 0x2c */ + _GRAPH | _PRINT | _PUNCT, /* `-', 0x2d */ + _GRAPH | _PRINT | _PUNCT, /* `.', 0x2e */ + _GRAPH | _PRINT | _PUNCT, /* `/', 0x2f */ + _DIGIT | _GRAPH | _PRINT | _HEX, /* `0', 0x30 */ + _DIGIT | _GRAPH | _PRINT | _HEX, /* `1', 0x31 */ + _DIGIT | _GRAPH | _PRINT | _HEX, /* `2', 0x32 */ + _DIGIT | _GRAPH | _PRINT | _HEX, /* `3', 0x33 */ + _DIGIT | _GRAPH | _PRINT | _HEX, /* `4', 0x34 */ + _DIGIT | _GRAPH | _PRINT | _HEX, /* `5', 0x35 */ + _DIGIT | _GRAPH | _PRINT | _HEX, /* `6', 0x36 */ + _DIGIT | _GRAPH | _PRINT | _HEX, /* `7', 0x37 */ + _DIGIT | _GRAPH | _PRINT | _HEX, /* `8', 0x38 */ + _DIGIT | _GRAPH | _PRINT | _HEX, /* `9', 0x39 */ + _GRAPH | _PRINT | _PUNCT, /* `:', 0x3a */ + _GRAPH | _PRINT | _PUNCT, /* `;', 0x3b */ + _GRAPH | _PRINT | _PUNCT, /* `<', 0x3c */ + _GRAPH | _PRINT | _PUNCT, /* `=', 0x3d */ + _GRAPH | _PRINT | _PUNCT, /* `>', 0x3e */ + _GRAPH | _PRINT | _PUNCT, /* `?', 0x3f */ + _GRAPH | _PRINT | _PUNCT, /* `@', 0x40 */ + _ALPHA | _GRAPH | _PRINT | _UPPER | _HEX, /* `A', 0x41 */ + _ALPHA | _GRAPH | _PRINT | _UPPER | _HEX, /* `B', 0x42 */ + _ALPHA | _GRAPH | _PRINT | _UPPER | _HEX, /* `C', 0x43 */ + _ALPHA | _GRAPH | _PRINT | _UPPER | _HEX, /* `D', 0x44 */ + _ALPHA | _GRAPH | _PRINT | _UPPER | _HEX, /* `E', 0x45 */ + _ALPHA | _GRAPH | _PRINT | _UPPER | _HEX, /* `F', 0x46 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `G', 0x47 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `H', 0x48 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `I', 0x49 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `J', 0x4a */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `K', 0x4b */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `L', 0x4c */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `M', 0x4d */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `N', 0x4e */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `O', 0x4f */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `P', 0x50 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `Q', 0x51 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `R', 0x52 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `S', 0x53 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `T', 0x54 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `U', 0x55 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `V', 0x56 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `W', 0x57 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `X', 0x58 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `Y', 0x59 */ + _ALPHA | _GRAPH | _PRINT | _UPPER, /* `Z', 0x5a */ + _GRAPH | _PRINT | _PUNCT, /* `[', 0x5b */ + _GRAPH | _PRINT | _PUNCT, /* 0x5c */ + _GRAPH | _PRINT | _PUNCT, /* `]', 0x5d */ + _GRAPH | _PRINT | _PUNCT, /* `^', 0x5e */ + _GRAPH | _PRINT | _PUNCT, /* `_', 0x5f */ + _GRAPH | _PRINT | _PUNCT, /* 0x60 */ + _ALPHA | _GRAPH | _LOWER | _PRINT | _HEX, /* `a', 0x61 */ + _ALPHA | _GRAPH | _LOWER | _PRINT | _HEX, /* `b', 0x62 */ + _ALPHA | _GRAPH | _LOWER | _PRINT | _HEX, /* `c', 0x63 */ + _ALPHA | _GRAPH | _LOWER | _PRINT | _HEX, /* `d', 0x64 */ + _ALPHA | _GRAPH | _LOWER | _PRINT | _HEX, /* `e', 0x65 */ + _ALPHA | _GRAPH | _LOWER | _PRINT | _HEX, /* `f', 0x66 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `g', 0x67 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `h', 0x68 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `i', 0x69 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `j', 0x6a */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `k', 0x6b */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `l', 0x6c */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `m', 0x6d */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `n', 0x6e */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `o', 0x6f */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `p', 0x70 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `q', 0x71 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `r', 0x72 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `s', 0x73 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `t', 0x74 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `u', 0x75 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `v', 0x76 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `w', 0x77 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `x', 0x78 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `y', 0x79 */ + _ALPHA | _GRAPH | _LOWER | _PRINT, /* `z', 0x7a */ + _GRAPH | _PRINT | _PUNCT, /* `{', 0x7b */ + _GRAPH | _PRINT | _PUNCT, /* `|', 0x7c */ + _GRAPH | _PRINT | _PUNCT, /* `}', 0x7d */ + _GRAPH | _PRINT | _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 *_pwctype_dll = _pctype_dll; + + +int _isctype (int c, int ctypeFlags) +{ + return((_pctype_dll[(unsigned char)(c & 0xFF)]&ctypeFlags) == ctypeFlags); +} + +int iswctype(wint_t wc, wctype_t wctypeFlags) +{ + return((_pwctype_dll[(unsigned char)(wc & 0xFF)]&wctypeFlags) == wctypeFlags); +} + int isalpha(int c) { - return(((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'))); + return(_isctype(c, _ALPHA)); } int isalnum(int c) @@ -13,89 +301,116 @@ int isalnum(int c) return(isalpha(c)||isdigit(c)); } +int __isascii(int c) +{ + return(!((c)&(~0x7f))); +} + int iscntrl(int c) { - return((c >=0x00 && c <= 0x1f) || c == 0x7f); + 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(c>=0x21 && c<=0x7e); + return(_isctype(c, _GRAPH)); } int islower(int c) { - return((c>='a') && (c<='z')); + return(_isctype(c, _LOWER)); } int isprint(int c) { - return(c>=0x20 && c<=0x7e); + return(_isctype(c, _PRINT)); } int ispunct(int c) { - return((c>=0x21 && c<=0x2f)||(c>=0x3a && c<=0x40)||(c>=0x5b && c<=0x60)); + 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 iswalpha(wint_t c) +{ + return(iswctype(c, _ALPHA)); } int isxdigit(int c) { - return(((c>='0') && (c<='9')) || ((toupper(c)>='A') && (toupper(c)<='Z'))); + return(_isctype(c, _HEX)); +} + +int __toascii(int c) +{ + return((unsigned)(c) & 0x7f); } int _tolower(int c) { - if (c>='A' && c <= 'Z') + if (_isctype (c, _UPPER)) return (c - upalpha); return(c); } int _toupper(int c) { - if ((c>='a') && (c<='z')) - return (c+upalpha); + if (_isctype (c, _LOWER)) + return (c + upalpha); return(c); } int tolower(int c) { - if (c>='A' && c <= 'Z') + if (_isctype (c, _UPPER)) return (c - upalpha); return(c); } int toupper(int c) { - if ((c>='a') && (c<='z')) - return (c+upalpha); + if (_isctype (c, _LOWER)) + return (c + upalpha); return(c); } wchar_t towlower(wchar_t c) { - if (c>='A' && c <= 'Z') + if (iswctype (c, _UPPER)) return (c - upalpha); return(c); } wchar_t towupper(wchar_t c) { - if ((c>='a') && (c<='z')) - return (c+upalpha); + if (iswctype (c, _LOWER)) + return (c + upalpha); return(c); } + +/* EOF */ diff --git a/reactos/lib/ntdll/stubs/stubs.c b/reactos/lib/ntdll/stubs/stubs.c index e32340d26a8..26b63b87107 100644 --- a/reactos/lib/ntdll/stubs/stubs.c +++ b/reactos/lib/ntdll/stubs/stubs.c @@ -26,14 +26,12 @@ STUB(CsrNewThread) STUB(CsrProbeForRead) STUB(CsrProbeForWrite) STUB(CsrSetPriorityClass) -STUB(DbgBreakPoint) STUB(DbgPrompt) STUB(DbgSsHandleKmApiMsg) STUB(DbgSsInitialize) STUB(DbgUiConnectToDbg) STUB(DbgUiContinue) STUB(DbgUiWaitStateChange) -STUB(DbgUserBreakPoint) STUB(KiRaiseUserExceptionDispatcher) STUB(KiUserApcDispatcher) STUB(KiUserCallbackDispatcher) @@ -183,10 +181,6 @@ STUB(__eFXTRACT) STUB(__eFYL2X) STUB(__eFYL2XP1) STUB(__eGetStatusWord) -STUB(__isascii) -STUB(__iscsym) -STUB(__iscsymf) -STUB(__toascii) STUB(_alldiv) STUB(_allmul) STUB(_alloca_probe) @@ -214,20 +208,8 @@ STUB(_vsnprintf) STUB(_wtoi) STUB(_wtoi64) STUB(_wtol) -STUB(atan) -STUB(ceil) -STUB(cos) -STUB(fabs) -STUB(floor) -STUB(iswalpha) -STUB(iswctype) -STUB(log) STUB(mbstowcs) -STUB(pow) STUB(qsort) -STUB(sin) -STUB(sqrt) STUB(sscanf) STUB(swprintf) -STUB(tan)