Module: wine Branch: master Commit: dadb2fdfa9f73ef49a71837c3a21483056950d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dadb2fdfa9f73ef49a71837c3a...
Author: Piotr Caban piotr@codeweavers.com Date: Thu Sep 19 10:31:07 2013 +0200
msvcrt: Add _snwprintf_s_l implementation.
---
dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 6 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index efb9dcd..4323e45 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1300,7 +1300,7 @@ @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) msvcrt._snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s -@ stub _snwprintf_s_l +@ varargs _snwprintf_s_l(ptr long long wstr ptr) msvcrt._snwprintf_s_l @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf @ varargs _snwscanf_l(wstr long wstr ptr) msvcrt._snwscanf_l @ varargs _snwscanf_s(wstr long wstr) msvcrt._snwscanf_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9237669..57bd107 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1658,7 +1658,7 @@ @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) msvcrt._snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s -@ stub _snwprintf_s_l +@ varargs _snwprintf_s_l(ptr long long wstr ptr) msvcrt._snwprintf_s_l @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf @ varargs _snwscanf_l(wstr long wstr ptr) msvcrt._snwscanf_l @ varargs _snwscanf_s(wstr long wstr) msvcrt._snwscanf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 328d2dc..55f922a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -980,7 +980,7 @@ @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) msvcrt._snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s -@ stub _snwprintf_s_l +@ varargs _snwprintf_s_l(ptr long long wstr ptr) msvcrt._snwprintf_s_l @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf @ varargs _snwscanf_l(wstr long wstr ptr) msvcrt._snwscanf_l @ varargs _snwscanf_s(wstr long wstr) msvcrt._snwscanf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5e77362..3632599 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -955,7 +955,7 @@ @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) msvcrt._snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s -@ stub _snwprintf_s_l +@ varargs _snwprintf_s_l(ptr long long wstr ptr) msvcrt._snwprintf_s_l @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf @ varargs _snwscanf_l(wstr long wstr ptr) msvcrt._snwscanf_l @ varargs _snwscanf_s(wstr long wstr) msvcrt._snwscanf_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 90bd7ff..6089656 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -922,7 +922,7 @@ @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) MSVCRT__snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s -# stub _snwprintf_s_l(ptr long long wstr ptr) +@ varargs _snwprintf_s_l(ptr long long wstr ptr) MSVCRT__snwprintf_s_l @ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf @ varargs _snwscanf_l(wstr long wstr ptr) MSVCRT__snwscanf_l @ varargs _snwscanf_s(wstr long wstr) MSVCRT__snwscanf_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 60eae92..d1e738f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -883,6 +883,20 @@ int CDECL MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, unsigned int len, unsigned i }
/********************************************************************* + * _snwprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__snwprintf_s_l( MSVCRT_wchar_t *str, unsigned int len, unsigned int count, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ... ) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, locale); + retval = MSVCRT_vsnwprintf_s_l(str, len, count, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * sprintf (MSVCRT.@) */ int CDECL MSVCRT_sprintf( char *str, const char *format, ... )