Module: wine Branch: master Commit: 97807760cad4bbbb06a072faa0c34b66ba952d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97807760cad4bbbb06a072faa0...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Thu Jun 10 23:54:30 2010 +0400
msvcrt: Add _scwprintf implementation.
---
dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 5 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b0b8172..44c5b31 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1012,7 +1012,7 @@ @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ stub _scwprintf_l @ stub _scwprintf_p @ stub _scwprintf_p_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a8ba61e..256031c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -857,7 +857,7 @@ @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ stub _scwprintf_l @ stub _scwprintf_p @ stub _scwprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index df65a5c..a2bed36 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -843,7 +843,7 @@ @ stub _scprintf_l @ stub _scprintf_p @ stub _scprintf_p_l -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ stub _scwprintf_l @ stub _scwprintf_p @ stub _scwprintf_p_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 88a2ab9..bba06d6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -801,7 +801,7 @@ # stub _scprintf # stub _scprintf_l # stub _scprintf_p_l -# stub _scwprintf +@ varargs _scwprintf(wstr) MSVCRT__scwprintf # stub _scwprintf_l # stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4485db3..03ecc7f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1247,6 +1247,20 @@ int CDECL MSVCRT_sprintf_s( char *str, MSVCRT_size_t num, const char *format, .. }
/********************************************************************* + * _scwprintf (MSVCRT.@) + */ +int CDECL MSVCRT__scwprintf( const MSVCRT_wchar_t *format, ... ) +{ + __ms_va_list ap; + int r; + + __ms_va_start( ap, format ); + r = MSVCRT_vsnwprintf( NULL, INT_MAX, format, ap ); + __ms_va_end( ap ); + return r; +} + +/********************************************************************* * swprintf (MSVCRT.@) */ int CDECL MSVCRT_swprintf( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ... )