Piotr Caban : msvcrt: Added fscanf_s(_l) implementation.
Alexandre Julliard
julliard at winehq.org
Thu Apr 22 11:24:04 CDT 2010
Module: wine
Branch: master
Commit: b38fcabfa08cb91314bc8953362e73916dd04709
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b38fcabfa08cb91314bc8953362e73916dd04709
Author: Piotr Caban <piotr at codeweavers.com>
Date: Thu Apr 22 13:51:41 2010 +0200
msvcrt: Added fscanf_s(_l) implementation.
---
dlls/msvcr80/msvcr80.spec | 4 ++--
dlls/msvcr90/msvcr90.spec | 4 ++--
dlls/msvcrt/msvcrt.spec | 11 +++--------
dlls/msvcrt/scanf.c | 32 ++++++++++++++++++++++++++++++++
4 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 84e9ff1..5cc1b8b 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -433,7 +433,7 @@
@ stub _freea_s
@ stub _freefls
@ varargs _fscanf_l(ptr str ptr) msvcrt._fscanf_l
-@ stub _fscanf_s_l
+@ varargs _fscanf_s_l(ptr str ptr) msvcrt._fscanf_s_l
@ stub _fseek_nolock
@ stub _fseeki64
@ stub _fseeki64_nolock
@@ -1273,7 +1273,7 @@
@ stub freopen_s
@ cdecl frexp(double ptr) msvcrt.frexp
@ varargs fscanf(ptr str) msvcrt.fscanf
-@ stub fscanf_s
+@ varargs fscanf_s(ptr str) msvcrt.fscanf_s
@ cdecl fseek(ptr long long) msvcrt.fseek
@ cdecl fsetpos(ptr ptr) msvcrt.fsetpos
@ cdecl ftell(ptr) msvcrt.ftell
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index a847cfe..f630e1a 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -425,7 +425,7 @@
@ stub _freea_s
@ stub _freefls
@ varargs _fscanf_l(ptr str ptr) msvcrt._fscanf_l
-@ stub _fscanf_s_l
+@ varargs _fscanf_s_l(ptr str ptr) msvcrt._fscanf_s_l
@ stub _fseek_nolock
@ stub _fseeki64
@ stub _fseeki64_nolock
@@ -1257,7 +1257,7 @@
@ stub freopen_s
@ cdecl frexp(double ptr) msvcrt.frexp
@ varargs fscanf(ptr str) msvcrt.fscanf
-@ stub fscanf_s
+@ varargs fscanf_s(ptr str) msvcrt.fscanf_s
@ cdecl fseek(ptr long long) msvcrt.fseek
@ cdecl fsetpos(ptr ptr) msvcrt.fsetpos
@ cdecl ftell(ptr) msvcrt.ftell
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index d3ad273..0fb6be3 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -395,7 +395,8 @@
# stub _freea
# stub _freea_s
# stub _fscanf_l
-# stub _fscanf_s_l
+@ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l
+@ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l
# stub _fseeki64
@ cdecl _fsopen(str str long) MSVCRT__fsopen
@ cdecl _fstat(long ptr) MSVCRT__fstat
@@ -1203,7 +1204,7 @@
# stub freopen_s
@ cdecl frexp(double ptr) MSVCRT_frexp
@ varargs fscanf(ptr str) MSVCRT_fscanf
-# stub fscanf_s
+@ varargs fscanf_s(ptr str) MSVCRT_fscanf_s
@ cdecl fseek(ptr long long) MSVCRT_fseek
@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
@ cdecl ftell(ptr) MSVCRT_ftell
@@ -1282,12 +1283,6 @@
@ cdecl puts(str) MSVCRT_puts
@ cdecl putwc(long ptr) MSVCRT_fputwc
@ cdecl putwchar(long) _fputwchar
-# stub _free_dbg
-# stub _freea
-# stub _freea_s
-@ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l
-# stub _fscanf_s_l
-# stub _fseeki64
@ cdecl qsort(ptr long long ptr) ntdll.qsort
# stub qsort_s
@ cdecl raise(long) MSVCRT_raise
diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c
index d0557d0..e1f917b 100644
--- a/dlls/msvcrt/scanf.c
+++ b/dlls/msvcrt/scanf.c
@@ -65,6 +65,9 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) {
#undef SECURE
#include "scanf.h"
+#define SECURE 1
+#include "scanf.h"
+
/* vfwscanf_l */
#define WIDE_SCANF 1
#undef CONSOLE
@@ -124,6 +127,35 @@ int CDECL MSVCRT__fscanf_l(MSVCRT_FILE *file, const char *format,
}
/*********************************************************************
+ * fscanf_s (MSVCRT.@)
+ */
+int CDECL MSVCRT_fscanf_s(MSVCRT_FILE *file, const char *format, ...)
+{
+ __ms_va_list valist;
+ int res;
+
+ __ms_va_start(valist, format);
+ res = MSVCRT_vfscanf_s_l(file, format, NULL, valist);
+ __ms_va_end(valist);
+ return res;
+}
+
+/*********************************************************************
+ * _fscanf_s_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__fscanf_s_l(MSVCRT_FILE *file, const char *format,
+ MSVCRT__locale_t locale, ...)
+{
+ __ms_va_list valist;
+ int res;
+
+ __ms_va_start(valist, locale);
+ res = MSVCRT_vfscanf_s_l(file, format, locale, valist);
+ __ms_va_end(valist);
+ return res;
+}
+
+/*********************************************************************
* scanf (MSVCRT.@)
*/
int CDECL MSVCRT_scanf(const char *format, ...)
More information about the wine-cvs
mailing list