Daniel Lehman : ucrtbase: Add __stdio_common_vfwscanf.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 0d8882ada83bf55fbffaa17f37f9e0fb7dfc3196
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0d8882ada83bf55fbffaa17f37f9e0fb7dfc3196

Author: Daniel Lehman <dlehman at esri.com>
Date:   Mon Aug  8 14:02:16 2016 -0700

ucrtbase: Add __stdio_common_vfwscanf.

Signed-off-by: Daniel Lehman <dlehman at esri.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 48340bd1fea772d0c3539edc693135ce800d4aaa)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 .../api-ms-win-crt-stdio-l1-1-0.spec                    |  2 +-
 dlls/msvcrt/scanf.c                                     | 17 +++++++++++++++++
 dlls/ucrtbase/ucrtbase.spec                             |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec
index 10a2ab7..448311d 100644
--- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec
@@ -8,7 +8,7 @@
 @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf
 @ stub __stdio_common_vfwprintf_p
 @ stub __stdio_common_vfwprintf_s
-@ stub __stdio_common_vfwscanf
+@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwscanf
 @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s
 @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s
 @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf
diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c
index a19d450..2ebb515 100644
--- a/dlls/msvcrt/scanf.c
+++ b/dlls/msvcrt/scanf.c
@@ -683,6 +683,23 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options,
 }
 
 /*********************************************************************
+ *		__stdio_common_vfwscanf (MSVCRT.@)
+ */
+int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options,
+                                        MSVCRT_FILE *file,
+                                        const MSVCRT_wchar_t *format,
+                                        MSVCRT__locale_t locale,
+                                        __ms_va_list valist)
+{
+    if (options & ~UCRTBASE_SCANF_SECURECRT)
+        FIXME("options %s not handled\n", wine_dbgstr_longlong(options));
+    if (options & UCRTBASE_SCANF_SECURECRT)
+        return MSVCRT_vfwscanf_s_l(file, format, locale, valist);
+    else
+        return MSVCRT_vfwscanf_l(file, format, locale, valist);
+}
+
+/*********************************************************************
  *		_snwscanf (MSVCRT.@)
  */
 int CDECL MSVCRT__snwscanf(MSVCRT_wchar_t *input, MSVCRT_size_t length,
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index fde39e8..25dfb2f 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -153,7 +153,7 @@
 @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf
 @ stub __stdio_common_vfwprintf_p
 @ stub __stdio_common_vfwprintf_s
-@ stub __stdio_common_vfwscanf
+@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf
 @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s
 @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s
 @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf