[PATCH 1/4] kernel32/tests: Fix locale.c compilation with Visual Studio 14.0.

[Dmitry Timoshkov]

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/kernel32/tests/locale.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 1df3c0dcd6..31add74e4e 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -25,6 +25,8 @@
  *  the control panel i8n page), we will still get the expected results.
  */
 
+#define _CRT_NON_CONFORMING_WCSTOK
+
 #include <assert.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4197,7 +4199,7 @@ static void test_GetCPInfo(void)
                 for (i = 0; i <= sizeof(buf); i++)
                 {
                     memset( wbuf, 0xcc, sizeof(wbuf) );
-                    RtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i );
+                    pRtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i );
                     for (j = 0; j < 4; j++) if (expect[i][j] == 0xcccc) break;
                     ok( reslen == j * sizeof(WCHAR), "%u: wrong len %u\n", i, reslen );
                     for (j = 0; j < 4; j++)
-- 
2.20.1