Commit 6296d95b authored by Eryk Wieliczko's avatar Eryk Wieliczko Committed by Alexandre Julliard

msvcrt: Implement vprintf_s and vwprintf_s.

parent 8bf437d8
...@@ -1621,12 +1621,12 @@ ...@@ -1621,12 +1621,12 @@
@ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf @ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf
@ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s @ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s
@ cdecl vprintf(str ptr) msvcrt.vprintf @ cdecl vprintf(str ptr) msvcrt.vprintf
@ stub vprintf_s @ cdecl vprintf_s(str ptr) msvcrt.vprintf_s
@ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf
@ cdecl vsprintf_s(ptr long str ptr) msvcrt.vsprintf_s @ cdecl vsprintf_s(ptr long str ptr) msvcrt.vsprintf_s
@ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s
@ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf
@ stub vwprintf_s @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s
@ stub wcrtomb @ stub wcrtomb
@ stub wcrtomb_s @ stub wcrtomb_s
@ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat(wstr wstr) msvcrt.wcscat
......
...@@ -1475,12 +1475,12 @@ ...@@ -1475,12 +1475,12 @@
@ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf @ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf
@ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s @ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s
@ cdecl vprintf(str ptr) msvcrt.vprintf @ cdecl vprintf(str ptr) msvcrt.vprintf
@ stub vprintf_s @ cdecl vprintf_s(str ptr) msvcrt.vprintf_s
@ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf
@ cdecl vsprintf_s(ptr long str ptr) msvcrt.vsprintf_s @ cdecl vsprintf_s(ptr long str ptr) msvcrt.vsprintf_s
@ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s
@ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf
@ stub vwprintf_s @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s
@ stub wcrtomb @ stub wcrtomb
@ stub wcrtomb_s @ stub wcrtomb_s
@ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat(wstr wstr) msvcrt.wcscat
......
...@@ -1459,12 +1459,12 @@ ...@@ -1459,12 +1459,12 @@
@ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf @ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf
@ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s @ cdecl vfwprintf_s(ptr wstr ptr) msvcrt.vfwprintf_s
@ cdecl vprintf(str ptr) msvcrt.vprintf @ cdecl vprintf(str ptr) msvcrt.vprintf
@ stub vprintf_s @ cdecl vprintf_s(str ptr) msvcrt.vprintf_s
@ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf
@ cdecl vsprintf_s(ptr long str ptr) msvcrt.vsprintf_s @ cdecl vsprintf_s(ptr long str ptr) msvcrt.vsprintf_s
@ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s
@ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf
@ stub vwprintf_s @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s
@ stub wcrtomb @ stub wcrtomb
@ stub wcrtomb_s @ stub wcrtomb_s
@ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat(wstr wstr) msvcrt.wcscat
......
...@@ -3463,6 +3463,14 @@ int CDECL MSVCRT_vprintf(const char *format, __ms_va_list valist) ...@@ -3463,6 +3463,14 @@ int CDECL MSVCRT_vprintf(const char *format, __ms_va_list valist)
} }
/********************************************************************* /*********************************************************************
* vprintf_s (MSVCRT.@)
*/
int CDECL MSVCRT_vprintf_s(const char *format, __ms_va_list valist)
{
return MSVCRT_vfprintf_s(MSVCRT_stdout,format,valist);
}
/*********************************************************************
* vwprintf (MSVCRT.@) * vwprintf (MSVCRT.@)
*/ */
int CDECL MSVCRT_vwprintf(const MSVCRT_wchar_t *format, __ms_va_list valist) int CDECL MSVCRT_vwprintf(const MSVCRT_wchar_t *format, __ms_va_list valist)
...@@ -3471,6 +3479,14 @@ int CDECL MSVCRT_vwprintf(const MSVCRT_wchar_t *format, __ms_va_list valist) ...@@ -3471,6 +3479,14 @@ int CDECL MSVCRT_vwprintf(const MSVCRT_wchar_t *format, __ms_va_list valist)
} }
/********************************************************************* /*********************************************************************
* vwprintf_s (MSVCRT.@)
*/
int CDECL MSVCRT_vwprintf_s(const MSVCRT_wchar_t *format, __ms_va_list valist)
{
return MSVCRT_vfwprintf_s(MSVCRT_stdout,format,valist);
}
/*********************************************************************
* fprintf (MSVCRT.@) * fprintf (MSVCRT.@)
*/ */
int CDECL MSVCRT_fprintf(MSVCRT_FILE* file, const char *format, ...) int CDECL MSVCRT_fprintf(MSVCRT_FILE* file, const char *format, ...)
......
...@@ -1426,14 +1426,14 @@ ...@@ -1426,14 +1426,14 @@
@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf @ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
@ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s @ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s
@ cdecl vprintf(str ptr) MSVCRT_vprintf @ cdecl vprintf(str ptr) MSVCRT_vprintf
# stub vprintf_s @ cdecl vprintf_s(str ptr) MSVCRT_vprintf_s
# stub vsnprintf # stub vsnprintf
@ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf
@ cdecl vsprintf_s(ptr long str ptr) MSVCRT_vsprintf_s @ cdecl vsprintf_s(ptr long str ptr) MSVCRT_vsprintf_s
@ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf
@ cdecl vswprintf_s(ptr long wstr ptr) MSVCRT_vswprintf_s @ cdecl vswprintf_s(ptr long wstr ptr) MSVCRT_vswprintf_s
@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
# stub vwprintf_s @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s
# stub wcrtomb # stub wcrtomb
# stub wcrtomb_s # stub wcrtomb_s
@ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat(wstr wstr) ntdll.wcscat
......
...@@ -168,6 +168,7 @@ int __cdecl ungetc(int,FILE*); ...@@ -168,6 +168,7 @@ int __cdecl ungetc(int,FILE*);
int __cdecl vfprintf(FILE*,const char*,__ms_va_list); int __cdecl vfprintf(FILE*,const char*,__ms_va_list);
int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list);
int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf(const char*,__ms_va_list);
int __cdecl vprintf_s(const char*,__ms_va_list);
int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf(char*,const char*,__ms_va_list);
int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list);
...@@ -217,6 +218,7 @@ int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); ...@@ -217,6 +218,7 @@ int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list);
int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list);
int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list);
int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list);
int __cdecl vwprintf_s(const wchar_t*,__ms_va_list);
int __cdecl wprintf(const wchar_t*,...); int __cdecl wprintf(const wchar_t*,...);
int __cdecl wscanf(const wchar_t*,...); int __cdecl wscanf(const wchar_t*,...);
int __cdecl wscanf_s(const wchar_t*,...); int __cdecl wscanf_s(const wchar_t*,...);
......
...@@ -314,6 +314,7 @@ int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); ...@@ -314,6 +314,7 @@ int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list);
int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list);
int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list);
int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list);
int __cdecl vwprintf_s(const wchar_t*,__ms_va_list);
int __cdecl wprintf(const wchar_t*,...); int __cdecl wprintf(const wchar_t*,...);
int __cdecl wscanf(const wchar_t*,...); int __cdecl wscanf(const wchar_t*,...);
int __cdecl wscanf_s(const wchar_t*,...); int __cdecl wscanf_s(const wchar_t*,...);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment