From 2242f281bababdbf4aa2aaf27608dc1a954cf4ec Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Thu, 22 Apr 2010 13:51:03 +0200 Subject: [PATCH] msvcrt: Added _swscanf_l implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/scanf.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b20223aced3..08a372d25fd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -975,7 +975,7 @@ @ stub _swprintf_p @ stub _swprintf_p_l @ stub _swprintf_s_l -@ stub _swscanf_l +@ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ stub _swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist @ extern _sys_nerr msvcrt._sys_nerr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9da64e789e5..355bfe42f64 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -962,7 +962,7 @@ @ stub _swprintf_p @ stub _swprintf_p_l @ stub _swprintf_s_l -@ stub _swscanf_l +@ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ stub _swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist @ extern _sys_nerr msvcrt._sys_nerr diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6eb3114a5c1..84298e711c8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -909,7 +909,7 @@ # stub _swprintf_c_l # stub _swprintf_p_l # stub _swprintf_s_l -# stub _swscanf_l +@ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l # stub _swscanf_s_l @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 079f4505e4b..1f7cfefcfd9 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -246,6 +246,20 @@ int CDECL MSVCRT_swscanf(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format return res; } +/********************************************************************* + * _swscanf_l (MSVCRT.@) + */ +int CDECL MSVCRT__swscanf_l(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vswscanf_l(str, format, locale, valist); + __ms_va_end(valist); + return res; +} /********************************************************************* * _cscanf (MSVCRT.@)