Piotr Caban : msvcrt: Added _swprintf_s_l implementation.
Alexandre Julliard
julliard at winehq.org
Thu Aug 1 14:25:46 CDT 2013
Module: wine
Branch: master
Commit: a51ffcd442678ce019a52bd5b95d99d0b7eab4ce
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a51ffcd442678ce019a52bd5b95d99d0b7eab4ce
Author: Piotr Caban <piotr at codeweavers.com>
Date: Thu Aug 1 13:55:39 2013 +0200
msvcrt: Added _swprintf_s_l implementation.
---
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 | 16 ++++++++++++++++
6 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 9d4cc80..7e602ef 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1371,7 +1371,7 @@
@ stub _swprintf_c_l
@ stub _swprintf_p
@ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l
-@ stub _swprintf_s_l
+@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l
@ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l
@ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l
@ extern _sys_errlist msvcrt._sys_errlist
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 6e97edb..6c2da4c 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1733,7 +1733,7 @@
@ stub _swprintf_c_l
@ stub _swprintf_p
@ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l
-@ stub _swprintf_s_l
+@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l
@ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l
@ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l
@ extern _sys_errlist msvcrt._sys_errlist
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 8d91d66..ec886eb 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -1049,7 +1049,7 @@
@ stub _swprintf_c
@ stub _swprintf_p
@ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l
-@ stub _swprintf_s_l
+@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l
@ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l
@ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l
@ extern _sys_errlist msvcrt._sys_errlist
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 9469587..d5eebb4 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -1025,7 +1025,7 @@
@ stub _swprintf_c_l
@ stub _swprintf_p
@ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l
-@ stub _swprintf_s_l
+@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l
@ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l
@ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l
@ extern _sys_errlist msvcrt._sys_errlist
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 975afe0..7511129 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -993,7 +993,7 @@
# stub _swprintf_c(ptr long str)
# stub _swprintf_c_l(ptr long str ptr)
@ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l
-# stub _swprintf_s_l(ptr long str ptr)
+@ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l
@ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l
@ varargs _swscanf_s_l(wstr wstr ptr) MSVCRT__swscanf_s_l
@ extern _sys_errlist MSVCRT__sys_errlist
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 3df7c02..ca4fba6 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -947,6 +947,22 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements,
}
/*********************************************************************
+ * _swprintf_s_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__swprintf_s_l(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements,
+ const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ... )
+{
+ __ms_va_list ap;
+ int r;
+
+ __ms_va_start(ap, locale);
+ r = MSVCRT_vsnwprintf_s_l(str, numberOfElements, INT_MAX, format, locale, ap);
+ __ms_va_end(ap);
+
+ return r;
+}
+
+/*********************************************************************
* _vswprintf (MSVCRT.@)
*/
int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, __ms_va_list args )
More information about the wine-cvs
mailing list