marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ucrtbase: Add __stdio_common_vswscanf(). 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Huw Davies 2016-08-24 12:58:31 +01:00 committed by Alexandre Julliard
parent a875e3c6ab
commit f22769f81a
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec
View File

@ -18,7 +18,7 @@
@ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf
@ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_p
@ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s
@ stub __stdio_common_vswscanf
@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswscanf
@ cdecl _chsize(long long) ucrtbase._chsize
@ cdecl _chsize_s(long int64) ucrtbase._chsize_s
@ cdecl _close(long) ucrtbase._close

22
dlls/msvcrt/scanf.c
View File

@ -66,7 +66,7 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) {
#undef SECURE
#include "scanf.h"
/* vfscanf_l */
/* vfscanf_s_l */
#define SECURE 1
#include "scanf.h"
@ -682,6 +682,26 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options,
return MSVCRT_vsnscanf_l(input, length, format, locale, valist);
}
/*********************************************************************
* __stdio_common_vswscanf (MSVCRT.@)
*/
int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options,
const MSVCRT_wchar_t *input, MSVCRT_size_t length,
const MSVCRT_wchar_t *format,
MSVCRT__locale_t locale,
__ms_va_list valist)
{
/* LEGACY_WIDE_SPECIFIERS only has got an effect on the wide
* scanf. LEGACY_MSVCRT_COMPATIBILITY affects parsing of nan/inf,
* but parsing of those isn't implemented at all yet. */
if (options & ~UCRTBASE_SCANF_MASK)
FIXME("options %s not handled\n", wine_dbgstr_longlong(options));
if (options & UCRTBASE_SCANF_SECURECRT)
return MSVCRT_vsnwscanf_s_l(input, length, format, locale, valist);
else
return MSVCRT_vsnwscanf_l(input, length, format, locale, valist);
}
/*********************************************************************
* __stdio_common_vfwscanf (MSVCRT.@)
*/

2
dlls/ucrtbase/ucrtbase.spec
View File

@ -163,7 +163,7 @@
@ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf
@ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_p
@ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s
@ stub __stdio_common_vswscanf
@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf
@ stub __strncnt
@ cdecl __sys_errlist()
@ cdecl __sys_nerr()