Piotr Caban : msvcrt: Add _vscprintf_l implementation.
Alexandre Julliard
julliard at winehq.org
Sun Mar 3 13:21:30 CST 2019
Module: wine
Branch: oldstable
Commit: df1cf003e4e57cd35175e2d3fb5c97285eb0ed45
URL: https://source.winehq.org/git/wine.git/?a=commit;h=df1cf003e4e57cd35175e2d3fb5c97285eb0ed45
Author: Piotr Caban <piotr at codeweavers.com>
Date: Fri Nov 16 22:55:30 2018 +0100
msvcrt: Add _vscprintf_l implementation.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 381e549b8138126635d65652d58c6c0801b4c25c)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
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 | 9 +++++++++
8 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 99eba24..1884813 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1446,7 +1446,7 @@
@ stub _vprintf_p_l
@ stub _vprintf_s_l
@ cdecl _vscprintf(str ptr) MSVCRT__vscprintf
-@ stub _vscprintf_l
+@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l
@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p
@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l
@ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index d516ea1..f6974f2 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1803,7 +1803,7 @@
@ stub _vprintf_p_l
@ stub _vprintf_s_l
@ cdecl _vscprintf(str ptr) MSVCRT__vscprintf
-@ stub _vscprintf_l
+@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l
@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p
@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l
@ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 1aabb80..6fab91e 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -1821,7 +1821,7 @@
@ stub _vprintf_p_l
@ stub _vprintf_s_l
@ cdecl _vscprintf(str ptr) MSVCRT__vscprintf
-@ stub _vscprintf_l
+@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l
@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p
@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l
@ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 94412a8..bbb6441 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1515,7 +1515,7 @@
@ stub _vprintf_p_l
@ stub _vprintf_s_l
@ cdecl _vscprintf(str ptr) msvcr120._vscprintf
-@ stub _vscprintf_l
+@ cdecl _vscprintf_l(str ptr ptr) msvcr120._vscprintf_l
@ cdecl _vscprintf_p(str ptr) msvcr120._vscprintf_p
@ cdecl _vscprintf_p_l(str ptr ptr) msvcr120._vscprintf_p_l
@ cdecl _vscwprintf(wstr ptr) msvcr120._vscwprintf
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index b3bd775..e04d591 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -1125,7 +1125,7 @@
@ stub _vprintf_p_l
@ stub _vprintf_s_l
@ cdecl _vscprintf(str ptr) MSVCRT__vscprintf
-@ stub _vscprintf_l
+@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l
@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p
@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l
@ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index a12c51e..8a3128a 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -1101,7 +1101,7 @@
@ stub _vprintf_p_l
@ stub _vprintf_s_l
@ cdecl _vscprintf(str ptr) MSVCRT__vscprintf
-@ stub _vscprintf_l
+@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l
@ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p
@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l
@ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 15d9ffc..1c8a488 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -1058,7 +1058,7 @@
# stub _vprintf_s_l(str ptr ptr)
@ cdecl _utime(str ptr)
@ cdecl _vscprintf(str ptr) MSVCRT__vscprintf
-# stub _vscprintf_l(str ptr ptr)
+@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l
@ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l
@ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf
@ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 098e0d5..7705bab 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1006,6 +1006,15 @@ int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist )
}
/*********************************************************************
+ * _vscprintf_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__vscprintf_l(const char *format,
+ MSVCRT__locale_t locale, __ms_va_list valist)
+{
+ return MSVCRT_vsnprintf_l(NULL, INT_MAX, format, locale, valist);
+}
+
+/*********************************************************************
* _vscprintf_p_l (MSVCRT.@)
*/
int CDECL MSVCRT__vscprintf_p_l(const char *format,
More information about the wine-cvs
mailing list