Module: wine Branch: master Commit: 03ae830653ac0b9f9b6e3dc4e1eaf66012588bda URL: https://gitlab.winehq.org/wine/wine/-/commit/03ae830653ac0b9f9b6e3dc4e1eaf66...
Author: Bartosz Kosiorek gang65@poczta.onet.pl Date: Fri Oct 28 14:06:42 2022 +0200
msvcrt: Add _fprintf_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/file.c | 13 +++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 8 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3902a731311..1f0eae4ebea 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -829,7 +829,7 @@ @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) @ varargs _fprintf_p(ptr str) -@ stub _fprintf_p_l +@ varargs _fprintf_p_l(ptr str ptr) @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) @ cdecl _fputchar(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c233e79c1d1..4e8aba90118 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1176,7 +1176,7 @@ @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) @ varargs _fprintf_p(ptr str) -@ stub _fprintf_p_l +@ varargs _fprintf_p_l(ptr str ptr) @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) @ cdecl _fputchar(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index e7350201a90..e8113babfd1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1177,7 +1177,7 @@ @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) @ varargs _fprintf_p(ptr str) -@ stub _fprintf_p_l +@ varargs _fprintf_p_l(ptr str ptr) @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) @ cdecl _fputchar(long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index de41ea06eb0..e2b539c917e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1106,7 +1106,7 @@ @ cdecl _fpreset() msvcr120._fpreset @ varargs _fprintf_l(ptr str ptr) msvcr120._fprintf_l @ varargs _fprintf_p(ptr str) msvcr120._fprintf_p -@ stub _fprintf_p_l +@ varargs _fprintf_p_l(ptr str ptr) msvcr120._fprintf_p_l @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) msvcr120._fputc_nolock @ cdecl _fputchar(long) msvcr120._fputchar diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7285ea78221..042393400a7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -495,7 +495,7 @@ @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) @ varargs _fprintf_p(ptr str) -@ stub _fprintf_p_l +@ varargs _fprintf_p_l(ptr str ptr) @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) @ cdecl _fputchar(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0a2e25e5c98..a5bf9c0224f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -478,7 +478,7 @@ @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) @ varargs _fprintf_p(ptr str) -@ stub _fprintf_p_l +@ varargs _fprintf_p_l(ptr str ptr) @ stub _fprintf_s_l @ cdecl _fputc_nolock(long ptr) @ cdecl _fputchar(long) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 170dae34c42..3e6ef1fc60e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5608,6 +5608,19 @@ int CDECL _fprintf_p(FILE* file, const char *format, ...) return res; }
+/********************************************************************* + * _fprintf_p_l (MSVCRT.@) + */ +int CDECL _fprintf_p_l(FILE* file, const char *format, _locale_t locale, ...) +{ + va_list valist; + int res; + va_start(valist, locale); + res = _vfprintf_p_l(file, format, locale, valist); + va_end(valist); + return res; +} + /********************************************************************* * fwprintf (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 60855f58997..79f6055ba48 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -462,7 +462,7 @@ @ cdecl _fpreset() @ varargs _fprintf_l(ptr str ptr) @ varargs _fprintf_p(ptr str) -# stub _fprintf_p_l(ptr str ptr) +@ varargs _fprintf_p_l(ptr str ptr) # stub _fprintf_s_l(ptr str ptr) @ cdecl _fputchar(long) @ cdecl _fputwchar(long)