Jacek Caban : stdio.h: Add ucrt _vsnprintf_s declaration.

Alexandre Julliard julliard at winehq.org
Thu Feb 20 18:26:13 CST 2020


Module: wine
Branch: master
Commit: a3f973c4345053e45c734dab1a60631d8f30907d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a3f973c4345053e45c734dab1a60631d8f30907d

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Feb 20 15:21:40 2020 +0100

stdio.h: Add ucrt _vsnprintf_s declaration.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 include/msvcrt/stdio.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
index 6db7ebe50b..9a7e4b69eb 100644
--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -89,7 +89,6 @@ char*  __cdecl _tempnam(const char*,const char*);
 int    __cdecl _unlink(const char*);
 int    WINAPIV _scprintf(const char*,...);
 int    __cdecl _vscprintf(const char*,__ms_va_list);
-int    __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list);
 int    __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list);
 
 size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*);
@@ -169,6 +168,7 @@ unsigned int __cdecl _set_output_format(void);
 #ifdef _UCRT
 
 _ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list);
+_ACRTIMP int __cdecl __stdio_common_vsnprintf_s(unsigned __int64,char*,size_t,size_t,const char*,_locale_t,__ms_va_list);
 
 static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args)
 {
@@ -184,8 +184,16 @@ static inline int __cdecl _vsnprintf(char *buffer, size_t size, const char *form
     return ret < 0 ? -1 : ret;
 }
 
+static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, const char *format, __ms_va_list args)
+{
+    int ret = __stdio_common_vsnprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args);
+    return ret < 0 ? -1 : ret;
+}
+
 #else /* _UCRT */
 
+_ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list);
+
 int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list);
 static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); }
 




More information about the wine-cvs mailing list