Alexandre Julliard : shlwapi: Add support for 64-bit formats in wsprintf.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2bf9c26df630525024e6b3ed0c1ce73f52b80cce
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2bf9c26df630525024e6b3ed0c1ce73f52b80cce

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jul 25 13:38:04 2011 +0200

shlwapi: Add support for 64-bit formats in wsprintf.

---

 dlls/shlwapi/wsprintf.c |   72 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c
index 26bca5d..1093393 100644
--- a/dlls/shlwapi/wsprintf.c
+++ b/dlls/shlwapi/wsprintf.c
@@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(string);
 #define WPRINTF_SHORT       0x0010  /* Short arg ('h' prefix) */
 #define WPRINTF_UPPER_HEX   0x0020  /* Upper-case hex ('X' specifier) */
 #define WPRINTF_WIDE        0x0040  /* Wide arg ('w' prefix) */
+#define WPRINTF_INTPTR      0x0080  /* Pointer-size arg ('I' prefix) */
+#define WPRINTF_I64         0x0100  /* 64-bit arg ('I64' prefix) */
 
 typedef enum
 {
@@ -65,11 +67,11 @@ typedef struct
 } WPRINTF_FORMAT;
 
 typedef union {
-    WCHAR   wchar_view;
-    CHAR    char_view;
-    LPCSTR  lpcstr_view;
-    LPCWSTR lpcwstr_view;
-    INT     int_view;
+    WCHAR    wchar_view;
+    CHAR     char_view;
+    LPCSTR   lpcstr_view;
+    LPCWSTR  lpcwstr_view;
+    LONGLONG int_view;
 } WPRINTF_DATA;
 
 static const CHAR null_stringA[] = "(null)";
@@ -111,6 +113,12 @@ static INT WPRINTF_ParseFormatA( LPCSTR format, WPRINTF_FORMAT *res )
     if (*p == 'l') { res->flags |= WPRINTF_LONG; p++; }
     else if (*p == 'h') { res->flags |= WPRINTF_SHORT; p++; }
     else if (*p == 'w') { res->flags |= WPRINTF_WIDE; p++; }
+    else if (*p == 'I')
+    {
+        if (p[1] == '6' && p[2] == '4') { res->flags |= WPRINTF_I64; p += 3; }
+        else if (p[1] == '3' && p[2] == '2') p += 3;
+        else { res->flags |= WPRINTF_INTPTR; p++; }
+    }
     switch(*p)
     {
     case 'c':
@@ -132,6 +140,10 @@ static INT WPRINTF_ParseFormatA( LPCSTR format, WPRINTF_FORMAT *res )
     case 'u':
         res->type = WPR_UNSIGNED;
         break;
+    case 'p':
+        res->width = 2 * sizeof(void *);
+        res->flags |= WPRINTF_ZEROPAD | WPRINTF_INTPTR;
+        /* fall through */
     case 'X':
         res->flags |= WPRINTF_UPPER_HEX;
         /* fall through */
@@ -183,7 +195,13 @@ static INT WPRINTF_ParseFormatW( LPCWSTR format, WPRINTF_FORMAT *res )
     if (*p == 'l') { res->flags |= WPRINTF_LONG; p++; }
     else if (*p == 'h') { res->flags |= WPRINTF_SHORT; p++; }
     else if (*p == 'w') { res->flags |= WPRINTF_WIDE; p++; }
-    switch((CHAR)*p)
+    else if (*p == 'I')
+    {
+        if (p[1] == '6' && p[2] == '4') { res->flags |= WPRINTF_I64; p += 3; }
+        else if (p[1] == '3' && p[2] == '2') p += 3;
+        else { res->flags |= WPRINTF_INTPTR; p++; }
+    }
+    switch(*p)
     {
     case 'c':
         res->type = (res->flags & WPRINTF_SHORT) ? WPR_CHAR : WPR_WCHAR;
@@ -204,6 +222,10 @@ static INT WPRINTF_ParseFormatW( LPCWSTR format, WPRINTF_FORMAT *res )
     case 'u':
         res->type = WPR_UNSIGNED;
         break;
+    case 'p':
+        res->width = 2 * sizeof(void *);
+        res->flags |= WPRINTF_ZEROPAD | WPRINTF_INTPTR;
+        /* fall through */
     case 'X':
         res->flags |= WPRINTF_UPPER_HEX;
         /* fall through */
@@ -247,16 +269,32 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg,
         if (len > maxlen) len = maxlen;
         return (format->precision = len);
     case WPR_SIGNED:
-        len = sprintf( number, "%d", arg->int_view );
-        break;
     case WPR_UNSIGNED:
-        len = sprintf( number, "%u", (UINT)arg->int_view );
-        break;
     case WPR_HEXA:
-        len = sprintf( number,
-                       (format->flags & WPRINTF_UPPER_HEX) ? "%X" : "%x",
-                       (UINT)arg->int_view);
+    {
+        const char *digits = (format->flags & WPRINTF_UPPER_HEX) ? "0123456789ABCDEF" : "0123456789abcdef";
+        ULONGLONG num = arg->int_view;
+        int base = format->type == WPR_HEXA ? 16 : 10;
+        char buffer[20], *p = buffer, *dst = number;
+
+        if (format->type == WPR_SIGNED && arg->int_view < 0)
+        {
+            *dst++ = '-';
+            num = -arg->int_view;
+        }
+        if (format->flags & WPRINTF_INTPTR) num = (UINT_PTR)num;
+        else if (!(format->flags & WPRINTF_I64)) num = (UINT)num;
+
+        do
+        {
+            *p++ = digits[num % base];
+            num /= base;
+        } while (num);
+        while (p > buffer) *dst++ = *(--p);
+        *dst = 0;
+        len = dst - number;
         break;
+    }
     default:
         return 0;
     }
@@ -318,7 +356,9 @@ INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, __ms_va_list args
         case WPR_HEXA:
         case WPR_SIGNED:
         case WPR_UNSIGNED:
-            argData.int_view = va_arg( args, INT );
+            if (format.flags & WPRINTF_INTPTR) argData.int_view = va_arg(args, INT_PTR);
+            else if (format.flags & WPRINTF_I64) argData.int_view = va_arg(args, LONGLONG);
+            else argData.int_view = va_arg(args, INT);
             break;
         default:
             argData.wchar_view = 0;
@@ -423,7 +463,9 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar
         case WPR_HEXA:
         case WPR_SIGNED:
         case WPR_UNSIGNED:
-            argData.int_view = va_arg( args, INT );
+            if (format.flags & WPRINTF_INTPTR) argData.int_view = va_arg(args, INT_PTR);
+            else if (format.flags & WPRINTF_I64) argData.int_view = va_arg(args, LONGLONG);
+            else argData.int_view = va_arg(args, INT);
             break;
         default:
             argData.wchar_view = 0;