marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Added implementations of _vswprintf* functions.

oldstable
Piotr Caban 2010-04-19 10:58:00 +02:00 committed by Alexandre Julliard
parent 743e6ba688
commit 97bad69184
4 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/msvcr80/msvcr80.spec
View File

@ -1061,13 +1061,13 @@
@ stub _vsprintf_p
@ stub _vsprintf_p_l
@ stub _vsprintf_s_l
@ stub _vswprintf
@ stub _vswprintf_c
@ stub _vswprintf_c_l
@ stub _vswprintf_l
@ stub _vswprintf_p
@ stub _vswprintf_p_l
@ stub _vswprintf_s_l
@ cdecl _vswprintf(ptr long wstr ptr) msvcrt._vswprintf
@ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c
@ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l
@ cdecl _vswprintf_l(ptr long wstr ptr ptr) msvcrt._vswprintf_l
@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf
@ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l
@ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l
@ stub _vwprintf_l
@ stub _vwprintf_p
@ stub _vwprintf_p_l

14
dlls/msvcr90/msvcr90.spec
View File

@ -1048,13 +1048,13 @@
@ stub _vsprintf_p
@ stub _vsprintf_p_l
@ stub _vsprintf_s_l
@ stub _vswprintf
@ stub _vswprintf_c
@ stub _vswprintf_c_l
@ stub _vswprintf_l
@ stub _vswprintf_p
@ stub _vswprintf_p_l
@ stub _vswprintf_s_l
@ cdecl _vswprintf(ptr long wstr ptr) msvcrt._vswprintf
@ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c
@ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l
@ cdecl _vswprintf_l(ptr long wstr ptr ptr) msvcrt._vswprintf_l
@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf
@ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l
@ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l
@ stub _vwprintf_l
@ stub _vwprintf_p
@ stub _vwprintf_p_l

12
dlls/msvcrt/msvcrt.spec
View File

@ -990,12 +990,12 @@
# stub _vsprintf_p
# stub _vsprintf_p_l
# stub _vsprintf_s_l
# stub _vswprintf
# stub _vswprintf_c
# stub _vswprintf_c_l
# stub _vswprintf_l
# stub _vswprintf_p_l
# stub _vswprintf_s_l
@ cdecl _vswprintf(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl _vswprintf_c(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l
@ cdecl _vswprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l
@ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l
@ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) MSVCRT_vswprintf_s_l
# stub _vwprintf_l
# stub _vwprintf_p
# stub _vwprintf_p_l

17
dlls/msvcrt/wcs.c
View File

@ -1083,10 +1083,21 @@ int CDECL _vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args )
/*********************************************************************
* vswprintf_s (MSVCRT.@)
*/
int CDECL MSVCRT_vswprintf_s( MSVCRT_wchar_t* str, MSVCRT_size_t num, const MSVCRT_wchar_t* format, __ms_va_list args )
int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements,
const MSVCRT_wchar_t* format, __ms_va_list args)
{
/* FIXME: must handle positional arguments */
return MSVCRT_vsnwprintf( str, num, format, args );
return MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t),
INT_MAX, format, args);
}
/*********************************************************************
* _vswprintf_s_l (MSVCRT.@)
*/
int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements,
const MSVCRT_wchar_t* format, MSVCRT__locale_t locale, __ms_va_list args)
{
return MSVCRT_vsnwprintf_s_l(str, numberOfElements*sizeof(MSVCRT_wchar_t),
INT_MAX, format, locale, args );
}
/*********************************************************************