Module: wine Branch: master Commit: 39b1d610d8605bc672e11ba4182d2938f61cf9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b1d610d8605bc672e11ba41...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Feb 21 16:40:51 2020 +0100
stdio.h: Add ucrt fprintf and fprintf_s declarations.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/msvcrt/stdio.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index b246182e8c..9aebcb64c5 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -113,8 +113,6 @@ int __cdecl fgetpos(FILE*,fpos_t*); char* __cdecl fgets(char*,int,FILE*); FILE* __cdecl fopen(const char*,const char*); errno_t __cdecl fopen_s(FILE**,const char*,const char*); -int WINAPIV fprintf(FILE*,const char*,...); -int WINAPIV fprintf_s(FILE*,const char*,...); int __cdecl fputc(int,FILE*); int __cdecl fputs(const char*,FILE*); size_t __cdecl fread(void*,size_t,size_t,FILE*); @@ -239,11 +237,33 @@ static inline int __cdecl vfprintf(FILE *file, const char *format, __ms_va_list return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); }
+static inline int WINAPIV fprintf(FILE *file, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + static inline int __cdecl vfprintf_s(FILE *file, const char *format, __ms_va_list args) { return __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); }
+static inline int WINAPIV fprintf_s(FILE *file, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */
_ACRTIMP int WINAPIV _scprintf(const char *,...); @@ -251,6 +271,8 @@ _ACRTIMP int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); _ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); _ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); +_ACRTIMP int WINAPIV fprintf(FILE*,const char*,...); +_ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...); _ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list);