[7/7] msvcrt: The sizeOfBuffer argument of _vsnwprintf_s is measured in wide characters, not bytes.

[Alexander Scott-Johns]

-------------- next part --------------
From 25f4985b00936addacf921373e7a326b637dba28 Mon Sep 17 00:00:00 2001
From: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date: Sun, 6 Jun 2010 16:47:09 +0100
Subject: msvcrt: The sizeOfBuffer argument of _vsnwprintf_s is measured in wide characters, not bytes.

---
 dlls/msvcrt/tests/printf.c |    4 ----
 dlls/msvcrt/wcs.c          |   16 +++++++---------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c
index d27a04e..b48db51 100644
--- a/dlls/msvcrt/tests/printf.c
+++ b/dlls/msvcrt/tests/printf.c
@@ -883,7 +883,6 @@ static void test_vsnwprintf_s(void)
     ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got);
     ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
 
-  todo_wine {
     got = _vsnwprintf_s_wrapper(buffer, 12, _TRUNCATE, format, 123);
     ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got);
     ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
@@ -891,19 +890,16 @@ static void test_vsnwprintf_s(void)
     got = _vsnwprintf_s_wrapper(buffer, 7, _TRUNCATE, format, 123);
     ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got);
     ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
-  }
 
     /* Not enough room. */
     exp = -1;
 
     got = _vsnwprintf_s_wrapper(buffer, 6, _TRUNCATE, format, 123);
     ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got);
-  todo_wine
     ok( !wcscmp(out6, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
 
     got = _vsnwprintf_s_wrapper(buffer, 2, _TRUNCATE, format, 123);
     ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got);
-  todo_wine
     ok( !wcscmp(out2, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer));
 
     got = _vsnwprintf_s_wrapper(buffer, 1, _TRUNCATE, format, 123);
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 90bc3b8..78e42b2 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1147,17 +1147,17 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer
 {
     int len, ret;
 
-    len = sizeOfBuffer/sizeof(MSVCRT_wchar_t);
+    len = sizeOfBuffer;
     if(count!=-1 && len>count+1)
         len = count+1;
 
     ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist);
 
     if(ret<0 || ret==len) {
-        if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) {
+        if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) {
             MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 );
             *MSVCRT__errno() = MSVCRT_ERANGE;
-            memset(str, 0, sizeOfBuffer);
+            memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t));
         } else
             str[len-1] = '\0';
 
@@ -1242,8 +1242,7 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements,
     int r;
 
     __ms_va_start(ap, format);
-    r = MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t),
-            INT_MAX, format, ap);
+    r = MSVCRT_vsnwprintf_s(str, numberOfElements, INT_MAX, format, ap);
     __ms_va_end(ap);
 
     return r;
@@ -1271,8 +1270,7 @@ int CDECL _vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args )
 int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements,
         const MSVCRT_wchar_t* format, __ms_va_list args)
 {
-    return MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t),
-            INT_MAX, format, args);
+    return MSVCRT_vsnwprintf_s(str, numberOfElements, INT_MAX, format, args );
 }
 
 /*********************************************************************
@@ -1281,8 +1279,8 @@ int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements
 int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements,
         const MSVCRT_wchar_t* format, MSVCRT__locale_t locale, __ms_va_list args)
 {
-    return MSVCRT_vsnwprintf_s_l(str, numberOfElements*sizeof(MSVCRT_wchar_t),
-            INT_MAX, format, locale, args );
+    return MSVCRT_vsnwprintf_s_l(str, numberOfElements, INT_MAX,
+            format, locale, args );
 }
 
 /*********************************************************************
-- 
1.6.0.4