[ros-diffs] [tkreuzer] 46504: Merge from amd64-branch: 46483 (tkreuzer) [CRT] - add _wctype table, it's not identical to _ctype as assumed before - point _pwctype to _wctype instead of _ctype - implement __pctype_func and __pwctype_func 46502 (tkreuzer) [MSVCRT] - enable exports for __pctype_func, __pwctype_func, _wctype

Author: tkreuzer
Date: Sun Mar 28 00:01:05 2010
New Revision: 46504

URL: http://svn.reactos.org/svn/reactos?rev=46504&view=rev
Log:
Merge from amd64-branch:

46483 (tkreuzer)
[CRT]
- add _wctype table, it's not identical to _ctype as assumed before
- point _pwctype to _wctype instead of _ctype
- implement __pctype_func and __pwctype_func

46502 (tkreuzer)
[MSVCRT]
- enable exports for __pctype_func, __pwctype_func, _wctype

Modified:
    trunk/reactos/dll/win32/msvcrt/msvcrt.def
    trunk/reactos/lib/sdk/crt/string/ctype.c

Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de…
==============================================================================
--- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Sun Mar 28 00:01:05 2010
@@ -158,9 +158,9 @@
   __p__winminor @153
   __p__winver @154
   __p__wpgmptr @155
-;  __pctype_func @156
+  __pctype_func @156
   __pioinfo @157 DATA
-;  __pwctype_func @158
+  __pwctype_func @158
   __pxcptinfoptrs @159
   __set_app_type @160
   __setlc_active @161 DATA
@@ -583,7 +583,7 @@
   _wcsupr @576
   _wctime @577
 ;  _wctime64 @578
-;  _wctype @579
+  _wctype @579
   _wenviron @580 DATA
   _wexecl @581
   _wexecle @582

Modified: trunk/reactos/lib/sdk/crt/string/ctype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] Sun Mar 28 00:01:05 2010
@@ -289,8 +289,267 @@
 	0			/* 0xff */
 };
 
