Daniel Lehman : msvcrt: Add __swprintf_l.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jun 1 07:36:59 CDT 2015
Module: wine
Branch: master
Commit: 65b8a3da473905e08c8be0745db8ed2657c6cff7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b8a3da473905e08c8be0745db8ed2657c6cff7
Author: Daniel Lehman <dlehman at esri.com>
Date: Fri May 29 12:08:33 2015 -0700
msvcrt: Add __swprintf_l.
---
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/wcs.c | 14 ++++++++++++++
7 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index b7d4945..9b47401 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -657,7 +657,7 @@
@ extern __setlc_active MSVCRT___setlc_active
@ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr
@ stub __strncnt
-@ stub __swprintf_l
+@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l
@ cdecl __sys_errlist()
@ cdecl __sys_nerr()
@ cdecl __threadhandle() kernel32.GetCurrentThread
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index c7222b9..e99df42 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1005,7 +1005,7 @@
@ extern __setlc_active MSVCRT___setlc_active
@ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr
@ stub __strncnt
-@ stub __swprintf_l
+@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l
@ cdecl __sys_errlist()
@ cdecl __sys_nerr()
@ cdecl __threadhandle() kernel32.GetCurrentThread
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 1a1470e..2beb51b 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -993,7 +993,7 @@
@ extern __setlc_active MSVCRT___setlc_active
@ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr
@ stub __strncnt
-@ stub __swprintf_l
+@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l
@ cdecl __sys_errlist()
@ cdecl __sys_nerr()
@ cdecl __threadhandle() kernel32.GetCurrentThread
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index f47f906..e262aa9 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -966,7 +966,7 @@
@ extern __setlc_active msvcr120.__setlc_active
@ cdecl __setusermatherr(ptr) msvcr120.__setusermatherr
@ stub __strncnt
-@ stub __swprintf_l
+@ varargs __swprintf_l(ptr wstr ptr) msvcr120.__swprintf_l
@ cdecl __sys_errlist() msvcr120.__sys_errlist
@ cdecl __sys_nerr() msvcr120.__sys_nerr
@ cdecl __threadhandle() msvcr120.__threadhandle
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 8b40e2e..e3de8ac 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -306,7 +306,7 @@
@ extern __setlc_active MSVCRT___setlc_active
@ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr
@ stub __strncnt
-@ stub __swprintf_l
+@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l
@ cdecl __sys_errlist()
@ cdecl __sys_nerr()
@ cdecl __threadhandle() kernel32.GetCurrentThread
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 5c65b2f..2de0526 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -290,7 +290,7 @@
@ extern __setlc_active MSVCRT___setlc_active
@ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr
@ stub __strncnt
-@ stub __swprintf_l
+@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l
@ cdecl __sys_errlist()
@ cdecl __sys_nerr()
@ cdecl __threadhandle() kernel32.GetCurrentThread
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 98bc686..913b0a7 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1295,6 +1295,20 @@ int CDECL MSVCRT_sprintf_p_l(char *buffer, MSVCRT_size_t length,
}
/*********************************************************************
+ * __swprintf_l (MSVCRT.@)
+ */
+int CDECL MSVCRT___swprintf_l( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format,
+ MSVCRT__locale_t locale, ...)
+{
+ int retval;
+ __ms_va_list valist;
+ __ms_va_start(valist, locale);
+ retval = MSVCRT_vswprintf_l(str, format, locale, valist);
+ __ms_va_end(valist);
+ return retval;
+}
+
+/*********************************************************************
* _sprintf_p (MSVCR100.@)
*/
int CDECL MSVCRT__sprintf_p(char *buffer, MSVCRT_size_t length, const char *format, ...)
More information about the wine-cvs
mailing list