Changeset 101 for trunk/src/user32/char.cpp

Timestamp:

Jun 11, 1999, 10:56:37 AM (26 years ago)

Author:

phaller

Message:

Add: few unicode character APIs added (i.e. CharNextW)

File:

• trunk/src/user32/char.cpp (modified) (8 diffs)

trunk/src/user32/char.cpp

@@ -1 @@
-/* $Id: char.cpp,v 1.3 1999-06-10 16:50:38 phaller Exp $ */
+/* $Id: char.cpp,v 1.4 1999-06-11 08:56:37 phaller Exp $ */
 
 /*
@@ -12 +12 @@
  *
  */
+
 #include "user32.h"
+
+#include <wctype.h> /* towupper, towlower support */
 
 
@@ -31 +34 @@
 //******************************************************************************
 //******************************************************************************
-DWORD WIN32API CharLowerBuffW( LPWSTR arg1, DWORD  arg2)
-{
-    dprintf(("USER32:  OS2CharLowerBuffW DOESN'T WORK\n"));
-    // NOTE: This will not work as is (needs UNICODE support)
-    return 0;
-//    return O32_CharLowerBuff(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-LPWSTR WIN32API CharLowerW( LPWSTR arg1)
-{
-    dprintf(("USER32:  OS2CharLowerW DOESN'T WORK\n"));
-    // NOTE: This will not work as is (needs UNICODE support)
-    return NULL;
-//    return O32_CharLower(arg1);
+DWORD WIN32API CharLowerBuffW(LPWSTR x,DWORD buflen)
+{
+  DWORD done=0;
+
+  dprintf(("USER32: CharLowerBuffW(%08xh,%08xh)\n",
+           x,
+           buflen));
+
+  if (!x)
+    return 0; /* YES */
+
+  while (*x && (buflen--))
+  {
+    *x=towlower(*x);
+    x++;
+    done++;
+  }
+
+  return done;
+}
+//******************************************************************************
+//******************************************************************************
+LPWSTR WIN32API CharLowerW( LPWSTR x)
+{
+  dprintf(("USER32: CharLowerW(%08xh)\n",
+           x));
+
+  if (HIWORD(x))
+  {
+      LPWSTR s = x;
+      while (*s)
+      {
+          *s=towlower(*s);
+          s++;
+      }
+      return x;
+  }
+  else
+    return (LPWSTR)((UINT)towlower(LOWORD(x)));
 }
 //******************************************************************************
@@ -51 +78 @@
 LPSTR WIN32API CharNextA( LPCSTR arg1)
 {
-    dprintf(("USER32:  OS2CharNextA\n"));
+    dprintf(("USER32: OS2CharNextA(%08xh)\n",
+             arg1));
+
     return O32_CharNext(arg1);
 }
 //******************************************************************************
 //******************************************************************************
-LPWSTR WIN32API CharNextW( LPCWSTR arg1)
-{
-    dprintf(("USER32:  OS2CharNextW DOESN'T WORK\n"));
-    // NOTE: This will not work as is (needs UNICODE support)
-    return 0;
-//    return O32_CharNext(arg1);
+LPWSTR WIN32API CharNextW(LPCWSTR x)
+{
+  dprintf(("USER32: OS2CharNextW(%08xh)\n",
+           x));
+
+  if (*x)
+    return (LPWSTR)(x+1);
+  else
+    return (LPWSTR)x;
 }
 //******************************************************************************
@@ -72 +104 @@
 //******************************************************************************
 //******************************************************************************
-LPWSTR WIN32API CharPrevW( LPCWSTR arg1, LPCWSTR  arg2)
-{
-    dprintf(("USER32:  OS2CharPrevW DOESN'T WORK\n"));
-    // NOTE: This will not work as is (needs UNICODE support)
-    return 0;
- //   return O32_CharPrev(arg1, arg2);
+LPWSTR WIN32API CharPrevW(LPCWSTR x,
+                          LPCWSTR start)
+{
+    dprintf(("USER32: OS2CharPrevW(%08xh,%08xh)\n",
+             x,
+             start));
+
+  /* FIXME: add DBCS / codepage stuff */
+  if (x>start)
+    return (LPWSTR)(x-1);
+  else
+    return (LPWSTR)x;
 }
 //******************************************************************************
@@ -118 +156 @@
 
     if((int)arg1 >> 16 != 0) {
-         dprintf(("USER32:  OS2CharUpperA %s\n", arg1));
+       dprintf(("USER32:  OS2CharUpperA %s\n", arg1));
     }
     else {
-        dprintf(("USER32:  OS2CharUpperA %X\n", arg1));
+   dprintf(("USER32:  OS2CharUpperA %X\n", arg1));
     }
 
@@ -127 +165 @@
 
     if((int)rc >> 16 != 0) {
-         dprintf(("USER32:  OS2CharUpperA %s\n", rc));
+       dprintf(("USER32:  OS2CharUpperA %s\n", rc));
     }
     else {
-         dprintf(("USER32:  OS2CharUpperA %X\n", rc));
+    dprintf(("USER32:  OS2CharUpperA %X\n", rc));
     }
 
@@ -144 +182 @@
 //******************************************************************************
 //******************************************************************************
-DWORD WIN32API CharUpperBuffW( LPWSTR arg1, DWORD  arg2)
-{
-    dprintf(("USER32:  OS2CharUpperBuffW DOESN'T WORK\n"));
-    // NOTE: This will not work as is (needs UNICODE support)
-    return 0;
-//    return O32_CharUpperBuff(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-LPWSTR WIN32API CharUpperW( LPWSTR arg1)
-{
-    dprintf(("USER32:  OS2CharUpperW  DOESN'T WORK\n"));
-    // NOTE: This will not work as is (needs UNICODE support)
-    return 0;
-//    return O32_CharUpper(arg1);
+DWORD WIN32API CharUpperBuffW(LPWSTR x, DWORD buflen)
+{
+  DWORD done=0;
+
+  dprintf(("USER32: OS2CharUpperBuffW(%08xh,%08xh)\n",
+           x,
+           buflen));
+
+  if (!x)
+    return 0; /* YES */
+
+  while (*x && (buflen--))
+  {
+    *x=towupper(*x);
+    x++;
+    done++;
+  }
+
+  return done;
+}
+//******************************************************************************
+//******************************************************************************
+LPWSTR WIN32API CharUpperW( LPWSTR x)
+{
+  dprintf(("USER32: OS2CharUpperW(%08xh)\n",
+           x));
+
+  if (HIWORD(x))
+  {
+    LPWSTR s = x;
+
+    while (*s)
+    {
+      *s=towupper(*s);
+      s++;
+    }
+    return x;
+  }
+  else
+    return (LPWSTR)((UINT)towupper(LOWORD(x)));
 }
 //******************************************************************************