From 5e5e7a0d8ce9d1ffa3cad0e21c731e6df2ad1d71 Mon Sep 17 00:00:00 2001 From: Daniel Lehman Date: Tue, 30 Aug 2016 13:56:48 -0700 Subject: [PATCH 2/2] include: Add some wide declarations. Signed-off-by: Daniel Lehman --- include/msvcrt/stdlib.h | 1 + include/msvcrt/string.h | 5 +++++ include/msvcrt/wchar.h | 10 ++++++++++ include/tchar.h | 1 + 4 files changed, 17 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 174df43..6043cbc 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -238,6 +238,7 @@ size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); int __cdecl mbtowc(wchar_t*,const char*,size_t); double __cdecl wcstod(const wchar_t*,wchar_t**); +float __cdecl wcstof(const wchar_t*,wchar_t**); __msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); size_t __cdecl wcstombs(char*,const wchar_t*,size_t); errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t); diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index d1dca89..7ccbe16 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -124,6 +124,11 @@ 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*); size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl wmemchr(const wchar_t*,wchar_t,size_t); +int __cdecl wmemcmp(const wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl wmemcpy(wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl wmemmove(wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl wmemset(wchar_t*,wchar_t,size_t); #endif /* _WSTRING_DEFINED */ #ifdef __cplusplus diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 7f5428f..2b28179 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -348,6 +348,7 @@ int __cdecl fputws(const wchar_t*,FILE*); int WINAPIV fwprintf(FILE*,const wchar_t*,...); int WINAPIV fwprintf_s(FILE*,const wchar_t*,...); int __cdecl fputws(const wchar_t*,FILE*); +int __cdecl fwide(FILE*,int); int WINAPIV fwscanf(FILE*,const wchar_t*,...); int WINAPIV fwscanf_s(FILE*,const wchar_t*,...); wint_t __cdecl getwc(FILE*); @@ -363,10 +364,13 @@ int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); wint_t __cdecl ungetwc(wint_t,FILE*); int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); +int __cdecl vfwscanf(FILE*,const wchar_t*,__ms_va_list); int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); +int __cdecl vswscanf(const wchar_t*,const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); +int __cdecl vwscanf(const wchar_t*,__ms_va_list); int WINAPIV wprintf(const wchar_t*,...); int WINAPIV wprintf_s(const wchar_t*,...); int WINAPIV wscanf(const wchar_t*,...); @@ -399,6 +403,7 @@ size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); int __cdecl mbtowc(wchar_t*,const char*,size_t); double __cdecl wcstod(const wchar_t*,wchar_t**); +float __cdecl wcstof(const wchar_t*,wchar_t**); __msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); size_t __cdecl wcstombs(char*,const wchar_t*,size_t); errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t); @@ -443,6 +448,11 @@ 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*); size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl wmemchr(const wchar_t*,wchar_t,size_t); +int __cdecl wmemcmp(const wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl wmemcpy(wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl wmemmove(wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl wmemset(wchar_t*,wchar_t,size_t); #endif /* _WSTRING_DEFINED */ #ifndef _WTIME_DEFINED diff --git a/include/tchar.h b/include/tchar.h index 9dc5757..edd9bc9 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -41,6 +41,7 @@ extern "C" { #define _strninc(str,n) (((char*)(str))+(n)) #define _strspnp(s1,s2) (*((s1)+=strspn((s1),(s2))) ? (s1) : NULL) +#define _wcsinc(current) (((wchar_t*)(current))+1) /***************************************************************************** * tchar mappings -- 1.9.5