Changeset 10348 for trunk/src/user32/wsprintf.cpp

Timestamp:

Dec 1, 2003, 2:13:26 PM (22 years ago)

Author:

sandervl

Message:

KOM: wvsnprintfA/W: fixed ascii and unicode conversion

File:

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

trunk/src/user32/wsprintf.cpp

@@ -12 +12 @@
 
 #include <misc.h>
+
+#include <winnls.h>
 
 #define DBG_LOCALLOG    DBG_wsprintf
@@ -373 +375 @@
     WPRINTF_DATA argData;
 
+#ifdef __WIN32OS2__
+    TRACE("wvsnprintfA : %p %u %s\n", buffer, maxlen, debugstr_a(spec));
+#else
     TRACE("%p %u %s\n", buffer, maxlen, debugstr_a(spec));
+#endif
 
     while (*spec && (maxlen > 1))
@@ -413 +419 @@
         {
         case WPR_WCHAR:
+#ifdef __WIN32OS2__
+            i = WideCharToMultiByte( CP_ACP, 0, &argData.wchar_view, 1, p, maxlen, 0, NULL );
+            if( i )
+            {
+                p += i - 1;
+                len = i;
+            }
+#else
             *p = argData.wchar_view;
+#endif
             if (*p != '\0') p++;
             else if (format.width > 1) *p++ = ' ';
@@ -431 +446 @@
             {
                 LPCWSTR ptr = argData.lpcwstr_view;
+#ifdef __WIN32OS2__
+                i = WideCharToMultiByte( CP_ACP, 0, ptr, len, p, maxlen, 0, 0 );
+                if( i )
+                {
+                    p += i;
+                    len = i;
+                }
+#else
                 for (i = 0; i < len; i++) *p++ = (CHAR)*ptr++;
+#endif
             }
             break;
@@ -458 +482 @@
     }
     *p = 0;
+#ifdef __WIN32OS2__
+    TRACE("%s\n",buffer);
+#else
     TRACE("%s\n",debugstr_a(buffer));
+#endif
     return (maxlen > 1) ? (INT)(p - buffer) : -1;
 }
@@ -474 +502 @@
     WPRINTF_DATA argData;
 
-    TRACE("%p %u %s\n", buffer, maxlen, debugstr_w(spec));
+    TRACE("wvsnprintfW : %p %u %s\n", buffer, maxlen, debugstr_w(spec));
 
     while (*spec && (maxlen > 1))
@@ -520 +548 @@
             break;
         case WPR_CHAR:
+#ifdef __WIN32OS2__
+            MultiByteToWideChar( CP_ACP, 0, &argData.char_view, 1, p, maxlen );
+#else
             *p = argData.char_view;
+#endif
             if (*p != '\0') p++;
             else if (format.width > 1) *p++ = ' ';
@@ -528 +560 @@
             {
                 LPCSTR ptr = argData.lpcstr_view;
+#ifdef __WIN32OS2__
+                i = MultiByteToWideChar( CP_ACP, 0, ptr, len, p, maxlen );
+                if( i )
+                {
+                    p += i;
+                    len = i;
+                }
+#else
                 for (i = 0; i < len; i++) *p++ = (WCHAR)*ptr++;
+#endif
             }
             break;