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

msvcrt: Add vf[w]printf_s_l. 

Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Gijs Vermeulen 2017-10-10 16:14:03 +02:00 committed by Alexandre Julliard
parent 307b3c8ed5
commit 1ae09d5fb2
8 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msvcr100/msvcr100.spec
View File

@ -1436,11 +1436,11 @@
@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
@ stub _vfprintf_p @ stub _vfprintf_p
@ stub _vfprintf_p_l @ stub _vfprintf_p_l
@ stub _vfprintf_s_l @ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
@ stub _vfwprintf_p @ stub _vfwprintf_p
@ stub _vfwprintf_p_l @ stub _vfwprintf_p_l
@ stub _vfwprintf_s_l @ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
@ stub _vprintf_l @ stub _vprintf_l
@ stub _vprintf_p @ stub _vprintf_p
@ stub _vprintf_p_l @ stub _vprintf_p_l

4
dlls/msvcr110/msvcr110.spec
View File

@ -1793,11 +1793,11 @@
@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
@ stub _vfprintf_p @ stub _vfprintf_p
@ stub _vfprintf_p_l @ stub _vfprintf_p_l
@ stub _vfprintf_s_l @ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
@ stub _vfwprintf_p @ stub _vfwprintf_p
@ stub _vfwprintf_p_l @ stub _vfwprintf_p_l
@ stub _vfwprintf_s_l @ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
@ stub _vprintf_l @ stub _vprintf_l
@ stub _vprintf_p @ stub _vprintf_p
@ stub _vprintf_p_l @ stub _vprintf_p_l

4
dlls/msvcr120/msvcr120.spec
View File

@ -1811,11 +1811,11 @@
@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
@ stub _vfprintf_p @ stub _vfprintf_p
@ stub _vfprintf_p_l @ stub _vfprintf_p_l
@ stub _vfprintf_s_l @ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
@ stub _vfwprintf_p @ stub _vfwprintf_p
@ stub _vfwprintf_p_l @ stub _vfwprintf_p_l
@ stub _vfwprintf_s_l @ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
@ stub _vprintf_l @ stub _vprintf_l
@ stub _vprintf_p @ stub _vprintf_p
@ stub _vprintf_p_l @ stub _vprintf_p_l

4
dlls/msvcr120_app/msvcr120_app.spec
View File

@ -1505,11 +1505,11 @@
@ cdecl _vfprintf_l(ptr str ptr ptr) msvcr120._vfprintf_l @ cdecl _vfprintf_l(ptr str ptr ptr) msvcr120._vfprintf_l
@ stub _vfprintf_p @ stub _vfprintf_p
@ stub _vfprintf_p_l @ stub _vfprintf_p_l
@ stub _vfprintf_s_l @ cdecl _vfprintf_s_l(ptr str ptr ptr) msvcr120._vfprintf_s_l
@ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcr120._vfwprintf_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcr120._vfwprintf_l
@ stub _vfwprintf_p @ stub _vfwprintf_p
@ stub _vfwprintf_p_l @ stub _vfwprintf_p_l
@ stub _vfwprintf_s_l @ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) msvcr120._vfwprintf_s_l
@ stub _vprintf_l @ stub _vprintf_l
@ stub _vprintf_p @ stub _vprintf_p
@ stub _vprintf_p_l @ stub _vprintf_p_l

4
dlls/msvcr80/msvcr80.spec
View File

@ -1115,11 +1115,11 @@
@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
@ stub _vfprintf_p @ stub _vfprintf_p
@ stub _vfprintf_p_l @ stub _vfprintf_p_l
@ stub _vfprintf_s_l @ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
@ stub _vfwprintf_p @ stub _vfwprintf_p
@ stub _vfwprintf_p_l @ stub _vfwprintf_p_l
@ stub _vfwprintf_s_l @ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
@ stub _vprintf_l @ stub _vprintf_l
@ stub _vprintf_p @ stub _vprintf_p
@ stub _vprintf_p_l @ stub _vprintf_p_l

4
dlls/msvcr90/msvcr90.spec
View File

@ -1091,11 +1091,11 @@
@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
@ stub _vfprintf_p @ stub _vfprintf_p
@ stub _vfprintf_p_l @ stub _vfprintf_p_l
@ stub _vfprintf_s_l @ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
@ stub _vfwprintf_p @ stub _vfwprintf_p
@ stub _vfwprintf_p_l @ stub _vfwprintf_p_l
@ stub _vfwprintf_s_l @ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
@ stub _vprintf_l @ stub _vprintf_l
@ stub _vprintf_p @ stub _vprintf_p
@ stub _vprintf_p_l @ stub _vprintf_p_l

22
dlls/msvcrt/file.c
View File

@ -5084,6 +5084,24 @@ static int vfwprintf_helper(DWORD options, MSVCRT_FILE* file, const MSVCRT_wchar
return ret; return ret;
} }
/*********************************************************************
* _vfprintf_s_l (MSVCRT.@)
*/
int CDECL MSVCRT__vfprintf_s_l(MSVCRT_FILE* file, const char *format,
MSVCRT__locale_t locale, __ms_va_list valist)
{
return vfprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, locale, valist);
}
/*********************************************************************
* _vfwprintf_s_l (MSVCRT.@)
*/
int CDECL MSVCRT__vfwprintf_s_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format,
MSVCRT__locale_t locale, __ms_va_list valist)
{
return vfwprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, locale, valist);
}
/********************************************************************* /*********************************************************************
* vfprintf (MSVCRT.@) * vfprintf (MSVCRT.@)
*/ */
@ -5097,7 +5115,7 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list va
*/ */
int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list valist) int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list valist)
{ {
return vfprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, NULL, valist); return MSVCRT__vfprintf_s_l(file, format, NULL, valist);
} }
/********************************************************************* /*********************************************************************
@ -5113,7 +5131,7 @@ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms
*/ */
int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist)
{ {
return vfwprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, NULL, valist); return MSVCRT__vfwprintf_s_l(file, format, NULL, valist);
} }
/********************************************************************* /*********************************************************************

4
dlls/msvcrt/msvcrt.spec
View File

@ -1047,11 +1047,11 @@
@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l @ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
# stub _vfprintf_p(ptr str ptr) # stub _vfprintf_p(ptr str ptr)
# stub _vfprintf_p_l(ptr str ptr ptr) # stub _vfprintf_p_l(ptr str ptr ptr)
# stub _vfprintf_s_l(ptr str ptr ptr) @ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l @ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
# stub _vfwprintf_p(ptr wstr ptr) # stub _vfwprintf_p(ptr wstr ptr)
# stub _vfwprintf_p_l(ptr wstr ptr ptr) # stub _vfwprintf_p_l(ptr wstr ptr ptr)
# stub _vfwprintf_s_l(ptr wstr ptr ptr) @ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
# stub _vprintf_l(str ptr ptr) # stub _vprintf_l(str ptr ptr)
# stub _vprintf_p(str ptr) # stub _vprintf_p(str ptr)
# stub _vprintf_p_l(str ptr ptr) # stub _vprintf_p_l(str ptr ptr)