Module: wine Branch: master Commit: b9b26926956ab2547654539aabf5b33dc0e19d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b26926956ab2547654539aab...
Author: Francois Gouget fgouget@free.fr Date: Thu Jun 28 17:03:57 2012 +0200
msvcp60: Remove unused functions.
---
dlls/msvcp60/main.c | 21 ------------ dlls/msvcp60/misc.c | 82 ------------------------------------------------- dlls/msvcp60/string.c | 6 --- 3 files changed, 0 insertions(+), 109 deletions(-)
diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 1dd6a49..f848a30 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -98,24 +98,3 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
return TRUE; } - -/* ?_BADOFF@std@@3JB -> long const std::_BADOFF */ -/* ?_BADOFF@std@@3_JB -> __int64 const std::_BADOFF */ -const INT_PTR std_BADOFF = -1; - -/* ?_BADOFF_func@std@@YAABJXZ -> long const & __cdecl std::_BADOFF_func(void) */ -/* ?_BADOFF_func@std@@YAAEB_JXZ -> __int64 const & __ptr64 __cdecl std::_BADOFF_func(void) */ -const INT_PTR * __cdecl std_BADOFF_func(void) -{ - return &std_BADOFF; -} - -/* ?_Fpz@std@@3_JA __int64 std::_Fpz */ -__int64 std_Fpz = 0; - -/* ?_Fpz_func@std@@YAAA_JXZ -> __int64 & __cdecl std::_Fpz_func(void) */ -/* ?_Fpz_func@std@@YAAEA_JXZ -> __int64 & __ptr64 __cdecl std::_Fpz_func(void) */ -__int64 * __cdecl std_Fpz_func(void) -{ - return &std_Fpz; -} diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 7fd234f..5390deb 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -61,34 +61,6 @@ void __thiscall mutex_unlock(mutex *this) ReleaseMutex(this->mutex); }
-/* ?_Mutex_Lock@_Mutex@std@@CAXPAV12@@Z */ -/* ?_Mutex_Lock@_Mutex@std@@CAXPEAV12@@Z */ -void CDECL mutex_mutex_lock(mutex *m) -{ - mutex_lock(m); -} - -/* ?_Mutex_Unlock@_Mutex@std@@CAXPAV12@@Z */ -/* ?_Mutex_Unlock@_Mutex@std@@CAXPEAV12@@Z */ -void CDECL mutex_mutex_unlock(mutex *m) -{ - mutex_unlock(m); -} - -/* ?_Mutex_ctor@_Mutex@std@@CAXPAV12@@Z */ -/* ?_Mutex_ctor@_Mutex@std@@CAXPEAV12@@Z */ -void CDECL mutex_mutex_ctor(mutex *m) -{ - mutex_ctor(m); -} - -/* ?_Mutex_dtor@_Mutex@std@@CAXPAV12@@Z */ -/* ?_Mutex_dtor@_Mutex@std@@CAXPEAV12@@Z */ -void CDECL mutex_mutex_dtor(mutex *m) -{ - mutex_dtor(m); -} - static CRITICAL_SECTION lockit_cs;
void init_lockit(void) { @@ -122,57 +94,3 @@ void __thiscall _Lockit_dtor(_Lockit *this) { LeaveCriticalSection(&lockit_cs); } - -/* wctype */ -unsigned short __cdecl wctype(const char *property) -{ - static const struct { - const char *name; - unsigned short mask; - } properties[] = { - { "alnum", _DIGIT|_ALPHA }, - { "alpha", _ALPHA }, - { "cntrl", _CONTROL }, - { "digit", _DIGIT }, - { "graph", _DIGIT|_PUNCT|_ALPHA }, - { "lower", _LOWER }, - { "print", _DIGIT|_PUNCT|_BLANK|_ALPHA }, - { "punct", _PUNCT }, - { "space", _SPACE }, - { "upper", _UPPER }, - { "xdigit", _HEX } - }; - int i; - - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) - if(!strcmp(property, properties[i].name)) - return properties[i].mask; - - return 0; -} - -typedef void (__cdecl *MSVCP_new_handler_func)(void); -static MSVCP_new_handler_func MSVCP_new_handler; -static int __cdecl new_handler_wrapper(MSVCP_size_t unused) -{ - MSVCP_new_handler(); - return 1; -} - -/* ?set_new_handler@std@@YAP6AXXZP6AXXZ@Z */ -MSVCP_new_handler_func __cdecl set_new_handler(MSVCP_new_handler_func new_handler) -{ - MSVCP_new_handler_func old_handler = MSVCP_new_handler; - - TRACE("%p\n", new_handler); - - MSVCP_new_handler = new_handler; - MSVCRT_set_new_handler(new_handler ? new_handler_wrapper : NULL); - return old_handler; -} - -/* ?set_new_handler@std@@YAP6AXXZH@Z */ -MSVCP_new_handler_func __cdecl set_new_handler_reset(int unused) -{ - return set_new_handler(NULL); -} diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 3138d06..a935de1 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -2154,12 +2154,6 @@ basic_string_wchar* __thiscall basic_string_wchar_ctor_cstr_alloc( return this; }
-basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr( - basic_string_wchar *this, const wchar_t *str) -{ - return basic_string_wchar_ctor_cstr_alloc(this, str, NULL); -} - /* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@IGABV?$allocator@G@1@@Z */ /* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@_KGAEBV?$allocator@G@1@@Z */ DEFINE_THISCALL_WRAPPER(basic_string_wchar_ctor_ch_alloc, 16)