Huw Davies : ucrtbase: Add __stdio_common_vfscanf().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fc64e2bfa6a1a8d0ac6aebdaa27ac5ac6803794b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fc64e2bfa6a1a8d0ac6aebdaa2...

Author: Huw Davies 
Date:   Wed Aug 24 12:58:32 2016 +0100

ucrtbase: Add __stdio_common_vfscanf().

Signed-off-by: Huw Davies 
Signed-off-by: Piotr Caban 
Signed-off-by: Alexandre Julliard

---

.../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 af723f7..4b8be01 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
@@ -4,7 +4,7 @@
 @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf
 @ stub __stdio_common_vfprintf_p
 @ stub __stdio_common_vfprintf_s
-@ stub __stdio_common_vfscanf
+@ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfscanf
 @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf
 @ stub __stdio_common_vfwprintf_p
 @ stub __stdio_common_vfwprintf_s
diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c
index 093424a..3642307 100644
--- a/dlls/msvcrt/scanf.c
+++ b/dlls/msvcrt/scanf.c
@@ -703,6 +703,23 @@ int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options,
 }

/*********************************************************************
+ *		__stdio_common_vfscanf (MSVCRT.@)
+ */
+int CDECL MSVCRT__stdio_common_vfscanf(unsigned __int64 options,
+                                       MSVCRT_FILE *file,
+                                       const char *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_vfscanf_s_l(file, format, locale, valist);
+    else
+        return MSVCRT_vfscanf_l(file, format, locale, valist);
+}
+
+/*********************************************************************
  *		__stdio_common_vfwscanf (MSVCRT.@)
  */
 int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options,
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 6ec16d9..07eb7e1 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -149,7 +149,7 @@
 @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf
 @ stub __stdio_common_vfprintf_p
 @ stub __stdio_common_vfprintf_s
-@ stub __stdio_common_vfscanf
+@ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfscanf
 @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf
 @ stub __stdio_common_vfwprintf_p
 @ stub __stdio_common_vfwprintf_s