81 files changed, 66 insertions, 515 deletions

diff --git a/src/pal/tests/palsuite/c_runtime/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/CMakeLists.txt
index cf062530eb..8225ed2dd4 100644
--- a/src/pal/tests/palsuite/c_runtime/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/CMakeLists.txt
@@ -165,7 +165,7 @@ add_subdirectory(_snwprintf_s)
 add_subdirectory(_stricmp)
 add_subdirectory(_strlwr)
 add_subdirectory(_strnicmp)
-add_subdirectory(_vsnprintf)
+add_subdirectory(_vsnprintf_s)
 add_subdirectory(_vsnwprintf_s)
 add_subdirectory(_wcsicmp)
 add_subdirectory(_wcslwr)
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt
deleted file mode 100644
index 92540541f3..0000000000
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12.2)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(SOURCES
-  test5.cpp
-)
-
-add_executable(paltest_vsnprintf_test5
-  ${SOURCES}
-)
-
-add_dependencies(paltest_vsnprintf_test5 coreclrpal)
-
-target_link_libraries(paltest_vsnprintf_test5
-  pthread
-  m
-  coreclrpal
-)
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp
deleted file mode 100644
index 534e42e293..0000000000
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-/*=====================================================================
-**
-** Source:    test5.c
-**
-** Purpose:   Test #5 for the _vsnprintf function.
-**
-**
-**===================================================================*/
-
-#include <palsuite.h>
-#include "../_vsnprintf.h"
-
-/*
- * Notes: memcmp is used, as is strlen.
- */
-
-static void DoTest(char *formatstr, int param, char *checkstr)
-{
-    char buf[256] = { 0 };
-    int n = -1;
-    
-    Testvsnprintf(buf, 256, formatstr, &n);
-
-    if (n != param)
-    {
-        Fail("ERROR: Expected count parameter to resolve to %d, got %X\n",
-             param, n);
-    }
-    if (memcmp(buf, checkstr, strlen(buf) + 1) != 0)
-    {
-        Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf);
-    }    
-}
-
-static void DoShortTest(char *formatstr, int param, char *checkstr)
-{
-    char buf[256] = { 0 };
-    short int n = -1;
-    
-    Testvsnprintf(buf, 256, formatstr, &n);
-
-    if (n != param)
-    {
-        Fail("ERROR: Expected count parameter to resolve to %d, got %X\n",
-             param, n);
-    }
-    if (memcmp(buf, checkstr, strlen(buf) + 1) != 0)
-    {
-        Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf);
-    }    
-}
-
-int __cdecl main(int argc, char *argv[])
-{    
-    if (PAL_Initialize(argc, argv) != 0)
-    {
-        return(FAIL);
-    }
-
-    DoTest("foo %n bar", 4, "foo  bar");
-    DoTest("foo %#n bar", 4, "foo  bar");
-    DoTest("foo % n bar", 4, "foo  bar");
-    DoTest("foo %+n bar", 4, "foo  bar");
-    DoTest("foo %-n bar", 4, "foo  bar");
-    DoTest("foo %0n bar", 4, "foo  bar");
-    DoShortTest("foo %hn bar", 4, "foo  bar");
-    DoTest("foo %ln bar", 4, "foo  bar");
-    DoTest("foo %Ln bar", 4, "foo  bar");
-    DoTest("foo %I64n bar", 4, "foo  bar");
-    DoTest("foo %20.3n bar", 4, "foo  bar");
-
-    PAL_Terminate();
-    return PASS;
-}
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/testinfo.dat
deleted file mode 100644
index c3848824f1..0000000000
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/testinfo.dat
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-
-Version = 1.0
-Section = C Runtime
-Function = _vsnprintf
-Name = Positive Test for _vsnprintf
-TYPE = DEFAULT
-EXE1 = test5
-Description
-= Tests the PAL implementation of the _vsnprintf function.
-= Tests _vsnprintf with the count specifier.
-= This test is modeled after sprintf_s.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt
index cafb9536b0..8fe1cb60ac 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt
@@ -14,7 +14,6 @@ add_subdirectory(test19)
 add_subdirectory(test2)
 add_subdirectory(test3)
 add_subdirectory(test4)
-add_subdirectory(test5)
 add_subdirectory(test6)
 add_subdirectory(test7)
 add_subdirectory(test8)
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h
index 30e70648c3..7c81136f71 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h
@@ -4,7 +4,7 @@
 
 /*============================================================================
 **
-** Source:  _vsnprintf.h
+** Source:  _vsnprintf_s.h
 **
 ** Purpose: Contains common testing functions for _vsnprintf
 **
@@ -21,7 +21,7 @@ int Testvsnprintf(char* buf, size_t count, const char* format, ...)
     va_list arglist;
 
     va_start(arglist, format);
-    retVal = _vsnprintf(buf, count, format, arglist);
+    retVal = _vsnprintf_s(buf, count, _TRUNCATE, format, arglist);
     va_end(arglist);
 
     return (retVal);
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt
index 489b7bf566..489b7bf566 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp
index 88aeec27a5..db70f5612b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
@@ -45,11 +45,11 @@ int __cdecl main(int argc, char *argv[])
     {
         Fail("ERROR: expected negative return value, got %d", ret);
     }
-    if (memcmp(checkstr, buf, 8) != 0 || buf[8] != 'x')
+    if (memcmp(checkstr, buf, 7) != 0 || buf[7] != 0)
     {
         Fail("ERROR: expected %s (up to %d chars), got %s\n", checkstr, 8, buf);
     }
-    
+
     PAL_Terminate();
     return PASS;
 }
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat
index f96bf084f2..f96bf084f2 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt
index bc35dbd0c2..bc35dbd0c2 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp
index 3099957ab7..707a91c048 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/ 
  
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat
index a3d8eca54e..a3d8eca54e 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt
index bf3dd9a534..bf3dd9a534 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp
index 74b0435c6d..4c710e56b0 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/ 
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat
index 17e9f04946..17e9f04946 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt
index 9fceeaf7a5..9fceeaf7a5 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp
index 3718620971..528e6582a8 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/  
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat
index 82f58e4371..82f58e4371 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt
index 7e805f6ad4..7e805f6ad4 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp
index 1abada4033..645a118682 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/   
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat
index d308edf871..d308edf871 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt
index 6e4566b577..6e4566b577 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp
index 2e98f6ad4e..05965f0ed7 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/   
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat
index 8d11b1d6ff..8d11b1d6ff 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt
index d9039b39b7..d9039b39b7 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp
index 4d32e9c638..cd34f74e6c 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/   
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat
index 913912508e..913912508e 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt
index b298df318b..b298df318b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp
index 118ba1453c..de9b74f9b3 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat
index fc2f13071b..fc2f13071b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt
index b195f334d3..b195f334d3 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp
index 9b5063ddf0..3304eda7f9 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/ 
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat
index aeb924495c..aeb924495c 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt
index f0f6d1124e..f0f6d1124e 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp
index 5232befc7f..14ad8f583a 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat
index 57aaed5953..57aaed5953 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt
index 44b38902ef..44b38902ef 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp
index 211354bc3a..6f2aefa94c 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat
index cda8966865..cda8966865 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt
index 1d3910e70c..1d3910e70c 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp
index 4bac4d2c83..69c8c2723b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/ 
  
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 /*
  * Notes: memcmp is used, as is strlen.
  */
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat
index 6e8f03e639..6e8f03e639 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt
index 62d765ec5f..62d765ec5f 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp
index 2b30c9ad99..a244aa44b6 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/ 
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat
index 638cef69ef..638cef69ef 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt
index 5662bd57ad..5662bd57ad 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp
index 33fc49deba..0cf25cb88d 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat
index 03ff2931bc..03ff2931bc 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt
index d80d433c22..d80d433c22 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp
index 103d1181c2..cbcead88b5 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat
index e375f9238d..e375f9238d 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt
index a1dc0a7c2c..a1dc0a7c2c 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp
index c7e45d67fa..4843d27598 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
     
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 /*
  * Notes: memcmp is used, as is strlen.
  */
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat
index 09eb481b59..09eb481b59 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt
index 1ca4732492..1ca4732492 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp
index 2cefbeac25..8021a797c8 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat
index 1bdf411983..1bdf411983 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt
index 583971fe5a..583971fe5a 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp
index d2cd8165c0..d36846e401 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp
@@ -12,7 +12,7 @@
 **===================================================================*/
 
 #include <palsuite.h>
