Module: wine Branch: master Commit: 25d44dd3972a6688fc2b6789590e4037066187a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/25d44dd3972a6688fc2b6789590e403...
Author: Bartosz Kosiorek gang65@poczta.onet.pl Date: Fri Oct 28 15:06:22 2022 +0200
msvcrt: Add _scprintf_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/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 13 +++++++++++++ 8 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6686fc0a249..052ce73ec7d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1260,7 +1260,7 @@ @ varargs _scanf_l(str ptr) @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) -@ stub _scprintf_l +@ varargs _scprintf_l(str ptr) @ stub _scprintf_p @ stub _scprintf_p_l @ varargs _scwprintf(wstr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 81a41f20645..7e098a049eb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1617,7 +1617,7 @@ @ varargs _scanf_l(str ptr) @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) -@ stub _scprintf_l +@ varargs _scprintf_l(str ptr) @ stub _scprintf_p @ stub _scprintf_p_l @ varargs _scwprintf(wstr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 33ee887819e..39a3565088a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1628,7 +1628,7 @@ @ varargs _scanf_l(str ptr) @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) -@ stub _scprintf_l +@ varargs _scprintf_l(str ptr) @ stub _scprintf_p @ stub _scprintf_p_l @ varargs _scwprintf(wstr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2ae6d631884..87508d5d069 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1354,7 +1354,7 @@ @ varargs _scanf_l(str ptr) msvcr120._scanf_l @ varargs _scanf_s_l(str ptr) msvcr120._scanf_s_l @ varargs _scprintf(str) msvcr120._scprintf -@ stub _scprintf_l +@ varargs _scprintf_l(str ptr) msvcr120._scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l @ varargs _scwprintf(wstr) msvcr120._scwprintf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f85df8a2335..9eb50ea2b8e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -938,7 +938,7 @@ @ varargs _scanf_l(str ptr) @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) -@ stub _scprintf_l +@ varargs _scprintf_l(str ptr) @ stub _scprintf_p @ stub _scprintf_p_l @ varargs _scwprintf(wstr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9510196e21d..90cd807ca19 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -914,7 +914,7 @@ @ varargs _scanf_l(str ptr) @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) -@ stub _scprintf_l +@ varargs _scprintf_l(str ptr) @ stub _scprintf_p @ stub _scprintf_p_l @ varargs _scwprintf(wstr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7e565aec760..7f169f1403a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -885,7 +885,7 @@ @ varargs _scanf_l(str ptr) @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) -# stub _scprintf_l(str ptr) +@ varargs _scprintf_l(str ptr) # stub _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) # stub _scwprintf_l(wstr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 971c04c0f6c..ccaa339ffa0 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1316,6 +1316,19 @@ int WINAPIV _scprintf(const char *format, ...) return retval; }
+/********************************************************************* + * _scprintf_l (MSVCRT.@) + */ +int WINAPIV _scprintf_l(const char *format, _locale_t locale, ...) +{ + int retval; + va_list valist; + va_start(valist, locale); + retval = _vscprintf_l(format, locale, valist); + va_end(valist); + return retval; +} + /********************************************************************* * _vsnwprintf (MSVCRT.@) */