Piotr Caban : msvcrt: Added _fwscanf_l implementation.
Alexandre Julliard
julliard at winehq.org
Thu Apr 22 11:24:02 CDT 2010
Module: wine
Branch: master
Commit: 674df1ee1e10864466240041dadcb1ae99a52cb2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=674df1ee1e10864466240041dadcb1ae99a52cb2
Author: Piotr Caban <piotr at codeweavers.com>
Date: Thu Apr 22 13:49:35 2010 +0200
msvcrt: Added _fwscanf_l implementation.
---
dlls/msvcr80/msvcr80.spec | 2 +-
dlls/msvcr90/msvcr90.spec | 2 +-
dlls/msvcrt/msvcrt.spec | 2 +-
dlls/msvcrt/scanf.c | 15 +++++++++++++++
4 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 20a9d1b..dc4c219 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -458,7 +458,7 @@
@ stub _fwprintf_p_l
@ stub _fwprintf_s_l
@ stub _fwrite_nolock
-@ stub _fwscanf_l
+@ varargs _fwscanf_l(ptr wstr ptr) msvcrt._fwscanf_l
@ stub _fwscanf_s_l
@ cdecl _gcvt(double long str) msvcrt._gcvt
@ stub _gcvt_s
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 60f6132..eae71a3 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -450,7 +450,7 @@
@ stub _fwprintf_p_l
@ stub _fwprintf_s_l
@ stub _fwrite_nolock
-@ stub _fwscanf_l
+@ varargs _fwscanf_l(ptr wstr ptr) msvcrt._fwscanf_l
@ stub _fwscanf_s_l
@ cdecl _gcvt(double long str) msvcrt._gcvt
@ stub _gcvt_s
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 2c2f93b..46c8acb 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -419,7 +419,7 @@
# stub _fwprintf_p
# stub _fwprintf_p_l
# stub _fwprintf_s_l
-# stub _fwscanf_l
+@ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l
# stub _fwscanf_s_l
@ cdecl _gcvt(double long str)
# stub _gcvt_s
diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c
index 4d294ff..bcad004 100644
--- a/dlls/msvcrt/scanf.c
+++ b/dlls/msvcrt/scanf.c
@@ -160,6 +160,21 @@ int CDECL MSVCRT_fwscanf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...)
}
/*********************************************************************
+ * _fwscanf_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__fwscanf_l(MSVCRT_FILE *file, const MSVCRT_wchar_t *format,
+ MSVCRT__locale_t locale, ...)
+{
+ __ms_va_list valist;
+ int res;
+
+ __ms_va_start(valist, locale);
+ res = MSVCRT_vfwscanf_l(file, format, locale, valist);
+ __ms_va_end(valist);
+ return res;
+}
+
+/*********************************************************************
* wscanf (MSVCRT.@)
*/
int CDECL MSVCRT_wscanf(const MSVCRT_wchar_t *format, ...)
More information about the wine-cvs
mailing list