+const unsigned short _wctype[] = {
+	0,						/* <EOF>, 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 */
+	_BLANK | _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 */
+	0x0100 | _UPPER | _HEX,	/* `A', 0x41 */
+	0x0100 | _UPPER | _HEX,	/* `B', 0x42 */
+	0x0100 | _UPPER | _HEX,	/* `C', 0x43 */
+	0x0100 | _UPPER | _HEX,	/* `D', 0x44 */
+	0x0100 | _UPPER | _HEX,	/* `E', 0x45 */
+	0x0100 | _UPPER | _HEX,	/* `F', 0x46 */
+	0x0100 | _UPPER,		/* `G', 0x47 */
+	0x0100 | _UPPER,		/* `H', 0x48 */
+	0x0100 | _UPPER,		/* `I', 0x49 */
+	0x0100 | _UPPER,		/* `J', 0x4a */
+	0x0100 | _UPPER,		/* `K', 0x4b */
+	0x0100 | _UPPER,		/* `L', 0x4c */
+	0x0100 | _UPPER,		/* `M', 0x4d */
+	0x0100 | _UPPER,		/* `N', 0x4e */
+	0x0100 | _UPPER,		/* `O', 0x4f */
+	0x0100 | _UPPER,		/* `P', 0x50 */
+	0x0100 | _UPPER,		/* `Q', 0x51 */
+	0x0100 | _UPPER,		/* `R', 0x52 */
+	0x0100 | _UPPER,		/* `S', 0x53 */
+	0x0100 | _UPPER,		/* `T', 0x54 */
+	0x0100 | _UPPER,		/* `U', 0x55 */
+	0x0100 | _UPPER,		/* `V', 0x56 */
+	0x0100 | _UPPER,		/* `W', 0x57 */
+	0x0100 | _UPPER,		/* `X', 0x58 */
+	0x0100 | _UPPER,		/* `Y', 0x59 */
+	0x0100 | _UPPER,		/* `Z', 0x5a */
+	_PUNCT,					/* `[', 0x5b */
+	_PUNCT,					/* 0x5c */
+	_PUNCT,					/* `]', 0x5d */
+	_PUNCT,					/* `^', 0x5e */
+	_PUNCT,					/* `_', 0x5f */
+	_PUNCT,					/* 0x60 */
+	0x0100 | _LOWER | _HEX,	/* `a', 0x61 */
+	0x0100 | _LOWER | _HEX,	/* `b', 0x62 */
+	0x0100 | _LOWER | _HEX,	/* `c', 0x63 */
+	0x0100 | _LOWER | _HEX,	/* `d', 0x64 */
+	0x0100 | _LOWER | _HEX,	/* `e', 0x65 */
+	0x0100 | _LOWER | _HEX,	/* `f', 0x66 */
+	0x0100 | _LOWER,		/* `g', 0x67 */
+	0x0100 | _LOWER,		/* `h', 0x68 */
+	0x0100 | _LOWER,		/* `i', 0x69 */
+	0x0100 | _LOWER,		/* `j', 0x6a */
+	0x0100 | _LOWER,		/* `k', 0x6b */
+	0x0100 | _LOWER,		/* `l', 0x6c */
+	0x0100 | _LOWER,		/* `m', 0x6d */
+	0x0100 | _LOWER,		/* `n', 0x6e */
+	0x0100 | _LOWER,		/* `o', 0x6f */
+	0x0100 | _LOWER,		/* `p', 0x70 */
+	0x0100 | _LOWER,		/* `q', 0x71 */
+	0x0100 | _LOWER,		/* `r', 0x72 */
+	0x0100 | _LOWER,		/* `s', 0x73 */
+	0x0100 | _LOWER,		/* `t', 0x74 */
+	0x0100 | _LOWER,		/* `u', 0x75 */
+	0x0100 | _LOWER,		/* `v', 0x76 */
+	0x0100 | _LOWER,		/* `w', 0x77 */
+	0x0100 | _LOWER,		/* `x', 0x78 */
+	0x0100 | _LOWER,		/* `y', 0x79 */
+	0x0100 | _LOWER,		/* `z', 0x7a */
+	_PUNCT,					/* `{', 0x7b */
+	_PUNCT,					/* `|', 0x7c */
+	_PUNCT,					/* `}', 0x7d */
+	_PUNCT,				    /* `~', 0x7e */
+	_CONTROL,				/* 0x7f */
+	_CONTROL,				/* 0x80 */
+	_CONTROL,				/* 0x81 */
+	_CONTROL,				/* 0x82 */
+	_CONTROL,				/* 0x83 */
+	_CONTROL,				/* 0x84 */
+	_CONTROL,				/* 0x85 */
+	_CONTROL,				/* 0x86 */
+	_CONTROL,				/* 0x87 */
+	_CONTROL,				/* 0x88 */
+	_CONTROL,				/* 0x89 */
+	_CONTROL,				/* 0x8a */
+	_CONTROL,				/* 0x8b */
+	_CONTROL,				/* 0x8c */
+	_CONTROL,				/* 0x8d */
+	_CONTROL,				/* 0x8e */
+	_CONTROL,				/* 0x8f */
+	_CONTROL,				/* 0x90 */
+	_CONTROL,				/* 0x91 */
+	_CONTROL,				/* 0x92 */
+	_CONTROL,				/* 0x93 */
+	_CONTROL,				/* 0x94 */
+	_CONTROL,				/* 0x95 */
+	_CONTROL,				/* 0x96 */
+	_CONTROL,				/* 0x97 */
+	_CONTROL,				/* 0x98 */
+	_CONTROL,				/* 0x99 */
+	_CONTROL,				/* 0x9a */
+	_CONTROL,				/* 0x9b */
+	_CONTROL,				/* 0x9c */
+	_CONTROL,				/* 0x9d */
+	_CONTROL,				/* 0x9e */
+	_CONTROL,				/* 0x9f */
+	_BLANK | _SPACE,		/* 0xa0 */
+	_PUNCT,					/* 0xa1 */
+	_PUNCT,					/* 0xa2 */
+	_PUNCT,					/* 0xa3 */
+	_PUNCT,					/* 0xa4 */
+	_PUNCT,					/* 0xa5 */
+	_PUNCT,					/* 0xa6 */
+	_PUNCT,					/* 0xa7 */
+	_PUNCT,					/* 0xa8 */
+	_PUNCT,					/* 0xa9 */
+	_PUNCT,					/* 0xaa */
+	_PUNCT,					/* 0xab */
+	_PUNCT,					/* 0xac */
+	_PUNCT,					/* 0xad */
+	_PUNCT,					/* 0xae */
+	_PUNCT,					/* 0xaf */
+	_PUNCT,					/* 0xb0 */
+	_PUNCT,					/* 0xb1 */
+	_PUNCT | _DIGIT,		/* 0xb2 */
+	_PUNCT | _DIGIT,		/* 0xb3 */
+	_PUNCT,					/* 0xb4 */
+	_PUNCT,					/* 0xb5 */
+	_PUNCT,					/* 0xb6 */
+	_PUNCT,					/* 0xb7 */
+	_PUNCT,					/* 0xb8 */
+	_PUNCT | _DIGIT,		/* 0xb9 */
+	_PUNCT,					/* 0xba */
+	_PUNCT,					/* 0xbb */
+	_PUNCT,					/* 0xbc */
+	_PUNCT,					/* 0xbd */
+	_PUNCT,					/* 0xbe */
+	_PUNCT,					/* 0xbf */
+	0x0100 | _UPPER,		/* 0xc0 */
+	0x0100 | _UPPER,		/* 0xc1 */
+	0x0100 | _UPPER,		/* 0xc2 */
+	0x0100 | _UPPER,		/* 0xc3 */
+	0x0100 | _UPPER,		/* 0xc4 */
+	0x0100 | _UPPER,		/* 0xc5 */
+	0x0100 | _UPPER,		/* 0xc6 */
+	0x0100 | _UPPER,		/* 0xc7 */
+	0x0100 | _UPPER,		/* 0xc8 */
+	0x0100 | _UPPER,		/* 0xc9 */
+	0x0100 | _UPPER,		/* 0xca */
+	0x0100 | _UPPER,		/* 0xcb */
+	0x0100 | _UPPER,		/* 0xcc */
+	0x0100 | _UPPER,		/* 0xcd */
+	0x0100 | _UPPER,		/* 0xce */
+	0x0100 | _UPPER,		/* 0xcf */
+	0x0100 | _UPPER,		/* 0xd0 */
+	0x0100 | _UPPER,		/* 0xd1 */
+	0x0100 | _UPPER,		/* 0xd2 */
+	0x0100 | _UPPER,		/* 0xd3 */
+	0x0100 | _UPPER,		/* 0xd4 */
+	0x0100 | _UPPER,		/* 0xd5 */
+	0x0100 | _UPPER,		/* 0xd6 */
+	_PUNCT,					/* 0xd7 */
+	0x0100 | _UPPER,		/* 0xd8 */
+	0x0100 | _UPPER,		/* 0xd9 */
+	0x0100 | _UPPER,		/* 0xda */
+	0x0100 | _UPPER,		/* 0xdb */
+	0x0100 | _UPPER,		/* 0xdc */
+	0x0100 | _UPPER,		/* 0xdd */
+	0x0100 | _UPPER,		/* 0xde */
+	0x0100 | _LOWER,		/* 0xdf */
+	0x0100 | _LOWER,		/* 0xe0 */
+	0x0100 | _LOWER,		/* 0xe1 */
+	0x0100 | _LOWER,		/* 0xe2 */
+	0x0100 | _LOWER,		/* 0xe3 */
+	0x0100 | _LOWER,		/* 0xe4 */
+	0x0100 | _LOWER,		/* 0xe5 */
+	0x0100 | _LOWER,		/* 0xe6 */
+	0x0100 | _LOWER,		/* 0xe7 */
+	0x0100 | _LOWER,		/* 0xe8 */
+	0x0100 | _LOWER,		/* 0xe9 */
+	0x0100 | _LOWER,		/* 0xea */
+	0x0100 | _LOWER,		/* 0xeb */
+	0x0100 | _LOWER,		/* 0xec */
+	0x0100 | _LOWER,		/* 0xed */
+	0x0100 | _LOWER,		/* 0xee */
+	0x0100 | _LOWER,		/* 0xef */
+	0x0100 | _LOWER,		/* 0xf0 */
+	0x0100 | _LOWER,		/* 0xf1 */
+	0x0100 | _LOWER,		/* 0xf2 */
+	0x0100 | _LOWER,		/* 0xf3 */
+	0x0100 | _LOWER,		/* 0xf4 */
+	0x0100 | _LOWER,		/* 0xf5 */
+	0x0100 | _LOWER,		/* 0xf6 */
+	_PUNCT,					/* 0xf7 */
+	0x0100 | _LOWER,		/* 0xf8 */
+	0x0100 | _LOWER,		/* 0xf9 */
+	0x0100 | _LOWER,		/* 0xfa */
+	0x0100 | _LOWER,		/* 0xfb */
+	0x0100 | _LOWER,		/* 0xfc */
+	0x0100 | _LOWER,		/* 0xfd */
+	0x0100 | _LOWER,		/* 0xfe */
+	0x0100 | _LOWER			/* 0xff */
+};
 const unsigned short *_pctype = _ctype + 1;
-const unsigned short *_pwctype = _ctype + 1;
+const unsigned short *_pwctype = _wctype + 1;
 
 /*
  * @implemented
@@ -300,12 +559,22 @@
    return &_pctype;
 }
 
+const unsigned short* __cdecl __pctype_func(void)
+{
+   return _pctype;
+}
+
 /*
  * @implemented
  */
 const unsigned short **__p__pwctype(void)
 {
    return &_pwctype;
+}
+
+const unsigned short* __cdecl __pwctype_func(void)
+{
+   return _pwctype;
 }
 
 int _isctype (int c, int ctypeFlags)