Module: wine Branch: master Commit: e2911c5ee62582f5022e6c1eddafb7a94b9dcff0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2911c5ee62582f5022e6c1eddafb7a...
Author: Bartosz Kosiorek gang65@poczta.onet.pl Date: Fri Oct 28 15:13:25 2022 +0200
msvcrt: Add _scprintf_p_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 2f22af81920..e00d0c181bd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1262,7 +1262,7 @@ @ varargs _scprintf(str) @ varargs _scprintf_l(str ptr) @ varargs _scprintf_p(str) -@ stub _scprintf_p_l +@ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ stub _scwprintf_l @ stub _scwprintf_p diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7a1408a0e24..d6e860e18ed 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1619,7 +1619,7 @@ @ varargs _scprintf(str) @ varargs _scprintf_l(str ptr) @ varargs _scprintf_p(str) -@ stub _scprintf_p_l +@ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ stub _scwprintf_l @ stub _scwprintf_p diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c8416c0545b..1ad88c3d705 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1630,7 +1630,7 @@ @ varargs _scprintf(str) @ varargs _scprintf_l(str ptr) @ varargs _scprintf_p(str) -@ stub _scprintf_p_l +@ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ stub _scwprintf_l @ stub _scwprintf_p diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 41b78b43b0a..10b5afacc0b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1356,7 +1356,7 @@ @ varargs _scprintf(str) msvcr120._scprintf @ varargs _scprintf_l(str ptr) msvcr120._scprintf_l @ varargs _scprintf_p(str) msvcr120._scprintf_p -@ stub _scprintf_p_l +@ varargs _scprintf_p_l(str ptr) msvcr120._scprintf_p_l @ varargs _scwprintf(wstr) msvcr120._scwprintf @ stub _scwprintf_l @ stub _scwprintf_p diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 890b1bead1b..fe93549517a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -940,7 +940,7 @@ @ varargs _scprintf(str) @ varargs _scprintf_l(str ptr) @ varargs _scprintf_p(str) -@ stub _scprintf_p_l +@ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ stub _scwprintf_l @ stub _scwprintf_p diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d878e7120c4..cebea457e8b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -916,7 +916,7 @@ @ varargs _scprintf(str) @ varargs _scprintf_l(str ptr) @ varargs _scprintf_p(str) -@ stub _scprintf_p_l +@ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ stub _scwprintf_l @ stub _scwprintf_p diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7f169f1403a..f015fa4b22c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -886,7 +886,7 @@ @ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) @ varargs _scprintf_l(str ptr) -# stub _scprintf_p_l(str ptr) +@ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) # stub _scwprintf_l(wstr ptr) # stub _scwprintf_p_l(wstr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index fc21f162aa7..2c4479f54e0 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1342,6 +1342,19 @@ int WINAPIV _scprintf_p(const char *format, ...) return retval; }
+/********************************************************************* + * _scprintf_p_l (MSVCRT.@) + */ +int WINAPIV _scprintf_p_l(const char *format, _locale_t locale, ...) +{ + int retval; + va_list valist; + va_start(valist, locale); + retval = _vscprintf_p_l(format, locale, valist); + va_end(valist); + return retval; +} + /********************************************************************* * _vsnwprintf (MSVCRT.@) */