Piotr Caban : msvcrt: Remove no longer needed exports.
Alexandre Julliard
julliard at winehq.org
Mon Apr 21 12:36:55 CDT 2014
Module: wine
Branch: master
Commit: 49e503c55ad8b9c8c681b7f7f672b1c4f606b56f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e503c55ad8b9c8c681b7f7f672b1c4f606b56f
Author: Piotr Caban <piotr at codeweavers.com>
Date: Mon Apr 21 13:08:20 2014 +0200
msvcrt: Remove no longer needed exports.
---
dlls/msvcr100/msvcr100.spec | 4 ++--
dlls/msvcr110/msvcr110.spec | 4 ++--
dlls/msvcr70/msvcr70.spec | 4 ++--
dlls/msvcr71/msvcr71.spec | 4 ++--
dlls/msvcr80/msvcr80.spec | 4 ++--
dlls/msvcr90/msvcr90.spec | 4 ++--
dlls/msvcrt/mbcs.c | 7 ++----
dlls/msvcrt/msvcrt.spec | 53 -------------------------------------------
dlls/msvcrt/string.c | 6 +++--
9 files changed, 18 insertions(+), 72 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 71c03fc..6a9461b 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1186,7 +1186,7 @@
@ stub _mbsspnp_l
@ cdecl _mbsstr(str str)
@ stub _mbsstr_l
-@ cdecl _mbstok(str str) MSVCR100__mbstok
+@ cdecl _mbstok(str str)
@ cdecl _mbstok_l(str str ptr)
@ cdecl _mbstok_s(str str ptr)
@ cdecl _mbstok_s_l(str str ptr ptr)
@@ -1633,7 +1633,7 @@
@ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f
@ cdecl atexit(ptr) MSVCRT_atexit
@ cdecl atof(str) MSVCRT_atof
-@ cdecl atoi(str) MSVCR100_atoi
+@ cdecl atoi(str) MSVCRT_atoi
@ cdecl atol(str) ntdll.atol
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 0744c40..68b48b7 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1544,7 +1544,7 @@
@ stub _mbsspnp_l
@ cdecl _mbsstr(str str)
@ stub _mbsstr_l
-@ cdecl _mbstok(str str) MSVCR100__mbstok
+@ cdecl _mbstok(str str)
@ cdecl _mbstok_l(str str ptr)
@ cdecl _mbstok_s(str str ptr)
@ cdecl _mbstok_s_l(str str ptr ptr)
@@ -1991,7 +1991,7 @@
@ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f
@ cdecl atexit(ptr) MSVCRT_atexit
@ cdecl atof(str) MSVCRT_atof
-@ cdecl atoi(str) MSVCR100_atoi
+@ cdecl atoi(str) MSVCRT_atoi
@ cdecl atol(str) ntdll.atol
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index 5d83cb5..cf3e236 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -468,7 +468,7 @@
@ cdecl _mbsspn(str str)
@ cdecl _mbsspnp(str str)
@ cdecl _mbsstr(str str)
-@ cdecl _mbstok(str str) MSVCR100__mbstok
+@ cdecl _mbstok(str str)
@ cdecl _mbstrlen(str)
@ cdecl _mbsupr(str)
@ cdecl _memccpy(ptr ptr long long) ntdll._memccpy
@@ -688,7 +688,7 @@
@ cdecl atan2(double double) MSVCRT_atan2
@ cdecl atexit(ptr) MSVCRT_atexit
@ cdecl atof(str) MSVCRT_atof
-@ cdecl atoi(str) MSVCR100_atoi
+@ cdecl atoi(str) MSVCRT_atoi
@ cdecl atol(str) ntdll.atol
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
@ cdecl calloc(long long) MSVCRT_calloc
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index 2252b3a..2912b2d 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -463,7 +463,7 @@
@ cdecl _mbsspn(str str)
@ cdecl _mbsspnp(str str)
@ cdecl _mbsstr(str str)
-@ cdecl _mbstok(str str) MSVCR100__mbstok
+@ cdecl _mbstok(str str)
@ cdecl _mbstrlen(str)
@ cdecl _mbsupr(str)
@ cdecl _memccpy(ptr ptr long long) ntdll._memccpy
@@ -684,7 +684,7 @@
@ cdecl atan2(double double) MSVCRT_atan2
@ cdecl atexit(ptr) MSVCRT_atexit
@ cdecl atof(str) MSVCRT_atof
-@ cdecl atoi(str) MSVCR100_atoi
+@ cdecl atoi(str) MSVCRT_atoi
@ cdecl atol(str) ntdll.atol
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
@ cdecl calloc(long long) MSVCRT_calloc
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 19774cc..105970a 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -858,7 +858,7 @@
@ stub _mbsspnp_l
@ cdecl _mbsstr(str str)
@ stub _mbsstr_l
-@ cdecl _mbstok(str str) MSVCR100__mbstok
+@ cdecl _mbstok(str str)
@ cdecl _mbstok_l(str str ptr)
@ cdecl _mbstok_s(str str ptr)
@ cdecl _mbstok_s_l(str str ptr ptr)
@@ -1315,7 +1315,7 @@
@ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f
@ cdecl atexit(ptr) MSVCRT_atexit
@ cdecl atof(str) MSVCRT_atof
-@ cdecl atoi(str) MSVCR100_atoi
+@ cdecl atoi(str) MSVCRT_atoi
@ cdecl atol(str) ntdll.atol
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 8059939..20260e2 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -836,7 +836,7 @@
@ stub _mbsspnp_l
@ cdecl _mbsstr(str str)
@ stub _mbsstr_l
-@ cdecl _mbstok(str str) MSVCR100__mbstok
+@ cdecl _mbstok(str str)
@ cdecl _mbstok_l(str str ptr)
@ cdecl _mbstok_s(str str ptr)
@ cdecl _mbstok_s_l(str str ptr ptr)
@@ -1288,7 +1288,7 @@
@ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf
@ cdecl atexit(ptr) MSVCRT_atexit
@ cdecl atof(str) MSVCRT_atof
-@ cdecl atoi(str) MSVCR100_atoi
+@ cdecl atoi(str) MSVCRT_atoi
@ cdecl atol(str) ntdll.atol
@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 512f59a..60464c3 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -1151,17 +1151,14 @@ unsigned char* CDECL _mbstok(unsigned char *str, const unsigned char *delim)
{
thread_data_t *data = msvcrt_get_thread_data();
+#if _MSVCR_VER == 0
if(!str && !data->mbstok_next)
return NULL;
+#endif
return _mbstok_s_l(str, delim, &data->mbstok_next, NULL);
}
-unsigned char* CDECL MSVCR100__mbstok(unsigned char *str, const unsigned char *delim)
-{
- return _mbstok_l(str, delim, NULL);
-}
-
/*********************************************************************
* _mbbtombc(MSVCRT.@)
*/
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index c04cee3..739914a 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -1517,56 +1517,3 @@
@ varargs wprintf_s(wstr) MSVCRT_wprintf_s
@ varargs wscanf(wstr) MSVCRT_wscanf
@ varargs wscanf_s(wstr) MSVCRT_wscanf_s
-
-# Functions not exported in native dll:
-@ cdecl ___mb_cur_max_l_func(ptr)
-@ cdecl -arch=i386 __control87_2(long long ptr ptr)
-@ cdecl _configthreadlocale(long)
-@ cdecl _dupenv_s(ptr ptr str)
-@ cdecl _get_invalid_parameter_handler()
-@ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior
-@ cdecl _set_invalid_parameter_handler(ptr)
-@ cdecl _set_purecall_handler(ptr)
-@ cdecl _set_security_error_handler(ptr)
-@ cdecl __security_error_handler(long ptr)
-@ cdecl -arch=i386 _statusfp2(ptr ptr)
-@ cdecl _wdupenv_s(ptr ptr wstr)
-@ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
-@ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
-@ cdecl _getptd()
-@ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
-@ cdecl _fstat32(long ptr) MSVCRT__fstat32
-@ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32
-@ cdecl _is_exception_typeof(ptr ptr)
-@ cdecl -arch=i386 __libm_sse2_sqrt_precise()
-@ cdecl wmemmove_s(ptr long ptr long)
-@ cdecl wmemcpy_s(ptr long ptr long)
-@ cdecl _encoded_null()
-@ cdecl _invalid_parameter_noinfo()
-@ cdecl __sys_nerr()
-@ cdecl __sys_errlist()
-@ cdecl __clean_type_info_names_internal(ptr)
-@ cdecl _recalloc(ptr long long)
-@ cdecl _stat32(str ptr) MSVCRT__stat32
-@ cdecl _stat32i64(str ptr) MSVCRT__stat32i64
-@ cdecl _stat64i32(str ptr) MSVCRT__stat64i32
-@ cdecl _wstat32(wstr ptr) MSVCRT__wstat32
-@ cdecl _wstat32i64(wstr ptr) MSVCRT__wstat32i64
-@ cdecl _wstat64i32(wstr ptr) MSVCRT__wstat64i32
-@ cdecl _atoflt(ptr str) MSVCRT__atoflt
-@ cdecl -arch=arm ?_name_internal_method at type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
-@ thiscall -arch=i386 ?_name_internal_method at type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
-@ cdecl -arch=win64 ?_name_internal_method at type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
-@ cdecl _CRT_RTC_INIT(ptr ptr long long long)
-@ cdecl _CRT_RTC_INITW(ptr ptr long long long)
-@ cdecl _byteswap_uint64(int64)
-@ cdecl _byteswap_ulong(long) MSVCRT__byteswap_ulong
-@ cdecl _byteswap_ushort(long)
-@ cdecl _aligned_msize(ptr long long)
-@ cdecl _get_daylight(ptr)
-@ cdecl _get_timezone(ptr)
-@ varargs _sprintf_p(ptr long str) MSVCRT__sprintf_p
-@ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p
-@ cdecl _vswprintf_p(ptr long wstr ptr) MSVCRT__vswprintf_p
-@ cdecl MSVCR100_atoi(str)
-@ cdecl MSVCR100__mbstok(str str)
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index 160bafe..e1a14ac 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -862,6 +862,7 @@ int __cdecl MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale)
/*********************************************************************
* atoi (MSVCRT.@)
*/
+#if _MSVCR_VER == 0
int __cdecl MSVCRT_atoi(const char *str)
{
BOOL minus = FALSE;
@@ -886,11 +887,12 @@ int __cdecl MSVCRT_atoi(const char *str)
return minus ? -ret : ret;
}
-
-int CDECL MSVCR100_atoi(const char *str)
+#else
+int CDECL MSVCRT_atoi(const char *str)
{
return MSVCRT__atoi_l(str, NULL);
}
+#endif
/******************************************************************
* strtol (MSVCRT.@)
More information about the wine-cvs
mailing list