[PATCH 0/2] MR10563: msvcrt: Add _wprintf_l implementation.
From: Piotr Caban <piotr@codeweavers.com> --- 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 | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 01812acd6ee..aa9c748dfcd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1645,7 +1645,7 @@ @ cdecl _vswprintf_p(ptr long wstr ptr) @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) -@ stub _vwprintf_l +@ cdecl _vwprintf_l(wstr ptr ptr) @ stub _vwprintf_p @ stub _vwprintf_p_l @ stub _vwprintf_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cada8e2c49b..37ee9d77990 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1831,7 +1831,7 @@ @ cdecl _vswprintf_p(ptr long wstr ptr) @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) -@ stub _vwprintf_l +@ cdecl _vwprintf_l(wstr ptr ptr) @ stub _vwprintf_p @ stub _vwprintf_p_l @ stub _vwprintf_s_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 237f2235cc7..723d319b62a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1850,7 +1850,7 @@ @ cdecl _vswprintf_p(ptr long wstr ptr) @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) -@ stub _vwprintf_l +@ cdecl _vwprintf_l(wstr ptr ptr) @ stub _vwprintf_p @ stub _vwprintf_p_l @ stub _vwprintf_s_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d97d99adbf6..0ecfa0b7e2e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1545,7 +1545,7 @@ @ cdecl _vswprintf_p(ptr long wstr ptr) msvcr120._vswprintf_p @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcr120._vswprintf_p_l @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcr120._vswprintf_s_l -@ stub _vwprintf_l +@ cdecl _vwprintf_l(wstr ptr ptr) msvcr120._vwprintf_l @ stub _vwprintf_p @ stub _vwprintf_p_l @ stub _vwprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4ebcc5aabe4..830b33897ab 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1177,7 +1177,7 @@ @ cdecl _vswprintf_p(ptr long wstr ptr) @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) -@ stub _vwprintf_l +@ cdecl _vwprintf_l(wstr ptr ptr) @ stub _vwprintf_p @ stub _vwprintf_p_l @ stub _vwprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3c446df9375..75a564e81db 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1152,7 +1152,7 @@ @ cdecl _vswprintf_p(ptr long wstr ptr) @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) -@ stub _vwprintf_l +@ cdecl _vwprintf_l(wstr ptr ptr) @ stub _vwprintf_p @ stub _vwprintf_p_l @ stub _vwprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 19b7547f59f..515b08c60eb 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5531,6 +5531,14 @@ int CDECL vwprintf(const wchar_t *format, va_list valist) return vfwprintf(stdout,format,valist); } +/********************************************************************* + * _vwprintf_l (MSVCRT.@) + */ +int CDECL _vwprintf_l(const wchar_t *format, _locale_t locale, va_list valist) +{ + return _vfwprintf_l(stdout, format, locale, valist); +} + /********************************************************************* * vwprintf_s (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c308c1711a7..a06859ae1e0 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1089,7 +1089,7 @@ @ cdecl _vswprintf_l(ptr wstr ptr ptr) @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) -# stub _vwprintf_l(wstr ptr ptr) +@ cdecl _vwprintf_l(wstr ptr ptr) # stub _vwprintf_p(wstr ptr) # stub _vwprintf_p_l(wstr ptr ptr) # stub _vwprintf_s_l(wstr ptr ptr) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10563
From: Piotr Caban <piotr@codeweavers.com> --- 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 aa9c748dfcd..989da52d28e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1742,7 +1742,7 @@ @ cdecl _wperror(wstr) @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) -@ stub _wprintf_l +@ varargs _wprintf_l(wstr ptr) @ stub _wprintf_p @ stub _wprintf_p_l @ stub _wprintf_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 37ee9d77990..5ed35765874 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1928,7 +1928,7 @@ @ cdecl _wperror(wstr) @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) -@ stub _wprintf_l +@ varargs _wprintf_l(wstr ptr) @ stub _wprintf_p @ stub _wprintf_p_l @ stub _wprintf_s_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 723d319b62a..b31c739b030 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1953,7 +1953,7 @@ @ cdecl _wperror(wstr) @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) -@ stub _wprintf_l +@ varargs _wprintf_l(wstr ptr) @ stub _wprintf_p @ stub _wprintf_p_l @ stub _wprintf_s_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0ecfa0b7e2e..7bdcebd1bca 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1633,7 +1633,7 @@ @ varargs _wopen(wstr long) msvcr120._wopen @ cdecl _wperror(wstr) msvcr120._wperror @ extern _wpgmptr msvcr120._wpgmptr -@ stub _wprintf_l +@ varargs _wprintf_l(wstr ptr) msvcr120._wprintf_l @ stub _wprintf_p @ stub _wprintf_p_l @ stub _wprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 830b33897ab..caad1162745 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1277,7 +1277,7 @@ @ cdecl _wperror(wstr) @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) -@ stub _wprintf_l +@ varargs _wprintf_l(wstr ptr) @ stub _wprintf_p @ stub _wprintf_p_l @ stub _wprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 75a564e81db..5e5d477d231 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1249,7 +1249,7 @@ @ cdecl _wperror(wstr) @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen(wstr wstr) -@ stub _wprintf_l +@ varargs _wprintf_l(wstr ptr) @ stub _wprintf_p @ stub _wprintf_p_l @ stub _wprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 515b08c60eb..b1eb86c42c7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5847,6 +5847,19 @@ int WINAPIV wprintf(const wchar_t *format, ...) return res; } +/********************************************************************* + * _wprintf_l (MSVCRT.@) + */ +int WINAPIV _wprintf_l(const wchar_t *format, _locale_t locale, ...) +{ + va_list valist; + int res; + va_start(valist, locale); + res = _vwprintf_l(format, locale, valist); + va_end(valist); + return res; +} + /********************************************************************* * wprintf_s (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a06859ae1e0..088ab0d1da9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1194,7 +1194,7 @@ @ cdecl _wperror(wstr) @ extern _wpgmptr MSVCRT__wpgmptr @ cdecl _wpopen (wstr wstr) _wpopen -# stub _wprintf_l(wstr ptr) +@ varargs _wprintf_l(wstr ptr) # stub _wprintf_p(wstr) # stub _wprintf_p_l(wstr ptr) # stub _wprintf_s_l(wstr ptr) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10563
participants (2)
-
Piotr Caban -
Piotr Caban (＠piotr)