Module: wine Branch: stable Commit: e48d3a14a02bfdcda758a98042c4c5355ce94652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48d3a14a02bfdcda758a98042...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Tue Aug 2 14:18:03 2016 +0300
ucrtbase: Added __stdio_common_vswprintf_s().
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit b6fd195279d874fff9ba1f81658d0ea49b5d36e7) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
.../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/wcs.c | 10 ++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 11d3f1d..8d55a3b 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -17,7 +17,7 @@ @ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p -@ stub __stdio_common_vswprintf_s +@ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf @ cdecl _chsize(long long) ucrtbase._chsize @ cdecl _chsize_s(long int64) ucrtbase._chsize_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f8b5205..81910c8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -908,6 +908,16 @@ int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, }
/********************************************************************* + * __stdio_common_vswprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vswprintf_s( unsigned __int64 options, + MSVCRT_wchar_t *str, MSVCRT_size_t count, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + return MSVCRT__stdio_common_vsnwprintf_s(options, str, INT_MAX, count, format, locale, valist); +} + +/********************************************************************* * __stdio_common_vsprintf_s (MSVCRT.@) */ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 24eba52..965c921 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -162,7 +162,7 @@ @ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p -@ stub __stdio_common_vswprintf_s +@ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf @ stub __strncnt @ cdecl __sys_errlist()