Module: wine Branch: master Commit: 78e5efd037ae8d2fd12764be21d96f1b32b7db6b URL: https://gitlab.winehq.org/wine/wine/-/commit/78e5efd037ae8d2fd12764be21d96f1...
Author: Bartosz Kosiorek gang65@poczta.onet.pl Date: Sat Nov 5 23:55:04 2022 +0100
msvcrt: Add _scwprintf_p_l implementation.
---
dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 8 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ebb79623048..599d709cd18 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1266,7 +1266,7 @@ @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) @ stub _scwprintf_p -@ stub _scwprintf_p_l +@ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 64d680923c3..bcc84c31a8b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1623,7 +1623,7 @@ @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) @ stub _scwprintf_p -@ stub _scwprintf_p_l +@ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ba16e61f397..1f69673502f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1634,7 +1634,7 @@ @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) @ stub _scwprintf_p -@ stub _scwprintf_p_l +@ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 468146ed056..eefac9d1089 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1360,7 +1360,7 @@ @ varargs _scwprintf(wstr) msvcr120._scwprintf @ varargs _scwprintf_l(wstr ptr) msvcr120._scwprintf_l @ stub _scwprintf_p -@ stub _scwprintf_p_l +@ varargs _scwprintf_p_l(wstr ptr) msvcr120._scwprintf_p_l @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) msvcr120._seh_longjmp_unwind4 @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) msvcr120._seh_longjmp_unwind @ cdecl -arch=i386 _set_SSE2_enable(long) msvcr120._set_SSE2_enable diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 49ea60e3dae..1c8e3e6868b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -944,7 +944,7 @@ @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) @ stub _scwprintf_p -@ stub _scwprintf_p_l +@ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d2cff259208..509193d63a6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -920,7 +920,7 @@ @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) @ stub _scwprintf_p -@ stub _scwprintf_p_l +@ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7a060f82769..8a4a3c85cc7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -889,7 +889,7 @@ @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) -# stub _scwprintf_p_l(wstr ptr) +@ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4ef779cba58..c10894e6753 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1633,6 +1633,20 @@ int WINAPIV _scwprintf_l( const wchar_t *format, _locale_t locale, ... ) return r; }
+/********************************************************************* + * _scwprintf_p_l (MSVCRT.@) + */ +int WINAPIV _scwprintf_p_l( const wchar_t *format, _locale_t locale, ... ) +{ + va_list ap; + int r; + + va_start( ap, locale ); + r = vswprintf_p_l_opt( NULL, INT_MAX, format, 0, locale, ap ); + va_end( ap ); + return r; +} + /********************************************************************* * _scwprintf (MSVCRT.@) */