-#include "../_vsnprintf.h"
+#include "../_vsnprintf_s.h"
 
 /*
  * Notes: memcmp is used, as is strlen.
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat
index bdaae87ce8..bdaae87ce8 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/testinfo.dat
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/CMakeLists.txt
index cafb9536b0..8fe1cb60ac 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/CMakeLists.txt
@@ -14,7 +14,6 @@ add_subdirectory(test19)
 add_subdirectory(test2)
 add_subdirectory(test3)
 add_subdirectory(test4)
-add_subdirectory(test5)
 add_subdirectory(test6)
 add_subdirectory(test7)
 add_subdirectory(test8)
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h b/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h
index 6f4c914a82..210b12ec7a 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h
@@ -18,7 +18,7 @@ void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
-    swprintf(buf, formatstr, param);
+    swprintf_s(buf, _countof(buf), formatstr, param);
 
     if (memcmp(buf, checkstr, wcslen(checkstr) * 2 + 2) != 0)
     {
@@ -33,7 +33,7 @@ void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
-    swprintf(buf, formatstr, param);
+    swprintf_s(buf, _countof(buf), formatstr, param);
 
     if (memcmp(buf, checkstr, wcslen(checkstr) * 2 + 2) != 0)
     {
@@ -48,7 +48,7 @@ void DoPointerTest(const WCHAR *formatstr, void* param, const WCHAR *checkstr1)
 {
     WCHAR buf[256] = { 0 };
 
-    swprintf(buf, formatstr, param);
+    swprintf_s(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr1, wcslen(checkstr1)*2 + 2) != 0)
     {
         Fail("ERROR: failed to insert pointer to %#p into \"%s\"\n"
@@ -57,51 +57,11 @@ void DoPointerTest(const WCHAR *formatstr, void* param, const WCHAR *checkstr1)
     }    
 }
 
-void DoCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr)
-{
-    WCHAR buf[512] = { 0 };
-    int n = -1;
-
-    swprintf(buf, formatstr, &n);
-
-    if (n != param)
-    {
-        Fail("ERROR: Expected count parameter to resolve to %d, got %d\n",
-             param, n);
-    }
-
-    if (memcmp(buf, checkstr, wcslen(checkstr)*2 + 2) != 0)
-    {
-        Fail("ERROR: Expected \"%s\" got \"%s\".\n",
-            convertC(checkstr), convertC(buf));
-    }
-}
-
-void DoShortCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr)
-{
-    WCHAR buf[256] = { 0 };
-    short int n = -1;
-
-    swprintf(buf, formatstr, &n);
-
-    if (n != param)
-    {
-        Fail("ERROR: Expected count parameter to resolve to %d, got %d\n",
-             param, n);
-    }
-
-    if (memcmp(buf, checkstr, wcslen(checkstr)*2 + 2) != 0)
-    {
-        Fail("ERROR: Expected \"%s\" got \"%s\".\n",
-            convertC(checkstr), convertC(buf));
-    }
-}
-
 void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
-    swprintf(buf, formatstr, param);
+    swprintf_s(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr, wcslen(checkstr)*2 + 2) != 0)
     {
         Fail("ERROR: failed to insert char \'%c\' (%d) into \"%s\"\n"
@@ -114,7 +74,7 @@ void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
-    swprintf(buf, formatstr, param);
+    swprintf_s(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr, wcslen(checkstr)*2 + 2) != 0)
     {
         Fail("ERROR: failed to insert wide char \'%c\' (%d) into \"%s\"\n"
@@ -127,7 +87,7 @@ void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
-    swprintf(buf, formatstr, value);
+    swprintf_s(buf, _countof(buf), formatstr, value);
     if (memcmp(buf, checkstr, wcslen(checkstr)* 2 + 2) != 0)
     {
         Fail("ERROR: failed to insert %#x into \"%s\"\n"
@@ -141,7 +101,7 @@ void DoI64Test(const WCHAR *formatstr, INT64 param, char *paramdesc,
 {
     WCHAR buf[256] = { 0 };
 
-    swprintf(buf, formatstr, param);
+    swprintf_s(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr1, wcslen(checkstr1)*2 + 2) != 0)
     {
         Fail("ERROR: failed to insert %s into \"%s\"\n"
@@ -155,7 +115,7 @@ void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1,
 {
     WCHAR buf[256] = { 0 };
 
-    swprintf(buf, formatstr, value);
+    swprintf_s(buf, _countof(buf), formatstr, value);
     if (memcmp(buf, checkstr1, wcslen(checkstr1)*2 + 2) != 0 &&
         memcmp(buf, checkstr2, wcslen(checkstr2)*2 + 2) != 0)
     {
@@ -171,7 +131,7 @@ void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param,
 {
     WCHAR buf[256];
 
-    swprintf(buf, formatstr, precision, param);
+    swprintf_s(buf, _countof(buf), formatstr, precision, param);
     if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0 &&
         memcmp(buf, checkstr2, wcslen(checkstr2) + 2) != 0)
     {
@@ -187,7 +147,7 @@ void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double para
 {
     WCHAR buf[256];
 
-    swprintf(buf, formatstr, precision, param);
+    swprintf_s(buf, _countof(buf), formatstr, precision, param);
     if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0 &&
         memcmp(buf, checkstr2, wcslen(checkstr2) + 2) != 0)
     {
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp
index 626040d9f7..c47d7d5202 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp
@@ -31,7 +31,7 @@ int __cdecl main(int argc, char *argv[])
     }
 
     checkstr = convert("hello world");
-    swprintf(buf, convert("hello world"));
+    swprintf_s(buf, _countof(buf), convert("hello world"));
 
     if (memcmp(checkstr, buf, wcslen(checkstr)*2+2) != 0)
     {
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp b/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp
index c0346036cd..0967bc8f4b 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp
@@ -33,14 +33,6 @@ int __cdecl main(int argc, char *argv[])
                        convert("ba"), convert("ba"));
     DoArgumentPrecTest(convert("%.*S"), 2, (void*)"bar", "bar", convert("ba"),
                        convert("ba"));
-    DoArgumentPrecTest(convert("%.*n"), 3, (void*)&n, "pointer to int", convert(""),
-                       convert(""));
-    if (n != 0)
-    {
-        Fail("ERROR: Expected count parameter to resolve to %d, got %X\n",
-             0, n);
-    }
-
     DoArgumentPrecTest(convert("%.*c"), 0, (void*)'a', "a", convert("a"),
                        convert("a"));
     DoArgumentPrecTest(convert("%.*c"), 4, (void*)'a', "a", convert("a"),
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test5/CMakeLists.txt
deleted file mode 100644
index 967ccbb992..0000000000
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test5/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12.2)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(SOURCES
-  test5.cpp
-)
-
-add_executable(paltest_swprintf_test5
-  ${SOURCES}
-)
-
-add_dependencies(paltest_swprintf_test5 coreclrpal)
-
-target_link_libraries(paltest_swprintf_test5
-  pthread
-  m
-  coreclrpal
-)
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test5/test5.cpp b/src/pal/tests/palsuite/c_runtime/swprintf/test5/test5.cpp
deleted file mode 100644
index e85adc120e..0000000000
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test5/test5.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-/*============================================================================
-**
-** Source:  test5.c
-**
-** Purpose:Tests swprintf with the count specifier
-**
-**
-**==========================================================================*/
-
-
-
-#include <palsuite.h>
-#include "../swprintf.h"
-
-/*
- * Uses memcmp & wcslen
- */
-
-int __cdecl main(int argc, char *argv[])
-{
-    WCHAR *longStr;
-    WCHAR *longResult;
-
-    if (PAL_Initialize(argc, argv) != 0)
-    {
-        return FAIL;
-    }
-
-    longStr = 
-        convert("really-long-string-that-just-keeps-going-on-and-on-and-on.."
-        "..................useless-filler.................................."
-        "..................useless-filler.................................."
-        "..................useless-filler.................................."
-        "%n bar");
-    longResult = 
-        convert("really-long-string-that-just-keeps-going-on-and-on-and-on.."
-        "..................useless-filler.................................."
-        "..................useless-filler.................................."
-        "..................useless-filler.................................."
-        " bar");
-
-    DoCountTest(convert("foo %n bar"), 4, convert("foo  bar"));
-    DoCountTest(longStr, 257, longResult);
-    DoCountTest(convert("fo%n bar"), 2, convert("fo bar"));
-    DoCountTest(convert("%n"), 0, convert(""));
-    DoCountTest(convert("foo %#n bar"), 4, convert("foo  bar"));
-    DoCountTest(convert("foo % n bar"), 4, convert("foo  bar"));
-    DoCountTest(convert("foo %+n bar"), 4, convert("foo  bar"));
-    DoCountTest(convert("foo %-n bar"), 4, convert("foo  bar"));
-    DoCountTest(convert("foo %0n bar"), 4, convert("foo  bar"));
-    DoShortCountTest(convert("foo %hn bar"), 4, convert("foo  bar"));
-    DoCountTest(convert("foo %ln bar"), 4, convert("foo  bar"));
-    DoCountTest(convert("foo %Ln bar"), 4, convert("foo  bar"));
-    DoCountTest(convert("foo %I64n bar"), 4, convert("foo  bar"));
-    DoCountTest(convert("foo %20.3n bar"), 4, convert("foo  bar"));
-
-    PAL_Terminate();
-
-    free(longStr);
-    free(longResult);
-
-    return PASS;
-}
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test5/testinfo.dat b/src/pal/tests/palsuite/c_runtime/swprintf/test5/testinfo.dat
deleted file mode 100644
index ef1f1ffc5a..0000000000
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test5/testinfo.dat
+++ /dev/null
@@ -1,12 +0,0 @@
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-
-Version = 1.0
-Section = C Runtime
-Function = swprintf
-Name = Positive Test for swprintf
-TYPE = DEFAULT
-EXE1 = test5
-Description
-= Tests swprintf with the count specifier
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/CMakeLists.txt
index cafb9536b0..8fe1cb60ac 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/CMakeLists.txt
@@ -14,7 +14,6 @@ add_subdirectory(test19)
 add_subdirectory(test2)
 add_subdirectory(test3)
 add_subdirectory(test4)
