Skip to content

W
wine-winehq
Commit eeada568 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Remove MSVCRT_ prefix from errno.c functions.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 22612bcf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 371 additions and 374 deletions
dlls/crtdll/crtdll.spec
View file @ eeada568
......@@ -28,7 +28,7 @@
@ extern __argc_dll MSVCRT___argc
@ extern __argv_dll MSVCRT___argv
@ cdecl __dllonexit(ptr ptr ptr)
@ cdecl __doserrno() MSVCRT___doserrno
@ cdecl __doserrno()
@ cdecl __fpecode()
@ cdecl __isascii(long) MSVCRT___isascii
@ cdecl __iscsym(long) MSVCRT___iscsym
......@@ -79,7 +79,7 @@
@ cdecl _endthread()
@ extern _environ_dll MSVCRT__environ
@ cdecl _eof(long) MSVCRT__eof
@ cdecl _errno() MSVCRT__errno
@ cdecl _errno()
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@ varargs _execl(str str)
@ varargs _execle(str str)
......@@ -288,7 +288,7 @@
@ cdecl _strdate(ptr) MSVCRT__strdate
@ cdecl _strdec(str str)
@ cdecl _strdup(str) MSVCRT__strdup
@ cdecl _strerror(long) MSVCRT__strerror
@ cdecl _strerror(long)
@ cdecl _stricmp(str str) MSVCRT__stricmp
@ cdecl _stricoll(str str) MSVCRT__stricoll
@ cdecl _strinc(str)
......@@ -439,7 +439,7 @@
@ cdecl memset(ptr long long)
@ cdecl mktime(ptr) MSVCRT_mktime
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl perror(str) MSVCRT_perror
@ cdecl perror(str)
@ cdecl pow(double double) MSVCRT_pow
@ varargs printf(str) MSVCRT_printf
@ cdecl putc(long ptr) MSVCRT_putc
......@@ -469,7 +469,7 @@
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str)
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror(long)
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
......
dlls/msvcr100/msvcr100.spec
View file @ eeada568
......@@ -426,8 +426,8 @@
@ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX@Z(ptr) __ExceptionPtrRethrow
@ cdecl __uncaught_exception() MSVCRT___uncaught_exception
@ stub ?_inconsistency@@YAXXZ
@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) _invalid_parameter
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) _invalid_parameter
@ cdecl -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z(ptr ptr) _is_exception_typeof
@ cdecl -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z(ptr ptr) _is_exception_typeof
@ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
......@@ -583,7 +583,7 @@
@ cdecl __crtLCMapStringW(long long wstr long ptr long long long)
@ cdecl __daylight() MSVCRT___p__daylight
@ cdecl __dllonexit(ptr ptr ptr)
@ cdecl __doserrno() MSVCRT___doserrno
@ cdecl __doserrno()
@ cdecl __dstbias() MSVCRT___p__dstbias
@ stub ___fls_getvalue@4
@ stub ___fls_setvalue@8
......@@ -671,8 +671,8 @@
@ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@ cdecl __vswprintf_l(ptr wstr ptr ptr) MSVCRT_vswprintf_l
@ extern __wargv MSVCRT___wargv
@ cdecl __wcserror(wstr) MSVCRT___wcserror
@ cdecl __wcserror_s(ptr long wstr) MSVCRT___wcserror_s
@ cdecl __wcserror(wstr)
@ cdecl __wcserror_s(ptr long wstr)
@ stub __wcsncnt
@ cdecl __wgetmainargs(ptr ptr ptr long ptr)
@ extern __winitenv MSVCRT___winitenv
......@@ -781,7 +781,7 @@
@ cdecl _endthreadex(long)
@ extern _environ MSVCRT__environ
@ cdecl _eof(long) MSVCRT__eof
@ cdecl _errno() MSVCRT__errno
@ cdecl _errno()
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr)
......@@ -937,7 +937,7 @@
@ stub -arch=i386 _inp(long)
@ stub -arch=i386 _inpd(long)
@ stub -arch=i386 _inpw(long)
@ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl _invalid_parameter(wstr wstr wstr long long)
@ cdecl _invalid_parameter_noinfo()
@ cdecl _invalid_parameter_noinfo_noreturn()
@ stub _invoke_watson
......@@ -1338,7 +1338,7 @@
@ cdecl _strdate(ptr) MSVCRT__strdate
@ cdecl _strdate_s(ptr long)
@ cdecl _strdup(str) MSVCRT__strdup
@ cdecl _strerror(long) MSVCRT__strerror
@ cdecl _strerror(long)
@ stub _strerror_s
@ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l
@ cdecl _stricmp(str str) MSVCRT__stricmp
......@@ -1489,8 +1489,8 @@
@ cdecl _wcreat(wstr long) MSVCRT__wcreat
@ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcserror(long) MSVCRT__wcserror
@ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s
@ cdecl _wcserror(long)
@ cdecl _wcserror_s(ptr long long)
@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l
......@@ -1568,7 +1568,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
@ cdecl _wperror(wstr) MSVCRT__wperror
@ cdecl _wperror(wstr)
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ stub _wprintf_l
......@@ -1758,7 +1758,7 @@
@ cdecl memset(ptr long long)
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ cdecl perror(str) MSVCRT_perror
@ cdecl perror(str)
@ cdecl pow(double double) MSVCRT_pow
@ cdecl -arch=!i386 powf(float float) MSVCRT_powf
@ varargs printf(str) MSVCRT_printf
......@@ -1803,8 +1803,8 @@
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strerror(long)
@ cdecl strerror_s(ptr long long)
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
......
dlls/msvcr110/msvcr110.spec
View file @ eeada568
......@@ -708,8 +708,8 @@
@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z(ptr) __ExceptionPtrToBool
@ cdecl __uncaught_exception() MSVCRT___uncaught_exception
@ stub ?_inconsistency@@YAXXZ
@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) _invalid_parameter
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) _invalid_parameter
@ cdecl -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z(ptr ptr) _is_exception_typeof
@ cdecl -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z(ptr ptr) _is_exception_typeof
@ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
......@@ -933,7 +933,7 @@
@ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException
@ cdecl __daylight() MSVCRT___p__daylight
@ cdecl __dllonexit(ptr ptr ptr)
@ cdecl __doserrno() MSVCRT___doserrno
@ cdecl __doserrno()
@ cdecl __dstbias() MSVCRT___p__dstbias
@ cdecl __fpecode()
@ cdecl __free_locale(ptr) _free_locale
......@@ -1019,8 +1019,8 @@
@ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@ cdecl __vswprintf_l(ptr wstr ptr ptr) MSVCRT_vswprintf_l
@ extern __wargv MSVCRT___wargv
@ cdecl __wcserror(wstr) MSVCRT___wcserror
@ cdecl __wcserror_s(ptr long wstr) MSVCRT___wcserror_s
@ cdecl __wcserror(wstr)
@ cdecl __wcserror_s(ptr long wstr)
@ stub __wcsncnt
@ cdecl __wgetmainargs(ptr ptr ptr long ptr)
@ extern __winitenv MSVCRT___winitenv
......@@ -1128,7 +1128,7 @@
@ cdecl _endthreadex(long)
@ extern _environ MSVCRT__environ
@ cdecl _eof(long) MSVCRT__eof
@ cdecl _errno() MSVCRT__errno
@ cdecl _errno()
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr)
......@@ -1283,7 +1283,7 @@
@ stub -arch=i386 _inp(long)
@ stub -arch=i386 _inpd(long)
@ stub -arch=i386 _inpw(long)
@ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl _invalid_parameter(wstr wstr wstr long long)
@ cdecl _invalid_parameter_noinfo()
@ cdecl _invalid_parameter_noinfo_noreturn()
@ stub _invoke_watson
......@@ -1695,7 +1695,7 @@
@ cdecl _strdate(ptr) MSVCRT__strdate
@ cdecl _strdate_s(ptr long)
@ cdecl _strdup(str) MSVCRT__strdup
@ cdecl _strerror(long) MSVCRT__strerror
@ cdecl _strerror(long)
@ stub _strerror_s
@ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l
@ cdecl _stricmp(str str) MSVCRT__stricmp
......@@ -1847,8 +1847,8 @@
@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale
@ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcserror(long) MSVCRT__wcserror
@ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s
@ cdecl _wcserror(long)
@ cdecl _wcserror_s(ptr long long)
@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l
......@@ -1925,7 +1925,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
@ cdecl _wperror(wstr) MSVCRT__wperror
@ cdecl _wperror(wstr)
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ stub _wprintf_l
......@@ -2116,7 +2116,7 @@
@ cdecl memset(ptr long long)
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ cdecl perror(str) MSVCRT_perror
@ cdecl perror(str)
@ cdecl pow(double double) MSVCRT_pow
@ cdecl -arch=!i386 powf(float float) MSVCRT_powf
@ varargs printf(str) MSVCRT_printf
......@@ -2161,8 +2161,8 @@
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strerror(long)
@ cdecl strerror_s(ptr long long)
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
......
dlls/msvcr120/msvcr120.spec
View file @ eeada568
......@@ -690,8 +690,8 @@
@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z(ptr) __ExceptionPtrToBool
@ cdecl __uncaught_exception() MSVCRT___uncaught_exception
@ stub ?_inconsistency@@YAXXZ
@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) _invalid_parameter
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) _invalid_parameter
@ cdecl -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z(ptr ptr) _is_exception_typeof
@ cdecl -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z(ptr ptr) _is_exception_typeof
@ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
......@@ -923,7 +923,7 @@
@ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException
@ cdecl __daylight() MSVCRT___p__daylight
@ cdecl __dllonexit(ptr ptr ptr)
@ cdecl __doserrno() MSVCRT___doserrno
@ cdecl __doserrno()
@ cdecl __dstbias() MSVCRT___p__dstbias
@ cdecl __fpecode()
@ cdecl __free_locale(ptr) _free_locale
......@@ -1009,8 +1009,8 @@
@ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@ cdecl __vswprintf_l(ptr wstr ptr ptr) MSVCRT_vswprintf_l
@ extern __wargv MSVCRT___wargv
@ cdecl __wcserror(wstr) MSVCRT___wcserror
@ cdecl __wcserror_s(ptr long wstr) MSVCRT___wcserror_s
@ cdecl __wcserror(wstr)
@ cdecl __wcserror_s(ptr long wstr)
@ stub __wcsncnt
@ cdecl __wgetmainargs(ptr ptr ptr long ptr)
@ extern __winitenv MSVCRT___winitenv
......@@ -1123,7 +1123,7 @@
@ cdecl _endthreadex(long)
@ extern _environ MSVCRT__environ
@ cdecl _eof(long) MSVCRT__eof
@ cdecl _errno() MSVCRT__errno
@ cdecl _errno()
@ cdecl _except1(long long double double long ptr)
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
......@@ -1283,7 +1283,7 @@
@ stub -arch=i386 _inp(long)
@ stub -arch=i386 _inpd(long)
@ stub -arch=i386 _inpw(long)
@ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl _invalid_parameter(wstr wstr wstr long long)
@ cdecl _invalid_parameter_noinfo()
@ cdecl _invalid_parameter_noinfo_noreturn()
@ stub _invoke_watson
......@@ -1706,7 +1706,7 @@
@ cdecl _strdate(ptr) MSVCRT__strdate
@ cdecl _strdate_s(ptr long)
@ cdecl _strdup(str) MSVCRT__strdup
@ cdecl _strerror(long) MSVCRT__strerror
@ cdecl _strerror(long)
@ stub _strerror_s
@ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l
@ cdecl _stricmp(str str) MSVCRT__stricmp
......@@ -1865,8 +1865,8 @@
@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale
@ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcserror(long) MSVCRT__wcserror
@ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s
@ cdecl _wcserror(long)
@ cdecl _wcserror_s(ptr long long)
@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l
......@@ -1949,7 +1949,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
@ cdecl _wperror(wstr) MSVCRT__wperror
@ cdecl _wperror(wstr)
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ stub _wprintf_l
......@@ -2308,7 +2308,7 @@
@ stub norm
@ stub normf
@ stub norml
@ cdecl perror(str) MSVCRT_perror
@ cdecl perror(str)
@ cdecl pow(double double) MSVCRT_pow
@ cdecl -arch=!i386 powf(float float) MSVCRT_powf
@ varargs printf(str) MSVCRT_printf
......@@ -2371,8 +2371,8 @@
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strerror(long)
@ cdecl strerror_s(ptr long long)
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
......
dlls/msvcr70/msvcr70.spec
View file @ eeada568
......@@ -147,7 +147,7 @@
@ cdecl __crtLCMapStringA(long long str long ptr long long long)
@ cdecl __crtLCMapStringW(long long wstr long ptr long long long)
@ cdecl __dllonexit(ptr ptr ptr)
@ cdecl __doserrno() MSVCRT___doserrno
@ cdecl __doserrno()
@ cdecl __fpecode()
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
......@@ -206,7 +206,7 @@
@ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@ extern __wargv MSVCRT___wargv
@ cdecl __wcserror(wstr) MSVCRT___wcserror
@ cdecl __wcserror(wstr)
@ cdecl __wgetmainargs(ptr ptr ptr long ptr)
@ extern __winitenv MSVCRT___winitenv
@ cdecl _abnormal_termination()
......@@ -278,7 +278,7 @@
@ cdecl _endthreadex(long)
@ extern _environ MSVCRT__environ
@ cdecl _eof(long) MSVCRT__eof
@ cdecl _errno() MSVCRT__errno
@ cdecl _errno()
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@ varargs _execl(str str)
......@@ -546,7 +546,7 @@
@ cdecl _strcmpi(str str) MSVCRT__stricmp
@ cdecl _strdate(ptr) MSVCRT__strdate
@ cdecl _strdup(str) MSVCRT__strdup
@ cdecl _strerror(long) MSVCRT__strerror
@ cdecl _strerror(long)
@ cdecl _stricmp(str str) MSVCRT__stricmp
@ cdecl _stricoll(str str) MSVCRT__stricoll
@ cdecl _strlwr(str) MSVCRT__strlwr
......@@ -595,7 +595,7 @@
@ extern _wcmdln MSVCRT__wcmdln
@ cdecl _wcreat(wstr long) MSVCRT__wcreat
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcserror(long) MSVCRT__wcserror
@ cdecl _wcserror(long)
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll
@ cdecl _wcslwr(wstr) MSVCRT__wcslwr
......@@ -641,7 +641,7 @@
@ cdecl _wmkdir(wstr) MSVCRT__wmkdir
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ varargs _wopen(wstr long) MSVCRT__wopen
@ cdecl _wperror(wstr) MSVCRT__wperror
@ cdecl _wperror(wstr)
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ cdecl _wputenv(wstr)
......@@ -783,7 +783,7 @@
@ cdecl memset(ptr long long)
@ cdecl mktime(ptr) MSVCRT_mktime
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl perror(str) MSVCRT_perror
@ cdecl perror(str)
@ cdecl pow(double double) MSVCRT_pow
@ varargs printf(str) MSVCRT_printf
@ cdecl putc(long ptr) MSVCRT_putc
......@@ -815,7 +815,7 @@
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str)
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror(long)
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
......
dlls/msvcr71/msvcr71.spec
View file @ eeada568
......@@ -142,7 +142,7 @@
@ cdecl __crtLCMapStringA(long long str long ptr long long long)
@ cdecl __crtLCMapStringW(long long wstr long ptr long long long)
@ cdecl __dllonexit(ptr ptr ptr)
@ cdecl __doserrno() MSVCRT___doserrno
@ cdecl __doserrno()
@ cdecl __fpecode()
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
......@@ -201,7 +201,7 @@
@ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@ extern __wargv MSVCRT___wargv
@ cdecl __wcserror(wstr) MSVCRT___wcserror
@ cdecl __wcserror(wstr)
@ cdecl __wgetmainargs(ptr ptr ptr long ptr)
@ extern __winitenv MSVCRT___winitenv
@ cdecl _abnormal_termination()
......@@ -272,7 +272,7 @@
@ cdecl _endthreadex(long)
@ extern _environ MSVCRT__environ
@ cdecl _eof(long) MSVCRT__eof
@ cdecl _errno() MSVCRT__errno
@ cdecl _errno()
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@ varargs _execl(str str)
......@@ -542,7 +542,7 @@
@ cdecl _strcmpi(str str) MSVCRT__stricmp
@ cdecl _strdate(ptr) MSVCRT__strdate
@ cdecl _strdup(str) MSVCRT__strdup
@ cdecl _strerror(long) MSVCRT__strerror
@ cdecl _strerror(long)
@ cdecl _stricmp(str str) MSVCRT__stricmp
@ cdecl _stricoll(str str) MSVCRT__stricoll
@ cdecl _strlwr(str) MSVCRT__strlwr
......@@ -591,7 +591,7 @@
@ extern _wcmdln MSVCRT__wcmdln
@ cdecl _wcreat(wstr long) MSVCRT__wcreat
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcserror(long) MSVCRT__wcserror
@ cdecl _wcserror(long)
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll
@ cdecl _wcslwr(wstr) MSVCRT__wcslwr
......@@ -637,7 +637,7 @@
@ cdecl _wmkdir(wstr) MSVCRT__wmkdir
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ varargs _wopen(wstr long) MSVCRT__wopen
@ cdecl _wperror(wstr) MSVCRT__wperror
@ cdecl _wperror(wstr)
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ cdecl _wputenv(wstr)
......@@ -779,7 +779,7 @@
@ cdecl memset(ptr long long)
@ cdecl mktime(ptr) MSVCRT_mktime
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl perror(str) MSVCRT_perror
@ cdecl perror(str)
@ cdecl pow(double double) MSVCRT_pow
@ varargs printf(str) MSVCRT_printf
@ cdecl putc(long ptr) MSVCRT_putc
......@@ -811,7 +811,7 @@
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str)
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror(long)
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
......
dlls/msvcr80/msvcr80.spec
View file @ eeada568
......@@ -82,8 +82,8 @@
@ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI@Z # int __cdecl _ValidateWrite(void * __ptr64,unsigned int)
@ cdecl __uncaught_exception() MSVCRT___uncaught_exception
@ stub ?_inconsistency@@YAXXZ
@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) _invalid_parameter
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) _invalid_parameter
@ cdecl -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z(ptr ptr) _is_exception_typeof
@ cdecl -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z(ptr ptr) _is_exception_typeof
@ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
......@@ -219,7 +219,7 @@
@ cdecl __crtLCMapStringW(long long wstr long ptr long long long)
@ cdecl __daylight() MSVCRT___p__daylight
@ cdecl __dllonexit(ptr ptr ptr)
@ cdecl __doserrno() MSVCRT___doserrno
@ cdecl __doserrno()
@ cdecl __dstbias() MSVCRT___p__dstbias
@ stub -arch=i386 ___fls_getvalue@4
@ stub -arch=x86_64 __fls_getvalue
......@@ -320,8 +320,8 @@
@ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@ cdecl __vswprintf_l(ptr wstr ptr ptr) MSVCRT_vswprintf_l
@ extern __wargv MSVCRT___wargv
@ cdecl __wcserror(wstr) MSVCRT___wcserror
@ cdecl __wcserror_s(ptr long wstr) MSVCRT___wcserror_s
@ cdecl __wcserror(wstr)
@ cdecl __wcserror_s(ptr long wstr)
@ stub __wcsncnt
@ cdecl __wgetmainargs(ptr ptr ptr long ptr)
@ extern __winitenv MSVCRT___winitenv
......@@ -447,7 +447,7 @@
@ cdecl _endthreadex(long)
@ extern _environ MSVCRT__environ
@ cdecl _eof(long) MSVCRT__eof
@ cdecl _errno() MSVCRT__errno
@ cdecl _errno()
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr)
......@@ -610,7 +610,7 @@
@ stub -arch=i386 _inp(long)
@ stub -arch=i386 _inpd(long)
@ stub -arch=i386 _inpw(long)
@ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl _invalid_parameter(wstr wstr wstr long long)
@ cdecl _invalid_parameter_noinfo()
@ stub _invoke_watson
@ extern _iob MSVCRT__iob
......@@ -1018,7 +1018,7 @@
@ cdecl _strdate(ptr) MSVCRT__strdate
@ cdecl _strdate_s(ptr long)
@ cdecl _strdup(str) MSVCRT__strdup
@ cdecl _strerror(long) MSVCRT__strerror
@ cdecl _strerror(long)
@ stub _strerror_s
@ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l
@ cdecl _stricmp(str str) MSVCRT__stricmp
......@@ -1169,8 +1169,8 @@
@ cdecl _wcreat(wstr long) MSVCRT__wcreat
@ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcserror(long) MSVCRT__wcserror
@ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s
@ cdecl _wcserror(long)
@ cdecl _wcserror_s(ptr long long)
@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l
......@@ -1251,7 +1251,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
@ cdecl _wperror(wstr) MSVCRT__wperror
@ cdecl _wperror(wstr)
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ stub _wprintf_l
......@@ -1439,7 +1439,7 @@
@ cdecl memset(ptr long long)
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ cdecl perror(str) MSVCRT_perror
@ cdecl perror(str)
@ cdecl pow(double double) MSVCRT_pow
@ cdecl -arch=!i386 powf(float float) MSVCRT_powf
@ varargs printf(str) MSVCRT_printf
......@@ -1484,8 +1484,8 @@
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strerror(long)
@ cdecl strerror_s(ptr long long)
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
......
dlls/msvcr90/msvcr90.spec
View file @ eeada568
......@@ -82,8 +82,8 @@
@ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI@Z # int __cdecl _ValidateWrite(void * __ptr64,unsigned int)
@ cdecl __uncaught_exception() MSVCRT___uncaught_exception
@ stub ?_inconsistency@@YAXXZ
@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) _invalid_parameter
@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) _invalid_parameter
@ cdecl -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z(ptr ptr) _is_exception_typeof
@ cdecl -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z(ptr ptr) _is_exception_typeof
@ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
......@@ -210,7 +210,7 @@
@ cdecl __crtLCMapStringW(long long wstr long ptr long long long)
@ cdecl __daylight() MSVCRT___p__daylight
@ cdecl __dllonexit(ptr ptr ptr)
@ cdecl __doserrno() MSVCRT___doserrno
@ cdecl __doserrno()
@ cdecl __dstbias() MSVCRT___p__dstbias
@ stub ___fls_getvalue@4
@ stub ___fls_setvalue@8
......@@ -304,8 +304,8 @@
@ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@ cdecl __vswprintf_l(ptr wstr ptr ptr) MSVCRT_vswprintf_l
@ extern __wargv MSVCRT___wargv
@ cdecl __wcserror(wstr) MSVCRT___wcserror
@ cdecl __wcserror_s(ptr long wstr) MSVCRT___wcserror_s
@ cdecl __wcserror(wstr)
@ cdecl __wcserror_s(ptr long wstr)
@ stub __wcsncnt
@ cdecl __wgetmainargs(ptr ptr ptr long ptr)
@ extern __winitenv MSVCRT___winitenv
......@@ -430,7 +430,7 @@
@ cdecl _endthreadex(long)
@ extern _environ MSVCRT__environ
@ cdecl _eof(long) MSVCRT__eof
@ cdecl _errno() MSVCRT__errno
@ cdecl _errno()
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr)
......@@ -588,7 +588,7 @@
@ stub -arch=i386 _inp(long)
@ stub -arch=i386 _inpd(long)
@ stub -arch=i386 _inpw(long)
@ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl _invalid_parameter(wstr wstr wstr long long)
@ cdecl _invalid_parameter_noinfo()
@ stub _invoke_watson
@ extern _iob MSVCRT__iob
......@@ -993,7 +993,7 @@
@ cdecl _strdate(ptr) MSVCRT__strdate
@ cdecl _strdate_s(ptr long)
@ cdecl _strdup(str) MSVCRT__strdup
@ cdecl _strerror(long) MSVCRT__strerror
@ cdecl _strerror(long)
@ stub _strerror_s
@ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l
@ cdecl _stricmp(str str) MSVCRT__stricmp
......@@ -1144,8 +1144,8 @@
@ cdecl _wcreat(wstr long) MSVCRT__wcreat
@ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcserror(long) MSVCRT__wcserror
@ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s
@ cdecl _wcserror(long)
@ cdecl _wcserror_s(ptr long long)
@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l
......@@ -1223,7 +1223,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
@ cdecl _wperror(wstr) MSVCRT__wperror
@ cdecl _wperror(wstr)
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ stub _wprintf_l
......@@ -1411,7 +1411,7 @@
@ cdecl memset(ptr long long)
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ cdecl perror(str) MSVCRT_perror
@ cdecl perror(str)
@ cdecl pow(double double) MSVCRT_pow
@ cdecl -arch=!i386 powf(float float) MSVCRT_powf
@ varargs printf(str) MSVCRT_printf
......@@ -1456,8 +1456,8 @@
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strerror(long)
@ cdecl strerror_s(ptr long long)
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
......
dlls/msvcrt/ctype.c
View file @ eeada568
......@@ -452,7 +452,7 @@ int CDECL MSVCRT__toupper_l(int c, _locale_t locale)
if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE)
*p++ = (c>>8) & 255;
else {
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
str[1] = 0;
}
*p++ = c & 255;
......@@ -506,7 +506,7 @@ int CDECL MSVCRT__tolower_l(int c, _locale_t locale)
if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE)
*p++ = (c>>8) & 255;
else {
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
str[1] = 0;
}
*p++ = c & 255;
......
dlls/msvcrt/dir.c
View file @ eeada568
......@@ -297,7 +297,7 @@ int CDECL MSVCRT__chdrive(int newdrive)
{
msvcrt_set_errno(GetLastError());
if (newdrive <= 0)
*MSVCRT__errno() = EACCES;
*_errno() = EACCES;
return -1;
}
return 0;
......@@ -571,7 +571,7 @@ int CDECL MSVCRT__findnext(intptr_t hand, struct MSVCRT__finddata_t * ft)
if (!FindNextFileA((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return -1;
}
......@@ -588,7 +588,7 @@ int CDECL MSVCRT__findnext32(intptr_t hand, struct MSVCRT__finddata32_t * ft)
if (!FindNextFileA((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return -1;
}
......@@ -605,7 +605,7 @@ int CDECL MSVCRT__wfindnext32(intptr_t hand, struct MSVCRT__wfinddata32_t * ft)
if (!FindNextFileW((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return -1;
}
......@@ -624,7 +624,7 @@ int CDECL MSVCRT__wfindnext(intptr_t hand, struct MSVCRT__wfinddata_t * ft)
if (!FindNextFileW((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return -1;
}
......@@ -643,7 +643,7 @@ int CDECL MSVCRT__findnexti64(intptr_t hand, struct MSVCRT__finddatai64_t * ft)
if (!FindNextFileA((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return -1;
}
......@@ -662,7 +662,7 @@ int CDECL MSVCRT__findnext64(intptr_t hand, struct MSVCRT__finddata64_t * ft)
if (!FindNextFileA((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return -1;
}
......@@ -681,7 +681,7 @@ int CDECL MSVCRT__wfindnext64(intptr_t hand, struct MSVCRT__wfinddata64_t * ft)
if (!FindNextFileW((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return -1;
}
......@@ -700,7 +700,7 @@ int CDECL MSVCRT__findnext64i32(intptr_t hand, struct MSVCRT__finddata64i32_t *
if (!FindNextFileA((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return -1;
}
......@@ -719,7 +719,7 @@ int CDECL MSVCRT__wfindnexti64(intptr_t hand, struct MSVCRT__wfinddatai64_t * ft
if (!FindNextFileW((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return -1;
}
......@@ -738,7 +738,7 @@ int CDECL MSVCRT__wfindnext64i32(intptr_t hand, struct MSVCRT__wfinddata64i32_t
if (!FindNextFileW((HANDLE)hand, &find_data))
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return -1;
}
......@@ -775,7 +775,7 @@ char* CDECL MSVCRT__getcwd(char * buf, int size)
}
else if (dir_len >= size)
{
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return NULL; /* buf too small */
}
strcpy(buf,dir);
......@@ -802,7 +802,7 @@ wchar_t* CDECL MSVCRT__wgetcwd(wchar_t * buf, int size)
}
if (dir_len >= size)
{
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return NULL; /* buf too small */
}
MSVCRT_wcscpy(buf,dir);
......@@ -862,14 +862,14 @@ char* CDECL MSVCRT__getdcwd(int drive, char * buf, int size)
drivespec[0] += drive - 1;
if (GetDriveTypeA(drivespec) < DRIVE_REMOVABLE)
{
*MSVCRT__errno() = EACCES;
*_errno() = EACCES;
return NULL;
}
dir_len = GetFullPathNameA(drivespec,MAX_PATH,dir,&dummy);
if (dir_len >= size || dir_len < 1)
{
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return NULL; /* buf too small */
}
......@@ -904,14 +904,14 @@ wchar_t* CDECL MSVCRT__wgetdcwd(int drive, wchar_t * buf, int size)
drivespec[0] += drive - 1;
if (GetDriveTypeW(drivespec) < DRIVE_REMOVABLE)
{
*MSVCRT__errno() = EACCES;
*_errno() = EACCES;
return NULL;
}
dir_len = GetFullPathNameW(drivespec,MAX_PATH,dir,&dummy);
if (dir_len >= size || dir_len < 1)
{
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return NULL; /* buf too small */
}
......@@ -1055,7 +1055,7 @@ int CDECL MSVCRT__splitpath_s(const char* inpath,
(!ext && sz_ext) ||
(ext && !sz_ext))
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -1119,7 +1119,7 @@ do_error:
if (dir) dir[0] = '\0';
if (fname) fname[0]= '\0';
if (ext) ext[0]= '\0';
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ERANGE;
}
......@@ -1155,7 +1155,7 @@ int CDECL MSVCRT__wsplitpath_s(const wchar_t* inpath,
(!ext && sz_ext) ||
(ext && !sz_ext))
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -1211,7 +1211,7 @@ do_error:
if (dir) dir[0] = '\0';
if (fname) fname[0]= '\0';
if (ext) ext[0]= '\0';
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ERANGE;
}
......@@ -1253,7 +1253,7 @@ wchar_t * CDECL MSVCRT__wfullpath(wchar_t * absPath, const wchar_t* relPath, siz
if (size < 4)
{
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return NULL;
}
......@@ -1307,7 +1307,7 @@ char * CDECL MSVCRT__fullpath(char * absPath, const char* relPath, unsigned int
if (size < 4)
{
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return NULL;
}
......@@ -1443,7 +1443,7 @@ int CDECL MSVCRT__makepath_s(char *path, size_t size, const char *drive,
if (!path || !size)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -1530,7 +1530,7 @@ int CDECL MSVCRT__makepath_s(char *path, size_t size, const char *drive,
range:
path[0] = '\0';
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ERANGE;
}
......@@ -1547,7 +1547,7 @@ int CDECL MSVCRT__wmakepath_s(wchar_t *path, size_t size, const wchar_t *drive,
if (!path || !size)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -1634,7 +1634,7 @@ int CDECL MSVCRT__wmakepath_s(wchar_t *path, size_t size, const wchar_t *drive,
range:
path[0] = '\0';
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ERANGE;
}
......@@ -1669,7 +1669,7 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, size
envVal = MSVCRT_getenv(env);
if (!envVal)
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return ENOENT;
}
......@@ -1719,7 +1719,7 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, size
}
}
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return ENOENT;
}
......@@ -1763,7 +1763,7 @@ int CDECL MSVCRT__wsearchenv_s(const wchar_t* file, const wchar_t* env,
envVal = MSVCRT__wgetenv(env);
if (!envVal)
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return ENOENT;
}
......@@ -1813,7 +1813,7 @@ int CDECL MSVCRT__wsearchenv_s(const wchar_t* file, const wchar_t* env,
}
}
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return ENOENT;
}
......
dlls/msvcrt/environ.c
View file @ eeada568
......@@ -30,12 +30,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
*/
char * CDECL MSVCRT_getenv(const char *name)
{
char **environ;
char **env;
unsigned int length=strlen(name);
for (environ = MSVCRT__environ; *environ; environ++)
for (env = MSVCRT__environ; *env; env++)
{
char *str = *environ;
char *str = *env;
char *pos = strchr(str,'=');
if (pos && ((pos - str) == length) && !MSVCRT__strnicmp(str,name,length))
{
......@@ -51,16 +51,16 @@ char * CDECL MSVCRT_getenv(const char *name)
*/
wchar_t * CDECL MSVCRT__wgetenv(const wchar_t *name)
{
wchar_t **environ;
wchar_t **env;
unsigned int length=MSVCRT_wcslen(name);
/* Initialize the _wenviron array if it's not already created. */
if (!MSVCRT__wenviron)
MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL);
for (environ = MSVCRT__wenviron; *environ; environ++)
for (env = MSVCRT__wenviron; *env; env++)
{
wchar_t *str = *environ;
wchar_t *str = *env;
wchar_t *pos = MSVCRT_wcschr(str,'=');
if (pos && ((pos - str) == length) && !MSVCRT__wcsnicmp(str,name,length))
{
......@@ -219,13 +219,13 @@ int CDECL _dupenv_s(char **buffer, size_t *numberOfElements, const char *varname
if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL;
if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL;
if (!(e = MSVCRT_getenv(varname))) return *MSVCRT__errno() = EINVAL;
if (!(e = MSVCRT_getenv(varname))) return *_errno() = EINVAL;
sz = strlen(e) + 1;
if (!(*buffer = MSVCRT_malloc(sz)))
{
if (numberOfElements) *numberOfElements = 0;
return *MSVCRT__errno() = ENOMEM;
return *_errno() = ENOMEM;
}
strcpy(*buffer, e);
if (numberOfElements) *numberOfElements = sz;
......@@ -244,13 +244,13 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements,
if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL;
if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL;
if (!(e = MSVCRT__wgetenv(varname))) return *MSVCRT__errno() = EINVAL;
if (!(e = MSVCRT__wgetenv(varname))) return *_errno() = EINVAL;
sz = MSVCRT_wcslen(e) + 1;
if (!(*buffer = MSVCRT_malloc(sz * sizeof(wchar_t))))
{
if (numberOfElements) *numberOfElements = 0;
return *MSVCRT__errno() = ENOMEM;
return *_errno() = ENOMEM;
}
MSVCRT_wcscpy(*buffer, e);
if (numberOfElements) *numberOfElements = sz;
......@@ -273,12 +273,12 @@ int CDECL getenv_s(size_t *pReturnValue, char* buffer, size_t numberOfElements,
if (!(e = MSVCRT_getenv(varname)))
{
*pReturnValue = 0;
return *MSVCRT__errno() = EINVAL;
return *_errno() = EINVAL;
}
*pReturnValue = strlen(e) + 1;
if (numberOfElements < *pReturnValue)
{
return *MSVCRT__errno() = ERANGE;
return *_errno() = ERANGE;
}
strcpy(buffer, e);
return 0;
......@@ -299,12 +299,12 @@ int CDECL _wgetenv_s(size_t *pReturnValue, wchar_t *buffer, size_t numberOfEleme
if (!(e = MSVCRT__wgetenv(varname)))
{
*pReturnValue = 0;
return *MSVCRT__errno() = EINVAL;
return *_errno() = EINVAL;
}
*pReturnValue = MSVCRT_wcslen(e) + 1;
if (numberOfElements < *pReturnValue)
{
return *MSVCRT__errno() = ERANGE;
return *_errno() = ERANGE;
}
MSVCRT_wcscpy(buffer, e);
return 0;
......
dlls/msvcrt/errno.c
View file @ eeada568
......@@ -130,8 +130,8 @@ static MSVCRT_invalid_parameter_handler invalid_parameter_handler = NULL;
/* INTERNAL: Set the crt and dos errno's from the OS error given. */
void msvcrt_set_errno(int err)
{
int *errno_ptr = MSVCRT__errno();
__msvcrt_ulong *doserrno = MSVCRT___doserrno();
int *errno_ptr = _errno();
__msvcrt_ulong *doserrno = __doserrno();
*doserrno = err;
......@@ -211,7 +211,7 @@ char** CDECL __sys_errlist(void)
/*********************************************************************
* _errno (MSVCRT.@)
*/
int* CDECL MSVCRT__errno(void)
int* CDECL _errno(void)
{
return &msvcrt_get_thread_data()->thread_errno;
}
......@@ -219,7 +219,7 @@ int* CDECL MSVCRT__errno(void)
/*********************************************************************
* __doserrno (MSVCRT.@)
*/
__msvcrt_ulong* CDECL MSVCRT___doserrno(void)
__msvcrt_ulong* CDECL __doserrno(void)
{
return &msvcrt_get_thread_data()->thread_doserrno;
}
......@@ -232,7 +232,7 @@ int CDECL _get_errno(int *pValue)
if (!pValue)
return EINVAL;
*pValue = *MSVCRT__errno();
*pValue = *_errno();
return 0;
}
......@@ -244,7 +244,7 @@ int CDECL _get_doserrno(int *pValue)
if (!pValue)
return EINVAL;
*pValue = *MSVCRT___doserrno();
*pValue = *__doserrno();
return 0;
}
......@@ -253,7 +253,7 @@ int CDECL _get_doserrno(int *pValue)
*/
int CDECL _set_errno(int value)
{
*MSVCRT__errno() = value;
*_errno() = value;
return 0;
}
......@@ -262,14 +262,14 @@ int CDECL _set_errno(int value)
*/
int CDECL _set_doserrno(int value)
{
*MSVCRT___doserrno() = value;
*__doserrno() = value;
return 0;
}
/*********************************************************************
* strerror (MSVCRT.@)
*/
char* CDECL MSVCRT_strerror(int err)
char* CDECL strerror(int err)
{
thread_data_t *data = msvcrt_get_thread_data();
......@@ -284,13 +284,13 @@ char* CDECL MSVCRT_strerror(int err)
/**********************************************************************
* strerror_s (MSVCRT.@)
*/
int CDECL MSVCRT_strerror_s(char *buffer, size_t numberOfElements, int errnum)
int CDECL strerror_s(char *buffer, size_t numberOfElements, int errnum)
{
char *ptr;
if (!buffer || !numberOfElements)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -311,7 +311,7 @@ int CDECL MSVCRT_strerror_s(char *buffer, size_t numberOfElements, int errnum)
/**********************************************************************
* _strerror (MSVCRT.@)
*/
char* CDECL MSVCRT__strerror(const char* str)
char* CDECL _strerror(const char* str)
{
thread_data_t *data = msvcrt_get_thread_data();
int err;
......@@ -333,9 +333,9 @@ char* CDECL MSVCRT__strerror(const char* str)
/*********************************************************************
* perror (MSVCRT.@)
*/
void CDECL MSVCRT_perror(const char* str)
void CDECL perror(const char* str)
{
int err = *MSVCRT__errno();
int err = *_errno();
if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr;
if (str && *str)
......@@ -350,7 +350,7 @@ void CDECL MSVCRT_perror(const char* str)
/*********************************************************************
* _wperror (MSVCRT.@)
*/
void CDECL MSVCRT__wperror(const wchar_t* str)
void CDECL _wperror(const wchar_t* str)
{
size_t size;
char *buffer = NULL;
......@@ -368,14 +368,14 @@ void CDECL MSVCRT__wperror(const wchar_t* str)
return;
}
}
MSVCRT_perror(buffer);
perror(buffer);
MSVCRT_free(buffer);
}
/*********************************************************************
* _wcserror_s (MSVCRT.@)
*/
int CDECL MSVCRT__wcserror_s(wchar_t* buffer, size_t nc, int err)
int CDECL _wcserror_s(wchar_t* buffer, size_t nc, int err)
{
if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL;
if (!MSVCRT_CHECK_PMT(nc > 0)) return EINVAL;
......@@ -388,25 +388,25 @@ int CDECL MSVCRT__wcserror_s(wchar_t* buffer, size_t nc, int err)
/*********************************************************************
* _wcserror (MSVCRT.@)
*/
wchar_t* CDECL MSVCRT__wcserror(int err)
wchar_t* CDECL _wcserror(int err)
{
thread_data_t *data = msvcrt_get_thread_data();
if (!data->wcserror_buffer)
if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(wchar_t)))) return NULL;
MSVCRT__wcserror_s(data->wcserror_buffer, 256, err);
_wcserror_s(data->wcserror_buffer, 256, err);
return data->wcserror_buffer;
}
/**********************************************************************
* __wcserror_s (MSVCRT.@)
*/
int CDECL MSVCRT___wcserror_s(wchar_t* buffer, size_t nc, const wchar_t* str)
int CDECL __wcserror_s(wchar_t* buffer, size_t nc, const wchar_t* str)
{
int err;
size_t len;
err = *MSVCRT__errno();
err = *_errno();
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 */;
......@@ -432,7 +432,7 @@ int CDECL MSVCRT___wcserror_s(wchar_t* buffer, size_t nc, const wchar_t* str)
/**********************************************************************
* __wcserror (MSVCRT.@)
*/
wchar_t* CDECL MSVCRT___wcserror(const wchar_t* str)
wchar_t* CDECL __wcserror(const wchar_t* str)
{
thread_data_t *data = msvcrt_get_thread_data();
int err;
......@@ -440,7 +440,7 @@ wchar_t* CDECL MSVCRT___wcserror(const wchar_t* str)
if (!data->wcserror_buffer)
if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(wchar_t)))) return NULL;
err = MSVCRT___wcserror_s(data->wcserror_buffer, 256, str);
err = __wcserror_s(data->wcserror_buffer, 256, str);
if (err) FIXME("bad wcserror call (%d)\n", err);
return data->wcserror_buffer;
......@@ -457,7 +457,7 @@ void CDECL _seterrormode(int mode)
/******************************************************************************
* _invalid_parameter (MSVCRT.@)
*/
void __cdecl MSVCRT__invalid_parameter(const wchar_t *expr, const wchar_t *func,
void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func,
const wchar_t *file, unsigned int line, uintptr_t arg)
{
#if _MSVCR_VER >= 140
......@@ -487,7 +487,7 @@ void __cdecl MSVCRT__invalid_parameter(const wchar_t *expr, const wchar_t *func,
*/
void CDECL _invalid_parameter_noinfo(void)
{
MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 );
_invalid_parameter( NULL, NULL, NULL, 0, 0 );
}
/*********************************************************************
......@@ -495,7 +495,7 @@ void CDECL _invalid_parameter_noinfo(void)
*/
void CDECL _invalid_parameter_noinfo_noreturn(void)
{
MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 );
_invalid_parameter( NULL, NULL, NULL, 0, 0 );
MSVCRT__exit( STATUS_INVALID_CRUNTIME_PARAMETER );
}
......
dlls/msvcrt/heap.c
View file @ eeada568
......@@ -335,7 +335,7 @@ int CDECL _heapset(unsigned int value)
int CDECL _heapadd(void* mem, size_t size)
{
TRACE("(%p,%Iu) unsupported in Win32\n", mem,size);
*MSVCRT__errno() = ENOSYS;
*_errno() = ENOSYS;
return -1;
}
......@@ -388,7 +388,7 @@ void* CDECL DECLSPEC_HOTPATCH MSVCRT_calloc(size_t count, size_t size)
if (size && bytes / size != count)
{
*MSVCRT__errno() = ENOMEM;
*_errno() = ENOMEM;
return NULL;
}
......@@ -438,7 +438,7 @@ void* CDECL MSVCRT_malloc(size_t size)
} while(_callnewh(size));
if (!ret)
*MSVCRT__errno() = ENOMEM;
*_errno() = ENOMEM;
return ret;
}
......@@ -490,7 +490,7 @@ void* CDECL _recalloc(void *mem, size_t num, size_t size)
ret = MSVCRT_realloc(mem, size);
if(!ret) {
*MSVCRT__errno() = ENOMEM;
*_errno() = ENOMEM;
return NULL;
}
......@@ -564,14 +564,14 @@ void * CDECL _aligned_offset_malloc(size_t size, size_t alignment, size_t offset
/* alignment must be a power of 2 */
if ((alignment & (alignment - 1)) != 0)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return NULL;
}
/* offset must be less than size */
if (offset && offset >= size)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return NULL;
}
......@@ -621,14 +621,14 @@ void * CDECL _aligned_offset_realloc(void *memblock, size_t size,
/* alignment must be a power of 2 */
if ((alignment & (alignment - 1)) != 0)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return NULL;
}
/* offset must be less than size */
if (offset >= size)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return NULL;
}
......@@ -646,7 +646,7 @@ void * CDECL _aligned_offset_realloc(void *memblock, size_t size,
saved = SAVED_PTR(memblock);
if (memblock != ALIGN_PTR(*saved, alignment, offset))
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return NULL;
}
......
dlls/msvcrt/mbcs.c
View file @ eeada568
......@@ -390,7 +390,7 @@ int CDECL _setmbcp(int cp)
mbcinfo = create_mbcinfo(cp, -1, get_mbcinfo());
if(!mbcinfo)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return -1;
}
......@@ -682,7 +682,7 @@ int CDECL _mbccpy_s_l(unsigned char* dest, size_t maxsize,
if(_ismbblead_l(*src, locale)) {
if(!src[1]) {
if(copied) *copied = 1;
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
return EILSEQ;
}
......@@ -1950,7 +1950,7 @@ int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src,
if (dst && size)
*dst = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -1961,7 +1961,7 @@ int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src,
if (!size)
{
*dst = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -1978,7 +1978,7 @@ int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src,
if (!size)
{
*dst = '\0';
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ERANGE;
}
}
......@@ -2052,7 +2052,7 @@ int CDECL _mbslwr_s(unsigned char* s, size_t len)
}
else if (!s || !len)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
if (get_mbcinfo()->ismbcodepage)
......@@ -2074,7 +2074,7 @@ int CDECL _mbslwr_s(unsigned char* s, size_t len)
if (*s)
{
*s = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
return 0;
......@@ -2120,7 +2120,7 @@ int CDECL _mbsupr_s(unsigned char* s, size_t len)
}
else if (!s || !len)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
if (get_mbcinfo()->ismbcodepage)
......@@ -2142,7 +2142,7 @@ int CDECL _mbsupr_s(unsigned char* s, size_t len)
if (*s)
{
*s = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
return 0;
......@@ -2374,7 +2374,7 @@ size_t CDECL _mbstrlen_l(const char* str, _locale_t locale)
len = MultiByteToWideChar(locinfo->lc_codepage, MB_ERR_INVALID_CHARS,
str, -1, NULL, 0);
if (!len) {
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
return -1;
}
return len - 1;
......@@ -2512,7 +2512,7 @@ size_t CDECL MSVCRT__mbstowcs_l(wchar_t *wcstr, const char *mbstr,
size_t i, size;
if(!mbstr) {
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return -1;
}
......@@ -2537,7 +2537,7 @@ size_t CDECL MSVCRT__mbstowcs_l(wchar_t *wcstr, const char *mbstr,
size = MultiByteToWideChar(locinfo->lc_codepage,
MB_ERR_INVALID_CHARS, mbstr, -1, NULL, 0);
if(!size) {
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
return -1;
}
return size - 1;
......@@ -2555,7 +2555,7 @@ size_t CDECL MSVCRT__mbstowcs_l(wchar_t *wcstr, const char *mbstr,
MB_ERR_INVALID_CHARS, mbstr, size, wcstr, count);
if(!size) {
if(count) wcstr[0] = '\0';
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
return -1;
}
}
......@@ -2681,7 +2681,7 @@ int CDECL MSVCRT_mbsrtowcs_s(size_t *ret, wchar_t *wcstr, size_t len,
*ret = MSVCRT_mbsrtowcs(wcstr, mbstr, count>len ? len : count, state);
if(*ret == -1) {
if(wcstr) *wcstr = 0;
return *MSVCRT__errno();
return *_errno();
}
(*ret)++;
if(*ret > len) {
......
dlls/msvcrt/misc.c
View file @ eeada568
......@@ -69,7 +69,7 @@ int CDECL MSVCRT_rand_s(unsigned int *pval)
{
if (!pval || !RtlGenRandom(pval, sizeof(*pval)))
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
return 0;
......
dlls/msvcrt/msvcrt.h
View file @ eeada568
......@@ -24,6 +24,7 @@
#include <stdarg.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <wchar.h>
#include "windef.h"
......@@ -789,8 +790,6 @@ __int64 __cdecl MSVCRT__ftelli64(MSVCRT_FILE* file);
__int64 __cdecl MSVCRT__ftelli64_nolock(MSVCRT_FILE*);
void __cdecl MSVCRT__exit(int);
void __cdecl MSVCRT_abort(void);
__msvcrt_ulong* __cdecl MSVCRT___doserrno(void);
int* __cdecl MSVCRT__errno(void);
char* __cdecl MSVCRT_getenv(const char*);
size_t __cdecl MSVCRT__fread_nolock(void*,size_t,size_t,MSVCRT_FILE*);
size_t __cdecl MSVCRT__fread_nolock_s(void*,size_t,size_t,size_t,MSVCRT_FILE*);
......@@ -872,8 +871,6 @@ int __cdecl MSVCRT__pipe(int *, unsigned int, int);
wchar_t* __cdecl MSVCRT__wgetenv(const wchar_t*);
void __cdecl MSVCRT__wsearchenv(const wchar_t*, const wchar_t*, wchar_t*);
intptr_t __cdecl MSVCRT__spawnvpe(int, const char*, const char* const*, const char* const*);
void __cdecl MSVCRT__invalid_parameter(const wchar_t *expr, const wchar_t *func,
const wchar_t *file, unsigned int line, uintptr_t arg);
int __cdecl MSVCRT__toupper_l(int,_locale_t);
int __cdecl MSVCRT__tolower_l(int,_locale_t);
int __cdecl MSVCRT__towupper_l(wint_t,_locale_t);
......@@ -940,10 +937,10 @@ int fpnum_double(struct fpnum*, double*) DECLSPEC_HIDDEN;
* #define MSVCRT_CHECK_PMT(x) ((x) ? TRUE : MSVCRT_INVALID_PMT(#x),FALSE)
* Until this is done, just keep the same semantics for CHECK_PMT(), but without generating / sending
* any information
* NB : MSVCRT_call_invalid_parameter_handler is a wrapper around MSVCRT__invalid_parameter in order
* NB : MSVCRT_call_invalid_parameter_handler is a wrapper around _invalid_parameter in order
* to do the Ansi to Unicode transformation
*/
#define MSVCRT_INVALID_PMT(x,err) (*MSVCRT__errno() = (err), MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0))
#define MSVCRT_INVALID_PMT(x,err) (*_errno() = (err), _invalid_parameter(NULL, NULL, NULL, 0, 0))
#define MSVCRT_CHECK_PMT_ERR(x,err) ((x) || (MSVCRT_INVALID_PMT( 0, (err) ), FALSE))
#define MSVCRT_CHECK_PMT(x) MSVCRT_CHECK_PMT_ERR((x), EINVAL)
......
dlls/msvcrt/msvcrt.spec
View file @ eeada568
......@@ -208,7 +208,7 @@
@ cdecl __crtLCMapStringW(long long wstr long ptr long long long)
@ cdecl __daylight() MSVCRT___p__daylight
@ cdecl __dllonexit(ptr ptr ptr)
@ cdecl __doserrno() MSVCRT___doserrno
@ cdecl __doserrno()
@ cdecl __dstbias() MSVCRT___p__dstbias
@ cdecl __fpecode()
@ stub __get_app_type
......@@ -290,8 +290,8 @@
@ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@ extern __wargv MSVCRT___wargv
@ cdecl __wcserror(wstr) MSVCRT___wcserror
@ cdecl __wcserror_s(ptr long wstr) MSVCRT___wcserror_s
@ cdecl __wcserror(wstr)
@ cdecl __wcserror_s(ptr long wstr)
# stub __wcsncnt(wstr long)
@ cdecl __wgetmainargs(ptr ptr ptr long ptr)
@ extern __winitenv MSVCRT___winitenv
......@@ -413,7 +413,7 @@
@ cdecl _endthreadex(long)
@ extern _environ MSVCRT__environ
@ cdecl _eof(long) MSVCRT__eof
@ cdecl _errno() MSVCRT__errno
@ cdecl _errno()
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr)
......@@ -558,7 +558,7 @@
@ stub -arch=i386 _inp(long)
@ stub -arch=i386 _inpd(long)
@ stub -arch=i386 _inpw(long)
@ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter
@ cdecl _invalid_parameter(wstr wstr wstr long long)
@ extern _iob MSVCRT__iob
@ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l
@ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l
......@@ -953,7 +953,7 @@
@ cdecl _strdate_s(ptr long)
@ cdecl _strdup(str) MSVCRT__strdup
# stub _strdup_dbg(str long str long)
@ cdecl _strerror(long) MSVCRT__strerror
@ cdecl _strerror(long)
# stub _strerror_s(ptr long long)
@ cdecl _stricmp(str str) MSVCRT__stricmp
@ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l
......@@ -1098,8 +1098,8 @@
@ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
# stub _wcsdup_dbg(wstr long str long)
@ cdecl _wcserror(long) MSVCRT__wcserror
@ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s
@ cdecl _wcserror(long)
@ cdecl _wcserror_s(ptr long long)
@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l
......@@ -1183,7 +1183,7 @@
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
# stub _woutput_s
@ cdecl _wperror(wstr) MSVCRT__wperror
@ cdecl _wperror(wstr)
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen (wstr wstr) MSVCRT__wpopen
# stub _wprintf_l(wstr ptr)
......@@ -1380,7 +1380,7 @@
@ cdecl mktime(ptr) MSVCRT_mktime
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ cdecl perror(str) MSVCRT_perror
@ cdecl perror(str)
@ cdecl pow(double double) MSVCRT_pow
@ cdecl -arch=!i386 powf(float float) MSVCRT_powf
@ varargs printf(str) MSVCRT_printf
......@@ -1425,8 +1425,8 @@
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strerror(long)
@ cdecl strerror_s(ptr long long)
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
......
dlls/msvcrt/printf.h
View file @ eeada568
......@@ -1188,8 +1188,8 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API
locale, three_digit_exp, standard_rounding);
} else {
if(invoke_invalid_param_handler) {
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
*MSVCRT__errno() = EINVAL;
_invalid_parameter(NULL, NULL, NULL, 0, 0);
*_errno() = EINVAL;
return -1;
}
......
dlls/msvcrt/process.c
View file @ eeada568
......@@ -139,7 +139,7 @@ static intptr_t msvcrt_spawn(int flags, const wchar_t* exe, wchar_t* cmdline,
if ((unsigned)flags > MSVCRT__P_DETACH)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return -1;
}
......@@ -372,8 +372,8 @@ intptr_t CDECL _cwait(int *status, intptr_t pid, int action)
if (doserrno == ERROR_INVALID_HANDLE)
{
*MSVCRT__errno() = ECHILD;
*MSVCRT___doserrno() = doserrno;
*_errno() = ECHILD;
*__doserrno() = doserrno;
}
else
msvcrt_set_errno(doserrno);
......@@ -1191,7 +1191,7 @@ int CDECL MSVCRT__pclose(MSVCRT_FILE* file)
if(i == popen_handles_size)
{
_unlock(_POPEN_LOCK);
*MSVCRT__errno() = EBADF;
*_errno() = EBADF;
return -1;
}
......@@ -1228,7 +1228,7 @@ int CDECL _wsystem(const wchar_t* cmd)
{
if (comspec == NULL)
{
*MSVCRT__errno() = ENOENT;
*_errno() = ENOENT;
return 0;
}
HeapFree(GetProcessHeap(), 0, comspec);
......
dlls/msvcrt/string.c
View file @ eeada568
......@@ -60,7 +60,7 @@ int CDECL MSVCRT__strlwr_s_l(char *str, size_t len, _locale_t locale)
if (!str || !len)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -73,7 +73,7 @@ int CDECL MSVCRT__strlwr_s_l(char *str, size_t len, _locale_t locale)
if (!len)
{
str[0] = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -139,7 +139,7 @@ int CDECL MSVCRT__strupr_s_l(char *str, size_t len, _locale_t locale)
if (!str || !len)
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -152,7 +152,7 @@ int CDECL MSVCRT__strupr_s_l(char *str, size_t len, _locale_t locale)
if (!len)
{
str[0] = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -227,8 +227,8 @@ int CDECL MSVCRT__strnset_s(char *str, size_t size, int c, size_t count)
if(!str[i]) return 0;
str[0] = 0;
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
*MSVCRT__errno() = EINVAL;
_invalid_parameter(NULL, NULL, NULL, 0, 0);
*_errno() = EINVAL;
return EINVAL;
}
......@@ -1010,7 +1010,7 @@ static inline double strtod_helper(const char *str, char **end, _locale_t locale
if (perr) *perr = 0;
#if _MSVCR_VER == 0
else *MSVCRT__errno() = 0;
else *_errno() = 0;
#endif
if (!MSVCRT_CHECK_PMT(str != NULL)) {
......@@ -1033,7 +1033,7 @@ static inline double strtod_helper(const char *str, char **end, _locale_t locale
err = fpnum_double(&fp, &ret);
if (perr) *perr = err;
else if(err) *MSVCRT__errno() = err;
else if(err) *_errno() = err;
return ret;
}
......@@ -1411,14 +1411,14 @@ size_t CDECL MSVCRT__strxfrm_l( char *dest, const char *src,
LCMAP_SORTKEY, src, -1, NULL, 0);
if(!ret) {
if(len) dest[0] = 0;
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
return INT_MAX;
}
if(!len) return ret-1;
if(ret > len) {
dest[0] = 0;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ret-1;
}
......@@ -1579,10 +1579,10 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, _loca
if(!negative && (ret>I64_MAX/base || ret*base>I64_MAX-v)) {
ret = I64_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
} else if(negative && (ret<I64_MIN/base || ret*base<I64_MIN-v)) {
ret = I64_MIN;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
} else
ret = ret*base + v;
}
......@@ -1610,10 +1610,10 @@ int __cdecl MSVCRT__atoi_l(const char *str, _locale_t locale)
if(ret > INT_MAX) {
ret = INT_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
} else if(ret < INT_MIN) {
ret = INT_MIN;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
}
return ret;
}
......@@ -1678,10 +1678,10 @@ __msvcrt_long CDECL MSVCRT__atol_l(const char *str, _locale_t locale)
if(ret > LONG_MAX) {
ret = LONG_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
} else if(ret < LONG_MIN) {
ret = LONG_MIN;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
}
return ret;
}
......@@ -1728,10 +1728,10 @@ __msvcrt_long CDECL MSVCRT__strtol_l(const char* nptr,
if(ret > LONG_MAX) {
ret = LONG_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
} else if(ret < LONG_MIN) {
ret = LONG_MIN;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
}
return ret;
......@@ -1754,10 +1754,10 @@ __msvcrt_ulong CDECL MSVCRT_strtoul_l(const char* nptr, char** end, int base, _l
if(ret > ULONG_MAX) {
ret = ULONG_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
}else if(ret < -(__int64)ULONG_MAX) {
ret = 1;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
}
return ret;
......@@ -1828,7 +1828,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b
if(ret>UI64_MAX/base || ret*base>UI64_MAX-v) {
ret = UI64_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
} else
ret = ret*base + v;
}
......@@ -2117,7 +2117,7 @@ int CDECL MSVCRT__ultoa_s(__msvcrt_ulong value, char *str, size_t size, int radi
if (str && size)
str[0] = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -2149,7 +2149,7 @@ int CDECL MSVCRT__ultoa_s(__msvcrt_ulong value, char *str, size_t size, int radi
*p++ = *pos--;
str[0] = '\0';
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ERANGE;
}
......@@ -2171,7 +2171,7 @@ int CDECL MSVCRT__ultow_s(__msvcrt_ulong value, wchar_t *str, size_t size, int r
if (str && size)
str[0] = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -2203,7 +2203,7 @@ int CDECL MSVCRT__ultow_s(__msvcrt_ulong value, wchar_t *str, size_t size, int r
*p++ = *pos--;
str[0] = '\0';
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ERANGE;
}
......
dlls/msvcrt/thread.c
View file @ eeada568
......@@ -121,7 +121,7 @@ uintptr_t CDECL _beginthread(
trampoline = MSVCRT_malloc(sizeof(*trampoline));
if(!trampoline) {
*MSVCRT__errno() = EAGAIN;
*_errno() = EAGAIN;
return -1;
}
......@@ -129,7 +129,7 @@ uintptr_t CDECL _beginthread(
trampoline, CREATE_SUSPENDED, NULL);
if(!thread) {
MSVCRT_free(trampoline);
*MSVCRT__errno() = EAGAIN;
*_errno() = EAGAIN;
return -1;
}
......@@ -139,7 +139,7 @@ uintptr_t CDECL _beginthread(
if(ResumeThread(thread) == -1) {
MSVCRT_free(trampoline);
*MSVCRT__errno() = EAGAIN;
*_errno() = EAGAIN;
return -1;
}
......
dlls/msvcrt/time.c
View file @ eeada568
......@@ -235,7 +235,7 @@ static __time64_t mktime_helper(struct tm *mstm, BOOL local)
}
if(ret<70 || ret>1100) {
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return -1;
}
......@@ -245,7 +245,7 @@ static __time64_t mktime_helper(struct tm *mstm, BOOL local)
st.wYear = ret+1900;
if(!SystemTimeToFileTime(&st, &ft)) {
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return -1;
}
......@@ -300,7 +300,7 @@ static __time64_t mktime_helper(struct tm *mstm, BOOL local)
mstm->tm_isdst = use_dst ? 1 : 0;
if(ret < TICKS_1601_TO_1970) {
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return -1;
}
ret = (ret-TICKS_1601_TO_1970)/TICKSPERSEC;
......@@ -388,7 +388,7 @@ int CDECL _localtime64_s(struct tm *res, const __time64_t *secs)
if (res)
write_invalid_msvcrt_tm(res);
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -462,7 +462,7 @@ int CDECL _localtime32_s(struct tm *time, const __time32_t *secs)
if (time)
write_invalid_msvcrt_tm(time);
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -500,7 +500,7 @@ int CDECL MSVCRT__gmtime64_s(struct tm *res, const __time64_t *secs)
write_invalid_msvcrt_tm(res);
}
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -604,12 +604,12 @@ int CDECL _strdate_s(char* date, size_t size)
date[0] = '\0';
if(!date) {
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
if(size < 9) {
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ERANGE;
}
......@@ -635,12 +635,12 @@ int CDECL _wstrdate_s(wchar_t* date, size_t size)
date[0] = '\0';
if(!date) {
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
if(size < 9) {
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ERANGE;
}
......@@ -666,12 +666,12 @@ int CDECL _strtime_s(char* time, size_t size)
time[0] = '\0';
if(!time) {
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
if(size < 9) {
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ERANGE;
}
......@@ -697,12 +697,12 @@ int CDECL _wstrtime_s(wchar_t* time, size_t size)
time[0] = '\0';
if(!time) {
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
if(size < 9) {
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ERANGE;
}
......@@ -916,13 +916,13 @@ int CDECL MSVCRT__get_tzname(size_t *ret, char *buf, size_t bufsize, int index)
timezone = tzname_dst;
break;
default:
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
if(!ret || (!buf && bufsize > 0) || (buf && !bufsize))
{
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -963,7 +963,7 @@ static inline BOOL strftime_nstr(STRFTIME_CHAR *str, size_t *pos,
{
if(*pos >= max) {
*str = 0;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return FALSE;
}
......@@ -992,7 +992,7 @@ static inline BOOL strftime_int(STRFTIME_CHAR *str, size_t *pos, size_t max,
#endif
if(len == -1) {
*str = 0;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return FALSE;
}
......@@ -1186,7 +1186,7 @@ static size_t strftime_impl(STRFTIME_CHAR *str, size_t max,
if(!str || !format) {
if(str && max)
*str = 0;
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return 0;
}
......@@ -1513,7 +1513,7 @@ static size_t strftime_impl(STRFTIME_CHAR *str, size_t max,
if(ret == max) {
if(max)
*str = 0;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return 0;
}
......@@ -1662,7 +1662,7 @@ static char* asctime_buf(char *buf, const struct tm *mstm)
|| mstm->tm_wday<0 || mstm->tm_wday>6
|| mstm->tm_year<0 || mstm->tm_mday<0
|| mstm->tm_mday>MonthLengths[IsLeapYear(1900+mstm->tm_year)][mstm->tm_mon]) {
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return NULL;
}
......@@ -1690,7 +1690,7 @@ char * CDECL MSVCRT_asctime(const struct tm *mstm)
if (!data->asctime_buffer) {
data->asctime_buffer = MSVCRT_malloc(26);
if (!data->asctime_buffer) {
*MSVCRT__errno() = ENOMEM;
*_errno() = ENOMEM;
return NULL;
}
}
......@@ -1731,7 +1731,7 @@ wchar_t * CDECL MSVCRT__wasctime(const struct tm *mstm)
if(!data->wasctime_buffer) {
data->wasctime_buffer = MSVCRT_malloc(26*sizeof(wchar_t));
if(!data->wasctime_buffer) {
*MSVCRT__errno() = ENOMEM;
*_errno() = ENOMEM;
return NULL;
}
}
......
dlls/msvcrt/wcs.c
View file @ eeada568
......@@ -308,8 +308,8 @@ int CDECL MSVCRT__wcsnset_s( wchar_t *str, size_t size, wchar_t c, size_t count
if(!str[i]) return 0;
str[0] = 0;
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
*MSVCRT__errno() = EINVAL;
_invalid_parameter(NULL, NULL, NULL, 0, 0);
*_errno() = EINVAL;
return EINVAL;
}
......@@ -342,8 +342,8 @@ int CDECL MSVCRT__wcsset_s( wchar_t *str, size_t n, wchar_t c )
while(*p && --n) *p++ = c;
if(!n) {
str[0] = 0;
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
*MSVCRT__errno() = EINVAL;
_invalid_parameter(NULL, NULL, NULL, 0, 0);
*_errno() = EINVAL;
return EINVAL;
}
return 0;
......@@ -370,7 +370,7 @@ int CDECL MSVCRT__wcsupr_s_l( wchar_t* str, size_t n, _locale_t locale )
if (!str || !n)
{
if (str) *str = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -393,7 +393,7 @@ int CDECL MSVCRT__wcsupr_s_l( wchar_t* str, size_t n, _locale_t locale )
/* MSDN claims that the function should return and set errno to
* ERANGE, which doesn't seem to be true based on the tests. */
*str = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -434,7 +434,7 @@ int CDECL MSVCRT__wcslwr_s_l( wchar_t* str, size_t n, _locale_t locale )
if (!str || !n)
{
if (str) *str = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -457,7 +457,7 @@ int CDECL MSVCRT__wcslwr_s_l( wchar_t* str, size_t n, _locale_t locale )
/* MSDN claims that the function should return and set errno to
* ERANGE, which doesn't seem to be true based on the tests. */
*str = '\0';
*MSVCRT__errno() = EINVAL;
*_errno() = EINVAL;
return EINVAL;
}
......@@ -574,7 +574,7 @@ double CDECL MSVCRT__wcstod_l(const wchar_t* str, wchar_t** end,
if (end) *end = (p == beg ? (wchar_t*)str : (wchar_t*)p);
err = fpnum_double(&fp, &ret);
if(err) *MSVCRT__errno() = err;
if(err) *_errno() = err;
return ret;
}
......@@ -602,7 +602,7 @@ static size_t MSVCRT_wcsrtombs_l(char *mbstr, const wchar_t **wcstr,
for(i=0; i<count; i++) {
if((*wcstr)[i] > 255) {
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
return -1;
}
......@@ -618,7 +618,7 @@ static size_t MSVCRT_wcsrtombs_l(char *mbstr, const wchar_t **wcstr,
tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS,
*wcstr, -1, NULL, 0, NULL, pused_default);
if(!tmp || used_default) {
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
return -1;
}
return tmp-1;
......@@ -631,7 +631,7 @@ static size_t MSVCRT_wcsrtombs_l(char *mbstr, const wchar_t **wcstr,
size = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS,
*wcstr, 1, buf, 3, NULL, pused_default);
if(!size || used_default) {
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
return -1;
}
if(tmp+size > count)
......@@ -693,7 +693,7 @@ static int MSVCRT_wcsrtombs_s_l(size_t *ret, char *mbstr, size_t size,
if(ret)
*ret = conv+1;
if(conv == -1)
return *MSVCRT__errno();
return *_errno();
return 0;
}
......@@ -713,7 +713,7 @@ static int MSVCRT_wcsrtombs_s_l(size_t *ret, char *mbstr, size_t size,
conv = 0;
if(size)
mbstr[0] = '\0';
err = *MSVCRT__errno();
err = *_errno();
}else if(conv < size)
mbstr[conv++] = '\0';
else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0')) {
......@@ -1167,8 +1167,8 @@ int CDECL MSVCRT__vscprintf_p_l(const char *format,
ret = create_positional_ctx_a(args_ctx, format, args);
if(ret < 0) {
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
*MSVCRT__errno() = EINVAL;
_invalid_parameter(NULL, NULL, NULL, 0, 0);
*_errno() = EINVAL;
return ret;
} else if(ret == 0) {
ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale,
......@@ -1345,8 +1345,8 @@ static int MSVCRT_vswprintf_p_l_opt(wchar_t *buffer, size_t length,
ret = create_positional_ctx_w(args_ctx, format, args);
if(ret < 0) {
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
*MSVCRT__errno() = EINVAL;
_invalid_parameter(NULL, NULL, NULL, 0, 0);
*_errno() = EINVAL;
return ret;
} else if(ret == 0)
ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options,
......@@ -1724,8 +1724,8 @@ static int MSVCRT_vsprintf_p_l_opt(char *buffer, size_t length, const char *form
ret = create_positional_ctx_a(args_ctx, format, args);
if(ret < 0) {
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
*MSVCRT__errno() = EINVAL;
_invalid_parameter(NULL, NULL, NULL, 0, 0);
*_errno() = EINVAL;
return ret;
} else if(ret == 0)
ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale,
......@@ -1963,7 +1963,7 @@ int CDECL MSVCRT__wctomb_s_l(int *len, char *mbchar, size_t size,
if(wch > 0xff) {
if(mbchar && size>0)
memset(mbchar, 0, size);
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
return EILSEQ;
}
......@@ -1987,7 +1987,7 @@ int CDECL MSVCRT__wctomb_s_l(int *len, char *mbchar, size_t size,
return ERANGE;
}
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
return EILSEQ;
}
......@@ -2552,10 +2552,10 @@ __int64 CDECL MSVCRT__wcstoi64_l(const wchar_t *nptr,
if(!negative && (ret>I64_MAX/base || ret*base>I64_MAX-v)) {
ret = I64_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
} else if(negative && (ret<I64_MIN/base || ret*base<I64_MIN-v)) {
ret = I64_MIN;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
} else
ret = ret*base + v;
}
......@@ -2585,10 +2585,10 @@ __msvcrt_long CDECL MSVCRT__wcstol_l(const wchar_t *s,
if(ret > LONG_MAX) {
ret = LONG_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
}else if(ret < LONG_MIN) {
ret = LONG_MIN;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
}
return ret;
}
......@@ -2611,10 +2611,10 @@ int __cdecl MSVCRT__wtoi_l(const wchar_t *str, _locale_t locale)
if(ret > INT_MAX) {
ret = INT_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
} else if(ret < INT_MIN) {
ret = INT_MIN;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
}
return ret;
}
......@@ -2636,10 +2636,10 @@ __msvcrt_long __cdecl MSVCRT__wtol_l(const wchar_t *str, _locale_t locale)
if(ret > LONG_MAX) {
ret = LONG_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
} else if(ret < LONG_MIN) {
ret = LONG_MIN;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
}
return ret;
}
......@@ -2722,7 +2722,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const wchar_t *nptr,
if(ret>UI64_MAX/base || ret*base>UI64_MAX-v) {
ret = UI64_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
} else
ret = ret*base + v;
}
......@@ -2752,10 +2752,10 @@ __msvcrt_ulong __cdecl MSVCRT__wcstoul_l(const wchar_t *s,
if(ret > ULONG_MAX) {
ret = ULONG_MAX;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
}else if(ret < -(__int64)ULONG_MAX) {
ret = 1;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
}
return ret;
}
......@@ -2927,14 +2927,14 @@ size_t CDECL MSVCRT__wcsxfrm_l(wchar_t *dest, const wchar_t *src,
LCMAP_SORTKEY, src, -1, NULL, 0);
if(!ret) {
if(len) dest[0] = 0;
*MSVCRT__errno() = EILSEQ;
*_errno() = EILSEQ;
return INT_MAX;
}
if(!len) return ret-1;
if(ret > len) {
dest[0] = 0;
*MSVCRT__errno() = ERANGE;
*_errno() = ERANGE;
return ret-1;
}
......
dlls/msvcrtd/msvcrtd.spec
View file @ eeada568
......@@ -138,7 +138,7 @@
@ cdecl __crtGetLocaleInfoW(long long ptr long)
@ cdecl __crtLCMapStringA(long long str long ptr long long long)
@ cdecl __dllonexit(ptr ptr ptr)
@ cdecl __doserrno() MSVCRT___doserrno
@ cdecl __doserrno()
@ cdecl __fpecode()
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
......@@ -260,7 +260,7 @@
@ cdecl _endthreadex(long)
@ extern _environ MSVCRT__environ
@ cdecl _eof(long) MSVCRT__eof
@ cdecl _errno() MSVCRT__errno
@ cdecl _errno()
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@ varargs _execl(str str)
......@@ -515,7 +515,7 @@
@ cdecl _strcmpi(str str) MSVCRT__stricmp
@ cdecl _strdate(ptr) MSVCRT__strdate
@ cdecl _strdup(str) MSVCRT__strdup
@ cdecl _strerror(long) MSVCRT__strerror
@ cdecl _strerror(long)
@ cdecl _stricmp(str str) MSVCRT__stricmp
@ cdecl _stricoll(str str) MSVCRT__stricoll
@ cdecl _strlwr(str) MSVCRT__strlwr
......@@ -596,7 +596,7 @@
@ cdecl _wmkdir(wstr) MSVCRT__wmkdir
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ varargs _wopen(wstr long) MSVCRT__wopen
@ cdecl _wperror(wstr) MSVCRT__wperror
@ cdecl _wperror(wstr)
@ extern _wpgmptr MSVCRT__wpgmptr
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ cdecl _wputenv(wstr)
......@@ -735,7 +735,7 @@
@ cdecl memset(ptr long long)
@ cdecl mktime(ptr) MSVCRT_mktime
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl perror(str) MSVCRT_perror
@ cdecl perror(str)
@ cdecl pow(double double) MSVCRT_pow
@ varargs printf(str) MSVCRT_printf
@ cdecl putc(long ptr) MSVCRT_putc
......@@ -767,7 +767,7 @@
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str)
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror(long)
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
......
dlls/ucrtbase/ucrtbase.spec
View file @ eeada568
......@@ -87,7 +87,7 @@
@ cdecl __daylight() MSVCRT___p__daylight
@ stub __dcrt_get_wide_environment_from_os
@ stub __dcrt_initial_narrow_environment
@ cdecl __doserrno() MSVCRT___doserrno
@ cdecl __doserrno()
@ cdecl __dstbias() MSVCRT___p__dstbias
@ cdecl __fpe_flt_rounds()
@ cdecl __fpecode()
......@@ -175,8 +175,8 @@
@ cdecl __unDName(ptr str long ptr ptr long)
@ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@ cdecl __uncaught_exception() MSVCRT___uncaught_exception
@ cdecl __wcserror(wstr) MSVCRT___wcserror
@ cdecl __wcserror_s(ptr long wstr) MSVCRT___wcserror_s
@ cdecl __wcserror(wstr)
@ cdecl __wcserror_s(ptr long wstr)
@ stub __wcsncnt
@ cdecl -ret64 _abs64(int64)
@ cdecl _access(str long) MSVCRT__access
......@@ -270,7 +270,7 @@
@ cdecl _endthread()
@ cdecl _endthreadex(long)
@ cdecl _eof(long) MSVCRT__eof
@ cdecl _errno() MSVCRT__errno
@ cdecl _errno()
@ cdecl _except1(long long double double long ptr)
@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
......@@ -830,7 +830,7 @@
@ cdecl _o___stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf
@ cdecl _o___timezone() MSVCRT___p__timezone
@ cdecl _o___tzname() __p__tzname
@ cdecl _o___wcserror(wstr) MSVCRT___wcserror
@ cdecl _o___wcserror(wstr) __wcserror
@ cdecl _o__access(str long) MSVCRT__access
@ cdecl _o__access_s(str long) MSVCRT__access_s
@ cdecl _o__aligned_free(ptr) _aligned_free
......@@ -904,7 +904,7 @@
@ cdecl _o__endthread() _endthread
@ cdecl _o__endthreadex(long) _endthreadex
@ cdecl _o__eof(long) MSVCRT__eof
@ cdecl _o__errno() MSVCRT__errno
@ cdecl _o__errno() _errno
@ cdecl _o__except1(long long double double long ptr) _except1
@ cdecl _o__execute_onexit_table(ptr) MSVCRT__execute_onexit_table
@ cdecl _o__execv(str ptr) _execv
......@@ -1357,7 +1357,7 @@
@ cdecl _o__strdate(ptr) MSVCRT__strdate
@ cdecl _o__strdate_s(ptr long) _strdate_s
@ cdecl _o__strdup(str) MSVCRT__strdup
@ cdecl _o__strerror(long) MSVCRT__strerror
@ cdecl _o__strerror(long) _strerror
@ stub _o__strerror_s
@ cdecl _o__strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l
@ cdecl _o__stricmp(str str) MSVCRT__stricmp
......@@ -1437,8 +1437,8 @@
@ cdecl _o__wcreate_locale(long wstr) MSVCRT__wcreate_locale
@ cdecl _o__wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l
@ cdecl _o__wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _o__wcserror(long) MSVCRT__wcserror
@ cdecl _o__wcserror_s(ptr long long) MSVCRT__wcserror_s
@ cdecl _o__wcserror(long) _wcserror
@ cdecl _o__wcserror_s(ptr long long) _wcserror_s
@ cdecl _o__wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l
@ cdecl _o__wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _o__wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l
......@@ -1511,7 +1511,7 @@
@ cdecl _o__wmkdir(wstr) MSVCRT__wmkdir
@ cdecl _o__wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _o__wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ cdecl _o__wperror(wstr) MSVCRT__wperror
@ cdecl _o__wperror(wstr) _wperror
@ cdecl _o__wpopen(wstr wstr) MSVCRT__wpopen
@ cdecl _o__wputenv(wstr) _wputenv
@ cdecl _o__wputenv_s(wstr wstr) _wputenv_s
......@@ -1781,8 +1781,8 @@
@ cdecl _o_strcat_s(str long str) MSVCRT_strcat_s
@ cdecl _o_strcoll(str str) MSVCRT_strcoll
@ cdecl _o_strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl _o_strerror(long) MSVCRT_strerror
@ cdecl _o_strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl _o_strerror(long) strerror
@ cdecl _o_strerror_s(ptr long long) strerror_s
@ cdecl _o_strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl _o_strncat_s(str long str long) MSVCRT_strncat_s
@ cdecl _o_strncpy_s(ptr long str long) MSVCRT_strncpy_s
......@@ -1924,7 +1924,7 @@
@ cdecl _strdate(ptr) MSVCRT__strdate
@ cdecl _strdate_s(ptr long)
@ cdecl _strdup(str) MSVCRT__strdup
@ cdecl _strerror(long) MSVCRT__strerror
@ cdecl _strerror(long)
@ stub _strerror_s
@ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l
@ cdecl _stricmp(str str) MSVCRT__stricmp
......@@ -2014,8 +2014,8 @@
@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale
@ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcserror(long) MSVCRT__wcserror
@ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s
@ cdecl _wcserror(long)
@ cdecl _wcserror_s(ptr long long)
@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l
......@@ -2097,7 +2097,7 @@
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ varargs _wopen(wstr long) MSVCRT__wopen
@ cdecl _wperror(wstr) MSVCRT__wperror
@ cdecl _wperror(wstr)
@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen
@ cdecl _wputenv(wstr)
@ cdecl _wputenv_s(wstr wstr)
......@@ -2444,7 +2444,7 @@
@ stub norm
@ stub normf
@ stub norml
@ cdecl perror(str) MSVCRT_perror
@ cdecl perror(str)
@ cdecl pow(double double) MSVCRT_pow
@ cdecl -arch=!i386 powf(float float) MSVCRT_powf
@ cdecl putc(long ptr) MSVCRT_putc
......@@ -2502,8 +2502,8 @@
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strerror(long)
@ cdecl strerror_s(ptr long long)
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
......
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