From fc64e2bfa6a1a8d0ac6aebdaa27ac5ac6803794b Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Wed, 24 Aug 2016 12:58:32 +0100 Subject: [PATCH] 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 af723f7ea68..4b8be011178 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 093424ac356..3642307a400 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -702,6 +702,23 @@ int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, return MSVCRT_vsnwscanf_l(input, length, format, locale, valist); } +/********************************************************************* + * __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.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6ec16d96bb1..07eb7e1828f 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