From a1662e3f7d6626618dc0158627ffbe8cf2c81be0 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Wed, 2 Dec 2020 00:54:03 +0100 Subject: [PATCH] msvcrt: Remove MSVCRT_ prefix from scanf.c functions. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/crtdll/crtdll.spec | 12 +-- dlls/msvcr100/msvcr100.spec | 64 ++++++------ dlls/msvcr110/msvcr110.spec | 64 ++++++------ dlls/msvcr120/msvcr120.spec | 66 ++++++------ dlls/msvcr70/msvcr70.spec | 16 +-- dlls/msvcr71/msvcr71.spec | 16 +-- dlls/msvcr80/msvcr80.spec | 64 ++++++------ dlls/msvcr90/msvcr90.spec | 64 ++++++------ dlls/msvcrt/math.c | 4 +- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 64 ++++++------ dlls/msvcrt/scanf.c | 176 ++++++++++++++++---------------- dlls/msvcrt/scanf.h | 32 +++--- dlls/msvcrtd/msvcrtd.spec | 12 +-- dlls/ucrtbase/ucrtbase.spec | 16 +-- include/msvcrt/corecrt_wstdio.h | 8 +- include/msvcrt/stdio.h | 8 +- 17 files changed, 348 insertions(+), 340 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index cb1cfba83fc..4be1a124362 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -384,13 +384,13 @@ @ cdecl free(ptr) @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl frexp(double ptr) MSVCRT_frexp -@ varargs fscanf(ptr str) MSVCRT_fscanf +@ varargs fscanf(ptr str) @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite -@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf +@ varargs fwscanf(ptr wstr) @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) @@ -454,7 +454,7 @@ @ cdecl remove(str) MSVCRT_remove @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind -@ varargs scanf(str) MSVCRT_scanf +@ varargs scanf(str) @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl setlocale(long str) @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf @@ -464,7 +464,7 @@ @ varargs sprintf(ptr str) MSVCRT_sprintf @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) -@ varargs sscanf(str str) MSVCRT_sscanf +@ varargs sscanf(str str) @ cdecl strcat(str str) @ cdecl strchr(str long) @ cdecl strcmp(str str) @@ -487,7 +487,7 @@ @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf(ptr wstr) MSVCRT_swprintf -@ varargs swscanf(wstr wstr) MSVCRT_swscanf +@ varargs swscanf(wstr wstr) @ cdecl system(str) @ cdecl tan(double) MSVCRT_tan @ cdecl tanh(double) MSVCRT_tanh @@ -529,4 +529,4 @@ @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf -@ varargs wscanf(wstr) MSVCRT_wscanf +@ varargs wscanf(wstr) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2738da41b6d..5f65b3aed6a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -841,8 +841,8 @@ @ stub _freea @ stub _freea_s @ stub _freefls -@ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l -@ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l +@ varargs _fscanf_l(ptr str ptr) +@ varargs _fscanf_s_l(ptr str ptr) @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @@ -867,8 +867,8 @@ @ stub _fwprintf_p_l @ stub _fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock -@ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l -@ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l +@ varargs _fwscanf_l(ptr wstr ptr) +@ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) MSVCRT__gcvt @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s @ cdecl _get_current_locale() @@ -1257,8 +1257,8 @@ @ cdecl -ret64 _rotr64(int64 long) @ cdecl _scalb(double long) MSVCRT__scalb @ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf -@ varargs _scanf_l(str ptr) MSVCRT__scanf_l -@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l +@ varargs _scanf_l(str ptr) +@ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) MSVCRT__scprintf @ stub _scprintf_l @ stub _scprintf_p @@ -1298,18 +1298,18 @@ @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l -@ varargs _snscanf(str long str) MSVCRT__snscanf -@ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l -@ varargs _snscanf_s(str long str) MSVCRT__snscanf_s -@ varargs _snscanf_s_l(str long str ptr) MSVCRT__snscanf_s_l +@ varargs _snscanf(str long str) +@ varargs _snscanf_l(str long str ptr) +@ varargs _snscanf_s(str long str) +@ varargs _snscanf_s_l(str long str ptr) @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) MSVCRT__snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s @ varargs _snwprintf_s_l(ptr long long wstr ptr) MSVCRT__snwprintf_s_l -@ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf -@ varargs _snwscanf_l(wstr long wstr ptr) MSVCRT__snwscanf_l -@ varargs _snwscanf_s(wstr long wstr) MSVCRT__snwscanf_s -@ varargs _snwscanf_s_l(wstr long wstr ptr) MSVCRT__snwscanf_s_l +@ varargs _snwscanf(wstr long wstr) +@ varargs _snwscanf_l(wstr long wstr ptr) +@ varargs _snwscanf_s(wstr long wstr) +@ varargs _snwscanf_s_l(wstr long wstr ptr) @ varargs _sopen(str long long) MSVCRT__sopen @ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s @ varargs _spawnl(long str str) @@ -1326,8 +1326,8 @@ @ varargs _sprintf_p(ptr long str) MSVCRT__sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) MSVCRT_sprintf_p_l @ varargs _sprintf_s_l(ptr long str ptr) MSVCRT_sprintf_s_l -@ varargs _sscanf_l(str str ptr) MSVCRT__sscanf_l -@ varargs _sscanf_s_l(str str ptr) MSVCRT__sscanf_s_l +@ varargs _sscanf_l(str str ptr) +@ varargs _sscanf_s_l(str str ptr) @ cdecl _stat32(str ptr) MSVCRT__stat32 @ cdecl _stat32i64(str ptr) MSVCRT__stat32i64 @ cdecl _stat64(str ptr) MSVCRT_stat64 @@ -1381,8 +1381,8 @@ @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l -@ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l -@ varargs _swscanf_s_l(wstr wstr ptr) MSVCRT__swscanf_s_l +@ varargs _swscanf_l(wstr wstr ptr) +@ varargs _swscanf_s_l(wstr wstr ptr) @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr @ cdecl _tell(long) MSVCRT__tell @@ -1581,8 +1581,8 @@ @ cdecl _wrename(wstr wstr) MSVCRT__wrename @ cdecl _write(long ptr long) MSVCRT__write @ cdecl _wrmdir(wstr) MSVCRT__wrmdir -@ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l -@ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l +@ varargs _wscanf_l(wstr ptr) +@ varargs _wscanf_s_l(wstr ptr) @ cdecl _wsearchenv(wstr wstr ptr) MSVCRT__wsearchenv @ cdecl _wsearchenv_s(wstr wstr ptr long) MSVCRT__wsearchenv_s @ cdecl _wsetlocale(long wstr) @@ -1685,16 +1685,16 @@ @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp -@ varargs fscanf(ptr str) MSVCRT_fscanf -@ varargs fscanf_s(ptr str) MSVCRT_fscanf_s +@ varargs fscanf(ptr str) +@ varargs fscanf_s(ptr str) @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf @ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite -@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf -@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s +@ varargs fwscanf(ptr wstr) +@ varargs fwscanf_s(ptr wstr) @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) @@ -1777,8 +1777,8 @@ @ cdecl remove(str) MSVCRT_remove @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind -@ varargs scanf(str) MSVCRT_scanf -@ varargs scanf_s(str) MSVCRT_scanf_s +@ varargs scanf(str) +@ varargs scanf_s(str) @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) @@ -1793,8 +1793,8 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) -@ varargs sscanf(str str) MSVCRT_sscanf -@ varargs sscanf_s(str str) MSVCRT_sscanf_s +@ varargs sscanf(str str) +@ varargs sscanf_s(str str) @ cdecl strcat(str str) @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) @@ -1824,8 +1824,8 @@ @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s -@ varargs swscanf(wstr wstr) MSVCRT_swscanf -@ varargs swscanf_s(wstr wstr) MSVCRT_swscanf_s +@ varargs swscanf(wstr wstr) +@ varargs swscanf_s(wstr wstr) @ cdecl system(str) @ cdecl tan(double) MSVCRT_tan @ cdecl -arch=!i386 tanf(float) MSVCRT_tanf @@ -1891,5 +1891,5 @@ @ cdecl wmemmove_s(ptr long ptr long) @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wprintf_s(wstr) MSVCRT_wprintf_s -@ varargs wscanf(wstr) MSVCRT_wscanf -@ varargs wscanf_s(wstr) MSVCRT_wscanf_s +@ varargs wscanf(wstr) +@ varargs wscanf_s(wstr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ee972d24f6b..bca7fbf8931 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1188,8 +1188,8 @@ @ stub _freea @ stub _freea_s @ stub _freefls -@ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l -@ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l +@ varargs _fscanf_l(ptr str ptr) +@ varargs _fscanf_s_l(ptr str ptr) @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @@ -1214,8 +1214,8 @@ @ stub _fwprintf_p_l @ stub _fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock -@ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l -@ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l +@ varargs _fwscanf_l(ptr wstr ptr) +@ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) MSVCRT__gcvt @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s @ cdecl _get_current_locale() @@ -1614,8 +1614,8 @@ @ cdecl -ret64 _rotr64(int64 long) @ cdecl _scalb(double long) MSVCRT__scalb @ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf -@ varargs _scanf_l(str ptr) MSVCRT__scanf_l -@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l +@ varargs _scanf_l(str ptr) +@ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) MSVCRT__scprintf @ stub _scprintf_l @ stub _scprintf_p @@ -1655,18 +1655,18 @@ @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l -@ varargs _snscanf(str long str) MSVCRT__snscanf -@ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l -@ varargs _snscanf_s(str long str) MSVCRT__snscanf_s -@ varargs _snscanf_s_l(str long str ptr) MSVCRT__snscanf_s_l +@ varargs _snscanf(str long str) +@ varargs _snscanf_l(str long str ptr) +@ varargs _snscanf_s(str long str) +@ varargs _snscanf_s_l(str long str ptr) @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) MSVCRT__snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s @ varargs _snwprintf_s_l(ptr long long wstr ptr) MSVCRT__snwprintf_s_l -@ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf -@ varargs _snwscanf_l(wstr long wstr ptr) MSVCRT__snwscanf_l -@ varargs _snwscanf_s(wstr long wstr) MSVCRT__snwscanf_s -@ varargs _snwscanf_s_l(wstr long wstr ptr) MSVCRT__snwscanf_s_l +@ varargs _snwscanf(wstr long wstr) +@ varargs _snwscanf_l(wstr long wstr ptr) +@ varargs _snwscanf_s(wstr long wstr) +@ varargs _snwscanf_s_l(wstr long wstr ptr) @ varargs _sopen(str long long) MSVCRT__sopen @ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s @ varargs _spawnl(long str str) @@ -1683,8 +1683,8 @@ @ varargs _sprintf_p(ptr long str) MSVCRT__sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) MSVCRT_sprintf_p_l @ varargs _sprintf_s_l(ptr long str ptr) MSVCRT_sprintf_s_l -@ varargs _sscanf_l(str str ptr) MSVCRT__sscanf_l -@ varargs _sscanf_s_l(str str ptr) MSVCRT__sscanf_s_l +@ varargs _sscanf_l(str str ptr) +@ varargs _sscanf_s_l(str str ptr) @ cdecl _stat32(str ptr) MSVCRT__stat32 @ cdecl _stat32i64(str ptr) MSVCRT__stat32i64 @ cdecl _stat64(str ptr) MSVCRT_stat64 @@ -1738,8 +1738,8 @@ @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l -@ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l -@ varargs _swscanf_s_l(wstr wstr ptr) MSVCRT__swscanf_s_l +@ varargs _swscanf_l(wstr wstr ptr) +@ varargs _swscanf_s_l(wstr wstr ptr) @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr @ cdecl _tell(long) MSVCRT__tell @@ -1938,8 +1938,8 @@ @ cdecl _wrename(wstr wstr) MSVCRT__wrename @ cdecl _write(long ptr long) MSVCRT__write @ cdecl _wrmdir(wstr) MSVCRT__wrmdir -@ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l -@ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l +@ varargs _wscanf_l(wstr ptr) +@ varargs _wscanf_s_l(wstr ptr) @ cdecl _wsearchenv(wstr wstr ptr) MSVCRT__wsearchenv @ cdecl _wsearchenv_s(wstr wstr ptr long) MSVCRT__wsearchenv_s @ cdecl _wsetlocale(long wstr) @@ -2043,16 +2043,16 @@ @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp -@ varargs fscanf(ptr str) MSVCRT_fscanf -@ varargs fscanf_s(ptr str) MSVCRT_fscanf_s +@ varargs fscanf(ptr str) +@ varargs fscanf_s(ptr str) @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf @ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite -@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf -@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s +@ varargs fwscanf(ptr wstr) +@ varargs fwscanf_s(ptr wstr) @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) @@ -2135,8 +2135,8 @@ @ cdecl remove(str) MSVCRT_remove @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind -@ varargs scanf(str) MSVCRT_scanf -@ varargs scanf_s(str) MSVCRT_scanf_s +@ varargs scanf(str) +@ varargs scanf_s(str) @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) @@ -2151,8 +2151,8 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) -@ varargs sscanf(str str) MSVCRT_sscanf -@ varargs sscanf_s(str str) MSVCRT_sscanf_s +@ varargs sscanf(str str) +@ varargs sscanf_s(str str) @ cdecl strcat(str str) @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) @@ -2182,8 +2182,8 @@ @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s -@ varargs swscanf(wstr wstr) MSVCRT_swscanf -@ varargs swscanf_s(wstr wstr) MSVCRT_swscanf_s +@ varargs swscanf(wstr wstr) +@ varargs swscanf_s(wstr wstr) @ cdecl system(str) @ cdecl tan(double) MSVCRT_tan @ cdecl -arch=!i386 tanf(float) MSVCRT_tanf @@ -2249,5 +2249,5 @@ @ cdecl wmemmove_s(ptr long ptr long) @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wprintf_s(wstr) MSVCRT_wprintf_s -@ varargs wscanf(wstr) MSVCRT_wscanf -@ varargs wscanf_s(wstr) MSVCRT_wscanf_s +@ varargs wscanf(wstr) +@ varargs wscanf_s(wstr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 30e531af5fa..9188e8cdd06 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1188,8 +1188,8 @@ @ stub _freea @ stub _freea_s @ stub _freefls -@ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l -@ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l +@ varargs _fscanf_l(ptr str ptr) +@ varargs _fscanf_s_l(ptr str ptr) @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @@ -1214,8 +1214,8 @@ @ stub _fwprintf_p_l @ stub _fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock -@ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l -@ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l +@ varargs _fwscanf_l(ptr wstr ptr) +@ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) MSVCRT__gcvt @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s @ cdecl _get_current_locale() @@ -1624,8 +1624,8 @@ @ cdecl -ret64 _rotr64(int64 long) @ cdecl _scalb(double long) MSVCRT__scalb @ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf -@ varargs _scanf_l(str ptr) MSVCRT__scanf_l -@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l +@ varargs _scanf_l(str ptr) +@ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) MSVCRT__scprintf @ stub _scprintf_l @ stub _scprintf_p @@ -1666,18 +1666,18 @@ @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l -@ varargs _snscanf(str long str) MSVCRT__snscanf -@ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l -@ varargs _snscanf_s(str long str) MSVCRT__snscanf_s -@ varargs _snscanf_s_l(str long str ptr) MSVCRT__snscanf_s_l +@ varargs _snscanf(str long str) +@ varargs _snscanf_l(str long str ptr) +@ varargs _snscanf_s(str long str) +@ varargs _snscanf_s_l(str long str ptr) @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) MSVCRT__snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s @ varargs _snwprintf_s_l(ptr long long wstr ptr) MSVCRT__snwprintf_s_l -@ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf -@ varargs _snwscanf_l(wstr long wstr ptr) MSVCRT__snwscanf_l -@ varargs _snwscanf_s(wstr long wstr) MSVCRT__snwscanf_s -@ varargs _snwscanf_s_l(wstr long wstr ptr) MSVCRT__snwscanf_s_l +@ varargs _snwscanf(wstr long wstr) +@ varargs _snwscanf_l(wstr long wstr ptr) +@ varargs _snwscanf_s(wstr long wstr) +@ varargs _snwscanf_s_l(wstr long wstr ptr) @ varargs _sopen(str long long) MSVCRT__sopen @ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s @ varargs _spawnl(long str str) @@ -1694,8 +1694,8 @@ @ varargs _sprintf_p(ptr long str) MSVCRT__sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) MSVCRT_sprintf_p_l @ varargs _sprintf_s_l(ptr long str ptr) MSVCRT_sprintf_s_l -@ varargs _sscanf_l(str str ptr) MSVCRT__sscanf_l -@ varargs _sscanf_s_l(str str ptr) MSVCRT__sscanf_s_l +@ varargs _sscanf_l(str str ptr) +@ varargs _sscanf_s_l(str str ptr) @ cdecl _stat32(str ptr) MSVCRT__stat32 @ cdecl _stat32i64(str ptr) MSVCRT__stat32i64 @ cdecl _stat64(str ptr) MSVCRT_stat64 @@ -1755,8 +1755,8 @@ @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l -@ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l -@ varargs _swscanf_s_l(wstr wstr ptr) MSVCRT__swscanf_s_l +@ varargs _swscanf_l(wstr wstr ptr) +@ varargs _swscanf_s_l(wstr wstr ptr) @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr @ cdecl _tell(long) MSVCRT__tell @@ -1962,8 +1962,8 @@ @ cdecl _wrename(wstr wstr) MSVCRT__wrename @ cdecl _write(long ptr long) MSVCRT__write @ cdecl _wrmdir(wstr) MSVCRT__wrmdir -@ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l -@ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l +@ varargs _wscanf_l(wstr ptr) +@ varargs _wscanf_s_l(wstr ptr) @ cdecl _wsearchenv(wstr wstr ptr) MSVCRT__wsearchenv @ cdecl _wsearchenv_s(wstr wstr ptr long) MSVCRT__wsearchenv_s @ cdecl _wsetlocale(long wstr) @@ -2189,16 +2189,16 @@ @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp -@ varargs fscanf(ptr str) MSVCRT_fscanf -@ varargs fscanf_s(ptr str) MSVCRT_fscanf_s +@ varargs fscanf(ptr str) +@ varargs fscanf_s(ptr str) @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf @ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite -@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf -@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s +@ varargs fwscanf(ptr wstr) +@ varargs fwscanf_s(ptr wstr) @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) @@ -2345,8 +2345,8 @@ @ cdecl scalbn(double long) MSVCRT__scalb @ cdecl scalbnf(float long) MSVCRT__scalbf @ cdecl scalbnl(double long) MSVCR120_scalbnl -@ varargs scanf(str) MSVCRT_scanf -@ varargs scanf_s(str) MSVCRT_scanf_s +@ varargs scanf(str) +@ varargs scanf_s(str) @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) @@ -2361,8 +2361,8 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) -@ varargs sscanf(str str) MSVCRT_sscanf -@ varargs sscanf_s(str str) MSVCRT_sscanf_s +@ varargs sscanf(str str) +@ varargs sscanf_s(str str) @ cdecl strcat(str str) @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) @@ -2398,8 +2398,8 @@ @ cdecl -ret64 strtoumax(str ptr long) MSVCRT_strtoui64 @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s -@ varargs swscanf(wstr wstr) MSVCRT_swscanf -@ varargs swscanf_s(wstr wstr) MSVCRT_swscanf_s +@ varargs swscanf(wstr wstr) +@ varargs swscanf_s(wstr wstr) @ cdecl system(str) @ cdecl tan(double) MSVCRT_tan @ cdecl -arch=!i386 tanf(float) MSVCRT_tanf @@ -2439,7 +2439,7 @@ @ cdecl vsscanf(ptr str ptr) MSVCRT_vsscanf @ stub vsscanf_s @ cdecl vswprintf_s(ptr long wstr ptr) MSVCRT_vswprintf_s -@ cdecl vswscanf(ptr wstr ptr) MSVCRT_vswscanf +@ cdecl vswscanf(ptr wstr ptr) @ stub vswscanf_s @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @@ -2492,5 +2492,5 @@ @ cdecl wmemmove_s(ptr long ptr long) @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wprintf_s(wstr) MSVCRT_wprintf_s -@ varargs wscanf(wstr) MSVCRT_wscanf -@ varargs wscanf_s(wstr) MSVCRT_wscanf_s +@ varargs wscanf(wstr) +@ varargs wscanf_s(wstr) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 2d1e230e7bc..c82efc73701 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -527,9 +527,9 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ varargs _snscanf(str long str) MSVCRT__snscanf +@ varargs _snscanf(str long str) @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf -@ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf +@ varargs _snwscanf(wstr long wstr) @ varargs _sopen(str long long) MSVCRT__sopen @ varargs _spawnl(long str str) @ varargs _spawnle(long str str) @@ -727,13 +727,13 @@ @ cdecl free(ptr) @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl frexp(double ptr) MSVCRT_frexp -@ varargs fscanf(ptr str) MSVCRT_fscanf +@ varargs fscanf(ptr str) @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite -@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf +@ varargs fwscanf(ptr wstr) @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) @@ -801,7 +801,7 @@ @ cdecl remove(str) MSVCRT_remove @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind -@ varargs scanf(str) MSVCRT_scanf +@ varargs scanf(str) @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl setlocale(long str) @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf @@ -811,7 +811,7 @@ @ varargs sprintf(ptr str) MSVCRT_sprintf @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) -@ varargs sscanf(str str) MSVCRT_sscanf +@ varargs sscanf(str str) @ cdecl strcat(str str) @ cdecl strchr(str long) @ cdecl strcmp(str str) @@ -834,7 +834,7 @@ @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf(ptr wstr) MSVCRT_swprintf -@ varargs swscanf(wstr wstr) MSVCRT_swscanf +@ varargs swscanf(wstr wstr) @ cdecl system(str) @ cdecl tan(double) MSVCRT_tan @ cdecl tanh(double) MSVCRT_tanh @@ -876,4 +876,4 @@ @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf -@ varargs wscanf(wstr) MSVCRT_wscanf +@ varargs wscanf(wstr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index d974a04fb8c..6f529bd5c62 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -523,9 +523,9 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) @ varargs _snprintf(ptr long str) MSVCRT__snprintf -@ varargs _snscanf(str long str) MSVCRT__snscanf +@ varargs _snscanf(str long str) @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf -@ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf +@ varargs _snwscanf(wstr long wstr) @ varargs _sopen(str long long) MSVCRT__sopen @ varargs _spawnl(long str str) @ varargs _spawnle(long str str) @@ -723,13 +723,13 @@ @ cdecl free(ptr) @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl frexp(double ptr) MSVCRT_frexp -@ varargs fscanf(ptr str) MSVCRT_fscanf +@ varargs fscanf(ptr str) @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite -@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf +@ varargs fwscanf(ptr wstr) @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) @@ -797,7 +797,7 @@ @ cdecl remove(str) MSVCRT_remove @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind -@ varargs scanf(str) MSVCRT_scanf +@ varargs scanf(str) @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl setlocale(long str) @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf @@ -807,7 +807,7 @@ @ varargs sprintf(ptr str) MSVCRT_sprintf @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) -@ varargs sscanf(str str) MSVCRT_sscanf +@ varargs sscanf(str str) @ cdecl strcat(str str) @ cdecl strchr(str long) @ cdecl strcmp(str str) @@ -830,7 +830,7 @@ @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf(ptr wstr) MSVCRT_swprintf -@ varargs swscanf(wstr wstr) MSVCRT_swscanf +@ varargs swscanf(wstr wstr) @ cdecl system(str) @ cdecl tan(double) MSVCRT_tan @ cdecl tanh(double) MSVCRT_tanh @@ -872,4 +872,4 @@ @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf -@ varargs wscanf(wstr) MSVCRT_wscanf +@ varargs wscanf(wstr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 98fe019361c..e9a9d0c0151 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -507,8 +507,8 @@ @ stub _freea @ stub _freea_s @ stub _freefls -@ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l -@ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l +@ varargs _fscanf_l(ptr str ptr) +@ varargs _fscanf_s_l(ptr str ptr) @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @@ -533,8 +533,8 @@ @ stub _fwprintf_p_l @ stub _fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock -@ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l -@ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l +@ varargs _fwscanf_l(ptr wstr ptr) +@ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) MSVCRT__gcvt @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s @ stub _get_amblksiz @@ -935,8 +935,8 @@ @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) MSVCRT__scalb @ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf -@ varargs _scanf_l(str ptr) MSVCRT__scanf_l -@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l +@ varargs _scanf_l(str ptr) +@ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) MSVCRT__scprintf @ stub _scprintf_l @ stub _scprintf_p @@ -978,18 +978,18 @@ @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l -@ varargs _snscanf(str long str) MSVCRT__snscanf -@ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l -@ varargs _snscanf_s(str long str) MSVCRT__snscanf_s -@ varargs _snscanf_s_l(str long str ptr) MSVCRT__snscanf_s_l +@ varargs _snscanf(str long str) +@ varargs _snscanf_l(str long str ptr) +@ varargs _snscanf_s(str long str) +@ varargs _snscanf_s_l(str long str ptr) @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) MSVCRT__snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s @ varargs _snwprintf_s_l(ptr long long wstr ptr) MSVCRT__snwprintf_s_l -@ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf -@ varargs _snwscanf_l(wstr long wstr ptr) MSVCRT__snwscanf_l -@ varargs _snwscanf_s(wstr long wstr) MSVCRT__snwscanf_s -@ varargs _snwscanf_s_l(wstr long wstr ptr) MSVCRT__snwscanf_s_l +@ varargs _snwscanf(wstr long wstr) +@ varargs _snwscanf_l(wstr long wstr ptr) +@ varargs _snwscanf_s(wstr long wstr) +@ varargs _snwscanf_s_l(wstr long wstr ptr) @ varargs _sopen(str long long) MSVCRT__sopen @ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s @ varargs _spawnl(long str str) @@ -1006,8 +1006,8 @@ @ varargs _sprintf_p(ptr long str) MSVCRT__sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) MSVCRT_sprintf_p_l @ varargs _sprintf_s_l(ptr long str ptr) MSVCRT_sprintf_s_l -@ varargs _sscanf_l(str str ptr) MSVCRT__sscanf_l -@ varargs _sscanf_s_l(str str ptr) MSVCRT__sscanf_s_l +@ varargs _sscanf_l(str str ptr) +@ varargs _sscanf_s_l(str str ptr) @ cdecl _stat32(str ptr) MSVCRT__stat32 @ cdecl _stat32i64(str ptr) MSVCRT__stat32i64 @ cdecl _stat64(str ptr) MSVCRT_stat64 @@ -1061,8 +1061,8 @@ @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l -@ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l -@ varargs _swscanf_s_l(wstr wstr ptr) MSVCRT__swscanf_s_l +@ varargs _swscanf_l(wstr wstr ptr) +@ varargs _swscanf_s_l(wstr wstr ptr) @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr @ cdecl _tell(long) MSVCRT__tell @@ -1264,8 +1264,8 @@ @ cdecl _wrename(wstr wstr) MSVCRT__wrename @ cdecl _write(long ptr long) MSVCRT__write @ cdecl _wrmdir(wstr) MSVCRT__wrmdir -@ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l -@ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l +@ varargs _wscanf_l(wstr ptr) +@ varargs _wscanf_s_l(wstr ptr) @ cdecl _wsearchenv(wstr wstr ptr) MSVCRT__wsearchenv @ cdecl _wsearchenv_s(wstr wstr ptr long) MSVCRT__wsearchenv_s @ cdecl _wsetlocale(long wstr) @@ -1368,16 +1368,16 @@ @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp -@ varargs fscanf(ptr str) MSVCRT_fscanf -@ varargs fscanf_s(ptr str) MSVCRT_fscanf_s +@ varargs fscanf(ptr str) +@ varargs fscanf_s(ptr str) @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf @ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite -@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf -@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s +@ varargs fwscanf(ptr wstr) +@ varargs fwscanf_s(ptr wstr) @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) @@ -1458,8 +1458,8 @@ @ cdecl remove(str) MSVCRT_remove @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind -@ varargs scanf(str) MSVCRT_scanf -@ varargs scanf_s(str) MSVCRT_scanf_s +@ varargs scanf(str) +@ varargs scanf_s(str) @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) @@ -1474,8 +1474,8 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) -@ varargs sscanf(str str) MSVCRT_sscanf -@ varargs sscanf_s(str str) MSVCRT_sscanf_s +@ varargs sscanf(str str) +@ varargs sscanf_s(str str) @ cdecl strcat(str str) @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) @@ -1505,8 +1505,8 @@ @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s -@ varargs swscanf(wstr wstr) MSVCRT_swscanf -@ varargs swscanf_s(wstr wstr) MSVCRT_swscanf_s +@ varargs swscanf(wstr wstr) +@ varargs swscanf_s(wstr wstr) @ cdecl system(str) @ cdecl tan(double) MSVCRT_tan @ cdecl -arch=!i386 tanf(float) MSVCRT_tanf @@ -1570,5 +1570,5 @@ @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wprintf_s(wstr) MSVCRT_wprintf_s -@ varargs wscanf(wstr) MSVCRT_wscanf -@ varargs wscanf_s(wstr) MSVCRT_wscanf_s +@ varargs wscanf(wstr) +@ varargs wscanf_s(wstr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index dd5da7902b8..78dc9cfb332 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -490,8 +490,8 @@ @ stub _freea @ stub _freea_s @ stub _freefls -@ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l -@ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l +@ varargs _fscanf_l(ptr str ptr) +@ varargs _fscanf_s_l(ptr str ptr) @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @@ -516,8 +516,8 @@ @ stub _fwprintf_p_l @ stub _fwprintf_s_l @ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock -@ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l -@ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l +@ varargs _fwscanf_l(ptr wstr ptr) +@ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) MSVCRT__gcvt @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s @ stub _get_amblksiz @@ -911,8 +911,8 @@ @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) MSVCRT__scalb @ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf -@ varargs _scanf_l(str ptr) MSVCRT__scanf_l -@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l +@ varargs _scanf_l(str ptr) +@ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) MSVCRT__scprintf @ stub _scprintf_l @ stub _scprintf_p @@ -953,18 +953,18 @@ @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l -@ varargs _snscanf(str long str) MSVCRT__snscanf -@ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l -@ varargs _snscanf_s(str long str) MSVCRT__snscanf_s -@ varargs _snscanf_s_l(str long str ptr) MSVCRT__snscanf_s_l +@ varargs _snscanf(str long str) +@ varargs _snscanf_l(str long str ptr) +@ varargs _snscanf_s(str long str) +@ varargs _snscanf_s_l(str long str ptr) @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) MSVCRT__snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s @ varargs _snwprintf_s_l(ptr long long wstr ptr) MSVCRT__snwprintf_s_l -@ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf -@ varargs _snwscanf_l(wstr long wstr ptr) MSVCRT__snwscanf_l -@ varargs _snwscanf_s(wstr long wstr) MSVCRT__snwscanf_s -@ varargs _snwscanf_s_l(wstr long wstr ptr) MSVCRT__snwscanf_s_l +@ varargs _snwscanf(wstr long wstr) +@ varargs _snwscanf_l(wstr long wstr ptr) +@ varargs _snwscanf_s(wstr long wstr) +@ varargs _snwscanf_s_l(wstr long wstr ptr) @ varargs _sopen(str long long) MSVCRT__sopen @ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s @ varargs _spawnl(long str str) @@ -981,8 +981,8 @@ @ varargs _sprintf_p(ptr long str) MSVCRT__sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) MSVCRT_sprintf_p_l @ varargs _sprintf_s_l(ptr long str ptr) MSVCRT_sprintf_s_l -@ varargs _sscanf_l(str str ptr) MSVCRT__sscanf_l -@ varargs _sscanf_s_l(str str ptr) MSVCRT__sscanf_s_l +@ varargs _sscanf_l(str str ptr) +@ varargs _sscanf_s_l(str str ptr) @ cdecl _stat32(str ptr) MSVCRT__stat32 @ cdecl _stat32i64(str ptr) MSVCRT__stat32i64 @ cdecl _stat64(str ptr) MSVCRT_stat64 @@ -1036,8 +1036,8 @@ @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l -@ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l -@ varargs _swscanf_s_l(wstr wstr ptr) MSVCRT__swscanf_s_l +@ varargs _swscanf_l(wstr wstr ptr) +@ varargs _swscanf_s_l(wstr wstr ptr) @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr @ cdecl _tell(long) MSVCRT__tell @@ -1236,8 +1236,8 @@ @ cdecl _wrename(wstr wstr) MSVCRT__wrename @ cdecl _write(long ptr long) MSVCRT__write @ cdecl _wrmdir(wstr) MSVCRT__wrmdir -@ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l -@ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l +@ varargs _wscanf_l(wstr ptr) +@ varargs _wscanf_s_l(wstr ptr) @ cdecl _wsearchenv(wstr wstr ptr) MSVCRT__wsearchenv @ cdecl _wsearchenv_s(wstr wstr ptr long) MSVCRT__wsearchenv_s @ cdecl _wsetlocale(long wstr) @@ -1340,16 +1340,16 @@ @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp -@ varargs fscanf(ptr str) MSVCRT_fscanf -@ varargs fscanf_s(ptr str) MSVCRT_fscanf_s +@ varargs fscanf(ptr str) +@ varargs fscanf_s(ptr str) @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf @ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite -@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf -@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s +@ varargs fwscanf(ptr wstr) +@ varargs fwscanf_s(ptr wstr) @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) @@ -1430,8 +1430,8 @@ @ cdecl remove(str) MSVCRT_remove @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind -@ varargs scanf(str) MSVCRT_scanf -@ varargs scanf_s(str) MSVCRT_scanf_s +@ varargs scanf(str) +@ varargs scanf_s(str) @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) @@ -1446,8 +1446,8 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) -@ varargs sscanf(str str) MSVCRT_sscanf -@ varargs sscanf_s(str str) MSVCRT_sscanf_s +@ varargs sscanf(str str) +@ varargs sscanf_s(str str) @ cdecl strcat(str str) @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) @@ -1477,8 +1477,8 @@ @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s -@ varargs swscanf(wstr wstr) MSVCRT_swscanf -@ varargs swscanf_s(wstr wstr) MSVCRT_swscanf_s +@ varargs swscanf(wstr wstr) +@ varargs swscanf_s(wstr wstr) @ cdecl system(str) @ cdecl tan(double) MSVCRT_tan @ cdecl -arch=!i386 tanf(float) MSVCRT_tanf @@ -1542,5 +1542,5 @@ @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wprintf_s(wstr) MSVCRT_wprintf_s -@ varargs wscanf(wstr) MSVCRT_wscanf -@ varargs wscanf_s(wstr) MSVCRT_wscanf_s +@ varargs wscanf(wstr) +@ varargs wscanf_s(wstr) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 59fe7036f3a..069a77dc860 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2415,7 +2415,7 @@ char * CDECL MSVCRT__ecvt( double number, int ndigits, int *decpt, int *sign ) /* take the exponential "e" out */ data->efcvt_buffer[ prec] = '\0'; /* read the exponent */ - MSVCRT_sscanf( data->efcvt_buffer + prec + 1, "%d", decpt); + sscanf( data->efcvt_buffer + prec + 1, "%d", decpt); (*decpt)++; /* adjust for some border cases */ if( data->efcvt_buffer[0] == '0')/* value is zero */ @@ -2475,7 +2475,7 @@ int CDECL MSVCRT__ecvt_s( char *buffer, size_t length, double number, int ndigit /* take the exponential "e" out */ result[ prec] = '\0'; /* read the exponent */ - MSVCRT_sscanf( result + prec + 1, "%d", decpt); + sscanf( result + prec + 1, "%d", decpt); (*decpt)++; /* adjust for some border cases */ if( result[0] == '0')/* value is zero */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index f30e388752c..23e77931146 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -23,6 +23,7 @@ #include #include #include +#define _NO_CRT_STDIO_INLINE #include #include #include @@ -670,7 +671,6 @@ int __cdecl _ungetch(int); int __cdecl _cputs(const char*); int WINAPIV _cprintf(const char*,...); int WINAPIV _cwprintf(const wchar_t*,...); -int WINAPIV MSVCRT_sscanf(const char *, const char *, ...); char*** __cdecl MSVCRT___p__environ(void); int* __cdecl __p___mb_cur_max(void); wchar_t* __cdecl MSVCRT__wcsdup(const wchar_t*); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a7429fd69f3..1f038800ac4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -469,8 +469,8 @@ @ cdecl _free_locale(ptr) # stub _freea(ptr) # stub _freea_s -@ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l -@ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l +@ varargs _fscanf_l(ptr str ptr) +@ varargs _fscanf_s_l(ptr str ptr) @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat(long ptr) MSVCRT__fstat @@ -496,8 +496,8 @@ # stub _fwprintf_p(ptr wstr) # stub _fwprintf_p_l(ptr wstr ptr) # stub _fwprintf_s_l(ptr wstr ptr) -@ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l -@ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l +@ varargs _fwscanf_l(ptr wstr ptr) +@ varargs _fwscanf_s_l(ptr wstr ptr) @ cdecl _gcvt(double long str) MSVCRT__gcvt @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s @ cdecl _get_current_locale() @@ -879,8 +879,8 @@ @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) MSVCRT__scalb @ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf -@ varargs _scanf_l(str ptr) MSVCRT__scanf_l -@ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l +@ varargs _scanf_l(str ptr) +@ varargs _scanf_s_l(str ptr) @ varargs _scprintf(str) MSVCRT__scprintf # stub _scprintf_l(str ptr) # stub _scprintf_p_l(str ptr) @@ -915,18 +915,18 @@ @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l -@ varargs _snscanf(str long str) MSVCRT__snscanf -@ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l -@ varargs _snscanf_s(str long str) MSVCRT__snscanf_s -@ varargs _snscanf_s_l(str long str ptr) MSVCRT__snscanf_s_l +@ varargs _snscanf(str long str) +@ varargs _snscanf_l(str long str ptr) +@ varargs _snscanf_s(str long str) +@ varargs _snscanf_s_l(str long str ptr) @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) MSVCRT__snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s @ varargs _snwprintf_s_l(ptr long long wstr ptr) MSVCRT__snwprintf_s_l -@ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf -@ varargs _snwscanf_l(wstr long wstr ptr) MSVCRT__snwscanf_l -@ varargs _snwscanf_s(wstr long wstr) MSVCRT__snwscanf_s -@ varargs _snwscanf_s_l(wstr long wstr ptr) MSVCRT__snwscanf_s_l +@ varargs _snwscanf(wstr long wstr) +@ varargs _snwscanf_l(wstr long wstr ptr) +@ varargs _snwscanf_s(wstr long wstr) +@ varargs _snwscanf_s_l(wstr long wstr ptr) @ varargs _sopen(str long long) MSVCRT__sopen @ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s @ varargs _spawnl(long str str) @@ -942,8 +942,8 @@ @ varargs _sprintf_l(ptr str ptr) MSVCRT_sprintf_l @ varargs _sprintf_p_l(ptr long str ptr) MSVCRT_sprintf_p_l @ varargs _sprintf_s_l(ptr long str ptr) MSVCRT_sprintf_s_l -@ varargs _sscanf_l(str str ptr) MSVCRT__sscanf_l -@ varargs _sscanf_s_l(str str ptr) MSVCRT__sscanf_s_l +@ varargs _sscanf_l(str str ptr) +@ varargs _sscanf_s_l(str str ptr) @ cdecl _stat(str ptr) MSVCRT_stat @ cdecl _stat64(str ptr) MSVCRT_stat64 @ cdecl _stati64(str ptr) MSVCRT_stati64 @@ -995,8 +995,8 @@ @ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l -@ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l -@ varargs _swscanf_s_l(wstr wstr ptr) MSVCRT__swscanf_s_l +@ varargs _swscanf_l(wstr wstr ptr) +@ varargs _swscanf_s_l(wstr wstr ptr) @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr @ cdecl _tell(long) MSVCRT__tell @@ -1198,8 +1198,8 @@ @ cdecl _wrename(wstr wstr) MSVCRT__wrename @ cdecl _write(long ptr long) MSVCRT__write @ cdecl _wrmdir(wstr) MSVCRT__wrmdir -@ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l -@ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l +@ varargs _wscanf_l(wstr ptr) +@ varargs _wscanf_s_l(wstr ptr) @ cdecl _wsearchenv(wstr wstr ptr) MSVCRT__wsearchenv @ cdecl _wsearchenv_s(wstr wstr ptr long) MSVCRT__wsearchenv_s @ cdecl _wsetlocale(long wstr) @@ -1309,16 +1309,16 @@ @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp @ cdecl -arch=x86_64 frexpf(float ptr) MSVCRT_frexpf -@ varargs fscanf(ptr str) MSVCRT_fscanf -@ varargs fscanf_s(ptr str) MSVCRT_fscanf_s +@ varargs fscanf(ptr str) +@ varargs fscanf_s(ptr str) @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf @ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite -@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf -@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s +@ varargs fwscanf(ptr wstr) +@ varargs fwscanf_s(ptr wstr) @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) @@ -1402,8 +1402,8 @@ @ cdecl remove(str) MSVCRT_remove @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind -@ varargs scanf(str) MSVCRT_scanf -@ varargs scanf_s(str) MSVCRT_scanf_s +@ varargs scanf(str) +@ varargs scanf_s(str) @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) @@ -1418,8 +1418,8 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) -@ varargs sscanf(str str) MSVCRT_sscanf -@ varargs sscanf_s(str str) MSVCRT_sscanf_s +@ varargs sscanf(str str) +@ varargs sscanf_s(str str) @ cdecl strcat(str str) @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) @@ -1450,8 +1450,8 @@ @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf(ptr wstr) MSVCRT_swprintf @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s -@ varargs swscanf(wstr wstr) MSVCRT_swscanf -@ varargs swscanf_s(wstr wstr) MSVCRT_swscanf_s +@ varargs swscanf(wstr wstr) +@ varargs swscanf_s(wstr wstr) @ cdecl system(str) @ cdecl tan(double) MSVCRT_tan @ cdecl tanh(double) MSVCRT_tanh @@ -1519,5 +1519,5 @@ @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s @ varargs wprintf(wstr) MSVCRT_wprintf @ varargs wprintf_s(wstr) MSVCRT_wprintf_s -@ varargs wscanf(wstr) MSVCRT_wscanf -@ varargs wscanf_s(wstr) MSVCRT_wscanf_s +@ varargs wscanf(wstr) +@ varargs wscanf_s(wstr) diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 64df0537ef6..8ada1cccfa5 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -146,13 +146,13 @@ static int wchar2digit(wchar_t c, int base) { /********************************************************************* * fscanf (MSVCRT.@) */ -int WINAPIV MSVCRT_fscanf(FILE *file, const char *format, ...) +int WINAPIV fscanf(FILE *file, const char *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vfscanf_l(file, format, NULL, valist); + res = vfscanf_l(file, format, NULL, valist); __ms_va_end(valist); return res; } @@ -160,14 +160,14 @@ int WINAPIV MSVCRT_fscanf(FILE *file, const char *format, ...) /********************************************************************* * _fscanf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__fscanf_l(FILE *file, const char *format, +int WINAPIV _fscanf_l(FILE *file, const char *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vfscanf_l(file, format, locale, valist); + res = vfscanf_l(file, format, locale, valist); __ms_va_end(valist); return res; } @@ -175,13 +175,13 @@ int WINAPIV MSVCRT__fscanf_l(FILE *file, const char *format, /********************************************************************* * fscanf_s (MSVCRT.@) */ -int WINAPIV MSVCRT_fscanf_s(FILE *file, const char *format, ...) +int WINAPIV fscanf_s(FILE *file, const char *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vfscanf_s_l(file, format, NULL, valist); + res = vfscanf_s_l(file, format, NULL, valist); __ms_va_end(valist); return res; } @@ -189,14 +189,14 @@ int WINAPIV MSVCRT_fscanf_s(FILE *file, const char *format, ...) /********************************************************************* * _fscanf_s_l (MSVCRT.@) */ -int WINAPIV MSVCRT__fscanf_s_l(FILE *file, const char *format, +int WINAPIV _fscanf_s_l(FILE *file, const char *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vfscanf_s_l(file, format, locale, valist); + res = vfscanf_s_l(file, format, locale, valist); __ms_va_end(valist); return res; } @@ -204,13 +204,13 @@ int WINAPIV MSVCRT__fscanf_s_l(FILE *file, const char *format, /********************************************************************* * scanf (MSVCRT.@) */ -int WINAPIV MSVCRT_scanf(const char *format, ...) +int WINAPIV scanf(const char *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vfscanf_l(MSVCRT_stdin, format, NULL, valist); + res = vfscanf_l(MSVCRT_stdin, format, NULL, valist); __ms_va_end(valist); return res; } @@ -218,13 +218,13 @@ int WINAPIV MSVCRT_scanf(const char *format, ...) /********************************************************************* * _scanf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__scanf_l(const char *format, _locale_t locale, ...) +int WINAPIV _scanf_l(const char *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vfscanf_l(MSVCRT_stdin, format, locale, valist); + res = vfscanf_l(MSVCRT_stdin, format, locale, valist); __ms_va_end(valist); return res; } @@ -232,13 +232,13 @@ int WINAPIV MSVCRT__scanf_l(const char *format, _locale_t locale, ...) /********************************************************************* * scanf_s (MSVCRT.@) */ -int WINAPIV MSVCRT_scanf_s(const char *format, ...) +int WINAPIV scanf_s(const char *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vfscanf_s_l(MSVCRT_stdin, format, NULL, valist); + res = vfscanf_s_l(MSVCRT_stdin, format, NULL, valist); __ms_va_end(valist); return res; } @@ -246,13 +246,13 @@ int WINAPIV MSVCRT_scanf_s(const char *format, ...) /********************************************************************* * _scanf_s_l (MSVCRT.@) */ -int WINAPIV MSVCRT__scanf_s_l(const char *format, _locale_t locale, ...) +int WINAPIV _scanf_s_l(const char *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vfscanf_s_l(MSVCRT_stdin, format, locale, valist); + res = vfscanf_s_l(MSVCRT_stdin, format, locale, valist); __ms_va_end(valist); return res; } @@ -260,13 +260,13 @@ int WINAPIV MSVCRT__scanf_s_l(const char *format, _locale_t locale, ...) /********************************************************************* * fwscanf (MSVCRT.@) */ -int WINAPIV MSVCRT_fwscanf(FILE *file, const wchar_t *format, ...) +int WINAPIV fwscanf(FILE *file, const wchar_t *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vfwscanf_l(file, format, NULL, valist); + res = vfwscanf_l(file, format, NULL, valist); __ms_va_end(valist); return res; } @@ -274,14 +274,14 @@ int WINAPIV MSVCRT_fwscanf(FILE *file, const wchar_t *format, ...) /********************************************************************* * _fwscanf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__fwscanf_l(FILE *file, const wchar_t *format, +int WINAPIV _fwscanf_l(FILE *file, const wchar_t *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vfwscanf_l(file, format, locale, valist); + res = vfwscanf_l(file, format, locale, valist); __ms_va_end(valist); return res; } @@ -289,13 +289,13 @@ int WINAPIV MSVCRT__fwscanf_l(FILE *file, const wchar_t *format, /********************************************************************* * fwscanf_s (MSVCRT.@) */ -int WINAPIV MSVCRT_fwscanf_s(FILE *file, const wchar_t *format, ...) +int WINAPIV fwscanf_s(FILE *file, const wchar_t *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vfwscanf_s_l(file, format, NULL, valist); + res = vfwscanf_s_l(file, format, NULL, valist); __ms_va_end(valist); return res; } @@ -303,14 +303,14 @@ int WINAPIV MSVCRT_fwscanf_s(FILE *file, const wchar_t *format, ...) /********************************************************************* * _fwscanf_s_l (MSVCRT.@) */ -int WINAPIV MSVCRT__fwscanf_s_l(FILE *file, const wchar_t *format, +int WINAPIV _fwscanf_s_l(FILE *file, const wchar_t *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vfwscanf_s_l(file, format, locale, valist); + res = vfwscanf_s_l(file, format, locale, valist); __ms_va_end(valist); return res; } @@ -318,13 +318,13 @@ int WINAPIV MSVCRT__fwscanf_s_l(FILE *file, const wchar_t *format, /********************************************************************* * wscanf (MSVCRT.@) */ -int WINAPIV MSVCRT_wscanf(const wchar_t *format, ...) +int WINAPIV wscanf(const wchar_t *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vfwscanf_l(MSVCRT_stdin, format, NULL, valist); + res = vfwscanf_l(MSVCRT_stdin, format, NULL, valist); __ms_va_end(valist); return res; } @@ -332,14 +332,14 @@ int WINAPIV MSVCRT_wscanf(const wchar_t *format, ...) /********************************************************************* * _wscanf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__wscanf_l(const wchar_t *format, +int WINAPIV _wscanf_l(const wchar_t *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vfwscanf_l(MSVCRT_stdin, format, locale, valist); + res = vfwscanf_l(MSVCRT_stdin, format, locale, valist); __ms_va_end(valist); return res; } @@ -347,13 +347,13 @@ int WINAPIV MSVCRT__wscanf_l(const wchar_t *format, /********************************************************************* * wscanf_s (MSVCRT.@) */ -int WINAPIV MSVCRT_wscanf_s(const wchar_t *format, ...) +int WINAPIV wscanf_s(const wchar_t *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vfwscanf_s_l(MSVCRT_stdin, format, NULL, valist); + res = vfwscanf_s_l(MSVCRT_stdin, format, NULL, valist); __ms_va_end(valist); return res; } @@ -361,14 +361,14 @@ int WINAPIV MSVCRT_wscanf_s(const wchar_t *format, ...) /********************************************************************* * _wscanf_s_l (MSVCRT.@) */ -int WINAPIV MSVCRT__wscanf_s_l(const wchar_t *format, +int WINAPIV _wscanf_s_l(const wchar_t *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vfwscanf_s_l(MSVCRT_stdin, format, locale, valist); + res = vfwscanf_s_l(MSVCRT_stdin, format, locale, valist); __ms_va_end(valist); return res; } @@ -376,13 +376,13 @@ int WINAPIV MSVCRT__wscanf_s_l(const wchar_t *format, /********************************************************************* * sscanf (MSVCRT.@) */ -int WINAPIV MSVCRT_sscanf(const char *str, const char *format, ...) +int WINAPIV sscanf(const char *str, const char *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vsscanf_l(str, format, NULL, valist); + res = vsscanf_l(str, format, NULL, valist); __ms_va_end(valist); return res; } @@ -390,14 +390,14 @@ int WINAPIV MSVCRT_sscanf(const char *str, const char *format, ...) /********************************************************************* * _sscanf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__sscanf_l(const char *str, const char *format, +int WINAPIV _sscanf_l(const char *str, const char *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vsscanf_l(str, format, locale, valist); + res = vsscanf_l(str, format, locale, valist); __ms_va_end(valist); return res; } @@ -405,13 +405,13 @@ int WINAPIV MSVCRT__sscanf_l(const char *str, const char *format, /********************************************************************* * sscanf_s (MSVCRT.@) */ -int WINAPIV MSVCRT_sscanf_s(const char *str, const char *format, ...) +int WINAPIV sscanf_s(const char *str, const char *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vsscanf_s_l(str, format, NULL, valist); + res = vsscanf_s_l(str, format, NULL, valist); __ms_va_end(valist); return res; } @@ -419,14 +419,14 @@ int WINAPIV MSVCRT_sscanf_s(const char *str, const char *format, ...) /********************************************************************* * _sscanf_s_l (MSVCRT.@) */ -int WINAPIV MSVCRT__sscanf_s_l(const char *str, const char *format, +int WINAPIV _sscanf_s_l(const char *str, const char *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vsscanf_s_l(str, format, locale, valist); + res = vsscanf_s_l(str, format, locale, valist); __ms_va_end(valist); return res; } @@ -434,13 +434,13 @@ int WINAPIV MSVCRT__sscanf_s_l(const char *str, const char *format, /********************************************************************* * swscanf (MSVCRT.@) */ -int WINAPIV MSVCRT_swscanf(const wchar_t *str, const wchar_t *format, ...) +int WINAPIV swscanf(const wchar_t *str, const wchar_t *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vswscanf_l(str, format, NULL, valist); + res = vswscanf_l(str, format, NULL, valist); __ms_va_end(valist); return res; } @@ -448,14 +448,14 @@ int WINAPIV MSVCRT_swscanf(const wchar_t *str, const wchar_t *format, ...) /********************************************************************* * _swscanf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__swscanf_l(const wchar_t *str, const wchar_t *format, +int WINAPIV _swscanf_l(const wchar_t *str, const wchar_t *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vswscanf_l(str, format, locale, valist); + res = vswscanf_l(str, format, locale, valist); __ms_va_end(valist); return res; } @@ -463,13 +463,13 @@ int WINAPIV MSVCRT__swscanf_l(const wchar_t *str, const wchar_t *format, /********************************************************************* * swscanf_s (MSVCRT.@) */ -int WINAPIV MSVCRT_swscanf_s(const wchar_t *str, const wchar_t *format, ...) +int WINAPIV swscanf_s(const wchar_t *str, const wchar_t *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vswscanf_s_l(str, format, NULL, valist); + res = vswscanf_s_l(str, format, NULL, valist); __ms_va_end(valist); return res; } @@ -477,14 +477,14 @@ int WINAPIV MSVCRT_swscanf_s(const wchar_t *str, const wchar_t *format, ...) /********************************************************************* * _swscanf_s_l (MSVCRT.@) */ -int WINAPIV MSVCRT__swscanf_s_l(const wchar_t *str, const wchar_t *format, +int WINAPIV _swscanf_s_l(const wchar_t *str, const wchar_t *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vswscanf_s_l(str, format, locale, valist); + res = vswscanf_s_l(str, format, locale, valist); __ms_va_end(valist); return res; } @@ -498,7 +498,7 @@ int WINAPIV _cscanf(const char *format, ...) int res; __ms_va_start(valist, format); - res = MSVCRT_vcscanf_l(format, NULL, valist); + res = vcscanf_l(format, NULL, valist); __ms_va_end(valist); return res; } @@ -512,7 +512,7 @@ int WINAPIV _cscanf_l(const char *format, _locale_t locale, ...) int res; __ms_va_start(valist, locale); - res = MSVCRT_vcscanf_l(format, locale, valist); + res = vcscanf_l(format, locale, valist); __ms_va_end(valist); return res; } @@ -526,7 +526,7 @@ int WINAPIV _cscanf_s(const char *format, ...) int res; __ms_va_start(valist, format); - res = MSVCRT_vcscanf_s_l(format, NULL, valist); + res = vcscanf_s_l(format, NULL, valist); __ms_va_end(valist); return res; } @@ -540,7 +540,7 @@ int WINAPIV _cscanf_s_l(const char *format, _locale_t locale, ...) int res; __ms_va_start(valist, locale); - res = MSVCRT_vcscanf_s_l(format, locale, valist); + res = vcscanf_s_l(format, locale, valist); __ms_va_end(valist); return res; } @@ -554,7 +554,7 @@ int WINAPIV _cwscanf(const wchar_t *format, ...) int res; __ms_va_start(valist, format); - res = MSVCRT_vcwscanf_l(format, NULL, valist); + res = vcwscanf_l(format, NULL, valist); __ms_va_end(valist); return res; } @@ -568,7 +568,7 @@ int WINAPIV _cwscanf_l(const wchar_t *format, _locale_t locale, ...) int res; __ms_va_start(valist, locale); - res = MSVCRT_vcwscanf_l(format, locale, valist); + res = vcwscanf_l(format, locale, valist); __ms_va_end(valist); return res; } @@ -582,7 +582,7 @@ int WINAPIV _cwscanf_s(const wchar_t *format, ...) int res; __ms_va_start(valist, format); - res = MSVCRT_vcwscanf_s_l(format, NULL, valist); + res = vcwscanf_s_l(format, NULL, valist); __ms_va_end(valist); return res; } @@ -596,7 +596,7 @@ int WINAPIV _cwscanf_s_l(const wchar_t *format, _locale_t locale, ...) int res; __ms_va_start(valist, locale); - res = MSVCRT_vcwscanf_s_l(format, locale, valist); + res = vcwscanf_s_l(format, locale, valist); __ms_va_end(valist); return res; } @@ -604,13 +604,13 @@ int WINAPIV _cwscanf_s_l(const wchar_t *format, _locale_t locale, ...) /********************************************************************* * _snscanf (MSVCRT.@) */ -int WINAPIV MSVCRT__snscanf(char *input, size_t length, const char *format, ...) +int WINAPIV _snscanf(const char *input, size_t length, const char *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vsnscanf_l(input, length, format, NULL, valist); + res = vsnscanf_l(input, length, format, NULL, valist); __ms_va_end(valist); return res; } @@ -618,14 +618,14 @@ int WINAPIV MSVCRT__snscanf(char *input, size_t length, const char *format, ...) /********************************************************************* * _snscanf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__snscanf_l(char *input, size_t length, +int WINAPIV _snscanf_l(const char *input, size_t length, const char *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vsnscanf_l(input, length, format, locale, valist); + res = vsnscanf_l(input, length, format, locale, valist); __ms_va_end(valist); return res; } @@ -633,13 +633,13 @@ int WINAPIV MSVCRT__snscanf_l(char *input, size_t length, /********************************************************************* * _snscanf_s (MSVCRT.@) */ -int WINAPIV MSVCRT__snscanf_s(char *input, size_t length, const char *format, ...) +int WINAPIV _snscanf_s(const char *input, size_t length, const char *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vsnscanf_s_l(input, length, format, NULL, valist); + res = vsnscanf_s_l(input, length, format, NULL, valist); __ms_va_end(valist); return res; } @@ -647,14 +647,14 @@ int WINAPIV MSVCRT__snscanf_s(char *input, size_t length, const char *format, .. /********************************************************************* * _snscanf_s_l (MSVCRT.@) */ -int WINAPIV MSVCRT__snscanf_s_l(char *input, size_t length, +int WINAPIV _snscanf_s_l(const char *input, size_t length, const char *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vsnscanf_s_l(input, length, format, locale, valist); + res = vsnscanf_s_l(input, length, format, locale, valist); __ms_va_end(valist); return res; } @@ -663,7 +663,7 @@ int WINAPIV MSVCRT__snscanf_s_l(char *input, size_t length, /********************************************************************* * __stdio_common_vsscanf (UCRTBASE.@) */ -int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, +int CDECL __stdio_common_vsscanf(unsigned __int64 options, const char *input, size_t length, const char *format, _locale_t locale, @@ -675,15 +675,15 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, if (options & ~UCRTBASE_SCANF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); if (options & _CRT_INTERNAL_SCANF_SECURECRT) - return MSVCRT_vsnscanf_s_l(input, length, format, locale, valist); + return vsnscanf_s_l(input, length, format, locale, valist); else - return MSVCRT_vsnscanf_l(input, length, format, locale, valist); + return vsnscanf_l(input, length, format, locale, valist); } /********************************************************************* * __stdio_common_vswscanf (UCRTBASE.@) */ -int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, +int CDECL __stdio_common_vswscanf(unsigned __int64 options, const wchar_t *input, size_t length, const wchar_t *format, _locale_t locale, @@ -695,15 +695,15 @@ int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, if (options & ~UCRTBASE_SCANF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); if (options & _CRT_INTERNAL_SCANF_SECURECRT) - return MSVCRT_vsnwscanf_s_l(input, length, format, locale, valist); + return vsnwscanf_s_l(input, length, format, locale, valist); else - return MSVCRT_vsnwscanf_l(input, length, format, locale, valist); + return vsnwscanf_l(input, length, format, locale, valist); } /********************************************************************* * __stdio_common_vfscanf (UCRTBASE.@) */ -int CDECL MSVCRT__stdio_common_vfscanf(unsigned __int64 options, +int CDECL __stdio_common_vfscanf(unsigned __int64 options, FILE *file, const char *format, _locale_t locale, @@ -712,15 +712,15 @@ int CDECL MSVCRT__stdio_common_vfscanf(unsigned __int64 options, if (options & ~_CRT_INTERNAL_SCANF_SECURECRT) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); if (options & _CRT_INTERNAL_SCANF_SECURECRT) - return MSVCRT_vfscanf_s_l(file, format, locale, valist); + return vfscanf_s_l(file, format, locale, valist); else - return MSVCRT_vfscanf_l(file, format, locale, valist); + return vfscanf_l(file, format, locale, valist); } /********************************************************************* * __stdio_common_vfwscanf (UCRTBASE.@) */ -int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, +int CDECL __stdio_common_vfwscanf(unsigned __int64 options, FILE *file, const wchar_t *format, _locale_t locale, @@ -729,22 +729,22 @@ int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, if (options & ~_CRT_INTERNAL_SCANF_SECURECRT) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); if (options & _CRT_INTERNAL_SCANF_SECURECRT) - return MSVCRT_vfwscanf_s_l(file, format, locale, valist); + return vfwscanf_s_l(file, format, locale, valist); else - return MSVCRT_vfwscanf_l(file, format, locale, valist); + return vfwscanf_l(file, format, locale, valist); } /********************************************************************* * _snwscanf (MSVCRT.@) */ -int WINAPIV MSVCRT__snwscanf(wchar_t *input, size_t length, +int WINAPIV _snwscanf(wchar_t *input, size_t length, const wchar_t *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vsnwscanf_l(input, length, format, NULL, valist); + res = vsnwscanf_l(input, length, format, NULL, valist); __ms_va_end(valist); return res; } @@ -752,14 +752,14 @@ int WINAPIV MSVCRT__snwscanf(wchar_t *input, size_t length, /********************************************************************* * _snwscanf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__snwscanf_l(wchar_t *input, size_t length, +int WINAPIV _snwscanf_l(wchar_t *input, size_t length, const wchar_t *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vsnwscanf_l(input, length, format, locale, valist); + res = vsnwscanf_l(input, length, format, locale, valist); __ms_va_end(valist); return res; } @@ -767,14 +767,14 @@ int WINAPIV MSVCRT__snwscanf_l(wchar_t *input, size_t length, /********************************************************************* * _snwscanf_s (MSVCRT.@) */ -int WINAPIV MSVCRT__snwscanf_s(wchar_t *input, size_t length, +int WINAPIV _snwscanf_s(wchar_t *input, size_t length, const wchar_t *format, ...) { __ms_va_list valist; int res; __ms_va_start(valist, format); - res = MSVCRT_vsnwscanf_s_l(input, length, format, NULL, valist); + res = vsnwscanf_s_l(input, length, format, NULL, valist); __ms_va_end(valist); return res; } @@ -782,19 +782,19 @@ int WINAPIV MSVCRT__snwscanf_s(wchar_t *input, size_t length, /********************************************************************* * _snscanf_s_l (MSVCRT.@) */ -int WINAPIV MSVCRT__snwscanf_s_l(wchar_t *input, size_t length, +int WINAPIV _snwscanf_s_l(wchar_t *input, size_t length, const wchar_t *format, _locale_t locale, ...) { __ms_va_list valist; int res; __ms_va_start(valist, locale); - res = MSVCRT_vsnwscanf_s_l(input, length, format, locale, valist); + res = vsnwscanf_s_l(input, length, format, locale, valist); __ms_va_end(valist); return res; } -#if _MSVCR_VER>=120 +#if _MSVCR_VER==120 /********************************************************************* * vsscanf (MSVCRT120.@) @@ -803,17 +803,17 @@ int CDECL MSVCRT_vsscanf(const char *buffer, const char *format, __ms_va_list va { if (!MSVCRT_CHECK_PMT(buffer != NULL && format != NULL)) return -1; - return MSVCRT_vsscanf_l(buffer, format, NULL, valist); + return vsscanf_l(buffer, format, NULL, valist); } /********************************************************************* * vswscanf (MSVCRT120.@) */ -int CDECL MSVCRT_vswscanf(const wchar_t *buffer, const wchar_t *format, __ms_va_list valist) +int CDECL vswscanf(const wchar_t *buffer, const wchar_t *format, __ms_va_list valist) { if (!MSVCRT_CHECK_PMT(buffer != NULL && format != NULL)) return -1; - return MSVCRT_vswscanf_l(buffer, format, NULL, valist); + return vswscanf_l(buffer, format, NULL, valist); } #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 04f85491cb4..2eefef36834 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -52,15 +52,15 @@ #define _UNLOCK_FILE_(file) MSVCRT__unlock_file(MSVCRT_stdin) #ifdef WIDE_SCANF #ifdef SECURE -#define _FUNCTION_ static int MSVCRT_vcwscanf_s_l(const wchar_t *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vcwscanf_s_l(const wchar_t *format, _locale_t locale, __ms_va_list ap) #else /* SECURE */ -#define _FUNCTION_ static int MSVCRT_vcwscanf_l(const wchar_t *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vcwscanf_l(const wchar_t *format, _locale_t locale, __ms_va_list ap) #endif /* SECURE */ #else /* WIDE_SCANF */ #ifdef SECURE -#define _FUNCTION_ static int MSVCRT_vcscanf_s_l(const char *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vcscanf_s_l(const char *format, _locale_t locale, __ms_va_list ap) #else /* SECURE */ -#define _FUNCTION_ static int MSVCRT_vcscanf_l(const char *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vcscanf_l(const char *format, _locale_t locale, __ms_va_list ap) #endif /* SECURE */ #endif /* WIDE_SCANF */ #else @@ -84,15 +84,15 @@ #define _UNLOCK_FILE_(file) do {} while(0) #ifdef WIDE_SCANF #ifdef SECURE -#define _FUNCTION_ static int MSVCRT_vsnwscanf_s_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vsnwscanf_s_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale, __ms_va_list ap) #else /* SECURE */ -#define _FUNCTION_ static int MSVCRT_vsnwscanf_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vsnwscanf_l(const wchar_t *file, size_t length, const wchar_t *format, _locale_t locale, __ms_va_list ap) #endif /* SECURE */ #else /* WIDE_SCANF */ #ifdef SECURE -#define _FUNCTION_ static int MSVCRT_vsnscanf_s_l(const char *file, size_t length, const char *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vsnscanf_s_l(const char *file, size_t length, const char *format, _locale_t locale, __ms_va_list ap) #else /* SECURE */ -#define _FUNCTION_ static int MSVCRT_vsnscanf_l(const char *file, size_t length, const char *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vsnscanf_l(const char *file, size_t length, const char *format, _locale_t locale, __ms_va_list ap) #endif /* SECURE */ #endif /* WIDE_SCANF */ #else /* STRING_LEN */ @@ -106,15 +106,15 @@ #define _UNLOCK_FILE_(file) do {} while(0) #ifdef WIDE_SCANF #ifdef SECURE -#define _FUNCTION_ static int MSVCRT_vswscanf_s_l(const wchar_t *file, const wchar_t *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vswscanf_s_l(const wchar_t *file, const wchar_t *format, _locale_t locale, __ms_va_list ap) #else /* SECURE */ -#define _FUNCTION_ static int MSVCRT_vswscanf_l(const wchar_t *file, const wchar_t *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vswscanf_l(const wchar_t *file, const wchar_t *format, _locale_t locale, __ms_va_list ap) #endif /* SECURE */ #else /* WIDE_SCANF */ #ifdef SECURE -#define _FUNCTION_ static int MSVCRT_vsscanf_s_l(const char *file, const char *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vsscanf_s_l(const char *file, const char *format, _locale_t locale, __ms_va_list ap) #else /* SECURE */ -#define _FUNCTION_ static int MSVCRT_vsscanf_l(const char *file, const char *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vsscanf_l(const char *file, const char *format, _locale_t locale, __ms_va_list ap) #endif /* SECURE */ #endif /* WIDE_SCANF */ #endif /* STRING_LEN */ @@ -127,9 +127,9 @@ #define _LOCK_FILE_(file) MSVCRT__lock_file(file) #define _UNLOCK_FILE_(file) MSVCRT__unlock_file(file) #ifdef SECURE -#define _FUNCTION_ static int MSVCRT_vfwscanf_s_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vfwscanf_s_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap) #else /* SECURE */ -#define _FUNCTION_ static int MSVCRT_vfwscanf_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vfwscanf_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap) #endif /* SECURE */ #else /* WIDE_SCANF */ #define _GETC_FUNC_(file) MSVCRT_fgetc(file) @@ -139,9 +139,9 @@ #define _LOCK_FILE_(file) MSVCRT__lock_file(file) #define _UNLOCK_FILE_(file) MSVCRT__unlock_file(file) #ifdef SECURE -#define _FUNCTION_ static int MSVCRT_vfscanf_s_l(FILE* file, const char *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vfscanf_s_l(FILE* file, const char *format, _locale_t locale, __ms_va_list ap) #else /* SECURE */ -#define _FUNCTION_ static int MSVCRT_vfscanf_l(FILE* file, const char *format, _locale_t locale, __ms_va_list ap) +#define _FUNCTION_ static int vfscanf_l(FILE* file, const char *format, _locale_t locale, __ms_va_list ap) #endif /* SECURE */ #endif /* WIDE_SCANF */ #endif /* STRING */ diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 1ee2dbc6794..88abe37e664 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -679,13 +679,13 @@ @ cdecl free(ptr) @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl frexp(double ptr) MSVCRT_frexp -@ varargs fscanf(ptr str) MSVCRT_fscanf +@ varargs fscanf(ptr str) @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @ cdecl ftell(ptr) MSVCRT_ftell @ varargs fwprintf(ptr wstr) MSVCRT_fwprintf @ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite -@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf +@ varargs fwscanf(ptr wstr) @ cdecl getc(ptr) MSVCRT_getc @ cdecl getchar() MSVCRT_getchar @ cdecl getenv(str) @@ -753,7 +753,7 @@ @ cdecl remove(str) MSVCRT_remove @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind -@ varargs scanf(str) MSVCRT_scanf +@ varargs scanf(str) @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl setlocale(long str) @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf @@ -763,7 +763,7 @@ @ varargs sprintf(ptr str) MSVCRT_sprintf @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) -@ varargs sscanf(str str) MSVCRT_sscanf +@ varargs sscanf(str str) @ cdecl strcat(str str) @ cdecl strchr(str long) @ cdecl strcmp(str str) @@ -786,7 +786,7 @@ @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf(ptr wstr) MSVCRT_swprintf -@ varargs swscanf(wstr wstr) MSVCRT_swscanf +@ varargs swscanf(wstr wstr) @ cdecl system(str) @ cdecl tan(double) MSVCRT_tan @ cdecl tanh(double) MSVCRT_tanh @@ -828,4 +828,4 @@ @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctomb(ptr long) MSVCRT_wctomb @ varargs wprintf(wstr) MSVCRT_wprintf -@ varargs wscanf(wstr) MSVCRT_wscanf +@ varargs wscanf(wstr) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0940f656bc4..3724e4d72a9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -149,21 +149,21 @@ @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p @ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf_s -@ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfscanf +@ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ cdecl __stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf_s -@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf +@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) @ 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 -norelay __stdio_common_vsprintf(int64 ptr long str ptr ptr) @ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s -@ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf +@ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) @ 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 -@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf +@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) @ cdecl __strncnt(str long) MSVCRT___strncnt @ cdecl __sys_errlist() @ cdecl __sys_nerr() @@ -813,21 +813,21 @@ @ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ cdecl _o___stdio_common_vfprintf_s(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf_s -@ cdecl _o___stdio_common_vfscanf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfscanf +@ cdecl _o___stdio_common_vfscanf(int64 ptr str ptr ptr) __stdio_common_vfscanf @ cdecl _o___stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub _o___stdio_common_vfwprintf_p @ cdecl _o___stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf_s -@ cdecl _o___stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf +@ cdecl _o___stdio_common_vfwscanf(int64 ptr wstr ptr ptr) __stdio_common_vfwscanf @ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl _o___stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s @ cdecl _o___stdio_common_vsprintf(int64 ptr long str ptr ptr) __stdio_common_vsprintf @ cdecl _o___stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p @ cdecl _o___stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s -@ cdecl _o___stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf +@ cdecl _o___stdio_common_vsscanf(int64 ptr long str ptr ptr) __stdio_common_vsscanf @ cdecl _o___stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf @ cdecl _o___stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_p @ cdecl _o___stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s -@ cdecl _o___stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf +@ cdecl _o___stdio_common_vswscanf(int64 ptr long wstr ptr ptr) __stdio_common_vswscanf @ cdecl _o___timezone() MSVCRT___p__timezone @ cdecl _o___tzname() __p__tzname @ cdecl _o___wcserror(wstr) __wcserror diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 091a3ade6f2..9d02a505766 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -92,6 +92,10 @@ _ACRTIMP int __cdecl __stdio_common_vswprintf_s(unsigned __int64,wchar_t*,size_t _ACRTIMP int __cdecl __stdio_common_vfwscanf(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswscanf(unsigned __int64,const wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); +#endif /* _UCRT */ + +#if defined(_UCRT) && !defined(_NO_CRT_STDIO_INLINE) + static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); @@ -339,7 +343,7 @@ static inline int WINAPIV wscanf_s(FILE *file, const wchar_t *format, ...) return ret; } -#else /* _UCRT */ +#else /* _UCRT && !_NO_CRT_STDIO_INLINE */ _ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...); @@ -384,7 +388,7 @@ _ACRTIMP int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); _ACRTIMP int WINAPIV wscanf(const wchar_t*,...); _ACRTIMP int WINAPIV wscanf_s(const wchar_t*,...); -#endif /* _UCRT */ +#endif /* _UCRT && !_NO_CRT_STDIO_INLINE */ #ifdef __cplusplus } diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index a202ecac6d0..a8e2e65ab40 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -155,6 +155,10 @@ _ACRTIMP int __cdecl __stdio_common_vsnprintf_s(unsigned __int64,char*,size_t,si _ACRTIMP int __cdecl __stdio_common_vfscanf(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsscanf(unsigned __int64,char const*,size_t,const char*,_locale_t,__ms_va_list); +#endif /* _UCRT */ + +#if defined(_UCRT) && !defined(_NO_CRT_STDIO_INLINE) + static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, @@ -376,7 +380,7 @@ static inline int WINAPIV scanf_s(const char *format, ...) return ret; } -#else /* _UCRT */ +#else /* _UCRT && !_NO_CRT_STDIO_INLINE */ _ACRTIMP int WINAPIV _scprintf(const char *,...); _ACRTIMP int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); @@ -406,7 +410,7 @@ _ACRTIMP int WINAPIV scanf_s(const char*,...); _ACRTIMP int WINAPIV sscanf(const char*,const char*,...); _ACRTIMP int WINAPIV sscanf_s(const char*,const char*,...); -#endif /* _UCRT */ +#endif /* _UCRT && !_NO_CRT_STDIO_INLINE */ #endif /* _STDIO_DEFINED */