Skip to content

W
wine-cw
Commit 6ad42ee7 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Remove MSVCRT_ prefix from wcs.c functions.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 40b3361c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 378 additions and 386 deletions
dlls/crtdll/crtdll.spec
View file @ 6ad42ee7
......@@ -272,8 +272,8 @@
@ cdecl _setmode(long long) MSVCRT__setmode
@ stub _setsystime(ptr long)
@ cdecl _sleep(long)
@ varargs _snprintf(ptr long str) MSVCRT__snprintf
@ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf
@ varargs _snprintf(ptr long str)
@ varargs _snwprintf(ptr long wstr)
@ varargs _sopen(str long long) MSVCRT__sopen
@ varargs _spawnl(long str str)
@ varargs _spawnle(long str str)
......@@ -323,22 +323,22 @@
@ cdecl -arch=win32 _utime(str ptr) _utime32
@ cdecl -arch=win64 _utime(str ptr) _utime64
@ cdecl _vsnprintf(ptr long str ptr)
@ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll
@ cdecl _wcslwr(wstr) MSVCRT__wcslwr
@ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp
@ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset
@ cdecl _wcsrev(wstr) MSVCRT__wcsrev
@ cdecl _wcsset(wstr long) MSVCRT__wcsset
@ cdecl _wcsupr(wstr) MSVCRT__wcsupr
@ cdecl _vsnwprintf(ptr long wstr ptr)
@ cdecl _wcsdup(wstr)
@ cdecl _wcsicmp(wstr wstr)
@ cdecl _wcsicoll(wstr wstr)
@ cdecl _wcslwr(wstr)
@ cdecl _wcsnicmp(wstr wstr long)
@ cdecl _wcsnset(wstr long long)
@ cdecl _wcsrev(wstr)
@ cdecl _wcsset(wstr long)
@ cdecl _wcsupr(wstr)
@ extern _winmajor_dll MSVCRT__winmajor
@ extern _winminor_dll MSVCRT__winminor
@ extern _winver_dll MSVCRT__winver
@ cdecl _write(long ptr long) MSVCRT__write
@ cdecl _wtoi(wstr) MSVCRT__wtoi
@ cdecl _wtol(wstr) MSVCRT__wtol
@ cdecl _wtoi(wstr)
@ cdecl _wtol(wstr)
@ cdecl _y0(double) MSVCRT__y0
@ cdecl _y1(double) MSVCRT__y1
@ cdecl _yn(long double) MSVCRT__yn
......@@ -400,7 +400,7 @@
@ cdecl gets(str) MSVCRT_gets
@ cdecl -arch=win32 gmtime(ptr) _gmtime32
@ cdecl -arch=win64 gmtime(ptr) _gmtime64
@ cdecl is_wctype(long long) MSVCRT_iswctype
@ cdecl is_wctype(long long) iswctype
@ cdecl isalnum(long)
@ cdecl isalpha(long)
@ cdecl iscntrl(long)
......@@ -412,19 +412,19 @@
@ cdecl ispunct(long)
@ cdecl isspace(long)
@ cdecl isupper(long)
@ cdecl iswalnum(long) MSVCRT_iswalnum
@ cdecl iswalpha(long) MSVCRT_iswalpha
@ cdecl iswalnum(long)
@ cdecl iswalpha(long)
@ cdecl iswascii(long)
@ cdecl iswcntrl(long) MSVCRT_iswcntrl
@ cdecl iswctype(long long) MSVCRT_iswctype
@ cdecl iswdigit(long) MSVCRT_iswdigit
@ cdecl iswgraph(long) MSVCRT_iswgraph
@ cdecl iswlower(long) MSVCRT_iswlower
@ cdecl iswprint(long) MSVCRT_iswprint
@ cdecl iswpunct(long) MSVCRT_iswpunct
@ cdecl iswspace(long) MSVCRT_iswspace
@ cdecl iswupper(long) MSVCRT_iswupper
@ cdecl iswxdigit(long) MSVCRT_iswxdigit
@ cdecl iswcntrl(long)
@ cdecl iswctype(long long)
@ cdecl iswdigit(long)
@ cdecl iswgraph(long)
@ cdecl iswlower(long)
@ cdecl iswprint(long)
@ cdecl iswpunct(long)
@ cdecl iswspace(long)
@ cdecl iswupper(long)
@ cdecl iswxdigit(long)
@ cdecl isxdigit(long)
@ cdecl labs(long) MSVCRT_labs
@ cdecl ldexp(double long) MSVCRT_ldexp
......@@ -467,7 +467,7 @@
@ cdecl signal(long long)
@ cdecl sin(double) MSVCRT_sin
@ cdecl sinh(double) MSVCRT_sinh
@ varargs sprintf(ptr str) MSVCRT_sprintf
@ varargs sprintf(ptr str)
@ cdecl sqrt(double) MSVCRT_sqrt
@ cdecl srand(long)
@ varargs sscanf(str str)
......@@ -492,7 +492,7 @@
@ cdecl strtol(str ptr long)
@ cdecl strtoul(str ptr long)
@ cdecl strxfrm(ptr str long)
@ varargs swprintf(ptr wstr) MSVCRT_swprintf
@ varargs swprintf(ptr wstr) _swprintf
@ varargs swscanf(wstr wstr)
@ cdecl system(str)
@ cdecl tan(double) MSVCRT_tan
......@@ -503,37 +503,37 @@
@ cdecl tmpnam(ptr) MSVCRT_tmpnam
@ cdecl tolower(long)
@ cdecl toupper(long)
@ cdecl towlower(long) MSVCRT_towlower
@ cdecl towupper(long) MSVCRT_towupper
@ cdecl towlower(long)
@ cdecl towupper(long)
@ cdecl ungetc(long ptr) MSVCRT_ungetc
@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
@ cdecl vprintf(str ptr) MSVCRT_vprintf
@ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf
@ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf
@ cdecl vsprintf(ptr str ptr)
@ cdecl vswprintf(ptr wstr ptr) _vswprintf
@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
@ cdecl wcscat(wstr wstr) MSVCRT_wcscat
@ cdecl wcschr(wstr long) MSVCRT_wcschr
@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp
@ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll
@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy
@ cdecl wcscat(wstr wstr)
@ cdecl wcschr(wstr long)
@ cdecl wcscmp(wstr wstr)
@ cdecl wcscoll(wstr wstr)
@ cdecl wcscpy(ptr wstr)
@ cdecl wcscspn(wstr wstr) ntdll.wcscspn
@ cdecl wcsftime(ptr long wstr ptr)
@ cdecl wcslen(wstr) MSVCRT_wcslen
@ cdecl wcslen(wstr)
@ cdecl wcsncat(wstr wstr long) ntdll.wcsncat
@ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp
@ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy
@ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk
@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr
@ cdecl wcsncmp(wstr wstr long)
@ cdecl wcsncpy(ptr wstr long)
@ cdecl wcspbrk(wstr wstr)
@ cdecl wcsrchr(wstr long)
@ cdecl wcsspn(wstr wstr) ntdll.wcsspn
@ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr
@ cdecl wcstod(wstr ptr) MSVCRT_wcstod
@ cdecl wcstok(wstr wstr) MSVCRT_wcstok
@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol
@ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs
@ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul
@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm
@ cdecl wctomb(ptr long) MSVCRT_wctomb
@ cdecl wcsstr(wstr wstr)
@ cdecl wcstod(wstr ptr)
@ cdecl wcstok(wstr wstr)
@ cdecl wcstol(wstr ptr long)
@ cdecl wcstombs(ptr ptr long)
@ cdecl wcstoul(wstr ptr long)
@ cdecl wcsxfrm(ptr wstr long)
@ cdecl wctomb(ptr long)
@ varargs wprintf(wstr) MSVCRT_wprintf
@ varargs wscanf(wstr)
dlls/msvcr70/msvcr70.spec
View file @ 6ad42ee7
......@@ -511,8 +511,8 @@
@ cdecl -arch=i386 _safe_fprem()
@ cdecl -arch=i386 _safe_fprem1()
@ cdecl _scalb(double long) MSVCRT__scalb
@ varargs _scprintf(str) MSVCRT__scprintf
@ varargs _scwprintf(wstr) MSVCRT__scwprintf
@ varargs _scprintf(str)
@ varargs _scwprintf(wstr)
@ cdecl _searchenv(str str ptr) MSVCRT__searchenv
@ stdcall -arch=i386 _seh_longjmp_unwind(ptr)
@ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable
......@@ -527,9 +527,9 @@
@ cdecl _setmode(long long) MSVCRT__setmode
@ stub _setsystime(ptr long)
@ cdecl _sleep(long)
@ varargs _snprintf(ptr long str) MSVCRT__snprintf
@ varargs _snprintf(ptr long str)
@ varargs _snscanf(str long str)
@ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf
@ varargs _snwprintf(ptr long wstr)
@ varargs _snwscanf(wstr long wstr)
@ varargs _sopen(str long long) MSVCRT__sopen
@ varargs _spawnl(long str str)
......@@ -587,30 +587,30 @@
@ cdecl -arch=win32 _utime(str ptr) _utime32
@ cdecl -arch=win64 _utime(str ptr) _utime64
@ cdecl _utime64(str ptr)
@ cdecl _vscprintf(str ptr) MSVCRT__vscprintf
@ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf
@ cdecl _vscprintf(str ptr)
@ cdecl _vscwprintf(wstr ptr)
@ cdecl -norelay _vsnprintf(ptr long str ptr)
@ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl _vsnwprintf(ptr long wstr ptr)
@ cdecl _waccess(wstr long) MSVCRT__waccess
@ cdecl _wasctime(ptr)
@ cdecl _wchdir(wstr) MSVCRT__wchdir
@ cdecl _wchmod(wstr long) MSVCRT__wchmod
@ extern _wcmdln MSVCRT__wcmdln
@ cdecl _wcreat(wstr long) MSVCRT__wcreat
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcsdup(wstr)
@ cdecl _wcserror(long)
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll
@ cdecl _wcslwr(wstr) MSVCRT__wcslwr
@ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll
@ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp
@ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll
@ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset
@ cdecl _wcsrev(wstr) MSVCRT__wcsrev
@ cdecl _wcsset(wstr long) MSVCRT__wcsset
@ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64
@ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64
@ cdecl _wcsupr(wstr) MSVCRT__wcsupr
@ cdecl _wcsicmp(wstr wstr)
@ cdecl _wcsicoll(wstr wstr)
@ cdecl _wcslwr(wstr)
@ cdecl _wcsncoll(wstr wstr long)
@ cdecl _wcsnicmp(wstr wstr long)
@ cdecl _wcsnicoll(wstr wstr long)
@ cdecl _wcsnset(wstr long long)
@ cdecl _wcsrev(wstr)
@ cdecl _wcsset(wstr long)
@ cdecl -ret64 _wcstoi64(wstr ptr long)
@ cdecl -ret64 _wcstoui64(wstr ptr long)
@ cdecl _wcsupr(wstr)
@ cdecl -arch=win32 _wctime(ptr) _wctime32
@ cdecl -arch=win64 _wctime(ptr) _wctime64
@ cdecl _wctime64(ptr)
......@@ -673,10 +673,10 @@
@ cdecl _wsystem(wstr)
@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
@ cdecl _wtof(wstr) MSVCRT__wtof
@ cdecl _wtoi(wstr) MSVCRT__wtoi
@ cdecl -ret64 _wtoi64(wstr) MSVCRT__wtoi64
@ cdecl _wtol(wstr) MSVCRT__wtol
@ cdecl _wtof(wstr)
@ cdecl _wtoi(wstr)
@ cdecl -ret64 _wtoi64(wstr)
@ cdecl _wtol(wstr)
@ cdecl _wunlink(wstr) MSVCRT__wunlink
@ cdecl -arch=win32 _wutime(wstr ptr) _wutime32
@ cdecl -arch=win64 _wutime(wstr ptr) _wutime64
......@@ -746,7 +746,7 @@
@ cdecl getwchar() MSVCRT_getwchar
@ cdecl -arch=win32 gmtime(ptr) _gmtime32
@ cdecl -arch=win64 gmtime(ptr) _gmtime64
@ cdecl is_wctype(long long) MSVCRT_iswctype
@ cdecl is_wctype(long long) iswctype
@ cdecl isalnum(long)
@ cdecl isalpha(long)
@ cdecl iscntrl(long)
......@@ -758,19 +758,19 @@
@ cdecl ispunct(long)
@ cdecl isspace(long)
@ cdecl isupper(long)
@ cdecl iswalnum(long) MSVCRT_iswalnum
@ cdecl iswalpha(long) MSVCRT_iswalpha
@ cdecl iswalnum(long)
@ cdecl iswalpha(long)
@ cdecl iswascii(long)
@ cdecl iswcntrl(long) MSVCRT_iswcntrl
@ cdecl iswctype(long long) MSVCRT_iswctype
@ cdecl iswdigit(long) MSVCRT_iswdigit
@ cdecl iswgraph(long) MSVCRT_iswgraph
@ cdecl iswlower(long) MSVCRT_iswlower
@ cdecl iswprint(long) MSVCRT_iswprint
@ cdecl iswpunct(long) MSVCRT_iswpunct
@ cdecl iswspace(long) MSVCRT_iswspace
@ cdecl iswupper(long) MSVCRT_iswupper
@ cdecl iswxdigit(long) MSVCRT_iswxdigit
@ cdecl iswcntrl(long)
@ cdecl iswctype(long long)
@ cdecl iswdigit(long)
@ cdecl iswgraph(long)
@ cdecl iswlower(long)
@ cdecl iswprint(long)
@ cdecl iswpunct(long)
@ cdecl iswspace(long)
@ cdecl iswupper(long)
@ cdecl iswxdigit(long)
@ cdecl isxdigit(long)
@ cdecl labs(long) MSVCRT_labs
@ cdecl ldexp(double long) MSVCRT_ldexp
......@@ -815,7 +815,7 @@
@ cdecl signal(long long)
@ cdecl sin(double) MSVCRT_sin
@ cdecl sinh(double) MSVCRT_sinh
@ varargs sprintf(ptr str) MSVCRT_sprintf
@ varargs sprintf(ptr str)
@ cdecl sqrt(double) MSVCRT_sqrt
@ cdecl srand(long)
@ varargs sscanf(str str)
......@@ -840,7 +840,7 @@
@ cdecl strtol(str ptr long)
@ cdecl strtoul(str ptr long)
@ cdecl strxfrm(ptr str long)
@ varargs swprintf(ptr wstr) MSVCRT_swprintf
@ varargs swprintf(ptr wstr) _swprintf
@ varargs swscanf(wstr wstr)
@ cdecl system(str)
@ cdecl tan(double) MSVCRT_tan
......@@ -851,37 +851,37 @@
@ cdecl tmpnam(ptr) MSVCRT_tmpnam
@ cdecl tolower(long)
@ cdecl toupper(long)
@ cdecl towlower(long) MSVCRT_towlower
@ cdecl towupper(long) MSVCRT_towupper
@ cdecl towlower(long)
@ cdecl towupper(long)
@ cdecl ungetc(long ptr) MSVCRT_ungetc
@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
@ cdecl vprintf(str ptr) MSVCRT_vprintf
@ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf
@ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf
@ cdecl vsprintf(ptr str ptr)
@ cdecl vswprintf(ptr wstr ptr) _vswprintf
@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
@ cdecl wcscat(wstr wstr) MSVCRT_wcscat
@ cdecl wcschr(wstr long) MSVCRT_wcschr
@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp
@ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll
@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy
@ cdecl wcscat(wstr wstr)
@ cdecl wcschr(wstr long)
@ cdecl wcscmp(wstr wstr)
@ cdecl wcscoll(wstr wstr)
@ cdecl wcscpy(ptr wstr)
@ cdecl wcscspn(wstr wstr) ntdll.wcscspn
@ cdecl wcsftime(ptr long wstr ptr)
@ cdecl wcslen(wstr) MSVCRT_wcslen
@ cdecl wcslen(wstr)
@ cdecl wcsncat(wstr wstr long) ntdll.wcsncat
@ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp
@ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy
@ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk
@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr
@ cdecl wcsncmp(wstr wstr long)
@ cdecl wcsncpy(ptr wstr long)
@ cdecl wcspbrk(wstr wstr)
@ cdecl wcsrchr(wstr long)
@ cdecl wcsspn(wstr wstr) ntdll.wcsspn
@ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr
@ cdecl wcstod(wstr ptr) MSVCRT_wcstod
@ cdecl wcstok(wstr wstr) MSVCRT_wcstok
@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol
@ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs
@ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul
@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm
@ cdecl wctomb(ptr long) MSVCRT_wctomb
@ cdecl wcsstr(wstr wstr)
@ cdecl wcstod(wstr ptr)
@ cdecl wcstok(wstr wstr)
@ cdecl wcstol(wstr ptr long)
@ cdecl wcstombs(ptr ptr long)
@ cdecl wcstoul(wstr ptr long)
@ cdecl wcsxfrm(ptr wstr long)
@ cdecl wctomb(ptr long)
@ varargs wprintf(wstr) MSVCRT_wprintf
@ varargs wscanf(wstr)
dlls/msvcr71/msvcr71.spec
View file @ 6ad42ee7
......@@ -76,12 +76,12 @@
@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler
@ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate
@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) MSVCRT__snwprintf
@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) MSVCRT__snwprintf
@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) _snwprintf
@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) _snwprintf
@ cdecl ?terminate@@YAXXZ() terminate
@ cdecl ?unexpected@@YAXXZ() unexpected
@ cdecl ?vswprintf@@YAHPAGIPBGPAD@Z(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl ?vswprintf@@YAHPAGIPBGPAD@Z(ptr long wstr ptr) _vsnwprintf
@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) _vsnwprintf
@ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception
@ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception
@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT
......@@ -506,8 +506,8 @@
@ cdecl -arch=i386 _safe_fprem()
@ cdecl -arch=i386 _safe_fprem1()
@ cdecl _scalb(double long) MSVCRT__scalb
@ varargs _scprintf(str) MSVCRT__scprintf
@ varargs _scwprintf(wstr) MSVCRT__scwprintf
@ varargs _scprintf(str)
@ varargs _scwprintf(wstr)
@ cdecl _searchenv(str str ptr) MSVCRT__searchenv
@ stdcall -arch=i386 _seh_longjmp_unwind(ptr)
@ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable
......@@ -523,9 +523,9 @@
@ cdecl _setmode(long long) MSVCRT__setmode
@ stub _setsystime(ptr long)
@ cdecl _sleep(long)
@ varargs _snprintf(ptr long str) MSVCRT__snprintf
@ varargs _snprintf(ptr long str)
@ varargs _snscanf(str long str)
@ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf
@ varargs _snwprintf(ptr long wstr)
@ varargs _snwscanf(wstr long wstr)
@ varargs _sopen(str long long) MSVCRT__sopen
@ varargs _spawnl(long str str)
......@@ -583,30 +583,30 @@
@ cdecl -arch=win32 _utime(str ptr) _utime32
@ cdecl -arch=win64 _utime(str ptr) _utime64
@ cdecl _utime64(str ptr)
@ cdecl _vscprintf(str ptr) MSVCRT__vscprintf
@ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf
@ cdecl _vscprintf(str ptr)
@ cdecl _vscwprintf(wstr ptr)
@ cdecl -norelay _vsnprintf(ptr long str ptr)
@ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl _vsnwprintf(ptr long wstr ptr)
@ cdecl _waccess(wstr long) MSVCRT__waccess
@ cdecl _wasctime(ptr)
@ cdecl _wchdir(wstr) MSVCRT__wchdir
@ cdecl _wchmod(wstr long) MSVCRT__wchmod
@ extern _wcmdln MSVCRT__wcmdln
@ cdecl _wcreat(wstr long) MSVCRT__wcreat
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcsdup(wstr)
@ cdecl _wcserror(long)
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll
@ cdecl _wcslwr(wstr) MSVCRT__wcslwr
@ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll
@ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp
@ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll
@ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset
@ cdecl _wcsrev(wstr) MSVCRT__wcsrev
@ cdecl _wcsset(wstr long) MSVCRT__wcsset
@ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64
@ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64
@ cdecl _wcsupr(wstr) MSVCRT__wcsupr
@ cdecl _wcsicmp(wstr wstr)
@ cdecl _wcsicoll(wstr wstr)
@ cdecl _wcslwr(wstr)
@ cdecl _wcsncoll(wstr wstr long)
@ cdecl _wcsnicmp(wstr wstr long)
@ cdecl _wcsnicoll(wstr wstr long)
@ cdecl _wcsnset(wstr long long)
@ cdecl _wcsrev(wstr)
@ cdecl _wcsset(wstr long)
@ cdecl -ret64 _wcstoi64(wstr ptr long)
@ cdecl -ret64 _wcstoui64(wstr ptr long)
@ cdecl _wcsupr(wstr)
@ cdecl -arch=win32 _wctime(ptr) _wctime32
@ cdecl -arch=win64 _wctime(ptr) _wctime64
@ cdecl _wctime64(ptr)
......@@ -669,10 +669,10 @@
@ cdecl _wsystem(wstr)
@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
@ cdecl _wtof(wstr) MSVCRT__wtof
@ cdecl _wtoi(wstr) MSVCRT__wtoi
@ cdecl -ret64 _wtoi64(wstr) MSVCRT__wtoi64
@ cdecl _wtol(wstr) MSVCRT__wtol
@ cdecl _wtof(wstr)
@ cdecl _wtoi(wstr)
@ cdecl -ret64 _wtoi64(wstr)
@ cdecl _wtol(wstr)
@ cdecl _wunlink(wstr) MSVCRT__wunlink
@ cdecl -arch=win32 _wutime(wstr ptr) _wutime32
@ cdecl -arch=win64 _wutime(wstr ptr) _wutime64
......@@ -742,7 +742,7 @@
@ cdecl getwchar() MSVCRT_getwchar
@ cdecl -arch=win32 gmtime(ptr) _gmtime32
@ cdecl -arch=win64 gmtime(ptr) _gmtime64
@ cdecl is_wctype(long long) MSVCRT_iswctype
@ cdecl is_wctype(long long) iswctype
@ cdecl isalnum(long)
@ cdecl isalpha(long)
@ cdecl iscntrl(long)
......@@ -754,19 +754,19 @@
@ cdecl ispunct(long)
@ cdecl isspace(long)
@ cdecl isupper(long)
@ cdecl iswalnum(long) MSVCRT_iswalnum
@ cdecl iswalpha(long) MSVCRT_iswalpha
@ cdecl iswalnum(long)
@ cdecl iswalpha(long)
@ cdecl iswascii(long)
@ cdecl iswcntrl(long) MSVCRT_iswcntrl
@ cdecl iswctype(long long) MSVCRT_iswctype
@ cdecl iswdigit(long) MSVCRT_iswdigit
@ cdecl iswgraph(long) MSVCRT_iswgraph
@ cdecl iswlower(long) MSVCRT_iswlower
@ cdecl iswprint(long) MSVCRT_iswprint
@ cdecl iswpunct(long) MSVCRT_iswpunct
@ cdecl iswspace(long) MSVCRT_iswspace
@ cdecl iswupper(long) MSVCRT_iswupper
@ cdecl iswxdigit(long) MSVCRT_iswxdigit
@ cdecl iswcntrl(long)
@ cdecl iswctype(long long)
@ cdecl iswdigit(long)
@ cdecl iswgraph(long)
@ cdecl iswlower(long)
@ cdecl iswprint(long)
@ cdecl iswpunct(long)
@ cdecl iswspace(long)
@ cdecl iswupper(long)
@ cdecl iswxdigit(long)
@ cdecl isxdigit(long)
@ cdecl labs(long) MSVCRT_labs
@ cdecl ldexp(double long) MSVCRT_ldexp
......@@ -810,7 +810,7 @@
@ cdecl signal(long long)
@ cdecl sin(double) MSVCRT_sin
@ cdecl sinh(double) MSVCRT_sinh
@ varargs sprintf(ptr str) MSVCRT_sprintf
@ varargs sprintf(ptr str)
@ cdecl sqrt(double) MSVCRT_sqrt
@ cdecl srand(long)
@ varargs sscanf(str str)
......@@ -835,7 +835,7 @@
@ cdecl strtol(str ptr long)
@ cdecl strtoul(str ptr long)
@ cdecl strxfrm(ptr str long)
@ varargs swprintf(ptr wstr) MSVCRT_swprintf
@ varargs swprintf(ptr wstr) _swprintf
@ varargs swscanf(wstr wstr)
@ cdecl system(str)
@ cdecl tan(double) MSVCRT_tan
......@@ -846,37 +846,37 @@
@ cdecl tmpnam(ptr) MSVCRT_tmpnam
@ cdecl tolower(long)
@ cdecl toupper(long)
@ cdecl towlower(long) MSVCRT_towlower
@ cdecl towupper(long) MSVCRT_towupper
@ cdecl towlower(long)
@ cdecl towupper(long)
@ cdecl ungetc(long ptr) MSVCRT_ungetc
@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
@ cdecl vprintf(str ptr) MSVCRT_vprintf
@ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf
@ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf
@ cdecl vsprintf(ptr str ptr)
@ cdecl vswprintf(ptr wstr ptr) _vswprintf
@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
@ cdecl wcscat(wstr wstr) MSVCRT_wcscat
@ cdecl wcschr(wstr long) MSVCRT_wcschr
@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp
@ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll
@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy
@ cdecl wcscat(wstr wstr)
@ cdecl wcschr(wstr long)
@ cdecl wcscmp(wstr wstr)
@ cdecl wcscoll(wstr wstr)
@ cdecl wcscpy(ptr wstr)
@ cdecl wcscspn(wstr wstr) ntdll.wcscspn
@ cdecl wcsftime(ptr long wstr ptr)
@ cdecl wcslen(wstr) MSVCRT_wcslen
@ cdecl wcslen(wstr)
@ cdecl wcsncat(wstr wstr long) ntdll.wcsncat
@ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp
@ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy
@ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk
@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr
@ cdecl wcsncmp(wstr wstr long)
@ cdecl wcsncpy(ptr wstr long)
@ cdecl wcspbrk(wstr wstr)
@ cdecl wcsrchr(wstr long)
@ cdecl wcsspn(wstr wstr) ntdll.wcsspn
@ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr
@ cdecl wcstod(wstr ptr) MSVCRT_wcstod
@ cdecl wcstok(wstr wstr) MSVCRT_wcstok
@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol
@ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs
@ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul
@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm
@ cdecl wctomb(ptr long) MSVCRT_wctomb
@ cdecl wcsstr(wstr wstr)
@ cdecl wcstod(wstr ptr)
@ cdecl wcstok(wstr wstr)
@ cdecl wcstol(wstr ptr long)
@ cdecl wcstombs(ptr ptr long)
@ cdecl wcstoul(wstr ptr long)
@ cdecl wcsxfrm(ptr wstr long)
@ cdecl wctomb(ptr long)
@ varargs wprintf(wstr) MSVCRT_wprintf
@ varargs wscanf(wstr)
dlls/msvcrt/console.c
View file @ 6ad42ee7
......@@ -90,7 +90,7 @@ int CDECL _cputws(const wchar_t* str)
int len, retval = -1;
if (!MSVCRT_CHECK_PMT(str != NULL)) return -1;
len = MSVCRT_wcslen(str);
len = wcslen(str);
LOCK_CONSOLE;
if (WriteConsoleW(MSVCRT_console_out, str, len, &count, NULL)
......
dlls/msvcrt/data.c
View file @ 6ad42ee7
......@@ -108,11 +108,11 @@ wchar_t ** msvcrt_SnapshotOfEnvironmentW(wchar_t **wblk)
int count = 1, len = 1, i = 0; /* keep space for the trailing NULLS */
wchar_t *wptr;
for (wptr = wenviron_strings; *wptr; wptr += MSVCRT_wcslen(wptr) + 1)
for (wptr = wenviron_strings; *wptr; wptr += wcslen(wptr) + 1)
{
/* Don't count environment variables starting with '=' which are command shell specific */
if (*wptr != '=') count++;
len += MSVCRT_wcslen(wptr) + 1;
len += wcslen(wptr) + 1;
}
if (wblk)
wblk = HeapReAlloc( GetProcessHeap(), 0, wblk, count* sizeof(wchar_t*) + len * sizeof(wchar_t));
......@@ -123,7 +123,7 @@ wchar_t ** msvcrt_SnapshotOfEnvironmentW(wchar_t **wblk)
if (count)
{
memcpy(&wblk[count],wenviron_strings,len * sizeof(wchar_t));
for (wptr = (wchar_t*)&wblk[count]; *wptr; wptr += MSVCRT_wcslen(wptr) + 1)
for (wptr = (wchar_t*)&wblk[count]; *wptr; wptr += wcslen(wptr) + 1)
{
/* Skip special environment strings set by the command shell */
if (*wptr != '=') wblk[i++] = wptr;
......@@ -160,7 +160,7 @@ static char **build_argv( WCHAR **wargv )
static WCHAR **cmdline_to_argv( const WCHAR *src, int *ret_argc )
{
WCHAR **argv, *arg, *dst;
int argc, in_quotes = 0, bcount = 0, len = MSVCRT_wcslen(src) + 1;
int argc, in_quotes = 0, bcount = 0, len = wcslen(src) + 1;
argc = 2 + len / 2;
argv = HeapAlloc( GetProcessHeap(), 0, argc * sizeof(*argv) + len * sizeof(WCHAR) );
......@@ -408,7 +408,7 @@ void msvcrt_init_args(void)
OSVERSIONINFOW osvi;
MSVCRT__acmdln = _strdup( GetCommandLineA() );
MSVCRT__wcmdln = MSVCRT__wcsdup( GetCommandLineW() );
MSVCRT__wcmdln = _wcsdup( GetCommandLineW() );
initial_wargv = cmdline_to_argv( GetCommandLineW(), &initial_argc );
MSVCRT___argc = initial_argc;
MSVCRT___wargv = initial_wargv;
......@@ -486,7 +486,7 @@ static int build_expanded_wargv(int *argc, wchar_t **argv)
int len = 0;
is_expandable = FALSE;
for(path_len = MSVCRT_wcslen(initial_wargv[i])-1; path_len>=0; path_len--) {
for(path_len = wcslen(initial_wargv[i])-1; path_len>=0; path_len--) {
if(initial_wargv[i][path_len]=='*' || initial_wargv[i][path_len]=='?')
is_expandable = TRUE;
else if(initial_wargv[i][path_len]=='\\' || initial_wargv[i][path_len]=='/')
......@@ -505,7 +505,7 @@ static int build_expanded_wargv(int *argc, wchar_t **argv)
(data.cFileName[1]=='.' && data.cFileName[2]=='\0')))
continue;
len = MSVCRT_wcslen(data.cFileName)+1;
len = wcslen(data.cFileName)+1;
if(argv) {
argv[args_no] = (wchar_t*)(argv+*argc+1)+size;
memcpy(argv[args_no], initial_wargv[i], path_len*sizeof(wchar_t));
......@@ -518,7 +518,7 @@ static int build_expanded_wargv(int *argc, wchar_t **argv)
}
if(!len) {
len = MSVCRT_wcslen(initial_wargv[i])+1;
len = wcslen(initial_wargv[i])+1;
if(argv) {
argv[args_no] = (wchar_t*)(argv+*argc+1)+size;
memcpy(argv[args_no], initial_wargv[i], len*sizeof(wchar_t));
......
dlls/msvcrt/dir.c
View file @ 6ad42ee7
......@@ -90,7 +90,7 @@ static void msvcrt_wfttofd( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddata
RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw );
ft->time_write = dw;
ft->size = fd->nFileSizeLow;
MSVCRT_wcscpy(ft->name, fd->cFileName);
wcscpy(ft->name, fd->cFileName);
}
/* INTERNAL: Translate WIN32_FIND_DATAW to wfinddata32_t */
......@@ -110,7 +110,7 @@ static void msvcrt_wfttofd32(const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddat
RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw );
ft->time_write = dw;
ft->size = fd->nFileSizeLow;
MSVCRT_wcscpy(ft->name, fd->cFileName);
wcscpy(ft->name, fd->cFileName);
}
/* INTERNAL: Translate WIN32_FIND_DATAA to finddatai64_t */
......@@ -170,7 +170,7 @@ static void msvcrt_wfttofd64( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfindda
RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw );
ft->time_write = dw;
ft->size = ((__int64)fd->nFileSizeHigh) << 32 | fd->nFileSizeLow;
MSVCRT_wcscpy(ft->name, fd->cFileName);
wcscpy(ft->name, fd->cFileName);
}
/* INTERNAL: Translate WIN32_FIND_DATAA to finddata64i32_t */
......@@ -210,7 +210,7 @@ static void msvcrt_wfttofdi64( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfindd
RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw );
ft->time_write = dw;
ft->size = ((__int64)fd->nFileSizeHigh) << 32 | fd->nFileSizeLow;
MSVCRT_wcscpy(ft->name, fd->cFileName);
wcscpy(ft->name, fd->cFileName);
}
/* INTERNAL: Translate WIN32_FIND_DATAW to wfinddata64i32_t */
......@@ -230,7 +230,7 @@ static void msvcrt_wfttofd64i32( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfin
RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw );
ft->time_write = dw;
ft->size = fd->nFileSizeLow;
MSVCRT_wcscpy(ft->name, fd->cFileName);
wcscpy(ft->name, fd->cFileName);
}
/*********************************************************************
......@@ -805,7 +805,7 @@ wchar_t* CDECL MSVCRT__wgetcwd(wchar_t * buf, int size)
*_errno() = ERANGE;
return NULL; /* buf too small */
}
MSVCRT_wcscpy(buf,dir);
wcscpy(buf,dir);
return buf;
}
......@@ -826,7 +826,7 @@ int CDECL MSVCRT__getdrive(void)
WCHAR buffer[MAX_PATH];
if (GetCurrentDirectoryW( MAX_PATH, buffer ) &&
buffer[0] >= 'A' && buffer[0] <= 'z' && buffer[1] == ':')
return MSVCRT_towupper(buffer[0]) - 'A' + 1;
return towupper(buffer[0]) - 'A' + 1;
return 0;
}
......@@ -917,8 +917,8 @@ wchar_t* CDECL MSVCRT__wgetdcwd(int drive, wchar_t * buf, int size)
TRACE(":returning %s\n", debugstr_w(dir));
if (!buf)
return MSVCRT__wcsdup(dir); /* allocate */
MSVCRT_wcscpy(buf,dir);
return _wcsdup(dir); /* allocate */
wcscpy(buf,dir);
}
return buf;
}
......@@ -1202,8 +1202,8 @@ int CDECL MSVCRT__wsplitpath_s(const wchar_t* inpath,
}
if (ext)
{
if (sz_ext <= MSVCRT_wcslen(end)) goto do_error;
MSVCRT_wcscpy( ext, end );
if (sz_ext <= wcslen(end)) goto do_error;
wcscpy( ext, end );
}
return 0;
do_error:
......@@ -1406,7 +1406,7 @@ VOID CDECL MSVCRT__wmakepath(wchar_t *path, const wchar_t *drive, const wchar_t
}
if (directory && directory[0])
{
unsigned int len = MSVCRT_wcslen(directory);
unsigned int len = wcslen(directory);
memmove(p, directory, len * sizeof(wchar_t));
p += len;
if (p[-1] != '/' && p[-1] != '\\')
......@@ -1414,7 +1414,7 @@ VOID CDECL MSVCRT__wmakepath(wchar_t *path, const wchar_t *drive, const wchar_t
}
if (filename && filename[0])
{
unsigned int len = MSVCRT_wcslen(filename);
unsigned int len = wcslen(filename);
memmove(p, filename, len * sizeof(wchar_t));
p += len;
}
......@@ -1422,7 +1422,7 @@ VOID CDECL MSVCRT__wmakepath(wchar_t *path, const wchar_t *drive, const wchar_t
{
if (extension[0] != '.')
*p++ = '.';
MSVCRT_wcscpy(p, extension);
wcscpy(p, extension);
}
else
*p = '\0';
......@@ -1563,7 +1563,7 @@ int CDECL MSVCRT__wmakepath_s(wchar_t *path, size_t size, const wchar_t *drive,
if (directory && directory[0])
{
unsigned int len = MSVCRT_wcslen(directory);
unsigned int len = wcslen(directory);
unsigned int needs_separator = directory[len - 1] != '/' && directory[len - 1] != '\\';
unsigned int copylen = min(size - 1, len);
......@@ -1590,7 +1590,7 @@ int CDECL MSVCRT__wmakepath_s(wchar_t *path, size_t size, const wchar_t *drive,
if (filename && filename[0])
{
unsigned int len = MSVCRT_wcslen(filename);
unsigned int len = wcslen(filename);
unsigned int copylen = min(size - 1, len);
if (size < 2)
......@@ -1607,7 +1607,7 @@ int CDECL MSVCRT__wmakepath_s(wchar_t *path, size_t size, const wchar_t *drive,
if (extension && extension[0])
{
unsigned int len = MSVCRT_wcslen(extension);
unsigned int len = wcslen(extension);
unsigned int needs_period = extension[0] != '.';
unsigned int copylen;
......@@ -1748,7 +1748,7 @@ int CDECL MSVCRT__wsearchenv_s(const wchar_t* file, const wchar_t* env,
if (count > MAX_PATH)
FIXME("count > MAX_PATH not supported\n");
fname_len = MSVCRT_wcslen(file);
fname_len = wcslen(file);
*buf = '\0';
/* Try CWD first */
......
dlls/msvcrt/environ.c
View file @ 6ad42ee7
......@@ -52,7 +52,7 @@ char * CDECL getenv(const char *name)
wchar_t * CDECL _wgetenv(const wchar_t *name)
{
wchar_t **env;
unsigned int length=MSVCRT_wcslen(name);
unsigned int length=wcslen(name);
/* Initialize the _wenviron array if it's not already created. */
if (!MSVCRT__wenviron)
......@@ -61,8 +61,8 @@ wchar_t * CDECL _wgetenv(const wchar_t *name)
for (env = MSVCRT__wenviron; *env; env++)
{
wchar_t *str = *env;
wchar_t *pos = MSVCRT_wcschr(str,'=');
if (pos && ((pos - str) == length) && !MSVCRT__wcsnicmp(str,name,length))
wchar_t *pos = wcschr(str,'=');
if (pos && ((pos - str) == length) && !_wcsnicmp(str,name,length))
{
TRACE("(%s): got %s\n", debugstr_w(name), debugstr_w(pos + 1));
return pos + 1;
......@@ -130,7 +130,7 @@ int CDECL _wputenv(const wchar_t *str)
if (!str)
return -1;
name = HeapAlloc(GetProcessHeap(), 0, (MSVCRT_wcslen(str) + 1) * sizeof(wchar_t));
name = HeapAlloc(GetProcessHeap(), 0, (wcslen(str) + 1) * sizeof(wchar_t));
if (!name)
return -1;
dst = name;
......@@ -246,13 +246,13 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements,
if (!(e = _wgetenv(varname))) return *_errno() = EINVAL;
sz = MSVCRT_wcslen(e) + 1;
sz = wcslen(e) + 1;
if (!(*buffer = malloc(sz * sizeof(wchar_t))))
{
if (numberOfElements) *numberOfElements = 0;
return *_errno() = ENOMEM;
}
MSVCRT_wcscpy(*buffer, e);
wcscpy(*buffer, e);
if (numberOfElements) *numberOfElements = sz;
return 0;
}
......@@ -301,12 +301,12 @@ int CDECL _wgetenv_s(size_t *pReturnValue, wchar_t *buffer, size_t numberOfEleme
*pReturnValue = 0;
return *_errno() = EINVAL;
}
*pReturnValue = MSVCRT_wcslen(e) + 1;
*pReturnValue = wcslen(e) + 1;
if (numberOfElements < *pReturnValue)
{
return *_errno() = ERANGE;
}
MSVCRT_wcscpy(buffer, e);
wcscpy(buffer, e);
return 0;
}
......
dlls/msvcrt/errno.c
View file @ 6ad42ee7
......@@ -323,9 +323,9 @@ char* CDECL _strerror(const char* str)
if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr;
if (str && *str)
MSVCRT_sprintf( data->strerror_buffer, "%s: %s\n", str, MSVCRT__sys_errlist[err] );
sprintf( data->strerror_buffer, "%s: %s\n", str, MSVCRT__sys_errlist[err] );
else
MSVCRT_sprintf( data->strerror_buffer, "%s\n", MSVCRT__sys_errlist[err] );
sprintf( data->strerror_buffer, "%s\n", MSVCRT__sys_errlist[err] );
return data->strerror_buffer;
}
......@@ -357,12 +357,12 @@ void CDECL _wperror(const wchar_t* str)
if (str && *str)
{
size = MSVCRT_wcstombs(NULL, str, 0);
size = wcstombs(NULL, str, 0);
if (size == -1) return;
size++;
buffer = malloc(size);
if (!buffer) return;
if (MSVCRT_wcstombs(buffer, str, size) == -1)
if (wcstombs(buffer, str, size) == -1)
{
free(buffer);
return;
......@@ -410,7 +410,7 @@ int CDECL __wcserror_s(wchar_t* buffer, size_t nc, const wchar_t* str)
if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr;
len = MultiByteToWideChar(CP_ACP, 0, MSVCRT__sys_errlist[err], -1, NULL, 0) + 1 /* \n */;
if (str && *str) len += MSVCRT_wcslen(str) + 2 /* ': ' */;
if (str && *str) len += wcslen(str) + 2 /* ': ' */;
if (len > nc)
{
MSVCRT_INVALID_PMT("buffer[nc] is too small", ERANGE);
......@@ -422,7 +422,7 @@ int CDECL __wcserror_s(wchar_t* buffer, size_t nc, const wchar_t* str)
lstrcatW(buffer, L": ");
}
else buffer[0] = '\0';
len = MSVCRT_wcslen(buffer);
len = wcslen(buffer);
MultiByteToWideChar(CP_ACP, 0, MSVCRT__sys_errlist[err], -1, buffer + len, 256 - len);
lstrcatW(buffer, L"\n");
......
dlls/msvcrt/exit.c
View file @ 6ad42ee7
......@@ -193,7 +193,7 @@ static void DoMessageBoxW(const wchar_t *lead, const wchar_t *message)
wchar_t text[2048];
INT ret;
MSVCRT__snwprintf(text, ARRAY_SIZE(text), L"%ls\n\nProgram: %ls\n%ls\n\n"
_snwprintf(text, ARRAY_SIZE(text), L"%ls\n\nProgram: %ls\n%ls\n\n"
L"Press OK to exit the program, or Cancel to start the Wine debugger.\n",
lead, MSVCRT__wpgmptr, message);
......@@ -234,7 +234,7 @@ void CDECL _amsg_exit(int errnum)
((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type == 2)))
{
char text[32];
MSVCRT_sprintf(text, "Error: R60%d",errnum);
sprintf(text, "Error: R60%d",errnum);
DoMessageBox("Runtime error!", text);
}
else
......@@ -292,7 +292,7 @@ void CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line)
((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type == 2)))
{
wchar_t text[2048];
MSVCRT__snwprintf(text, sizeof(text), L"File: %ls\nLine: %d\n\nExpression: \"%ls\"", file, line, str);
_snwprintf(text, sizeof(text), L"File: %ls\nLine: %d\n\nExpression: \"%ls\"", file, line, str);
DoMessageBoxW(L"Assertion failed!", text);
}
else
......
dlls/msvcrt/file.c
View file @ 6ad42ee7
......@@ -1531,7 +1531,7 @@ void CDECL MSVCRT_rewind(FILE* file)
static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_flags)
{
int plus = MSVCRT_wcschr(mode, '+') != NULL;
int plus = wcschr(mode, '+') != NULL;
TRACE("%s\n", debugstr_w(mode));
......@@ -1602,7 +1602,7 @@ static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_fl
{
mode++;
while(*mode == ' ') mode++;
if(!MSVCRT_CHECK_PMT(!MSVCRT_wcsncmp(L"ccs", mode, 3)))
if(!MSVCRT_CHECK_PMT(!wcsncmp(L"ccs", mode, 3)))
return -1;
mode += 3;
while(*mode == ' ') mode++;
......@@ -1611,17 +1611,17 @@ static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_fl
mode++;
while(*mode == ' ') mode++;
if(!MSVCRT__wcsnicmp(L"utf-8", mode, 5))
if(!_wcsnicmp(L"utf-8", mode, 5))
{
*open_flags |= MSVCRT__O_U8TEXT;
mode += 5;
}
else if(!MSVCRT__wcsnicmp(L"utf-16le", mode, 8))
else if(!_wcsnicmp(L"utf-16le", mode, 8))
{
*open_flags |= MSVCRT__O_U16TEXT;
mode += 8;
}
else if(!MSVCRT__wcsnicmp(L"unicode", mode, 7))
else if(!_wcsnicmp(L"unicode", mode, 7))
{
*open_flags |= MSVCRT__O_WTEXT;
mode += 7;
......@@ -3118,7 +3118,7 @@ int CDECL MSVCRT__wstat64(const wchar_t* path, struct MSVCRT__stat64 * buf)
TRACE(":file (%s) buf(%p)\n",debugstr_w(path),buf);
plen = MSVCRT_wcslen(path);
plen = wcslen(path);
while (plen && path[plen-1]==' ')
plen--;
......@@ -3146,8 +3146,8 @@ int CDECL MSVCRT__wstat64(const wchar_t* path, struct MSVCRT__stat64 * buf)
memset(buf,0,sizeof(struct MSVCRT__stat64));
/* FIXME: rdev isn't drive num, despite what the docs says-what is it? */
if (MSVCRT_iswalpha(*path) && path[1] == ':')
buf->st_dev = buf->st_rdev = MSVCRT_towupper(*path) - 'A'; /* drive num */
if (iswalpha(*path) && path[1] == ':')
buf->st_dev = buf->st_rdev = towupper(*path) - 'A'; /* drive num */
else
buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1;
......@@ -3160,8 +3160,8 @@ int CDECL MSVCRT__wstat64(const wchar_t* path, struct MSVCRT__stat64 * buf)
/* executable? */
if (plen > 6 && path[plen-4] == '.') /* shortest exe: "\x.exe" */
{
ULONGLONG ext = MSVCRT_towlower(path[plen-1]) | (MSVCRT_towlower(path[plen-2]) << 16) |
((ULONGLONG)MSVCRT_towlower(path[plen-3]) << 32);
ULONGLONG ext = towlower(path[plen-1]) | (towlower(path[plen-2]) << 16) |
((ULONGLONG)towlower(path[plen-3]) << 32);
if (ext == WCEXE || ext == WCBAT || ext == WCCMD || ext == WCCOM)
mode |= ALL_S_IEXEC;
}
......@@ -3308,7 +3308,7 @@ wchar_t * CDECL MSVCRT__wtempnam(const wchar_t *dir, const wchar_t *prefix)
{
TRACE("got name (%s)\n",debugstr_w(tmpbuf));
DeleteFileW(tmpbuf);
return MSVCRT__wcsdup(tmpbuf);
return _wcsdup(tmpbuf);
}
TRACE("failed (%d)\n",GetLastError());
return NULL;
......@@ -4052,7 +4052,7 @@ wint_t CDECL MSVCRT__fputwc_nolock(wint_t wc, FILE* file)
char buf[MB_LEN_MAX];
int char_len;
char_len = MSVCRT_wctomb(buf, mwc);
char_len = wctomb(buf, mwc);
if(char_len!=-1 && MSVCRT__fwrite_nolock(buf, char_len, 1, file)==1)
ret = wc;
else
......@@ -4628,7 +4628,7 @@ int CDECL MSVCRT_fputs(const char *s, FILE* file)
*/
int CDECL MSVCRT_fputws(const wchar_t *s, FILE* file)
{
size_t i, len = MSVCRT_wcslen(s);
size_t i, len = wcslen(s);
BOOL tmp_buf;
int ret;
......@@ -5546,7 +5546,7 @@ wint_t CDECL MSVCRT__ungetwc_nolock(wint_t wc, FILE * file)
char mbs[MB_LEN_MAX];
int len;
len = MSVCRT_wctomb(mbs, mwc);
len = wctomb(mbs, mwc);
if(len == -1)
return WEOF;
......
dlls/msvcrt/locale.c
View file @ 6ad42ee7
......@@ -529,7 +529,7 @@ static BOOL update_threadlocinfo_category(LCID lcid, unsigned short cp,
len += GetLocaleInfoA(lcid, LOCALE_SENGCOUNTRY
|LOCALE_NOUSEROVERRIDE, &buf[len], 256-len);
buf[len-1] = '.';
MSVCRT_sprintf(buf+len, "%d", cp);
sprintf(buf+len, "%d", cp);
len += strlen(buf+len);
return init_category_name(buf, len, locinfo, category);
......@@ -630,7 +630,7 @@ static inline char* construct_lc_all(pthreadlocinfo locinfo) {
if(i==LC_MAX)
return locinfo->lc_category[LC_COLLATE].locale;
MSVCRT_sprintf(current_lc_all,
sprintf(current_lc_all,
"LC_COLLATE=%s;LC_CTYPE=%s;LC_MONETARY=%s;LC_NUMERIC=%s;LC_TIME=%s",
locinfo->lc_category[LC_COLLATE].locale,
locinfo->lc_category[LC_CTYPE].locale,
......@@ -691,8 +691,8 @@ wchar_t* CDECL _W_Getdays(void)
TRACE("\n");
for(i=0; i<7; i++) {
size += MSVCRT_wcslen(cur->wstr.names.short_wday[i]) + 1;
size += MSVCRT_wcslen(cur->wstr.names.wday[i]) + 1;
size += wcslen(cur->wstr.names.short_wday[i]) + 1;
size += wcslen(cur->wstr.names.wday[i]) + 1;
}
out = malloc((size+1)*sizeof(*out));
if(!out)
......@@ -701,12 +701,12 @@ wchar_t* CDECL _W_Getdays(void)
size = 0;
for(i=0; i<7; i++) {
out[size++] = ':';
len = MSVCRT_wcslen(cur->wstr.names.short_wday[i]);
len = wcslen(cur->wstr.names.short_wday[i]);
memcpy(&out[size], cur->wstr.names.short_wday[i], len*sizeof(*out));
size += len;
out[size++] = ':';
len = MSVCRT_wcslen(cur->wstr.names.wday[i]);
len = wcslen(cur->wstr.names.wday[i]);
memcpy(&out[size], cur->wstr.names.wday[i], len*sizeof(*out));
size += len;
}
......@@ -765,8 +765,8 @@ wchar_t* CDECL _W_Getmonths(void)
TRACE("\n");
for(i=0; i<12; i++) {
size += MSVCRT_wcslen(cur->wstr.names.short_mon[i]) + 1;
size += MSVCRT_wcslen(cur->wstr.names.mon[i]) + 1;
size += wcslen(cur->wstr.names.short_mon[i]) + 1;
size += wcslen(cur->wstr.names.mon[i]) + 1;
}
out = malloc((size+1)*sizeof(*out));
if(!out)
......@@ -775,12 +775,12 @@ wchar_t* CDECL _W_Getmonths(void)
size = 0;
for(i=0; i<12; i++) {
out[size++] = ':';
len = MSVCRT_wcslen(cur->wstr.names.short_mon[i]);
len = wcslen(cur->wstr.names.short_mon[i]);
memcpy(&out[size], cur->wstr.names.short_mon[i], len*sizeof(*out));
size += len;
out[size++] = ':';
len = MSVCRT_wcslen(cur->wstr.names.mon[i]);
len = wcslen(cur->wstr.names.mon[i]);
memcpy(&out[size], cur->wstr.names.mon[i], len*sizeof(*out));
size += len;
}
......@@ -1938,12 +1938,12 @@ _locale_t CDECL _wcreate_locale(int category, const wchar_t *locale)
if(category<LC_MIN || category>LC_MAX || !locale)
return NULL;
len = MSVCRT_wcstombs(NULL, locale, 0);
len = wcstombs(NULL, locale, 0);
if(len == -1)
return NULL;
if(!(str = malloc(++len)))
return NULL;
MSVCRT_wcstombs(str, locale, len);
wcstombs(str, locale, len);
loc = _create_locale(category, str);
......@@ -2021,7 +2021,7 @@ wchar_t* CDECL _wsetlocale(int category, const wchar_t* wlocale)
size_t len;
if(wlocale) {
len = MSVCRT_wcstombs(NULL, wlocale, 0);
len = wcstombs(NULL, wlocale, 0);
if(len == -1)
return NULL;
......@@ -2029,7 +2029,7 @@ wchar_t* CDECL _wsetlocale(int category, const wchar_t* wlocale)
if(!locale)
return NULL;
MSVCRT_wcstombs(locale, wlocale, len);
wcstombs(locale, wlocale, len);
}
_lock_locales();
......
dlls/msvcrt/main.c
View file @ 6ad42ee7
......@@ -123,7 +123,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
/* don't allow unloading msvcrt, we can't setup file handles twice */
LdrAddRefDll( LDR_ADDREF_DLL_PIN, hinstDLL );
#elif _MSVCR_VER >= 80
MSVCRT__set_printf_count_output(0);
_set_printf_count_output(0);
#endif
msvcrt_init_clock();
TRACE("finished process init\n");
......
dlls/msvcrt/math.c
View file @ 6ad42ee7
......@@ -2408,7 +2408,7 @@ char * CDECL MSVCRT__ecvt( double number, int ndigits, int *decpt, int *sign )
/* handle cases with zero ndigits or less */
prec = ndigits;
if( prec < 1) prec = 2;
len = MSVCRT__snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number);
len = _snprintf(data->efcvt_buffer, 80, "%.*le", prec - 1, number);
/* take the decimal "point away */
if( prec != 1)
memmove( data->efcvt_buffer + 1, data->efcvt_buffer + 2, len - 1 );
......@@ -2468,7 +2468,7 @@ int CDECL MSVCRT__ecvt_s( char *buffer, size_t length, double number, int ndigit
number = -number;
} else
*sign = FALSE;
len = MSVCRT__snprintf(result, prec + 7, "%.*le", prec - 1, number);
len = _snprintf(result, prec + 7, "%.*le", prec - 1, number);
/* take the decimal "point away */
if( prec != 1)
memmove( result + 1, result + 2, len - 1 );
......@@ -2511,7 +2511,7 @@ char * CDECL MSVCRT__fcvt( double number, int ndigits, int *decpt, int *sign )
number = -number;
} else *sign = 0;
stop = MSVCRT__snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number);
stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number);
ptr1 = buf;
ptr2 = data->efcvt_buffer;
first = NULL;
......@@ -2595,7 +2595,7 @@ int CDECL MSVCRT__fcvt_s(char* outbuffer, size_t size, double number, int ndigit
number = -number;
} else *sign = 0;
stop = MSVCRT__snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number);
stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number);
ptr1 = buf;
ptr2 = outbuffer;
first = NULL;
......@@ -2676,7 +2676,7 @@ char * CDECL MSVCRT__gcvt( double number, int ndigit, char *buff )
return NULL;
}
MSVCRT_sprintf(buff, "%.*g", ndigit, number);
sprintf(buff, "%.*g", ndigit, number);
return buff;
}
......@@ -2700,14 +2700,14 @@ int CDECL MSVCRT__gcvt_s(char *buff, size_t size, double number, int digits)
return ERANGE;
}
len = MSVCRT__scprintf("%.*g", digits, number);
len = _scprintf("%.*g", digits, number);
if(len > size) {
buff[0] = '\0';
*_errno() = ERANGE;
return ERANGE;
}
MSVCRT_sprintf(buff, "%.*g", digits, number);
sprintf(buff, "%.*g", digits, number);
return 0;
}
......
dlls/msvcrt/mbcs.c
View file @ 6ad42ee7
......@@ -256,7 +256,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo)
}
if(lcid == -1) {
MSVCRT_sprintf(bufA, ".%d", newcp);
sprintf(bufA, ".%d", newcp);
mbcinfo->mblcid = locale_to_LCID(bufA, NULL, NULL);
} else {
mbcinfo->mblcid = lcid;
......@@ -1454,7 +1454,7 @@ int CDECL _ismbbkana(unsigned int c)
*/
int CDECL _ismbcdigit_l(unsigned int ch, _locale_t locale)
{
return MSVCRT__iswdigit_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
return _iswdigit_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
}
/*********************************************************************
......@@ -1470,7 +1470,7 @@ int CDECL _ismbcdigit(unsigned int ch)
*/
int CDECL _ismbcgraph_l(unsigned int ch, _locale_t locale)
{
return MSVCRT__iswgraph_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
return _iswgraph_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
}
/*********************************************************************
......@@ -1486,7 +1486,7 @@ int CDECL _ismbcgraph(unsigned int ch)
*/
int CDECL _ismbcalpha_l(unsigned int ch, _locale_t locale)
{
return MSVCRT__iswalpha_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
return _iswalpha_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
}
/*********************************************************************
......@@ -1502,7 +1502,7 @@ int CDECL _ismbcalpha(unsigned int ch)
*/
int CDECL _ismbclower_l(unsigned int ch, _locale_t locale)
{
return MSVCRT__iswlower_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
return _iswlower_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
}
/*********************************************************************
......@@ -1518,7 +1518,7 @@ int CDECL _ismbclower(unsigned int ch)
*/
int CDECL _ismbcupper_l(unsigned int ch, _locale_t locale)
{
return MSVCRT__iswupper_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
return _iswupper_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
}
/*********************************************************************
......@@ -1549,7 +1549,7 @@ int CDECL _ismbcsymbol(unsigned int ch)
*/
int CDECL _ismbcalnum_l(unsigned int ch, _locale_t locale)
{
return MSVCRT__iswalnum_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
return _iswalnum_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
}
/*********************************************************************
......@@ -1565,7 +1565,7 @@ int CDECL _ismbcalnum(unsigned int ch)
*/
int CDECL _ismbcspace_l(unsigned int ch, _locale_t locale)
{
return MSVCRT__iswspace_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
return _iswspace_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
}
/*********************************************************************
......@@ -1581,7 +1581,7 @@ int CDECL _ismbcspace(unsigned int ch)
*/
int CDECL _ismbcprint_l(unsigned int ch, _locale_t locale)
{
return MSVCRT__iswprint_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
return _iswprint_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
}
/*********************************************************************
......@@ -1597,7 +1597,7 @@ int CDECL _ismbcprint(unsigned int ch)
*/
int CDECL _ismbcpunct_l(unsigned int ch, _locale_t locale)
{
return MSVCRT__iswpunct_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
return _iswpunct_l( msvcrt_mbc_to_wc_l(ch, locale), locale );
}
/*********************************************************************
......
dlls/msvcrt/msvcrt.h
View file @ 6ad42ee7
......@@ -602,10 +602,7 @@ struct MSVCRT__stat64 {
#define MSVCRT__NLSCMPERROR ((unsigned int)0x7fffffff)
int __cdecl MSVCRT_iswalpha(wint_t);
int __cdecl MSVCRT_iswspace(wint_t);
int __cdecl MSVCRT_iswdigit(wint_t);
int __cdecl MSVCRT__iswspace_l(wchar_t, _locale_t);
void __cdecl MSVCRT__lock_file(FILE*);
void __cdecl MSVCRT__unlock_file(FILE*);
......@@ -634,13 +631,6 @@ __time64_t __cdecl MSVCRT__time64(__time64_t*);
FILE* __cdecl MSVCRT__fdopen(int, const char *);
FILE* __cdecl MSVCRT__wfdopen(int, const wchar_t *);
int WINAPIV MSVCRT_fwprintf(FILE *file, const wchar_t *format, ...);
int __cdecl MSVCRT_vsnwprintf(wchar_t *str, size_t len,
const wchar_t *format, __ms_va_list valist );
int WINAPIV MSVCRT__snwprintf(wchar_t*, size_t, const wchar_t*, ...);
int WINAPIV MSVCRT_sprintf(char*,const char*,...);
int WINAPIV MSVCRT__snprintf(char*,size_t,const char*,...);
int WINAPIV MSVCRT__scprintf(const char*,...);
int __cdecl MSVCRT__set_printf_count_output(int);
#define MSVCRT__ENABLE_PER_THREAD_LOCALE 1
#define MSVCRT__DISABLE_PER_THREAD_LOCALE 2
......@@ -660,8 +650,6 @@ int __cdecl _ismbblead(unsigned int);
int __cdecl _ismbblead_l(unsigned int, _locale_t);
int __cdecl _ismbclegal(unsigned int c);
int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str);
size_t __cdecl MSVCRT_wcstombs(char*,const wchar_t*,size_t);
size_t __cdecl MSVCRT__wcstombs_l(char*, const wchar_t*, size_t, _locale_t);
void __cdecl MSVCRT__searchenv(const char*,const char*,char*);
int __cdecl MSVCRT__getdrive(void);
char* __cdecl _strset(char*,int);
......@@ -671,11 +659,7 @@ int WINAPIV _cprintf(const char*,...);
int WINAPIV _cwprintf(const wchar_t*,...);
char*** __cdecl MSVCRT___p__environ(void);
int* __cdecl __p___mb_cur_max(void);
wchar_t* __cdecl MSVCRT__wcsdup(const wchar_t*);
size_t __cdecl MSVCRT_wcsnlen(const wchar_t*,size_t);
wchar_t*** __cdecl MSVCRT___p__wenviron(void);
INT __cdecl MSVCRT_wctomb(char*,wchar_t);
int __cdecl MSVCRT__wctomb_l(char*, wchar_t, _locale_t);
char* __cdecl MSVCRT__strdate(char* date);
char* __cdecl MSVCRT__strtime(char* date);
int __cdecl _setmbcp(int);
......@@ -688,22 +672,6 @@ int __cdecl MSVCRT__towupper_l(wint_t,_locale_t);
int __cdecl MSVCRT__towlower_l(wint_t,_locale_t);
int __cdecl MSVCRT_strcmp(const char*, const char*);
char* __cdecl MSVCRT__itoa(int, char*, int);
int __cdecl MSVCRT_wcsncmp(const wchar_t*, const wchar_t*, size_t);
int __cdecl MSVCRT__wcsnicmp(const wchar_t*, const wchar_t*, size_t);
int __cdecl MSVCRT_towlower(wint_t);
int __cdecl MSVCRT_towupper(wint_t);
int __cdecl MSVCRT__iswalnum_l(wchar_t, _locale_t);
int __cdecl MSVCRT__iswdigit_l(wchar_t, _locale_t);
int __cdecl MSVCRT__iswgraph_l(wchar_t, _locale_t);
int __cdecl MSVCRT__iswalpha_l(wchar_t, _locale_t);
int __cdecl MSVCRT__iswlower_l(wchar_t, _locale_t);
int __cdecl MSVCRT__iswupper_l(wchar_t, _locale_t);
int __cdecl MSVCRT__iswprint_l(wchar_t, _locale_t);
int __cdecl MSVCRT__iswpunct_l(wchar_t, _locale_t);
size_t __cdecl MSVCRT_wcslen(const wchar_t*);
wchar_t* __cdecl MSVCRT_wcscpy(wchar_t*, const wchar_t*);
wchar_t* __cdecl MSVCRT_wcschr(const wchar_t*, wchar_t);
wchar_t* __cdecl MSVCRT_wcscat(wchar_t*, const wchar_t*);
double __cdecl MSVCRT_floor( double x );
float __cdecl MSVCRT_floorf( float x );
......
dlls/msvcrt/printf.h
View file @ 6ad42ee7
......@@ -115,7 +115,7 @@ static inline int wcstombs_len(char *mbstr, const wchar_t *wcstr,
int i, r, mblen = 0;
for(i=0; i<len; i++) {
r = MSVCRT__wctomb_l(mbstr ? mbstr+mblen : buf, wcstr[i], locale);
r = _wctomb_l(mbstr ? mbstr+mblen : buf, wcstr[i], locale);
if(r < 0) return r;
mblen += r;
}
......@@ -189,9 +189,9 @@ static inline int FUNC_NAME(pf_output_format_wstr)(FUNC_NAME(puts_clbk) pf_puts,
if(len < 0) {
/* Do not search past the length specified by the precision. */
if(flags->Precision>=0)
len = MSVCRT_wcsnlen(str, flags->Precision);
len = wcsnlen(str, flags->Precision);
else
len = MSVCRT_wcslen(str);
len = wcslen(str);
}
if(flags->Precision>=0 && flags->Precision<len)
......
dlls/msvcrt/process.c
View file @ 6ad42ee7
......@@ -62,7 +62,7 @@ static void msvcrt_search_executable(const wchar_t *name, wchar_t *fullname, int
/* try current dir first */
if (GetFileAttributesW(buffer) != INVALID_FILE_ATTRIBUTES)
{
MSVCRT_wcscpy(fullname, buffer);
wcscpy(fullname, buffer);
return;
}
......@@ -77,7 +77,7 @@ static void msvcrt_search_executable(const wchar_t *name, wchar_t *fullname, int
memcpy(buffer + name_len, suffix[i], 5 * sizeof(wchar_t));
if (GetFileAttributesW(buffer) != INVALID_FILE_ATTRIBUTES)
{
MSVCRT_wcscpy(fullname, buffer);
wcscpy(fullname, buffer);
return;
}
}
......@@ -104,10 +104,10 @@ static void msvcrt_search_executable(const wchar_t *name, wchar_t *fullname, int
}
else buffer[path_len] = '\0';
MSVCRT_wcscat(buffer, name);
wcscat(buffer, name);
if (GetFileAttributesW(buffer) != INVALID_FILE_ATTRIBUTES)
{
MSVCRT_wcscpy(fullname, buffer);
wcscpy(fullname, buffer);
return;
}
}
......@@ -119,7 +119,7 @@ static void msvcrt_search_executable(const wchar_t *name, wchar_t *fullname, int
memcpy(buffer + path_len + name_len, suffix[i], 5 * sizeof(wchar_t));
if (GetFileAttributesW(buffer) != INVALID_FILE_ATTRIBUTES)
{
MSVCRT_wcscpy(fullname, buffer);
wcscpy(fullname, buffer);
return;
}
}
......@@ -202,7 +202,7 @@ static wchar_t* msvcrt_argvtos(const wchar_t* const* arg, wchar_t delim)
size = 0;
while (*a)
{
size += MSVCRT_wcslen(*a) + 1;
size += wcslen(*a) + 1;
a++;
}
......@@ -215,7 +215,7 @@ static wchar_t* msvcrt_argvtos(const wchar_t* const* arg, wchar_t delim)
p = ret;
while (*a)
{
int len = MSVCRT_wcslen(*a);
int len = wcslen(*a);
memcpy(p,*a,len * sizeof(wchar_t));
p += len;
*p++ = delim;
......@@ -279,7 +279,7 @@ static wchar_t *msvcrt_valisttos(const wchar_t *arg0, __ms_va_list alist, wchar_
for (arg = arg0; arg; arg = va_arg( alist, wchar_t * ))
{
unsigned int len = MSVCRT_wcslen( arg ) + 1;
unsigned int len = wcslen( arg ) + 1;
if (pos + len >= size)
{
size = max( 256, size * 2 );
......@@ -291,7 +291,7 @@ static wchar_t *msvcrt_valisttos(const wchar_t *arg0, __ms_va_list alist, wchar_
}
ret = new;
}
MSVCRT_wcscpy( ret + pos, arg );
wcscpy( ret + pos, arg );
pos += len;
ret[pos - 1] = delim;
}
......@@ -346,7 +346,7 @@ static wchar_t *msvcrt_get_comspec(void)
if (!(len = GetEnvironmentVariableW(L"COMSPEC", NULL, 0))) len = 4;
if ((ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(wchar_t))))
{
if (!GetEnvironmentVariableW(L"COMSPEC", ret, len)) MSVCRT_wcscpy(ret, L"cmd");
if (!GetEnvironmentVariableW(L"COMSPEC", ret, len)) wcscpy(ret, L"cmd");
}
return ret;
}
......@@ -1107,7 +1107,7 @@ FILE* CDECL _wpopen(const wchar_t* command, const wchar_t* mode)
MSVCRT__close(fds[fdToDup]);
if (!(comspec = msvcrt_get_comspec())) goto error;
len = MSVCRT_wcslen(comspec) + MSVCRT_wcslen(command) + 5;
len = wcslen(comspec) + wcslen(command) + 5;
if (!(fullcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(wchar_t))))
{
......@@ -1115,9 +1115,9 @@ FILE* CDECL _wpopen(const wchar_t* command, const wchar_t* mode)
goto error;
}
MSVCRT_wcscpy(fullcmd, comspec);
MSVCRT_wcscat(fullcmd, L" /c ");
MSVCRT_wcscat(fullcmd, command);
wcscpy(fullcmd, comspec);
wcscat(fullcmd, L" /c ");
wcscat(fullcmd, command);
if ((container->proc = (HANDLE)msvcrt_spawn(MSVCRT__P_NOWAIT, comspec, fullcmd, NULL, 1))
== INVALID_HANDLE_VALUE)
......@@ -1240,16 +1240,16 @@ int CDECL _wsystem(const wchar_t* cmd)
if (comspec == NULL)
return -1;
len = MSVCRT_wcslen(comspec) + MSVCRT_wcslen(cmd) + 5;
len = wcslen(comspec) + wcslen(cmd) + 5;
if (!(fullcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(wchar_t))))
{
HeapFree(GetProcessHeap(), 0, comspec);
return -1;
}
MSVCRT_wcscpy(fullcmd, comspec);
MSVCRT_wcscat(fullcmd, L" /c ");
MSVCRT_wcscat(fullcmd, cmd);
wcscpy(fullcmd, comspec);
wcscat(fullcmd, L" /c ");
wcscat(fullcmd, cmd);
res = msvcrt_spawn(MSVCRT__P_WAIT, comspec, fullcmd, NULL, 1);
......
dlls/msvcrt/scanf.h
View file @ 6ad42ee7
......@@ -27,7 +27,7 @@
#define _CHAR_ wchar_t
#define _EOF_ WEOF
#define _EOF_RET (short)WEOF
#define _ISSPACE_(c) MSVCRT_iswspace(c)
#define _ISSPACE_(c) iswspace(c)
#define _WIDE2SUPPORTED_(c) c /* No conversion needed (wide to wide) */
#define _CHAR2SUPPORTED_(c) c /* FIXME: convert char to wide char */
#define _CHAR2DIGIT_(c, base) wchar2digit((c), (base))
......
dlls/msvcrt/string.c
View file @ 6ad42ee7
......@@ -2434,8 +2434,8 @@ int CDECL I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPU
prec = 0;
}
MSVCRT_sprintf(format, "%%.%dle", prec);
MSVCRT_sprintf(buf, format, d);
sprintf(format, "%%.%dle", prec);
sprintf(buf, format, d);
buf[1] = buf[0];
data->pos = atoi(buf+prec+3);
......
dlls/msvcrt/time.c
View file @ 6ad42ee7
......@@ -889,9 +889,9 @@ static inline BOOL strftime_int(STRFTIME_CHAR *str, size_t *pos, size_t max,
}
#if _MSVCR_VER <= 90
len = MSVCRT__snprintf(str+*pos, max-*pos, "%0*d", prec, src);
len = _snprintf(str+*pos, max-*pos, "%0*d", prec, src);
#else
len = MSVCRT__snwprintf(str+*pos, max-*pos, L"%0*d", prec, src);
len = _snwprintf(str+*pos, max-*pos, L"%0*d", prec, src);
#endif
if(len == -1) {
*str = 0;
......@@ -1453,7 +1453,7 @@ static size_t strftime_helper(char *str, size_t max, const char *format,
{
len = strftime_impl( s, max, fmt, mstm, time_data, loc );
if (len)
len = MSVCRT__wcstombs_l( str, s, max, loc );
len = _wcstombs_l( str, s, max, loc );
free( s );
}
else len = 0;
......@@ -1502,9 +1502,9 @@ static size_t wcsftime_helper( wchar_t *str, size_t max,
TRACE("%p %Iu %s %p %p %p\n", str, max, debugstr_w(format), mstm, time_data, loc);
len = MSVCRT__wcstombs_l( NULL, format, 0, loc ) + 1;
len = _wcstombs_l( NULL, format, 0, loc ) + 1;
if (!(fmt = malloc( len ))) return 0;
MSVCRT__wcstombs_l(fmt, format, len, loc);
_wcstombs_l(fmt, format, len, loc);
if ((s = malloc( max*4 )))
{
......@@ -1571,11 +1571,11 @@ static char* asctime_buf(char *buf, const struct tm *mstm)
#if _MSVCR_VER>=140
/* C89 (4.12.3.1) uses space-padding for day of month. */
MSVCRT__snprintf(buf, 26, "%s %s %2d %02d:%02d:%02d %c%03d\n", wday[mstm->tm_wday],
_snprintf(buf, 26, "%s %s %2d %02d:%02d:%02d %c%03d\n", wday[mstm->tm_wday],
month[mstm->tm_mon], mstm->tm_mday, mstm->tm_hour, mstm->tm_min,
mstm->tm_sec, '1'+(mstm->tm_year+900)/1000, (900+mstm->tm_year)%1000);
#else
MSVCRT__snprintf(buf, 26, "%s %s %02d %02d:%02d:%02d %c%03d\n", wday[mstm->tm_wday],
_snprintf(buf, 26, "%s %s %02d %02d:%02d:%02d %c%03d\n", wday[mstm->tm_wday],
month[mstm->tm_mon], mstm->tm_mday, mstm->tm_hour, mstm->tm_min,
mstm->tm_sec, '1'+(mstm->tm_year+900)/1000, (900+mstm->tm_year)%1000);
#endif
......
dlls/msvcrt/undname.c
View file @ 6ad42ee7
......@@ -328,7 +328,7 @@ static const char* get_number(struct parsed_symbol* sym)
if (*sym->current != '@') return NULL;
ptr = und_alloc(sym, 17);
MSVCRT_sprintf(ptr, "%s%u", sgn ? "-" : "", ret);
sprintf(ptr, "%s%u", sgn ? "-" : "", ret);
sym->current++;
}
else return NULL;
......
dlls/msvcrtd/msvcrtd.spec
View file @ 6ad42ee7
......@@ -499,8 +499,8 @@
@ cdecl _setmode(long long) MSVCRT__setmode
@ stub _setsystime(ptr long)
@ cdecl _sleep(long)
@ varargs _snprintf(ptr long str) MSVCRT__snprintf
@ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf
@ varargs _snprintf(ptr long str)
@ varargs _snwprintf(ptr long wstr)
@ varargs _sopen(str long long) MSVCRT__sopen
@ varargs _spawnl(long str str)
@ varargs _spawnle(long str str)
......@@ -552,24 +552,24 @@
@ cdecl -arch=win32 _utime(str ptr) _utime32
@ cdecl -arch=win64 _utime(str ptr) _utime64
@ cdecl _vsnprintf(ptr long str ptr)
@ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl _vsnwprintf(ptr long wstr ptr)
@ cdecl _waccess(wstr long) MSVCRT__waccess
@ cdecl _wasctime(ptr)
@ cdecl _wchdir(wstr) MSVCRT__wchdir
@ cdecl _wchmod(wstr long) MSVCRT__wchmod
@ extern _wcmdln MSVCRT__wcmdln
@ cdecl _wcreat(wstr long) MSVCRT__wcreat
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll
@ cdecl _wcslwr(wstr) MSVCRT__wcslwr
@ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll
@ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp
@ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll
@ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset
@ cdecl _wcsrev(wstr) MSVCRT__wcsrev
@ cdecl _wcsset(wstr long) MSVCRT__wcsset
@ cdecl _wcsupr(wstr) MSVCRT__wcsupr
@ cdecl _wcsdup(wstr)
@ cdecl _wcsicmp(wstr wstr)
@ cdecl _wcsicoll(wstr wstr)
@ cdecl _wcslwr(wstr)
@ cdecl _wcsncoll(wstr wstr long)
@ cdecl _wcsnicmp(wstr wstr long)
@ cdecl _wcsnicoll(wstr wstr long)
@ cdecl _wcsnset(wstr long long)
@ cdecl _wcsrev(wstr)
@ cdecl _wcsset(wstr long)
@ cdecl _wcsupr(wstr)
@ cdecl -arch=win32 _wctime(ptr) _wctime32
@ cdecl -arch=win64 _wctime(ptr) _wctime64
@ extern _wenviron MSVCRT__wenviron
......@@ -627,9 +627,9 @@
@ cdecl _wsystem(wstr)
@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
@ cdecl _wtoi(wstr) MSVCRT__wtoi
@ cdecl -ret64 _wtoi64(wstr) MSVCRT__wtoi64
@ cdecl _wtol(wstr) MSVCRT__wtol
@ cdecl _wtoi(wstr)
@ cdecl -ret64 _wtoi64(wstr)
@ cdecl _wtol(wstr)
@ cdecl _wunlink(wstr) MSVCRT__wunlink
@ cdecl -arch=win32 _wutime(wstr ptr) _wutime32
@ cdecl -arch=win64 _wutime(wstr ptr) _wutime64
......@@ -698,7 +698,7 @@
@ cdecl getwchar() MSVCRT_getwchar
@ cdecl -arch=win32 gmtime(ptr) _gmtime32
@ cdecl -arch=win64 gmtime(ptr) _gmtime64
@ cdecl is_wctype(long long) MSVCRT_iswctype
@ cdecl is_wctype(long long) iswctype
@ cdecl isalnum(long)
@ cdecl isalpha(long)
@ cdecl iscntrl(long)
......@@ -710,19 +710,19 @@
@ cdecl ispunct(long)
@ cdecl isspace(long)
@ cdecl isupper(long)
@ cdecl iswalnum(long) MSVCRT_iswalnum
@ cdecl iswalpha(long) MSVCRT_iswalpha
@ cdecl iswalnum(long)
@ cdecl iswalpha(long)
@ cdecl iswascii(long)
@ cdecl iswcntrl(long) MSVCRT_iswcntrl
@ cdecl iswctype(long long) MSVCRT_iswctype
@ cdecl iswdigit(long) MSVCRT_iswdigit
@ cdecl iswgraph(long) MSVCRT_iswgraph
@ cdecl iswlower(long) MSVCRT_iswlower
@ cdecl iswprint(long) MSVCRT_iswprint
@ cdecl iswpunct(long) MSVCRT_iswpunct
@ cdecl iswspace(long) MSVCRT_iswspace
@ cdecl iswupper(long) MSVCRT_iswupper
@ cdecl iswxdigit(long) MSVCRT_iswxdigit
@ cdecl iswcntrl(long)
@ cdecl iswctype(long long)
@ cdecl iswdigit(long)
@ cdecl iswgraph(long)
@ cdecl iswlower(long)
@ cdecl iswprint(long)
@ cdecl iswpunct(long)
@ cdecl iswspace(long)
@ cdecl iswupper(long)
@ cdecl iswxdigit(long)
@ cdecl isxdigit(long)
@ cdecl labs(long) MSVCRT_labs
@ cdecl ldexp(double long) MSVCRT_ldexp
......@@ -767,7 +767,7 @@
@ cdecl signal(long long)
@ cdecl sin(double) MSVCRT_sin
@ cdecl sinh(double) MSVCRT_sinh
@ varargs sprintf(ptr str) MSVCRT_sprintf
@ varargs sprintf(ptr str)
@ cdecl sqrt(double) MSVCRT_sqrt
@ cdecl srand(long)
@ varargs sscanf(str str)
......@@ -792,7 +792,7 @@
@ cdecl strtol(str ptr long)
@ cdecl strtoul(str ptr long)
@ cdecl strxfrm(ptr str long)
@ varargs swprintf(ptr wstr) MSVCRT_swprintf
@ varargs swprintf(ptr wstr) _swprintf
@ varargs swscanf(wstr wstr)
@ cdecl system(str)
@ cdecl tan(double) MSVCRT_tan
......@@ -803,37 +803,37 @@
@ cdecl tmpnam(ptr) MSVCRT_tmpnam
@ cdecl tolower(long)
@ cdecl toupper(long)
@ cdecl towlower(long) MSVCRT_towlower
@ cdecl towupper(long) MSVCRT_towupper
@ cdecl towlower(long)
@ cdecl towupper(long)
@ cdecl ungetc(long ptr) MSVCRT_ungetc
@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
@ cdecl vprintf(str ptr) MSVCRT_vprintf
@ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf
@ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf
@ cdecl vsprintf(ptr str ptr)
@ cdecl vswprintf(ptr wstr ptr) _vswprintf
@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
@ cdecl wcscat(wstr wstr) MSVCRT_wcscat
@ cdecl wcschr(wstr long) MSVCRT_wcschr
@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp
@ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll
@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy
@ cdecl wcscat(wstr wstr)
@ cdecl wcschr(wstr long)
@ cdecl wcscmp(wstr wstr)
@ cdecl wcscoll(wstr wstr)
@ cdecl wcscpy(ptr wstr)
@ cdecl wcscspn(wstr wstr) ntdll.wcscspn
@ cdecl wcsftime(ptr long wstr ptr)
@ cdecl wcslen(wstr) MSVCRT_wcslen
@ cdecl wcslen(wstr)
@ cdecl wcsncat(wstr wstr long) ntdll.wcsncat
@ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp
@ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy
@ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk
@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr
@ cdecl wcsncmp(wstr wstr long)
@ cdecl wcsncpy(ptr wstr long)
@ cdecl wcspbrk(wstr wstr)
@ cdecl wcsrchr(wstr long)
@ cdecl wcsspn(wstr wstr) ntdll.wcsspn
@ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr
@ cdecl wcstod(wstr ptr) MSVCRT_wcstod
@ cdecl wcstok(wstr wstr) MSVCRT_wcstok
@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol
@ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs
@ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul
@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm
@ cdecl wctomb(ptr long) MSVCRT_wctomb
@ cdecl wcsstr(wstr wstr)
@ cdecl wcstod(wstr ptr)
@ cdecl wcstok(wstr wstr)
@ cdecl wcstol(wstr ptr long)
@ cdecl wcstombs(ptr ptr long)
@ cdecl wcstoul(wstr ptr long)
@ cdecl wcsxfrm(ptr wstr long)
@ cdecl wctomb(ptr long)
@ varargs wprintf(wstr) MSVCRT_wprintf
@ varargs wscanf(wstr)
include/msvcrt/corecrt_wctype.h
View file @ 6ad42ee7
......@@ -25,8 +25,17 @@ extern "C" {
#define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */
_ACRTIMP int __cdecl _isleadbyte_l(int,_locale_t);
_ACRTIMP int __cdecl _iswalnum_l(wint_t,_locale_t);
_ACRTIMP int __cdecl _iswalpha_l(wint_t,_locale_t);
_ACRTIMP int __cdecl _iswblank_l(wint_t,_locale_t);
_ACRTIMP int __cdecl _iswctype_l(wint_t,wctype_t,_locale_t);
_ACRTIMP int __cdecl _iswdigit_l(wint_t,_locale_t);
_ACRTIMP int __cdecl _iswgraph_l(wint_t,_locale_t);
_ACRTIMP int __cdecl _iswlower_l(wint_t,_locale_t);
_ACRTIMP int __cdecl _iswprint_l(wint_t,_locale_t);
_ACRTIMP int __cdecl _iswpunct_l(wint_t,_locale_t);
_ACRTIMP int __cdecl _iswspace_l(wint_t,_locale_t);
_ACRTIMP int __cdecl _iswupper_l(wint_t,_locale_t);
_ACRTIMP wchar_t __cdecl _towlower_l(wchar_t,_locale_t);
_ACRTIMP wchar_t __cdecl _towupper_l(wchar_t,_locale_t);
_ACRTIMP int __cdecl is_wctype(wint_t,wctype_t);
......
include/msvcrt/corecrt_wstdio.h
View file @ 6ad42ee7
......@@ -367,7 +367,7 @@ _ACRTIMP int WINAPIV wprintf_s(const wchar_t*,...);
#ifdef _CRT_NON_CONFORMING_SWPRINTFS
_ACRTIMP int WINAPIV swprintf(wchar_t*,const wchar_t*,...);
_ACRTIMP int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list);
#else /* _CRT_NON_CONFORMING_SWPRINTFS */
#elif !defined(_NO_CRT_STDIO_INLINE)
static inline int vswprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { return _vsnwprintf(buffer,size,format,args); }
static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t *format, ...)
{
......@@ -379,6 +379,9 @@ static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t *
__ms_va_end(args);
return ret;
}
#else
_ACRTIMP int vswprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list);
_ACRTIMP int WINAPIV swprintf(wchar_t*,size_t,const wchar_t*,...);
#endif /* _CRT_NON_CONFORMING_SWPRINTFS */
_ACRTIMP int WINAPIV fwscanf(FILE*,const wchar_t*,...);
......
include/msvcrt/corecrt_wstdlib.h
View file @ 6ad42ee7
......@@ -48,9 +48,11 @@ _ACRTIMP float __cdecl wcstof(const wchar_t*,wchar_t**);
_ACRTIMP double __cdecl wcstod(const wchar_t*,wchar_t**);
_ACRTIMP __msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int);
_ACRTIMP size_t __cdecl wcstombs(char*,const wchar_t*,size_t);
_ACRTIMP size_t __cdecl _wcstombs_l(char*,const wchar_t*,size_t,_locale_t);
_ACRTIMP errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t);
_ACRTIMP __msvcrt_ulong __cdecl wcstoul(const wchar_t*,wchar_t**,int);
_ACRTIMP int __cdecl wctomb(char*,wchar_t);
_ACRTIMP int __cdecl _wctomb_l(char*,wchar_t,_locale_t);
_ACRTIMP __int64 __cdecl _wcstoi64(const wchar_t*,wchar_t**,int);
_ACRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t*,wchar_t**,int,_locale_t);
_ACRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t*,wchar_t**,int);
......
include/msvcrt/stdio.h
View file @ 6ad42ee7
......@@ -431,6 +431,8 @@ static inline int unlink(const char* path) { return _unlink(path); }
#define _UNLINK_DEFINED
#endif
#if !defined(_NO_CRT_STDIO_INLINE)
static inline int WINAPIV snprintf(char *buffer, size_t size, const char *format, ...)
{
int ret;
......@@ -464,6 +466,14 @@ static inline int WINAPIV sprintf(char *buffer, const char *format, ...)
return ret;
}
#else /* !_NO_CRT_STDIO_INLINE */
_ACRTIMP int WINAPIV snprintf(char*,size_t,const char*,...);
_ACRTIMP int WINAPIV _snprintf(char*,size_t,const char*,...);
_ACRTIMP int WINAPIV sprintf(char*,const char*,...);
#endif /* !_NO_CRT_STDIO_INLINE */
static inline wint_t fgetwchar(void) { return _fgetwchar(); }
static inline wint_t fputwchar(wint_t wc) { return _fputwchar(wc); }
static inline int getw(FILE* file) { return _getw(file); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment