Module: wine Branch: master Commit: af7aaba0bfd98e48692650aa6739d0013d0d4f36 URL: https://gitlab.winehq.org/wine/wine/-/commit/af7aaba0bfd98e48692650aa6739d00...
Author: Bartosz Kosiorek gang65@poczta.onet.pl Date: Sun Nov 6 00:33:04 2022 +0100
msvcrt: Add _vcprintf_l implementation.
---
dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 10 ++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 599d709cd18..dc028bd932b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1265,7 +1265,7 @@ @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) -@ stub _scwprintf_p +@ varargs _scwprintf_p(wstr) @ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) @@ -1422,7 +1422,7 @@ @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _vcprintf(str ptr) -@ stub _vcprintf_l +@ cdecl _vcprintf_l(str ptr ptr) @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 10e3b6ca629..1e46cf9983e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1779,7 +1779,7 @@ @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _vcprintf(str ptr) -@ stub _vcprintf_l +@ cdecl _vcprintf_l(str ptr ptr) @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index fdeb1496ea6..59b99a04a31 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1798,7 +1798,7 @@ @ cdecl _utime64(str ptr) @ cdecl _vacopy(ptr ptr) @ cdecl _vcprintf(str ptr) -@ stub _vcprintf_l +@ cdecl _vcprintf_l(str ptr ptr) @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ac247640db7..5dbb83893e2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1102,7 +1102,7 @@ @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _vcprintf(str ptr) -@ stub _vcprintf_l +@ cdecl _vcprintf_l(str ptr ptr) @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 053ccc6c212..e67ea400657 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1077,7 +1077,7 @@ @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _vcprintf(str ptr) -@ stub _vcprintf_l +@ cdecl _vcprintf_l(str ptr ptr) @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 2b47287c5c7..70df825866f 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -522,6 +522,16 @@ static int puts_clbk_console_w(void *ctx, int len, const wchar_t *str) return len; }
+#if _MSVCR_VER<=120 +/********************************************************************* + * _vcprintf_l (MSVCRT.@) + */ +int CDECL _vcprintf_l(const char* format, _locale_t locale, va_list valist) +{ + return pf_printf_a(puts_clbk_console_a, NULL, format, locale, 0, arg_clbk_valist, NULL, &valist); +} +#endif + /********************************************************************* * _vcprintf (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8a4a3c85cc7..a82adcb2951 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1036,7 +1036,7 @@ @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _vcprintf(str ptr) -# stub _vcprintf_l(str ptr ptr) +@ cdecl _vcprintf_l(str ptr ptr) # stub _vcprintf_p(str ptr) # stub _vcprintf_p_l(str ptr ptr) # stub _vcprintf_s(str ptr)