Module: wine Branch: master Commit: 33551b28a594678c03580dcaa23e9e5c5603730d URL: https://gitlab.winehq.org/wine/wine/-/commit/33551b28a594678c03580dcaa23e9e5...
Author: Bartosz Kosiorek gang65@poczta.onet.pl Date: Fri Oct 28 14:13:30 2022 +0200
msvcrt: Add _fprintf_s_l implementation.
---
dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 13 +++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1f0eae4ebea..3ae04c0af78 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -830,7 +830,7 @@ @ varargs _fprintf_l(ptr str ptr) @ varargs _fprintf_p(ptr str) @ varargs _fprintf_p_l(ptr str ptr) -@ stub _fprintf_s_l +@ varargs _fprintf_s_l(ptr str ptr) @ cdecl _fputc_nolock(long ptr) @ cdecl _fputchar(long) @ cdecl _fputwc_nolock(long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index e8113babfd1..c3ce7970f8e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1178,7 +1178,7 @@ @ varargs _fprintf_l(ptr str ptr) @ varargs _fprintf_p(ptr str) @ varargs _fprintf_p_l(ptr str ptr) -@ stub _fprintf_s_l +@ varargs _fprintf_s_l(ptr str ptr) @ cdecl _fputc_nolock(long ptr) @ cdecl _fputchar(long) @ cdecl _fputwc_nolock(long ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e2b539c917e..98bc11aaf6e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1107,7 +1107,7 @@ @ varargs _fprintf_l(ptr str ptr) msvcr120._fprintf_l @ varargs _fprintf_p(ptr str) msvcr120._fprintf_p @ varargs _fprintf_p_l(ptr str ptr) msvcr120._fprintf_p_l -@ stub _fprintf_s_l +@ varargs _fprintf_s_l(ptr str ptr) msvcr120._fprintf_s_l @ cdecl _fputc_nolock(long ptr) msvcr120._fputc_nolock @ cdecl _fputchar(long) msvcr120._fputchar @ cdecl _fputwc_nolock(long ptr) msvcr120._fputwc_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 042393400a7..377f29579a9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -496,7 +496,7 @@ @ varargs _fprintf_l(ptr str ptr) @ varargs _fprintf_p(ptr str) @ varargs _fprintf_p_l(ptr str ptr) -@ stub _fprintf_s_l +@ varargs _fprintf_s_l(ptr str ptr) @ cdecl _fputc_nolock(long ptr) @ cdecl _fputchar(long) @ cdecl _fputwc_nolock(long ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a5bf9c0224f..7c1ed166ca6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -479,7 +479,7 @@ @ varargs _fprintf_l(ptr str ptr) @ varargs _fprintf_p(ptr str) @ varargs _fprintf_p_l(ptr str ptr) -@ stub _fprintf_s_l +@ varargs _fprintf_s_l(ptr str ptr) @ cdecl _fputc_nolock(long ptr) @ cdecl _fputchar(long) @ cdecl _fputwc_nolock(long ptr) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 3e6ef1fc60e..8249fdd7764 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5621,6 +5621,19 @@ int CDECL _fprintf_p_l(FILE* file, const char *format, _locale_t locale, ...) return res; }
+/********************************************************************* + * _fprintf_s_l (MSVCRT.@) + */ +int CDECL _fprintf_s_l(FILE* file, const char *format, _locale_t locale, ...) +{ + va_list valist; + int res; + va_start(valist, locale); + res = _vfprintf_s_l(file, format, locale, valist); + va_end(valist); + return res; +} + /********************************************************************* * fwprintf (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 79f6055ba48..e576f980815 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -463,7 +463,7 @@ @ varargs _fprintf_l(ptr str ptr) @ varargs _fprintf_p(ptr str) @ varargs _fprintf_p_l(ptr str ptr) -# stub _fprintf_s_l(ptr str ptr) +@ varargs _fprintf_s_l(ptr str ptr) @ cdecl _fputchar(long) @ cdecl _fputwchar(long) # stub _free_dbg(ptr long)