Hans Leidekker : msvcrt: Implement _snprintf_l.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Oct 31 02:53:36 CDT 2014


Module: wine
Branch: master
Commit: ed79b3f9a52bcab2b748ceb417c06dd4c5cdc345
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ed79b3f9a52bcab2b748ceb417c06dd4c5cdc345

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Thu Oct 30 14:08:26 2014 +0100

msvcrt: Implement _snprintf_l.

---

 dlls/msvcr100/msvcr100.spec |  2 +-
 dlls/msvcr110/msvcr110.spec |  2 +-
 dlls/msvcr80/msvcr80.spec   |  2 +-
 dlls/msvcr90/msvcr90.spec   |  2 +-
 dlls/msvcrt/msvcrt.spec     |  2 +-
 dlls/msvcrt/wcs.c           | 14 ++++++++++++++
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index d6c38f4..91805ee 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1289,7 +1289,7 @@
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ stub _snprintf_c
 @ stub _snprintf_c_l
-@ stub _snprintf_l
+@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l
 @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s
 @ stub _snprintf_s_l
 @ varargs _snscanf(str long str) MSVCRT__snscanf
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 02b6497..5de6965 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1647,7 +1647,7 @@
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ stub _snprintf_c
 @ stub _snprintf_c_l
-@ stub _snprintf_l
+@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l
 @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s
 @ stub _snprintf_s_l
 @ varargs _snscanf(str long str) MSVCRT__snscanf
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index ce09f00..b7f0a86 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -969,7 +969,7 @@
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ stub _snprintf_c
 @ stub _snprintf_c_l
-@ stub _snprintf_l
+@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l
 @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s
 @ stub _snprintf_s_l
 @ varargs _snscanf(str long str) MSVCRT__snscanf
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index e4302cf..a8ad25f 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -944,7 +944,7 @@
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ stub _snprintf_c
 @ stub _snprintf_c_l
-@ stub _snprintf_l
+@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l
 @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s
 @ stub _snprintf_s_l
 @ varargs _snscanf(str long str) MSVCRT__snscanf
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index f376db3..37046c3 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -912,7 +912,7 @@
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 # stub _snprintf_c(ptr long str)
 # stub _snprintf_c_l(ptr long str ptr)
-# stub _snprintf_l(ptr long str ptr)
+@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l
 @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s
 # stub _snprintf_s_l(ptr long long str ptr)
 @ varargs _snscanf(str long str) MSVCRT__snscanf
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 4123d06..a6a4fe7 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -818,6 +818,20 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...)
 }
 
 /*********************************************************************
+ *		_snprintf_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__snprintf_l(char *str, unsigned int count, MSVCRT__locale_t locale,
+    const char *format, ...)
+{
+    int retval;
+    __ms_va_list valist;
+    __ms_va_start(valist, format);
+    retval = MSVCRT_vsnprintf_l(str, count, format, locale, valist);
+    __ms_va_end(valist);
+    return retval;
+}
+
+/*********************************************************************
  *		_snprintf_s (MSVCRT.@)
  */
 int CDECL MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count,




More information about the wine-cvs mailing list