From 381e549b8138126635d65652d58c6c0801b4c25c Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Fri, 16 Nov 2018 22:55:30 +0100 Subject: [PATCH] msvcrt: Add _vscprintf_l implementation. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- 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 | 9 +++++++++ 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 151d6ae5afc..d9f927165d0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1446,7 +1446,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index abb6adafaa2..e0508bb9198 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1803,7 +1803,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8b7b154a0f1..c9547bcbdf0 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1821,7 +1821,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d293900ead2..c1f6e0bcf08 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1515,7 +1515,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) msvcr120._vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) msvcr120._vscprintf_l @ cdecl _vscprintf_p(str ptr) msvcr120._vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) msvcr120._vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcr120._vscwprintf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index aa89792adbd..1f78197c074 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1125,7 +1125,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index cf604b7ad67..2181a8ffb50 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1101,7 +1101,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e4d0aad8fbb..d71d37a2236 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1058,7 +1058,7 @@ # stub _vprintf_s_l(str ptr ptr) @ cdecl _utime(str ptr) @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -# stub _vscprintf_l(str ptr ptr) +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 27c9eb8740f..a6d7c1f2006 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1016,6 +1016,15 @@ int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist ) return MSVCRT_vsnprintf( NULL, INT_MAX, format, valist ); } +/********************************************************************* + * _vscprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__vscprintf_l(const char *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + return MSVCRT_vsnprintf_l(NULL, INT_MAX, format, locale, valist); +} + /********************************************************************* * _vscprintf_p_l (MSVCRT.@) */