From 00f704539f270036ab8a7ccf9c27f5649fa479ec Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Thu, 22 Apr 2010 13:49:16 +0200 Subject: [PATCH] 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 227d108730c..20a9d1b7d4e 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 b8f4d5cb2eb..60f613274e2 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 6643e04a145..2c2f93b74e5 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 13186bf3191..4d294fffabb 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -131,6 +131,20 @@ int CDECL MSVCRT_scanf(const char *format, ...) return res; } +/********************************************************************* + * _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.@) */ @@ -145,7 +159,6 @@ int CDECL MSVCRT_fwscanf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...) return res; } - /********************************************************************* * wscanf (MSVCRT.@) */