Module: wine Branch: master Commit: 74252df967afcbf7dd608f92ebeb47c472548ac2 URL: https://gitlab.winehq.org/wine/wine/-/commit/74252df967afcbf7dd608f92ebeb47c...
Author: Bartosz Kosiorek gang65@poczta.onet.pl Date: Fri Oct 28 14:56:48 2022 +0200
msvcrt: Add _fwprintf_s_l implementation.
---
dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.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 +- 8 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index dd2cd8f5c8b..6686fc0a249 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -865,7 +865,7 @@ @ varargs _fwprintf_l(ptr wstr ptr) @ varargs _fwprintf_p(ptr wstr) @ varargs _fwprintf_p_l(ptr wstr ptr) -@ stub _fwprintf_s_l +@ varargs _fwprintf_s_l(ptr wstr ptr) @ cdecl _fwrite_nolock(ptr long long ptr) @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index add0a536df9..81a41f20645 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1212,7 +1212,7 @@ @ varargs _fwprintf_l(ptr wstr ptr) @ varargs _fwprintf_p(ptr wstr) @ varargs _fwprintf_p_l(ptr wstr ptr) -@ stub _fwprintf_s_l +@ varargs _fwprintf_s_l(ptr wstr ptr) @ cdecl _fwrite_nolock(ptr long long ptr) @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 83968827b2c..33ee887819e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1213,7 +1213,7 @@ @ varargs _fwprintf_l(ptr wstr ptr) @ varargs _fwprintf_p(ptr wstr) @ varargs _fwprintf_p_l(ptr wstr ptr) -@ stub _fwprintf_s_l +@ varargs _fwprintf_s_l(ptr wstr ptr) @ cdecl _fwrite_nolock(ptr long long ptr) @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 945437ead22..2ae6d631884 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1142,7 +1142,7 @@ @ varargs _fwprintf_l(ptr wstr ptr) msvcr120._fwprintf_l @ varargs _fwprintf_p(ptr wstr) msvcr120._fwprintf_p @ varargs _fwprintf_p_l(ptr wstr ptr) msvcr120._fwprintf_p_l -@ stub _fwprintf_s_l +@ varargs _fwprintf_s_l(ptr wstr ptr) msvcr120._fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) msvcr120._fwrite_nolock @ varargs _fwscanf_l(ptr wstr ptr) msvcr120._fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) msvcr120._fwscanf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d430a4e3875..f85df8a2335 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -531,7 +531,7 @@ @ varargs _fwprintf_l(ptr wstr ptr) @ varargs _fwprintf_p(ptr wstr) @ varargs _fwprintf_p_l(ptr wstr ptr) -@ stub _fwprintf_s_l +@ varargs _fwprintf_s_l(ptr wstr ptr) @ cdecl _fwrite_nolock(ptr long long ptr) @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ff1ee58b3a0..9510196e21d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -514,7 +514,7 @@ @ varargs _fwprintf_l(ptr wstr ptr) @ varargs _fwprintf_p(ptr wstr) @ varargs _fwprintf_p_l(ptr wstr ptr) -@ stub _fwprintf_s_l +@ varargs _fwprintf_s_l(ptr wstr ptr) @ cdecl _fwrite_nolock(ptr long long ptr) @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 810fbaa42e9..a3140589481 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5699,6 +5699,19 @@ int WINAPIV _fwprintf_p_l(FILE* file, const wchar_t *format, _locale_t locale, . return res; }
+/********************************************************************* + * _fwprintf_s_l (MSVCRT.@) + */ +int WINAPIV _fwprintf_s_l(FILE* file, const wchar_t *format, _locale_t locale, ...) +{ + va_list valist; + int res; + va_start(valist, locale); + res = _vfwprintf_s_l(file, format, locale, valist); + va_end(valist); + return res; +} + /********************************************************************* * printf (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 07a44cdf2f1..7e565aec760 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -497,7 +497,7 @@ @ varargs _fwprintf_l(ptr wstr ptr) @ varargs _fwprintf_p(ptr wstr) @ varargs _fwprintf_p_l(ptr wstr ptr) -# stub _fwprintf_s_l(ptr wstr ptr) +@ varargs _fwprintf_s_l(ptr wstr ptr) @ varargs _fwscanf_l(ptr wstr ptr) @ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str)