-add_subdirectory(test5)
 add_subdirectory(test6)
 add_subdirectory(test7)
 add_subdirectory(test8)
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp
index 2007fefc5b..18c8c0ea1a 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp
@@ -29,7 +29,7 @@ int __cdecl main(int argc, char *argv[])
         return(FAIL);
     }
 
-    testvsp(buf, "hello world");
+    testvsp(buf, _countof(buf), "hello world");
 
     if (memcmp(checkstr, buf, strlen(checkstr)+1) != 0)
     {
@@ -37,8 +37,8 @@ int __cdecl main(int argc, char *argv[])
              checkstr, 256, buf);
     }
 
-    testvsp(buf, "xxxxxxxxxxxxxxxxx");
-    ret = testvsp(buf,  "hello world");
+    testvsp(buf, _countof(buf), "xxxxxxxxxxxxxxxxx");
+    ret = testvsp(buf, _countof(buf),  "hello world");
 
     if (ret != strlen(checkstr))
     {
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test5/CMakeLists.txt
deleted file mode 100644
index 6d14bf76bf..0000000000
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12.2)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(SOURCES
-  test5.cpp
-)
-
-add_executable(paltest_vsprintf_test5
-  ${SOURCES}
-)
-
-add_dependencies(paltest_vsprintf_test5 coreclrpal)
-
-target_link_libraries(paltest_vsprintf_test5
-  pthread
-  m
-  coreclrpal
-)
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/test5.cpp b/src/pal/tests/palsuite/c_runtime/vsprintf/test5/test5.cpp
deleted file mode 100644
index e630d8863b..0000000000
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/test5.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-/*=====================================================================
-**
-** Source:    test5.c
-**
-** Purpose:   Test #5 for the vsprintf function.
-**
-**
-**===================================================================*/
-
-#include <palsuite.h>
-#include "../vsprintf.h"
-
-/*
- * Notes: memcmp is used, as is strlen.
- */
-
-
-int __cdecl main(int argc, char *argv[])
-{    
-    if (PAL_Initialize(argc, argv) != 0)
-    {
-        return(FAIL);
-    }
-
-    DoTest("foo %n bar", 4, "foo  bar");
-    DoTest("foo %#n bar", 4, "foo  bar");
-    DoTest("foo % n bar", 4, "foo  bar");
-    DoTest("foo %+n bar", 4, "foo  bar");
-    DoTest("foo %-n bar", 4, "foo  bar");
-    DoTest("foo %0n bar", 4, "foo  bar");
-    DoShortTest("foo %hn bar", 4, "foo  bar");
-    DoTest("foo %ln bar", 4, "foo  bar");
-    DoTest("foo %Ln bar", 4, "foo  bar");
-    DoTest("foo %I64n bar", 4, "foo  bar");
-    DoTest("foo %20.3n bar", 4, "foo  bar");
-
-    PAL_Terminate();
-    return PASS;
-}
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/testinfo.dat b/src/pal/tests/palsuite/c_runtime/vsprintf/test5/testinfo.dat
deleted file mode 100644
index 81748f88b9..0000000000
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/testinfo.dat
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-
-Version = 1.0
-Section = C Runtime
-Function = vsprintf
-Name = Positive Test for vsprintf
-TYPE = DEFAULT
-EXE1 = test5
-Description
-= Tests the PAL implementation of the vsprintf function.
-= Tests vsprintf with the count specifier.
-= This test is modeled after _snprintf.
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h b/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h
index 7b04a777ca..22bf53e53b 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h
@@ -14,13 +14,13 @@
 #define __VSPRINTF_H__
 
 /* These functions leaks memory like crazy. C'est la vie. */
-int testvsp(char* buf, const char* format, ...)
+int testvsp(char* buf, size_t buffSize, const char* format, ...)
 {
     int retVal;
     va_list arglist;
 
     va_start(arglist, format);
-    retVal = vsprintf(buf, format, arglist);
+    retVal = _vsnprintf_s(buf, buffSize, _TRUNCATE, format, arglist);
     va_end(arglist);
 
     return (retVal);
@@ -30,7 +30,7 @@ void DoStrTest(const char *formatstr, char* param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
-    testvsp(buf, formatstr, param);
+    testvsp(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr, strlen(buf) + 1) != 0)
     {
         Fail("ERROR: failed to insert string \"%s\" into \"%s\"\n"
@@ -43,7 +43,7 @@ void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
-    testvsp(buf, formatstr, param);
+    testvsp(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr, strlen(buf) + 1) != 0)
     {
         Fail("ERROR: failed to insert wide string \"%s\" into \"%s\"\n"
@@ -57,7 +57,7 @@ void DoCharTest(const char *formatstr, char param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
-    testvsp(buf, formatstr, param);
+    testvsp(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr, strlen(buf) + 1) != 0)
     {
         Fail("ERROR: failed to insert char \'%c\' (%d) into \"%s\"\n"
@@ -70,7 +70,7 @@ void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
-    testvsp(buf, formatstr, param);
+    testvsp(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr, strlen(buf) + 1) != 0)
     {
         Fail("ERROR: failed to insert wide char \'%c\' (%d) into \"%s\"\n"
@@ -83,7 +83,7 @@ void DoNumTest(const char *formatstr, int value, const char *checkstr)
 {
     char buf[256] = { 0 };
 
-    testvsp(buf, formatstr, value);
+    testvsp(buf, _countof(buf), formatstr, value);
     if (memcmp(buf, checkstr, strlen(buf) + 1) != 0)
     {
         Fail("ERROR: failed to insert %#x into \"%s\"\n"
@@ -96,7 +96,7 @@ void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *c
 {
     char buf[256] = { 0 };
 
-    testvsp(buf, formatstr, value);
+    testvsp(buf, _countof(buf), formatstr, value);
     if (memcmp(buf, checkstr, strlen(buf) + 1) != 0)
     {
         Fail("ERROR: failed to insert %s into \"%s\"\n"
@@ -109,7 +109,7 @@ void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, ch
 {
     char buf[256] = { 0 };
 
-    testvsp(buf, formatstr, value);
+    testvsp(buf, _countof(buf), formatstr, value);
     if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 &&
         memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0)
     {
@@ -124,7 +124,7 @@ void DoArgumentPrecTest(const char *formatstr, int precision, void *param,
 {
     char buf[256];
 
-    testvsp(buf, formatstr, precision, param);
+    testvsp(buf, _countof(buf), formatstr, precision, param);
     if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 &&
         memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0)
     {
@@ -140,7 +140,7 @@ void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param
 {
     char buf[256];
 
-    testvsp(buf, formatstr, precision, param);
+    testvsp(buf, _countof(buf), formatstr, precision, param);
     if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 &&
         memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0)
     {
@@ -155,7 +155,7 @@ void DoPointerTest(const char *formatstr, void* param, char* paramstr,
 {
     char buf[256] = { 0 };
 
-    testvsp(buf, formatstr, param);
+    testvsp(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr1, strlen(checkstr1) + 1))
     {
         Fail("ERROR: failed to insert %s into \"%s\"\n"
@@ -169,7 +169,7 @@ void DoI64DoubleTest(const char *formatstr, INT64 value, char *valuestr,
 {
     char buf[256] = { 0 };
 
-    testvsp(buf, formatstr, value);
+    testvsp(buf, _countof(buf), formatstr, value);
     if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0)
     {
         Fail("ERROR: failed to insert %s into \"%s\"\n"
@@ -183,7 +183,7 @@ void DoTest(const char *formatstr, int param, const char *checkstr)
     char buf[256] = { 0 };
     int n = -1;
 
-    testvsp(buf, formatstr, &n);
+    testvsp(buf, _countof(buf), formatstr, &n);
 
     if (n != param)
     {
@@ -201,7 +201,7 @@ void DoShortTest(const char *formatstr, int param, const char *checkstr)
     char buf[256] = { 0 };
     short int n = -1;
 
-    testvsp(buf, formatstr, &n);
+    testvsp(buf, _countof(buf), formatstr, &n);
 
     if (n != param)
     {
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/CMakeLists.txt
index cafb9536b0..8fe1cb60ac 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/CMakeLists.txt
@@ -14,7 +14,6 @@ add_subdirectory(test19)
 add_subdirectory(test2)
 add_subdirectory(test3)
 add_subdirectory(test4)
-add_subdirectory(test5)
 add_subdirectory(test6)
 add_subdirectory(test7)
 add_subdirectory(test8)
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp
index d386ce104f..968f8a5c69 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp
@@ -27,7 +27,7 @@ int __cdecl main(int argc, char *argv[])
         return(FAIL);
 
 	checkstr = convert("hello world");
-    testvswp(buf, checkstr);
+    testvswp(buf, _countof(buf), checkstr);
 
     if (memcmp(checkstr, buf, wcslen(checkstr)*2+2) != 0)
     {
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp b/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp
index 1d1c5656b2..12f2b7ba99 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp
@@ -24,7 +24,7 @@ void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param,
 {
     WCHAR buf[256];
     
-    testvswp(buf, formatstr, precision, param);
+    testvswp(buf, _countof(buf), formatstr, precision, param);
     if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0 &&
         memcmp(buf, checkstr2, wcslen(checkstr2) + 2) != 0)
     {
@@ -43,7 +43,7 @@ void DoArgumentPrecDoubleTest(WCHAR *formatstr, int precision, double param,
 {
     WCHAR buf[256];
 
-    testvswp(buf, formatstr, precision, param);
+    testvswp(buf, _countof(buf), formatstr, precision, param);
     if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0 &&
         memcmp(buf, checkstr2, wcslen(checkstr2) + 2) != 0)
     {
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp
index 5c9047b5a7..583cf0c849 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp
@@ -21,7 +21,7 @@ static void DoPointerTest(WCHAR *formatstr, void* param, WCHAR* paramstr,
 {
     WCHAR buf[256] = { 0 };
 
-    testvswp(buf, formatstr, param);
+    testvswp(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0)
 
     {
@@ -39,7 +39,7 @@ static void DoI64DoubleTest(WCHAR *formatstr, INT64 value, WCHAR *valuestr,
 {
     WCHAR buf[256] = { 0 };
  
-    testvswp(buf, formatstr, value);
+    testvswp(buf, _countof(buf), formatstr, value);
     if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0)
     {
         Fail("ERROR: failed to insert %s into \"%s\"\n"
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test5/CMakeLists.txt
deleted file mode 100644
index 888ce27d22..0000000000
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12.2)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(SOURCES
-  test5.cpp
-)
-
-add_executable(paltest_vswprintf_test5
-  ${SOURCES}
-)
-
-add_dependencies(paltest_vswprintf_test5 coreclrpal)
-
-target_link_libraries(paltest_vswprintf_test5
-  pthread
-  m
-  coreclrpal
-)
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/test5.cpp b/src/pal/tests/palsuite/c_runtime/vswprintf/test5/test5.cpp
deleted file mode 100644
index 42146c8be7..0000000000
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/test5.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-/*=====================================================================
-**
-** Source:    test5.c
-**
-** Purpose:   Test #5 for the vswprintf function.
-**
-**
-**===================================================================*/
-
-#include <palsuite.h>
-#include "../vswprintf.h"
-
-/* memcmp is used to verify the results, so this test is dependent on it. */
-/* ditto with wcslen */
-
-static void DoTest(WCHAR *formatstr, int param, WCHAR *checkstr)
-{
-    WCHAR buf[256] = { 0 };
-    int n = -1;
-
-    testvswp(buf, formatstr, &n);
-
-    if (n != param)
-    {
-        Fail("ERROR: Expected count parameter to resolve to %d, got %d\n",
-              param, n);
-    }
-
-    if (memcmp(buf, checkstr, wcslen(buf)*2 + 2) != 0)
-    {
-        Fail("ERROR: Expected \"%s\" got \"%s\".\n", 
-            convertC(checkstr), convertC(buf));
-    }    
-}
-
-static void DoShortTest(WCHAR *formatstr, int param, WCHAR *checkstr)
-{
-    WCHAR buf[256] = { 0 };
-    short int n = -1;
-
-    testvswp(buf, formatstr, &n);
-
-    if (n != param)
-    {
-        Fail("ERROR: Expected count parameter to resolve to %d, got %d\n",
-              param, n);
-    }
-
-    if (memcmp(buf, checkstr, wcslen(buf)*2 + 2) != 0)
-    {
-        Fail("ERROR: Expected \"%s\" got \"%s\".\n", 
-            convertC(checkstr), convertC(buf));
-    }    
-}
-
-int __cdecl main(int argc, char *argv[])
-{
-    if (PAL_Initialize(argc, argv) != 0)
-        return(FAIL);
-
-    DoTest(convert("foo %n bar"), 4, convert("foo  bar"));
-    DoTest(convert("foo %#n bar"), 4, convert("foo  bar"));
-    DoTest(convert("foo % n bar"), 4, convert("foo  bar"));
-    DoTest(convert("foo %+n bar"), 4, convert("foo  bar"));
-    DoTest(convert("foo %-n bar"), 4, convert("foo  bar"));
-    DoTest(convert("foo %0n bar"), 4, convert("foo  bar"));
-    DoShortTest(convert("foo %hn bar"), 4, convert("foo  bar"));
-    DoTest(convert("foo %ln bar"), 4, convert("foo  bar"));
-    DoTest(convert("foo %Ln bar"), 4, convert("foo  bar"));
-    DoTest(convert("foo %I64n bar"), 4, convert("foo  bar"));
-    DoTest(convert("foo %20.3n bar"), 4, convert("foo  bar"));
-
-    PAL_Terminate();
-    return PASS;
-}
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/testinfo.dat b/src/pal/tests/palsuite/c_runtime/vswprintf/test5/testinfo.dat
deleted file mode 100644
index 17ca0fd33b..0000000000
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/testinfo.dat
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the .NET Foundation under one or more agreements.
-# The .NET Foundation licenses this file to you under the MIT license.
-# See the LICENSE file in the project root for more information.
-
-Version = 1.0
-Section = C Runtime
-Function = vswprintf
-Name = Positive Test for vswprintf
-TYPE = DEFAULT
-EXE1 = test5
-Description
-= Tests the PAL implementation of the vswprintf function.
-= Tests vswprintf with the count specifier.
-= This test is modeled after _snwprintf.
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h b/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h
index 37a379212e..36895d207f 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h
@@ -15,13 +15,13 @@
 #define __vswprintf_H__
 
 /* These functions leaks memory like crazy. C'est la vie. */
-int testvswp(wchar_t* buf, const wchar_t* format, ...)
+int testvswp(wchar_t* buf, size_t buffSize, const wchar_t* format, ...)
 {
 	int retVal = 0;
 	va_list arglist;
 
 	va_start(arglist, format);
-	retVal = vswprintf(buf, format, arglist);
+	retVal = _vsnwprintf_s(buf, buffSize, _TRUNCATE, format, arglist);
 	va_end(arglist);
 
 	return( retVal);
@@ -31,7 +31,7 @@ void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
-    testvswp(buf, formatstr, param);
+    testvswp(buf, _countof(buf), formatstr, param);
 
     if (memcmp(buf, checkstr, wcslen(buf) * 2 + 2) != 0)
     {
@@ -46,7 +46,7 @@ void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
-    testvswp(buf, formatstr, param);
+    testvswp(buf, _countof(buf), formatstr, param);
 
     if (memcmp(buf, checkstr, wcslen(buf) * 2 + 2) != 0)
     {
@@ -61,7 +61,7 @@ void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
-    testvswp(buf, formatstr, param);
+    testvswp(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr, wcslen(buf)*2 + 2) != 0)
     {
         Fail("ERROR: failed to insert char \'%c\' (%d) into \"%s\"\n"
@@ -75,7 +75,7 @@ void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
-    testvswp(buf, formatstr, param);
+    testvswp(buf, _countof(buf), formatstr, param);
     if (memcmp(buf, checkstr, wcslen(buf)*2 + 2) != 0)
     {
         Fail("ERROR: failed to insert wide char \'%c\' (%d) into \"%s\"\n"
@@ -89,7 +89,7 @@ void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
-    testvswp(buf, formatstr, value);
+    testvswp(buf, _countof(buf), formatstr, value);
     if (memcmp(buf, checkstr, wcslen(buf)* 2 + 2) != 0)
     {
         Fail("ERROR: failed to insert %#x into \"%s\"\n"
@@ -102,7 +102,7 @@ void DoI64NumTest(const WCHAR *formatstr, INT64 value, char *valuestr, const WCH
 {
     WCHAR buf[256] = { 0 };
 
-    testvswp(buf, formatstr, value);
+    testvswp(buf, _countof(buf), formatstr, value);
     if (memcmp(buf, checkstr, wcslen(buf)* 2 + 2) != 0)
     {
         Fail("ERROR: failed to insert %s into \"%s\"\n"
@@ -115,7 +115,7 @@ void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1,
 {
     WCHAR buf[256] = { 0 };
 
-    testvswp(buf, formatstr, value);
+    testvswp(buf, _countof(buf), formatstr, value);
     if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0 &&
         memcmp(buf, checkstr2, wcslen(checkstr2) + 2) != 0)
     {