ucrtbase: Add __stdio_common_vfscanf().

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ucrtbase: Add __stdio_common_vfscanf().
fc64e2bf · Huw Davies · Alexandre Julliard · f22769f8 · fc64e2bf · fc64e2bf
Commit fc64e2bf authored Aug 24, 2016 by Huw Davies Committed by Alexandre Julliard Aug 25, 2016
Showing with 19 additions and 2 deletions

api-ms-win-crt-stdio-l1-1-0.spec ...-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +1 -1

scanf.c dlls/msvcrt/scanf.c +17 -0

ucrtbase.spec dlls/ucrtbase/ucrtbase.spec +1 -1

No files found.
--- 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

--- 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,

--- 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