Changeset 4667 for trunk/src/crtdll/crt_wc.cpp

Timestamp:

Nov 22, 2000, 12:49:04 AM (25 years ago)

Author:

phaller

Message:

Major move towards WINE CRTDLL, mixture between both code branches

File:

• trunk/src/crtdll/crt_wc.cpp (modified) (14 diffs)

trunk/src/crtdll/crt_wc.cpp

@@ -1 @@
-/* $Id: crt_wc.cpp,v 1.2 2000-02-21 23:11:30 sandervl Exp $ */
+/* $Id: crt_wc.cpp,v 1.3 2000-11-21 23:48:49 phaller Exp $ */
 
 /*
@@ -253 +253 @@
 {
   dprintf2(("CRTDLL: iswalnum(%08xh)\n", i));
+  //return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER);
   return (iswalnum(i));
 }
@@ -264 +265 @@
   dprintf2(("CRTDLL: iswalpha(%08xh)\n", i));
   return (iswalpha(i));
-}
-
-
-/*********************************************************************
- *                  iswascii    (CRTDLL.404)
- */
-int CDECL CRTDLL_iswascii(wint_t c)
-{
-  dprintf2(("CRTDLL: iswascii\n", c));
-  return  (!((c)&(~0x7f)));
+  //return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER);
 }
 
@@ -283 +275 @@
 {
   dprintf2(("CRTDLL: iswcntrl(%08xh)\n", i));
+  //return get_char_typeW(wc) & C1_CNTRL;
   return (iswcntrl(i));
 }
@@ -303 +296 @@
 {
   dprintf2(("CRTDLL: iswdigit(%08xh)\n", i));
+  //return get_char_typeW(wc) & C1_DIGIT;
   return (iswdigit(i));
 }
@@ -313 +307 @@
 {
   dprintf2(("CRTDLL: iswgraph(%08xh)\n", i));
+  //return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER);
   return (iswgraph(i));
 }
@@ -323 +318 @@
 {
   dprintf2(("CRTDLL: iswlower(%08xh)\n", i));
+  //return get_char_typeW(wc) & C1_LOWER;
   return (iswlower(i));
 }
@@ -333 +329 @@
 {
   dprintf2(("CRTDLL: iswprint(%08xh)\n", i));
+  //return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER);
   return (iswprint(i));
 }
@@ -343 +340 @@
 {
   dprintf2(("CRTDLL: iswpunct(%08xh)\n", i));
+  //return get_char_typeW(wc) & C1_PUNCT;
   return (iswpunct(i));
 }
@@ -353 +351 @@
 {
   dprintf2(("CRTDLL: iswspace(%08xh)\n", i));
+  //return get_char_typeW(wc) & C1_SPACE;
   return (iswspace(i));
 }
@@ -363 +362 @@
 {
   dprintf2(("CRTDLL: iswupper(%08xh)\n", i));
+  //return get_char_typeW(wc) & C1_UPPER;
   return (iswupper(i));
 }
@@ -373 +373 @@
 {
   dprintf2(("CRTDLL: iswxdigit(%08xh)\n", i));
+  //return get_char_typeW(wc) & C1_XDIGIT;
   return (iswxdigit(i));
 }
@@ -448 +449 @@
 
 /*********************************************************************
- *                  vswprintf       (CRTDLL.498)
- */
-int CDECL CRTDLL_vswprintf( wchar_t *s , size_t t, const wchar_t *format, va_list arg )
-{
-  dprintf2(("CRTDLL: vswprintf\n"));
-  return (vswprintf(s, t, format, arg));
-}
-
-
-/*********************************************************************
  *                  wcscat            (CRTDLL.500)
  */
@@ -731 +722 @@
 {
   dprintf2(("CRTDLL: wctomb\n"));
+  //return WideCharToMultiByte( CP_ACP, 0, &ch, 1, dst, 6, NULL, NULL );
   return (wctomb((char*)dst,ch));
 }