Skip to content

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

msvcp71: Removed unused functions.

parent e0936fee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 327 deletions
dlls/msvcp71/cxx.h
View file @ 06d5c487
...@@ -211,8 +211,6 @@ extern void *vtbl_wrapper_40; ...@@ -211,8 +211,6 @@ extern void *vtbl_wrapper_40;
extern void *vtbl_wrapper_44; extern void *vtbl_wrapper_44;
extern void *vtbl_wrapper_48; extern void *vtbl_wrapper_48;
extern void *vtbl_wrapper_52; extern void *vtbl_wrapper_52;
extern void *vtbl_wrapper_56;
extern void *vtbl_wrapper_60;
#else #else
......
dlls/msvcp71/exception.c
View file @ 06d5c487
...@@ -98,8 +98,7 @@ void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int fl ...@@ -98,8 +98,7 @@ void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int fl
DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ); DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" );
DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor, 8) static exception* MSVCP_exception_ctor(exception *this, const char **name)
exception* __thiscall MSVCP_exception_ctor(exception *this, const char **name)
{ {
TRACE("(%p %s)\n", this, *name); TRACE("(%p %s)\n", this, *name);
...@@ -189,8 +188,7 @@ static const cxx_exception_type exception_cxx_type = { ...@@ -189,8 +188,7 @@ static const cxx_exception_type exception_cxx_type = {
/* bad_alloc class data */ /* bad_alloc class data */
typedef exception bad_alloc; typedef exception bad_alloc;
DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_ctor, 8) static bad_alloc* MSVCP_bad_alloc_ctor(bad_alloc *this, const char **name)
bad_alloc* __thiscall MSVCP_bad_alloc_ctor(bad_alloc *this, const char **name)
{ {
TRACE("%p %s\n", this, *name); TRACE("%p %s\n", this, *name);
MSVCP_exception_ctor(this, name); MSVCP_exception_ctor(this, name);
...@@ -273,8 +271,7 @@ typedef struct _logic_error { ...@@ -273,8 +271,7 @@ typedef struct _logic_error {
basic_string_char str; basic_string_char str;
} logic_error; } logic_error;
DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_ctor, 8) static logic_error* MSVCP_logic_error_ctor(
logic_error* __thiscall MSVCP_logic_error_ctor(
logic_error *this, const char **name) logic_error *this, const char **name)
{ {
TRACE("%p %s\n", this, *name); TRACE("%p %s\n", this, *name);
...@@ -361,8 +358,7 @@ static const cxx_exception_type logic_error_cxx_type = { ...@@ -361,8 +358,7 @@ static const cxx_exception_type logic_error_cxx_type = {
/* length_error class data */ /* length_error class data */
typedef logic_error length_error; typedef logic_error length_error;
DEFINE_THISCALL_WRAPPER(MSVCP_length_error_ctor, 8) static length_error* MSVCP_length_error_ctor(
length_error* __thiscall MSVCP_length_error_ctor(
length_error *this, const char **name) length_error *this, const char **name)
{ {
TRACE("%p %s\n", this, *name); TRACE("%p %s\n", this, *name);
...@@ -410,8 +406,7 @@ static const cxx_exception_type length_error_cxx_type = { ...@@ -410,8 +406,7 @@ static const cxx_exception_type length_error_cxx_type = {
/* out_of_range class data */ /* out_of_range class data */
typedef logic_error out_of_range; typedef logic_error out_of_range;
DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_ctor, 8) static out_of_range* MSVCP_out_of_range_ctor(
out_of_range* __thiscall MSVCP_out_of_range_ctor(
out_of_range *this, const char **name) out_of_range *this, const char **name)
{ {
TRACE("%p %s\n", this, *name); TRACE("%p %s\n", this, *name);
...@@ -459,8 +454,7 @@ static const cxx_exception_type out_of_range_cxx_type = { ...@@ -459,8 +454,7 @@ static const cxx_exception_type out_of_range_cxx_type = {
/* invalid_argument class data */ /* invalid_argument class data */
typedef logic_error invalid_argument; typedef logic_error invalid_argument;
DEFINE_THISCALL_WRAPPER(MSVCP_invalid_argument_ctor, 8) static invalid_argument* MSVCP_invalid_argument_ctor(
invalid_argument* __thiscall MSVCP_invalid_argument_ctor(
invalid_argument *this, const char **name) invalid_argument *this, const char **name)
{ {
TRACE("%p %s\n", this, *name); TRACE("%p %s\n", this, *name);
...@@ -511,8 +505,7 @@ typedef struct { ...@@ -511,8 +505,7 @@ typedef struct {
basic_string_char str; basic_string_char str;
} runtime_error; } runtime_error;
DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_ctor, 8) static runtime_error* MSVCP_runtime_error_ctor(
runtime_error* __thiscall MSVCP_runtime_error_ctor(
runtime_error *this, const char **name) runtime_error *this, const char **name)
{ {
TRACE("%p %s\n", this, *name); TRACE("%p %s\n", this, *name);
...@@ -599,8 +592,7 @@ static const cxx_exception_type runtime_error_cxx_type = { ...@@ -599,8 +592,7 @@ static const cxx_exception_type runtime_error_cxx_type = {
/* failure class data */ /* failure class data */
typedef runtime_error failure; typedef runtime_error failure;
DEFINE_THISCALL_WRAPPER(MSVCP_failure_ctor, 8) static failure* MSVCP_failure_ctor(
failure* __thiscall MSVCP_failure_ctor(
failure *this, const char **name) failure *this, const char **name)
{ {
TRACE("%p %s\n", this, *name); TRACE("%p %s\n", this, *name);
......
dlls/msvcp71/memory.c
View file @ 06d5c487
...@@ -26,142 +26,32 @@ ...@@ -26,142 +26,32 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
/* ?address@?$allocator@D@std@@QBEPADAAD@Z */
/* ?address@?$allocator@D@std@@QEBAPEADAEAD@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_address, 8)
char* __thiscall MSVCP_allocator_char_address(void *this, char *ptr)
{
return ptr;
}
/* ?address@?$allocator@D@std@@QBEPBDABD@Z */
/* ?address@?$allocator@D@std@@QEBAPEBDAEBD@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_const_address, 8)
const char* __thiscall MSVCP_allocator_char_const_address(void *this, const char *ptr)
{
return ptr;
}
/* ??0?$allocator@D@std@@QAE@XZ */
/* ??0?$allocator@D@std@@QEAA@XZ */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_ctor, 4)
void* __thiscall MSVCP_allocator_char_ctor(void *this)
{
return this;
}
/* ??0?$allocator@D@std@@QAE@ABV01@@Z */
/* ??0?$allocator@D@std@@QEAA@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_copy_ctor, 8)
void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, const void *copy)
{
return this;
}
/* ??4?$allocator@D@std@@QAEAAV01@ABV01@@Z */
/* ??4?$allocator@D@std@@QEAAAEAV01@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8)
void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign)
{
return this;
}
/* ?deallocate@?$allocator@D@std@@QAEXPADI@Z */ /* ?deallocate@?$allocator@D@std@@QAEXPADI@Z */
/* ?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z */ /* ?deallocate@?$allocator@D@std@@QEAAXPEAD_K@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12) void MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_size_t size)
void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_size_t size)
{ {
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
} }
/* ?allocate@?$allocator@D@std@@QAEPADI@Z */ /* ?allocate@?$allocator@D@std@@QAEPADI@Z */
/* ?allocate@?$allocator@D@std@@QEAAPEAD_K@Z */ /* ?allocate@?$allocator@D@std@@QEAAPEAD_K@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8) char* MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count)
char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count)
{ {
return MSVCRT_operator_new(count); return MSVCRT_operator_new(count);
} }
/* ?allocate@?$allocator@D@std@@QAEPADIPBX@Z */
/* ?allocate@?$allocator@D@std@@QEAAPEAD_KPEBX@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate_hint, 12)
char* __thiscall MSVCP_allocator_char_allocate_hint(void *this,
MSVCP_size_t count, const void *hint)
{
/* Native ignores hint */
return MSVCP_allocator_char_allocate(this, count);
}
/* ?construct@?$allocator@D@std@@QAEXPADABD@Z */
/* ?construct@?$allocator@D@std@@QEAAXPEADAEBD@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_construct, 12)
void __thiscall MSVCP_allocator_char_construct(void *this, char *ptr, const char *val)
{
*ptr = *val;
}
/* ?destroy@?$allocator@D@std@@QAEXPAD@Z */
/* ?destroy@?$allocator@D@std@@QEAAXPEAD@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_destroy, 8)
void __thiscall MSVCP_allocator_char_destroy(void *this, char *ptr)
{
}
/* ?max_size@?$allocator@D@std@@QBEIXZ */ /* ?max_size@?$allocator@D@std@@QBEIXZ */
/* ?max_size@?$allocator@D@std@@QEBA_KXZ */ /* ?max_size@?$allocator@D@std@@QEBA_KXZ */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4) MSVCP_size_t MSVCP_allocator_char_max_size(void *this)
MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void *this)
{ {
return UINT_MAX/sizeof(char); return UINT_MAX/sizeof(char);
} }
/* allocator<wchar_t> */ /* allocator<wchar_t> */
/* ?address@?$allocator@_W@std@@QBEPA_WAA_W@Z */
/* ?address@?$allocator@_W@std@@QEBAPEA_WAEA_W@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_address, 8)
wchar_t* __thiscall MSVCP_allocator_wchar_address(void *this, wchar_t *ptr)
{
return ptr;
}
/* ?address@?$allocator@_W@std@@QBEPB_WAB_W@Z */
/* ?address@?$allocator@_W@std@@QEBAPEB_WAEB_W@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_const_address, 8)
const wchar_t* __thiscall MSVCP_allocator_wchar_const_address(void *this, const wchar_t *ptr)
{
return ptr;
}
/* ??0?$allocator@_W@std@@QAE@XZ */
/* ??0?$allocator@_W@std@@QEAA@XZ */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_ctor, 4)
void* __thiscall MSVCP_allocator_wchar_ctor(void *this)
{
return this;
}
/* ??0?$allocator@_W@std@@QAE@ABV01@@Z */
/* ??0?$allocator@_W@std@@QEAA@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_copy_ctor, 8)
void* __thiscall MSVCP_allocator_wchar_copy_ctor(void *this, void *copy)
{
return this;
}
/* ??4?$allocator@_W@std@@QAEAAV01@ABV01@@Z */
/* ??4?$allocator@_W@std@@QEAAAEAV01@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_assign, 8)
void* __thiscall MSVCP_allocator_wchar_assign(void *this, void *assign)
{
return this;
}
/* ?deallocate@?$allocator@_W@std@@QAEXPA_WI@Z */ /* ?deallocate@?$allocator@_W@std@@QAEXPA_WI@Z */
/* ?deallocate@?$allocator@_W@std@@QEAAXPEA_W_K@Z */ /* ?deallocate@?$allocator@_W@std@@QEAAXPEA_W_K@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_deallocate, 12) void MSVCP_allocator_wchar_deallocate(void *this,
void __thiscall MSVCP_allocator_wchar_deallocate(void *this,
wchar_t *ptr, MSVCP_size_t size) wchar_t *ptr, MSVCP_size_t size)
{ {
MSVCRT_operator_delete(ptr); MSVCRT_operator_delete(ptr);
...@@ -169,8 +59,7 @@ void __thiscall MSVCP_allocator_wchar_deallocate(void *this, ...@@ -169,8 +59,7 @@ void __thiscall MSVCP_allocator_wchar_deallocate(void *this,
/* ?allocate@?$allocator@_W@std@@QAEPA_WI@Z */ /* ?allocate@?$allocator@_W@std@@QAEPA_WI@Z */
/* ?allocate@?$allocator@_W@std@@QEAAPEA_W_K@Z */ /* ?allocate@?$allocator@_W@std@@QEAAPEA_W_K@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_allocate, 8) wchar_t* MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t count)
wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t count)
{ {
if(UINT_MAX/count < sizeof(wchar_t)) { if(UINT_MAX/count < sizeof(wchar_t)) {
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
...@@ -180,138 +69,13 @@ wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t coun ...@@ -180,138 +69,13 @@ wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t coun
return MSVCRT_operator_new(count * sizeof(wchar_t)); return MSVCRT_operator_new(count * sizeof(wchar_t));
} }
/* ?allocate@?$allocator@_W@std@@QAEPA_WIPBX@Z */
/* ?allocate@?$allocator@_W@std@@QEAAPEA_W_KPEBX@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_allocate_hint, 12)
wchar_t* __thiscall MSVCP_allocator_wchar_allocate_hint(void *this,
MSVCP_size_t count, const void *hint)
{
return MSVCP_allocator_wchar_allocate(this, count);
}
/* ?construct@?$allocator@_W@std@@QAEXPA_WAB_W@Z */
/* ?construct@?$allocator@_W@std@@QEAAXPEA_WAEB_W@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_construct, 12)
void __thiscall MSVCP_allocator_wchar_construct(void *this,
wchar_t *ptr, const wchar_t *val)
{
*ptr = *val;
}
/* ?destroy@?$allocator@_W@std@@QAEXPA_W@Z */
/* ?destroy@?$allocator@_W@std@@QEAAXPEA_W@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_destroy, 8)
void __thiscall MSVCP_allocator_wchar_destroy(void *this, char *ptr)
{
}
/* ?max_size@?$allocator@_W@std@@QBEIXZ */ /* ?max_size@?$allocator@_W@std@@QBEIXZ */
/* ?max_size@?$allocator@_W@std@@QEBA_KXZ */ /* ?max_size@?$allocator@_W@std@@QEBA_KXZ */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_max_size, 4) MSVCP_size_t MSVCP_allocator_wchar_max_size(void *this)
MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(void *this)
{ {
return UINT_MAX/sizeof(wchar_t); return UINT_MAX/sizeof(wchar_t);
} }
/* allocator<unsigned short> */
/* ?address@?$allocator@G@std@@QBEPAGAAG@Z */
/* ?address@?$allocator@G@std@@QEBAPEAGAEAG@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_address, 8)
unsigned short* __thiscall MSVCP_allocator_short_address(
void *this, unsigned short *ptr)
{
return ptr;
}
/* ?address@?$allocator@G@std@@QBEPBGABG@Z */
/* ?address@?$allocator@G@std@@QEBAPEBGAEBG@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_const_address, 8)
const unsigned short* __thiscall MSVCP_allocator_short_const_address(
void *this, const unsigned short *ptr)
{
return ptr;
}
/* ??0?$allocator@G@std@@QAE@XZ */
/* ??0?$allocator@G@std@@QEAA@XZ */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_ctor, 4)
void* __thiscall MSVCP_allocator_short_ctor(void *this)
{
return this;
}
/* ??0?$allocator@G@std@@QAE@ABV01@@Z */
/* ??0?$allocator@G@std@@QEAA@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_copy_ctor, 8)
void* __thiscall MSVCP_allocator_short_copy_ctor(void *this, void *copy)
{
return this;
}
/* ??4?$allocator@G@std@@QAEAAV01@ABV01@@Z */
/* ??4?$allocator@G@std@@QEAAAEAV01@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_assign, 8)
void* __thiscall MSVCP_allocator_short_assign(void *this, void *assign)
{
return this;
}
/* ?deallocate@?$allocator@G@std@@QAEXPAGI@Z */
/* ?deallocate@?$allocator@G@std@@QEAAXPEAG_K@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_deallocate, 12)
void __thiscall MSVCP_allocator_short_deallocate(void *this,
unsigned short *ptr, MSVCP_size_t size)
{
MSVCRT_operator_delete(ptr);
}
/* ?allocate@?$allocator@G@std@@QAEPAGI@Z */
/* ?allocate@?$allocator@G@std@@QEAAPEAG_K@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_allocate, 8)
unsigned short* __thiscall MSVCP_allocator_short_allocate(
void *this, MSVCP_size_t count)
{
if(UINT_MAX/count < sizeof(unsigned short)) {
throw_exception(EXCEPTION_BAD_ALLOC, NULL);
return NULL;
}
return MSVCRT_operator_new(count * sizeof(unsigned short));
}
/* ?allocate@?$allocator@G@std@@QAEPAGIPBX@Z */
/* ?allocate@?$allocator@G@std@@QEAAPEAG_KPEBX@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_allocate_hint, 12)
unsigned short* __thiscall MSVCP_allocator_short_allocate_hint(
void *this, MSVCP_size_t count, const void *hint)
{
return MSVCP_allocator_short_allocate(this, count);
}
/* ?construct@?$allocator@G@std@@QAEXPAGABG@Z */
/* ?construct@?$allocator@G@std@@QEAAXPEAGAEBG@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_construct, 12)
void __thiscall MSVCP_allocator_short_construct(void *this,
unsigned short *ptr, unsigned short *val)
{
*ptr = *val;
}
/* ?destroy@?$allocator@G@std@@QAEXPAG@Z */
/* ?destroy@?$allocator@G@std@@QEAAXPEAG@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_destroy, 8)
void __thiscall MSVCP_allocator_short_destroy(void *this, MSVCP_size_t *ptr)
{
}
/* ?max_size@?$allocator@G@std@@QBEIXZ */
/* ?max_size@?$allocator@G@std@@QEBA_KXZ */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_max_size, 4)
MSVCP_size_t __thiscall MSVCP_allocator_short_max_size(void *this)
{
return UINT_MAX/sizeof(unsigned short);
}
/* allocator<void> */ /* allocator<void> */
/* ??0?$allocator@X@std@@QAE@XZ */ /* ??0?$allocator@X@std@@QAE@XZ */
/* ??0?$allocator@X@std@@QEAA@XZ */ /* ??0?$allocator@X@std@@QEAA@XZ */
......
dlls/msvcp71/misc.c
View file @ 06d5c487
...@@ -61,44 +61,16 @@ void __thiscall mutex_unlock(mutex *this) ...@@ -61,44 +61,16 @@ void __thiscall mutex_unlock(mutex *this)
ReleaseMutex(this->mutex); 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[_MAX_LOCK]; static CRITICAL_SECTION lockit_cs[_MAX_LOCK];
/* ?_Lockit_ctor@_Lockit@std@@SAXH@Z */ /* ?_Lockit_ctor@_Lockit@std@@SAXH@Z */
void __cdecl _Lockit_init(int locktype) { static void _Lockit_init(int locktype) {
InitializeCriticalSection(&lockit_cs[locktype]); InitializeCriticalSection(&lockit_cs[locktype]);
lockit_cs[locktype].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); lockit_cs[locktype].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section");
} }
/* ?_Lockit_dtor@_Lockit@std@@SAXH@Z */ /* ?_Lockit_dtor@_Lockit@std@@SAXH@Z */
void __cdecl _Lockit_free(int locktype) static void _Lockit_free(int locktype)
{ {
lockit_cs[locktype].DebugInfo->Spare[0] = 0; lockit_cs[locktype].DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&lockit_cs[locktype]); DeleteCriticalSection(&lockit_cs[locktype]);
...@@ -120,19 +92,12 @@ void free_lockit(void) { ...@@ -120,19 +92,12 @@ void free_lockit(void) {
/* ?_Lockit_ctor@_Lockit@std@@CAXPAV12@H@Z */ /* ?_Lockit_ctor@_Lockit@std@@CAXPAV12@H@Z */
/* ?_Lockit_ctor@_Lockit@std@@CAXPEAV12@H@Z */ /* ?_Lockit_ctor@_Lockit@std@@CAXPEAV12@H@Z */
void __cdecl _Lockit__Lockit_ctor_locktype(_Lockit *lockit, int locktype) static void _Lockit__Lockit_ctor_locktype(_Lockit *lockit, int locktype)
{ {
lockit->locktype = locktype; lockit->locktype = locktype;
EnterCriticalSection(&lockit_cs[locktype]); EnterCriticalSection(&lockit_cs[locktype]);
} }
/* ?_Lockit_ctor@_Lockit@std@@CAXPAV12@@Z */
/* ?_Lockit_ctor@_Lockit@std@@CAXPEAV12@@Z */
void __cdecl _Lockit__Lockit_ctor(_Lockit *lockit)
{
_Lockit__Lockit_ctor_locktype(lockit, 0);
}
/* ??0_Lockit@std@@QAE@H@Z */ /* ??0_Lockit@std@@QAE@H@Z */
/* ??0_Lockit@std@@QEAA@H@Z */ /* ??0_Lockit@std@@QEAA@H@Z */
DEFINE_THISCALL_WRAPPER(_Lockit_ctor_locktype, 8) DEFINE_THISCALL_WRAPPER(_Lockit_ctor_locktype, 8)
...@@ -153,7 +118,7 @@ _Lockit* __thiscall _Lockit_ctor(_Lockit *this) ...@@ -153,7 +118,7 @@ _Lockit* __thiscall _Lockit_ctor(_Lockit *this)
/* ?_Lockit_dtor@_Lockit@std@@CAXPAV12@@Z */ /* ?_Lockit_dtor@_Lockit@std@@CAXPAV12@@Z */
/* ?_Lockit_dtor@_Lockit@std@@CAXPEAV12@@Z */ /* ?_Lockit_dtor@_Lockit@std@@CAXPEAV12@@Z */
void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit) static void _Lockit__Lockit_dtor(_Lockit *lockit)
{ {
LeaveCriticalSection(&lockit_cs[lockit->locktype]); LeaveCriticalSection(&lockit_cs[lockit->locktype]);
} }
...@@ -213,9 +178,3 @@ MSVCP_new_handler_func __cdecl set_new_handler(MSVCP_new_handler_func new_handle ...@@ -213,9 +178,3 @@ MSVCP_new_handler_func __cdecl set_new_handler(MSVCP_new_handler_func new_handle
MSVCRT_set_new_handler(new_handler ? new_handler_wrapper : NULL); MSVCRT_set_new_handler(new_handler ? new_handler_wrapper : NULL);
return old_handler; 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);
}
dlls/msvcp71/msvcp.h
View file @ 06d5c487
...@@ -77,12 +77,12 @@ void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar*); ...@@ -77,12 +77,12 @@ void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar*);
basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch(basic_string_wchar*, wchar_t); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch(basic_string_wchar*, wchar_t);
MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(const basic_string_wchar*); MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(const basic_string_wchar*);
char* __stdcall MSVCP_allocator_char_allocate(void*, MSVCP_size_t); char* MSVCP_allocator_char_allocate(void*, MSVCP_size_t);
void __stdcall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); void MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t);
MSVCP_size_t __stdcall MSVCP_allocator_char_max_size(void*); MSVCP_size_t MSVCP_allocator_char_max_size(void*);
wchar_t* __stdcall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); wchar_t* MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t);
void __stdcall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); void MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t);
MSVCP_size_t __stdcall MSVCP_allocator_wchar_max_size(void*); MSVCP_size_t MSVCP_allocator_wchar_max_size(void*);
/* class locale::facet */ /* class locale::facet */
typedef struct { typedef struct {
......
dlls/msvcp71/msvcp71.c
View file @ 06d5c487
...@@ -52,8 +52,6 @@ DEFINE_VTBL_WRAPPER(40); ...@@ -52,8 +52,6 @@ DEFINE_VTBL_WRAPPER(40);
DEFINE_VTBL_WRAPPER(44); DEFINE_VTBL_WRAPPER(44);
DEFINE_VTBL_WRAPPER(48); DEFINE_VTBL_WRAPPER(48);
DEFINE_VTBL_WRAPPER(52); DEFINE_VTBL_WRAPPER(52);
DEFINE_VTBL_WRAPPER(56);
DEFINE_VTBL_WRAPPER(60);
#endif #endif
...@@ -105,19 +103,5 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) ...@@ -105,19 +103,5 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
/* ?_BADOFF@std@@3_JB -> __int64 const std::_BADOFF */ /* ?_BADOFF@std@@3_JB -> __int64 const std::_BADOFF */
const streamoff std_BADOFF = -1; const streamoff 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 streamoff * __cdecl std_BADOFF_func(void)
{
return &std_BADOFF;
}
/* ?_Fpz@std@@3_JA __int64 std::_Fpz */ /* ?_Fpz@std@@3_JA __int64 std::_Fpz */
__int64 std_Fpz = 0; __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;
}
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