Piotr Caban : msvcrt: Added _scanf_l implementation.
Alexandre Julliard
julliard at winehq.org
Thu Apr 22 11:24:02 CDT 2010
Module: wine
Branch: master
Commit: 00f704539f270036ab8a7ccf9c27f5649fa479ec
URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f704539f270036ab8a7ccf9c27f5649fa479ec
Author: Piotr Caban <piotr at codeweavers.com>
Date: Thu Apr 22 13:49:16 2010 +0200
msvcrt: Added _scanf_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, 17 insertions(+), 4 deletions(-)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 227d108..20a9d1b 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -851,7 +851,7 @@
@ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem
@ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1
@ cdecl _scalb( double long) msvcrt._scalb
-@ stub _scanf_l
+@ varargs _scanf_l(str ptr) msvcrt._scanf_l
@ stub _scanf_s_l
@ stub _scprintf
@ stub _scprintf_l
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index b8f4d5c..60f6132 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -837,7 +837,7 @@
@ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem
@ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1
@ cdecl _scalb( double long) msvcrt._scalb
-@ stub _scanf_l
+@ varargs _scanf_l(str ptr) msvcrt._scanf_l
@ stub _scanf_s_l
@ stub _scprintf
@ stub _scprintf_l
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 6643e04..2c2f93b 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -793,7 +793,7 @@
@ cdecl -arch=i386 _safe_fprem()
@ cdecl -arch=i386 _safe_fprem1()
@ cdecl _scalb(double long) MSVCRT__scalb
-# stub _scanf_l
+@ varargs _scanf_l(str ptr) MSVCRT__scanf_l
# stub _scanf_s_l
# stub _scprintf
# stub _scprintf_l
diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c
index 13186bf..4d294ff 100644
--- a/dlls/msvcrt/scanf.c
+++ b/dlls/msvcrt/scanf.c
@@ -132,6 +132,20 @@ int CDECL MSVCRT_scanf(const char *format, ...)
}
/*********************************************************************
+ * _scanf_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__scanf_l(const char *format, MSVCRT__locale_t locale, ...)
+{
+ __ms_va_list valist;
+ int res;
+
+ __ms_va_start(valist, locale);
+ res = MSVCRT_vfscanf_l(MSVCRT_stdin, format, locale, valist);
+ __ms_va_end(valist);
+ return res;
+}
+
+/*********************************************************************
* fwscanf (MSVCRT.@)
*/
int CDECL MSVCRT_fwscanf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...)
@@ -145,7 +159,6 @@ int CDECL MSVCRT_fwscanf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...)
return res;
}
-
/*********************************************************************
* wscanf (MSVCRT.@)
*/
More information about the wine-cvs
mailing list