Module: wine Branch: master Commit: e5771a94e756f6b9a137fb20759e18d69cb51e7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5771a94e756f6b9a137fb207...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Feb 24 15:33:58 2020 +0100
corecrt_wstdio.h: Add ucrt _vscwprintf_p_l and _vswprintf_p_l declarations.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/msvcrt/corecrt_wstdio.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index a371d54cff..a04e571f02 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -56,8 +56,6 @@ wchar_t* __cdecl _getws(wchar_t*); wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); -int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); -int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); errno_t __cdecl _wfopen_s(FILE**,const wchar_t*,const wchar_t*); @@ -102,6 +100,7 @@ int WINAPIV wscanf_s(const wchar_t*,...);
_ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_t,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list);
static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { @@ -178,6 +177,19 @@ static inline int __cdecl _vscwprintf(const wchar_t *format, __ms_va_list args) return ret < 0 ? -1 : ret; }
+static inline int __cdecl _vswprintf_p_l(wchar_t *buffer, size_t size, const wchar_t *format, _locale_t locale, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args); + return ret < 0 ? -1 : ret; +} + +static inline int __cdecl _vscwprintf_p_l(const wchar_t *format, _locale_t locale, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, locale, args); + return ret < 0 ? -1 : ret; +} + static inline int WINAPIV _scwprintf(const wchar_t *format, ...) { int ret; @@ -196,8 +208,10 @@ _ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); _ACRTIMP int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list);
#ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);