include: Update wcstok declarations.

include/msvcrt/string.h

@@ -119,8 +119,22 @@ _ACRTIMP wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*);
 _ACRTIMP wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor);
 _ACRTIMP size_t   __cdecl wcsspn(const wchar_t*,const wchar_t*);
 _ACRTIMP wchar_t* __cdecl wcsstr(const wchar_t*,const wchar_t*);
-_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*);
+_ACRTIMP wchar_t* __cdecl wcstok_s(wchar_t*,const wchar_t*,wchar_t**);
 _ACRTIMP size_t   __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t);
+
+#ifdef _UCRT
+_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*,wchar_t**);
+static inline wchar_t* _wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); }
+#  ifdef __cplusplus
+extern "C++" inline wchar_t* wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); }
+#  elif defined(_CRT_NON_CONFORMING_WCSTOK)
+#    define wcstok _wcstok
+#  endif
+#else /* _UCRT */
+_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*);
+#  define _wcstok wcstok
+#endif /* _UCRT */
+
 #endif /* _WSTRING_DEFINED */
 
 #ifdef __cplusplus

include/msvcrt/wchar.h

@@ -140,8 +140,22 @@ wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*);
 wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor);
 size_t   __cdecl wcsspn(const wchar_t*,const wchar_t*);
 wchar_t* __cdecl wcsstr(const wchar_t*,const wchar_t*);
-wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*);
+wchar_t* __cdecl wcstok_s(wchar_t*,const wchar_t*,wchar_t**);
 size_t   __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t);
+
+#ifdef _UCRT
+wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*,wchar_t**);
+static inline wchar_t* _wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); }
+#  ifdef __cplusplus
+extern "C++" inline wchar_t* wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); }
+#  elif defined(_CRT_NON_CONFORMING_WCSTOK)
+#    define wcstok _wcstok
+#  endif
+#else /* _UCRT */
+wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*);
+#  define _wcstok wcstok
+#endif /* _UCRT */
+
 #endif /* _WSTRING_DEFINED */
 
 wchar_t __cdecl btowc(int);

include/tchar.h

@@ -148,7 +148,7 @@ extern "C" {
 #define _tcsspn       WINE_tchar_routine(strspn,          _mbsspn,     wcsspn)
 #define _tcsstr       WINE_tchar_routine(strstr,          _mbsstr,     wcsstr)
 #define _tcstod       WINE_tchar_routine(strtod,          strtod,      wcstod)
-#define _tcstok       WINE_tchar_routine(strtok,          _mbstok,     wcstok)
+#define _tcstok       WINE_tchar_routine(strtok,          _mbstok,     _wcstok)
 #define _tcstol       WINE_tchar_routine(strtol,          strtol,      wcstol)
 #define _tcstoul      WINE_tchar_routine(strtoul,         strtoul,     wcstoul)
 #define _tcsupr       WINE_tchar_routine(_strupr,         _mbsupr,     _wcsupr)