Module: wine Branch: master Commit: a5f525276f6459fe5ab269a5632e7141a2c70607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f525276f6459fe5ab269a563...
Author: Piotr Caban piotr@codeweavers.com Date: Tue Apr 30 14:28:34 2013 +0200
msvcr100: Added _vscwprintf_p implementation.
---
dlls/msvcr100/msvcr100.c | 8 ++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- include/msvcrt/stdio.h | 1 + include/msvcrt/wchar.h | 1 + 7 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index d43cbbf..4449310 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -423,6 +423,14 @@ int CDECL _vswprintf_p(wchar_t *buffer, size_t length, const wchar_t *format, __ }
/********************************************************************* + * _vscwprintf_p (MSVCR100.@) + */ +int CDECL _vscwprintf_p(const wchar_t *format, __ms_va_list args) +{ + return _vscwprintf_p_l(format, NULL, args); +} + +/********************************************************************* * _byteswap_ushort (MSVCR100.@) */ unsigned short CDECL _byteswap_ushort(unsigned short s) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 197a414..52835cb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1442,7 +1442,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d00f1a9..171bf37 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1804,7 +1804,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) msvcr100._vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 860383a..f45095e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1120,7 +1120,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) msvcr100._vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ab9cea6..140797d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1096,7 +1096,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) msvcr100._vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index a01859e..737003d 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -194,6 +194,7 @@ int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _scwprintf(const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); +int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 27f673c..d936dc3 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -320,6 +320,7 @@ int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); +int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list);