ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcp60: Copy source files from msvcp90.

This commit is contained in:
Piotr Caban 2012-10-04 13:15:41 +02:00 committed by Alexandre Julliard
parent d844ceeae8
commit 9d7f3c7651
11 changed files with 21851 additions and 1939 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msvcp60/Makefile.in
View File

@ -1,10 +1,12 @@
MODULE = msvcp60.dll MODULE = msvcp60.dll
IMPORTS = msvcrt IMPORTS = msvcrt
MODCFLAGS = @BUILTINFLAG@ MODCFLAGS = @BUILTINFLAG@
EXTRAINCL = -I$(top_srcdir)/include/msvcrt EXTRAINCL = -I$(top_srcdir)/include/msvcrt
C_SRCS = \ C_SRCS = \
exception.c \ exception.c \
ios.c \
locale.c \
main.c \ main.c \
memory.c \ memory.c \
misc.c \ misc.c \

2
dlls/msvcp60/cxx.h
View File

@ -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

36
dlls/msvcp60/exception.c
View File

@ -103,8 +103,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);
@ -317,15 +316,14 @@ typedef struct {
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);
this->e.vtable = &MSVCP_logic_error_vtable; this->e.vtable = &MSVCP_logic_error_vtable;
this->e.name = NULL; this->e.name = NULL;
this->e.do_free = FALSE; this->e.do_free = FALSE;
MSVCP_basic_string_char_ctor_cstr(&this->str, name); basic_string_char_ctor_cstr(&this->str, name);
return this; return this;
} }
@ -337,7 +335,7 @@ logic_error* __thiscall MSVCP_logic_error_copy_ctor(
{ {
TRACE("%p %p\n", this, rhs); TRACE("%p %p\n", this, rhs);
MSVCP_exception_copy_ctor(&this->e, &rhs->e); MSVCP_exception_copy_ctor(&this->e, &rhs->e);
MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str); basic_string_char_copy_ctor(&this->str, &rhs->str);
this->e.vtable = &MSVCP_logic_error_vtable; this->e.vtable = &MSVCP_logic_error_vtable;
return this; return this;
} }
@ -348,7 +346,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_ctor_bstr, 8)
logic_error* __thiscall MSVCP_logic_error_ctor_bstr(logic_error *this, const basic_string_char *str) logic_error* __thiscall MSVCP_logic_error_ctor_bstr(logic_error *this, const basic_string_char *str)
{ {
TRACE("(%p %p)\n", this, str); TRACE("(%p %p)\n", this, str);
return MSVCP_logic_error_ctor(this, MSVCP_basic_string_char_c_str(str)); return MSVCP_logic_error_ctor(this, basic_string_char_c_str(str));
} }
/* ??1logic_error@std@@UAE@XZ */ /* ??1logic_error@std@@UAE@XZ */
@ -364,7 +362,7 @@ void __thiscall MSVCP_logic_error_dtor(logic_error *this)
{ {
TRACE("%p\n", this); TRACE("%p\n", this);
MSVCP_exception_dtor(&this->e); MSVCP_exception_dtor(&this->e);
MSVCP_basic_string_char_dtor(&this->str); basic_string_char_dtor(&this->str);
} }
DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_vector_dtor, 8) DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_vector_dtor, 8)
@ -403,7 +401,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_what, 4)
const char* __thiscall MSVCP_logic_error_what(logic_error *this) const char* __thiscall MSVCP_logic_error_what(logic_error *this)
{ {
TRACE("%p\n", this); TRACE("%p\n", this);
return MSVCP_basic_string_char_c_str(&this->str); return basic_string_char_c_str(&this->str);
} }
DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error@std@@"); DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error@std@@");
@ -435,8 +433,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);
@ -463,7 +460,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_length_error_ctor_bstr, 8)
length_error* __thiscall MSVCP_length_error_ctor_bstr(length_error *this, const basic_string_char *str) length_error* __thiscall MSVCP_length_error_ctor_bstr(length_error *this, const basic_string_char *str)
{ {
TRACE("(%p %p)\n", this, str); TRACE("(%p %p)\n", this, str);
return MSVCP_length_error_ctor(this, MSVCP_basic_string_char_c_str(str)); return MSVCP_length_error_ctor(this, basic_string_char_c_str(str));
} }
/* ??4length_error@std@@QAEAAV01@ABV01@@Z */ /* ??4length_error@std@@QAEAAV01@ABV01@@Z */
@ -504,8 +501,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);
@ -532,7 +528,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_ctor_bstr, 8)
out_of_range* __thiscall MSVCP_out_of_range_ctor_bstr(out_of_range *this, const basic_string_char *str) out_of_range* __thiscall MSVCP_out_of_range_ctor_bstr(out_of_range *this, const basic_string_char *str)
{ {
TRACE("(%p %p)\n", this, str); TRACE("(%p %p)\n", this, str);
return MSVCP_out_of_range_ctor(this, MSVCP_basic_string_char_c_str(str)); return MSVCP_out_of_range_ctor(this, basic_string_char_c_str(str));
} }
/* ??4out_of_range@std@@QAEAAV01@ABV01@@Z */ /* ??4out_of_range@std@@QAEAAV01@ABV01@@Z */
@ -573,8 +569,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);
@ -622,8 +617,7 @@ static const cxx_exception_type invalid_argument_cxx_type = {
/* runtime_error class data */ /* runtime_error class data */
typedef logic_error runtime_error; typedef logic_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);
@ -650,7 +644,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_ctor_bstr, 8)
runtime_error* __thiscall MSVCP_runtime_error_ctor_bstr(runtime_error *this, const basic_string_char *str) runtime_error* __thiscall MSVCP_runtime_error_ctor_bstr(runtime_error *this, const basic_string_char *str)
{ {
TRACE("(%p %p)\n", this, str); TRACE("(%p %p)\n", this, str);
return MSVCP_runtime_error_ctor(this, MSVCP_basic_string_char_c_str(str)); return MSVCP_runtime_error_ctor(this, basic_string_char_c_str(str));
} }
DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_vector_dtor, 8) DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_vector_dtor, 8)
@ -702,7 +696,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_what, 4)
const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) const char* __thiscall MSVCP_runtime_error_what(runtime_error *this)
{ {
TRACE("%p\n", this); TRACE("%p\n", this);
return MSVCP_basic_string_char_c_str(&this->str); return basic_string_char_c_str(&this->str);
} }
/* failure class data */ /* failure class data */

11564
dlls/msvcp60/ios.c Normal file
View File

File diff suppressed because it is too large Load Diff

8198
dlls/msvcp60/locale.c Normal file
View File

File diff suppressed because it is too large Load Diff

9
dlls/msvcp60/main.c
View File

@ -52,14 +52,11 @@ 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
void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t);
void (__cdecl *MSVCRT_operator_delete)(void*); void (__cdecl *MSVCRT_operator_delete)(void*);
void* (__cdecl *MSVCRT_set_new_handler)(void*);
static void init_cxx_funcs(void) static void init_cxx_funcs(void)
{ {
@ -69,13 +66,11 @@ static void init_cxx_funcs(void)
{ {
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z"); MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z");
MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z");
} }
else else
{ {
MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z"); MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z");
MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z");
MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z");
} }
} }
@ -91,8 +86,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
init_cxx_funcs(); init_cxx_funcs();
init_lockit(); init_lockit();
init_exception(hinstDLL); init_exception(hinstDLL);
init_locale(hinstDLL);
init_io(hinstDLL);
break; break;
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
free_io();
free_locale();
free_lockit(); free_lockit();
break; break;
} }

264
dlls/msvcp60/memory.c
View File

@ -27,141 +27,32 @@
#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 +60,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,155 +70,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> */
/* ??0?$allocator@X@std@@QAE@XZ */
/* ??0?$allocator@X@std@@QEAA@XZ */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_ctor, 4)
void* __thiscall MSVCP_allocator_void_ctor(void *this)
{
return this;
}
/* ??0?$allocator@X@std@@QAE@ABV01@@Z */
/* ??0?$allocator@X@std@@QEAA@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_copy_ctor, 8)
void* __thiscall MSVCP_allocator_void_copy_ctor(void *this, void *copy)
{
return this;
}
/* ??4?$allocator@X@std@@QAEAAV01@ABV01@@Z */ /* ??4?$allocator@X@std@@QAEAAV01@ABV01@@Z */
/* ??4?$allocator@X@std@@QEAAAEAV01@AEBV01@@Z */ /* ??4?$allocator@X@std@@QEAAAEAV01@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_assign, 8) DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_assign, 8)

42
dlls/msvcp60/misc.c
View File

@ -29,8 +29,7 @@
/* ??0_Mutex@std@@QAE@XZ */ /* ??0_Mutex@std@@QAE@XZ */
/* ??0_Mutex@std@@QEAA@XZ */ /* ??0_Mutex@std@@QEAA@XZ */
DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) mutex* mutex_ctor(mutex *this)
mutex* __thiscall mutex_ctor(mutex *this)
{ {
this->mutex = CreateMutexW(NULL, FALSE, NULL); this->mutex = CreateMutexW(NULL, FALSE, NULL);
return this; return this;
@ -38,24 +37,21 @@ mutex* __thiscall mutex_ctor(mutex *this)
/* ??1_Mutex@std@@QAE@XZ */ /* ??1_Mutex@std@@QAE@XZ */
/* ??1_Mutex@std@@QEAA@XZ */ /* ??1_Mutex@std@@QEAA@XZ */
DEFINE_THISCALL_WRAPPER(mutex_dtor, 4) void mutex_dtor(mutex *this)
void __thiscall mutex_dtor(mutex *this)
{ {
CloseHandle(this->mutex); CloseHandle(this->mutex);
} }
/* ?_Lock@_Mutex@std@@QAEXXZ */ /* ?_Lock@_Mutex@std@@QAEXXZ */
/* ?_Lock@_Mutex@std@@QEAAXXZ */ /* ?_Lock@_Mutex@std@@QEAAXXZ */
DEFINE_THISCALL_WRAPPER(mutex_lock, 4) void mutex_lock(mutex *this)
void __thiscall mutex_lock(mutex *this)
{ {
WaitForSingleObject(this->mutex, INFINITE); WaitForSingleObject(this->mutex, INFINITE);
} }
/* ?_Unlock@_Mutex@std@@QAEXXZ */ /* ?_Unlock@_Mutex@std@@QAEXXZ */
/* ?_Unlock@_Mutex@std@@QEAAXXZ */ /* ?_Unlock@_Mutex@std@@QEAAXXZ */
DEFINE_THISCALL_WRAPPER(mutex_unlock, 4) void mutex_unlock(mutex *this)
void __thiscall mutex_unlock(mutex *this)
{ {
ReleaseMutex(this->mutex); ReleaseMutex(this->mutex);
} }
@ -72,7 +68,7 @@ void free_lockit(void) {
DeleteCriticalSection(&lockit_cs); DeleteCriticalSection(&lockit_cs);
} }
static _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype)
{ {
EnterCriticalSection(&lockit_cs); EnterCriticalSection(&lockit_cs);
return this; return this;
@ -93,3 +89,31 @@ void __thiscall _Lockit_dtor(_Lockit *this)
{ {
LeaveCriticalSection(&lockit_cs); 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;
}

396
dlls/msvcp60/msvcp.h
View File

@ -22,15 +22,15 @@
typedef unsigned char MSVCP_bool; typedef unsigned char MSVCP_bool;
typedef SIZE_T MSVCP_size_t; typedef SIZE_T MSVCP_size_t;
typedef SIZE_T streamoff; typedef SSIZE_T streamoff;
typedef SIZE_T streamsize; typedef SSIZE_T streamsize;
void __cdecl _invalid_parameter(const wchar_t*, const wchar_t*, void __cdecl _invalid_parameter(const wchar_t*, const wchar_t*,
const wchar_t*, unsigned int, uintptr_t); const wchar_t*, unsigned int, uintptr_t);
BOOL __cdecl __uncaught_exception(void);
extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t);
extern void (__cdecl *MSVCRT_operator_delete)(void*); extern void (__cdecl *MSVCRT_operator_delete)(void*);
extern void* (__cdecl *MSVCRT_set_new_handler)(void*);
/* basic_string<char, char_traits<char>, allocator<char>> */ /* basic_string<char, char_traits<char>, allocator<char>> */
typedef struct typedef struct
@ -41,10 +41,15 @@ typedef struct
MSVCP_size_t res; MSVCP_size_t res;
} basic_string_char; } basic_string_char;
basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); basic_string_char* __thiscall basic_string_char_ctor(basic_string_char*);
basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); basic_string_char* basic_string_char_ctor_cstr(basic_string_char*, const char*);
void __stdcall MSVCP_basic_string_char_dtor(basic_string_char*); basic_string_char* basic_string_char_ctor_cstr_len(basic_string_char*, const char*, MSVCP_size_t);
const char* __stdcall MSVCP_basic_string_char_c_str(const basic_string_char*); basic_string_char* __thiscall basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*);
void __thiscall basic_string_char_dtor(basic_string_char*);
const char* __thiscall basic_string_char_c_str(const basic_string_char*);
void basic_string_char_clear(basic_string_char*);
basic_string_char* __thiscall basic_string_char_append_ch(basic_string_char*, char);
MSVCP_size_t __thiscall basic_string_char_length(const basic_string_char*);
typedef struct typedef struct
{ {
@ -54,12 +59,102 @@ typedef struct
MSVCP_size_t res; MSVCP_size_t res;
} basic_string_wchar; } basic_string_wchar;
char* __stdcall MSVCP_allocator_char_allocate(void*, MSVCP_size_t); basic_string_wchar* __thiscall basic_string_wchar_ctor(basic_string_wchar*);
void __stdcall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); basic_string_wchar* basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*);
MSVCP_size_t __stdcall MSVCP_allocator_char_max_size(void*); basic_string_wchar* basic_string_wchar_ctor_cstr_len(basic_string_wchar*, const wchar_t*, MSVCP_size_t);
wchar_t* __stdcall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); void __thiscall basic_string_wchar_dtor(basic_string_wchar*);
void __stdcall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); const wchar_t* __thiscall basic_string_wchar_c_str(const basic_string_wchar*);
MSVCP_size_t __stdcall MSVCP_allocator_wchar_max_size(void*); void basic_string_wchar_clear(basic_string_wchar*);
basic_string_wchar* __thiscall basic_string_wchar_append_ch(basic_string_wchar*, wchar_t);
MSVCP_size_t __thiscall basic_string_wchar_length(const basic_string_wchar*);
char* MSVCP_allocator_char_allocate(void*, MSVCP_size_t);
void MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t);
MSVCP_size_t MSVCP_allocator_char_max_size(void*);
wchar_t* MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t);
void MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t);
MSVCP_size_t MSVCP_allocator_wchar_max_size(void*);
/* class locale::facet */
typedef struct {
const vtable_ptr *vtable;
MSVCP_size_t refs;
} locale_facet;
typedef enum {
CODECVT_ok = 0,
CODECVT_partial = 1,
CODECVT_error = 2,
CODECVT_noconv = 3
} codecvt_base_result;
typedef struct {
LCID handle;
unsigned page;
const short *table;
int delfl;
} _Ctypevec;
/* class codecvt_base */
typedef struct {
locale_facet facet;
} codecvt_base;
/* class codecvt<char> */
typedef struct {
codecvt_base base;
} codecvt_char;
MSVCP_bool __thiscall codecvt_base_always_noconv(const codecvt_base*);
int codecvt_char_unshift(const codecvt_char*, int*, char*, char*, char**);
int __thiscall codecvt_char_out(const codecvt_char*, int*, const char*,
const char*, const char**, char*, char*, char**);
int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*,
const char*, const char**, char*, char*, char**);
int __thiscall codecvt_base_max_length(const codecvt_base*);
typedef struct {
LCID handle;
unsigned page;
} _Cvtvec;
/* class codecvt<wchar> */
typedef struct {
codecvt_base base;
_Cvtvec cvt;
} codecvt_wchar;
int codecvt_wchar_unshift(const codecvt_wchar*, int*, char*, char*, char**);
int __thiscall codecvt_wchar_out(const codecvt_wchar*, int*, const wchar_t*,
const wchar_t*, const wchar_t**, char*, char*, char**);
int __thiscall codecvt_wchar_in(const codecvt_wchar*, int*, const char*,
const char*, const char**, wchar_t*, wchar_t*, wchar_t**);
/* class ctype_base */
typedef struct {
locale_facet facet;
} ctype_base;
/* class ctype<char> */
typedef struct {
ctype_base base;
_Ctypevec ctype;
} ctype_char;
MSVCP_bool __thiscall ctype_char_is_ch(const ctype_char*, short, char);
char __thiscall ctype_char_narrow_ch(const ctype_char*, char, char);
char __thiscall ctype_char_widen_ch(const ctype_char*, char);
/* class ctype<wchar> */
typedef struct {
ctype_base base;
_Ctypevec ctype;
_Cvtvec cvt;
} ctype_wchar;
MSVCP_bool __thiscall ctype_wchar_is_ch(const ctype_wchar*, short, wchar_t);
char __thiscall ctype_wchar_narrow_ch(const ctype_wchar*, wchar_t, char);
wchar_t __thiscall ctype_wchar_widen_ch(const ctype_wchar*, char);
/* class locale */ /* class locale */
typedef struct typedef struct
@ -68,7 +163,16 @@ typedef struct
} locale; } locale;
locale* __thiscall locale_ctor(locale*); locale* __thiscall locale_ctor(locale*);
locale* __thiscall locale_copy_ctor(locale*, const locale*);
locale* __thiscall locale_operator_assign(locale*, const locale*);
void __thiscall locale_dtor(locale*); void __thiscall locale_dtor(locale*);
void free_locale(void);
codecvt_char* codecvt_char_use_facet(const locale*);
codecvt_wchar* codecvt_wchar_use_facet(const locale*);
codecvt_wchar* codecvt_short_use_facet(const locale*);
ctype_char* ctype_char_use_facet(const locale*);
ctype_wchar* ctype_wchar_use_facet(const locale*);
ctype_wchar* ctype_short_use_facet(const locale*);
/* class _Lockit */ /* class _Lockit */
typedef struct { typedef struct {
@ -83,16 +187,272 @@ typedef struct {
void init_lockit(void); void init_lockit(void);
void free_lockit(void); void free_lockit(void);
_Lockit* __thiscall _Lockit_ctor_locktype(_Lockit*, int);
void __thiscall _Lockit_dtor(_Lockit*); void __thiscall _Lockit_dtor(_Lockit*);
/* class mutex */ /* class mutex */
typedef struct { typedef struct {
void *mutex; void *mutex;
} mutex; } mutex;
mutex* __thiscall mutex_ctor(mutex*); mutex* mutex_ctor(mutex*);
void __thiscall mutex_dtor(mutex*); void mutex_dtor(mutex*);
void __thiscall mutex_lock(mutex*); void mutex_lock(mutex*);
void __thiscall mutex_unlock(mutex*); void mutex_unlock(mutex*);
typedef enum {
FMTFLAG_skipws = 0x0001,
FMTFLAG_unitbuf = 0x0002,
FMTFLAG_uppercase = 0x0004,
FMTFLAG_showbase = 0x0008,
FMTFLAG_showpoint = 0x0010,
FMTFLAG_showpos = 0x0020,
FMTFLAG_left = 0x0040,
FMTFLAG_right = 0x0080,
FMTFLAG_internal = 0x0100,
FMTFLAG_dec = 0x0200,
FMTFLAG_oct = 0x0400,
FMTFLAG_hex = 0x0800,
FMTFLAG_scientific = 0x1000,
FMTFLAG_fixed = 0x2000,
FMTFLAG_hexfloat = 0x3000,
FMTFLAG_boolalpha = 0x4000,
FMTFLAG_stdio = 0x8000,
FMTFLAG_adjustfield = FMTFLAG_left|FMTFLAG_right|FMTFLAG_internal,
FMTFLAG_basefield = FMTFLAG_dec|FMTFLAG_oct|FMTFLAG_hex,
FMTFLAG_floatfield = FMTFLAG_scientific|FMTFLAG_fixed,
FMTFLAG_mask = 0xffff
} IOSB_fmtflags;
typedef enum {
OPENMODE_in = 0x01,
OPENMODE_out = 0x02,
OPENMODE_ate = 0x04,
OPENMODE_app = 0x08,
OPENMODE_trunc = 0x10,
OPENMODE__Nocreate = 0x40,
OPENMODE__Noreplace = 0x80,
OPENMODE_binary = 0x20,
OPENMODE_mask = 0xff
} IOSB_openmode;
typedef enum {
SEEKDIR_beg = 0x0,
SEEKDIR_cur = 0x1,
SEEKDIR_end = 0x2,
SEEKDIR_mask = 0x3
} IOSB_seekdir;
typedef enum {
IOSTATE_goodbit = 0x00,
IOSTATE_eofbit = 0x01,
IOSTATE_failbit = 0x02,
IOSTATE_badbit = 0x04,
IOSTATE__Hardfail = 0x10,
IOSTATE_mask = 0x17
} IOSB_iostate;
typedef struct _iosarray {
struct _iosarray *next;
int index;
int long_val;
void *ptr_val;
} IOS_BASE_iosarray;
typedef enum {
EVENT_erase_event,
EVENT_imbue_event,
EVENT_copyfmt_event
} IOS_BASE_event;
struct _ios_base;
typedef void (CDECL *IOS_BASE_event_callback)(IOS_BASE_event, struct _ios_base*, int);
typedef struct _fnarray {
struct _fnarray *next;
int index;
IOS_BASE_event_callback event_handler;
} IOS_BASE_fnarray;
/* class ios_base */
typedef struct _ios_base {
const vtable_ptr *vtable;
MSVCP_size_t stdstr;
IOSB_iostate state;
IOSB_iostate except;
IOSB_fmtflags fmtfl;
streamsize prec;
streamsize wide;
IOS_BASE_iosarray *arr;
IOS_BASE_fnarray *calls;
locale *loc;
} ios_base;
/* class basic_streambuf<char> */
typedef struct {
const vtable_ptr *vtable;
mutex lock;
char *rbuf;
char *wbuf;
char **prbuf;
char **pwbuf;
char *rpos;
char *wpos;
char **prpos;
char **pwpos;
int rsize;
int wsize;
int *prsize;
int *pwsize;
locale *loc;
} basic_streambuf_char;
typedef struct {
basic_streambuf_char *strbuf;
MSVCP_bool got;
char val;
} istreambuf_iterator_char;
typedef struct {
MSVCP_bool failed;
basic_streambuf_char *strbuf;
} ostreambuf_iterator_char;
int __thiscall basic_streambuf_char_sgetc(basic_streambuf_char*);
int __thiscall basic_streambuf_char_sbumpc(basic_streambuf_char*);
int __thiscall basic_streambuf_char_sputc(basic_streambuf_char*, char);
/* class basic_streambuf<wchar> */
typedef struct {
const vtable_ptr *vtable;
mutex lock;
wchar_t *rbuf;
wchar_t *wbuf;
wchar_t **prbuf;
wchar_t **pwbuf;
wchar_t *rpos;
wchar_t *wpos;
wchar_t **prpos;
wchar_t **pwpos;
int rsize;
int wsize;
int *prsize;
int *pwsize;
locale *loc;
} basic_streambuf_wchar;
typedef struct {
basic_streambuf_wchar *strbuf;
MSVCP_bool got;
wchar_t val;
} istreambuf_iterator_wchar;
typedef struct {
MSVCP_bool failed;
basic_streambuf_wchar *strbuf;
} ostreambuf_iterator_wchar;
unsigned short __thiscall basic_streambuf_wchar_sgetc(basic_streambuf_wchar*);
unsigned short __thiscall basic_streambuf_wchar_sbumpc(basic_streambuf_wchar*);
unsigned short __thiscall basic_streambuf_wchar_sputc(basic_streambuf_wchar*, wchar_t);
/* class num_get<char> */
typedef struct {
locale_facet facet;
_Cvtvec cvt;
} num_get;
num_get* num_get_char_use_facet(const locale*);
istreambuf_iterator_char* __thiscall num_get_char_get_long(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, LONG*);
istreambuf_iterator_char* __thiscall num_get_char_get_ushort(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, unsigned short*);
istreambuf_iterator_char* __thiscall num_get_char_get_uint(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, unsigned int*);
istreambuf_iterator_char* __thiscall num_get_char_get_ulong(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, ULONG*);
istreambuf_iterator_char* __thiscall num_get_char_get_float(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, float*);
istreambuf_iterator_char *__thiscall num_get_char_get_double(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, double*);
istreambuf_iterator_char *__thiscall num_get_char_get_ldouble(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, double*);
istreambuf_iterator_char *__thiscall num_get_char_get_void(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, void**);
istreambuf_iterator_char *__thiscall num_get_char_get_int64(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, LONGLONG*);
istreambuf_iterator_char *__thiscall num_get_char_get_uint64(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, ULONGLONG*);
istreambuf_iterator_char *__thiscall num_get_char_get_bool(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, MSVCP_bool*);
num_get* num_get_short_use_facet(const locale*);
istreambuf_iterator_wchar* __thiscall num_get_wchar_get_long(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, LONG*);
istreambuf_iterator_wchar* __thiscall num_get_wchar_get_ushort(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, unsigned short*);
istreambuf_iterator_wchar* __thiscall num_get_wchar_get_uint(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, unsigned int*);
istreambuf_iterator_wchar* __thiscall num_get_wchar_get_ulong(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, ULONG*);
istreambuf_iterator_wchar* __thiscall num_get_wchar_get_float(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, float*);
istreambuf_iterator_wchar *__thiscall num_get_wchar_get_double(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, double*);
istreambuf_iterator_wchar *__thiscall num_get_wchar_get_ldouble(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, double*);
istreambuf_iterator_wchar *__thiscall num_get_wchar_get_void(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, void**);
istreambuf_iterator_wchar *__thiscall num_get_wchar_get_int64(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, LONGLONG*);
istreambuf_iterator_wchar *__thiscall num_get_wchar_get_uint64(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, ULONGLONG*);
istreambuf_iterator_wchar *__thiscall num_get_wchar_get_bool(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, MSVCP_bool*);
/* class num_put<char> */
/* class num_put<wchar> */
typedef struct {
locale_facet facet;
_Cvtvec cvt;
} num_put;
num_put* num_put_char_use_facet(const locale*);
ostreambuf_iterator_char* __thiscall num_put_char_put_long(const num_put*, ostreambuf_iterator_char*,
ostreambuf_iterator_char, ios_base*, char, LONG);
ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put*, ostreambuf_iterator_char*,
ostreambuf_iterator_char, ios_base*, char, ULONG);
ostreambuf_iterator_char* __thiscall num_put_char_put_double(const num_put*, ostreambuf_iterator_char*,
ostreambuf_iterator_char, ios_base*, char, double);
ostreambuf_iterator_char* __thiscall num_put_char_put_ldouble(const num_put*, ostreambuf_iterator_char*,
ostreambuf_iterator_char, ios_base*, char, double);
ostreambuf_iterator_char* __thiscall num_put_char_put_ptr(const num_put*, ostreambuf_iterator_char*,
ostreambuf_iterator_char, ios_base*, char, const void*);
ostreambuf_iterator_char* __thiscall num_put_char_put_int64(const num_put*, ostreambuf_iterator_char*,
ostreambuf_iterator_char, ios_base*, char, __int64);
ostreambuf_iterator_char* __thiscall num_put_char_put_uint64(const num_put*, ostreambuf_iterator_char*,
ostreambuf_iterator_char, ios_base*, char, unsigned __int64);
ostreambuf_iterator_char* __thiscall num_put_char_put_bool(const num_put*, ostreambuf_iterator_char*,
ostreambuf_iterator_char, ios_base*, char, MSVCP_bool);
num_put* num_put_short_use_facet(const locale*);
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_long(const num_put*, ostreambuf_iterator_wchar*,
ostreambuf_iterator_wchar, ios_base*, wchar_t, LONG);
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_ulong(const num_put*, ostreambuf_iterator_wchar*,
ostreambuf_iterator_wchar, ios_base*, wchar_t, ULONG);
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_double(const num_put*, ostreambuf_iterator_wchar*,
ostreambuf_iterator_wchar, ios_base*, wchar_t, double);
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_ldouble(const num_put*, ostreambuf_iterator_wchar*,
ostreambuf_iterator_wchar, ios_base*, wchar_t, double);
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_ptr(const num_put*, ostreambuf_iterator_wchar*,
ostreambuf_iterator_wchar, ios_base*, wchar_t, const void*);
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_int64(const num_put*, ostreambuf_iterator_wchar*,
ostreambuf_iterator_wchar, ios_base*, wchar_t, __int64);
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_uint64(const num_put*, ostreambuf_iterator_wchar*,
ostreambuf_iterator_wchar, ios_base*, wchar_t, unsigned __int64);
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_bool(const num_put*, ostreambuf_iterator_wchar*,
ostreambuf_iterator_wchar, ios_base*, wchar_t, MSVCP_bool);
void init_exception(void*); void init_exception(void*);
void init_locale(void*);
void init_io(void*);
void free_io(void);

3208
dlls/msvcp60/msvcp60.spec
View File

File diff suppressed because it is too large Load Diff

67
dlls/msvcp60/string.c
View File

@ -151,6 +151,11 @@ void __thiscall basic_string_char__Eos(basic_string_char *this, MSVCP_size_t len
this->ptr[len] = 0; this->ptr[len] = 0;
} }
void basic_string_char_clear(basic_string_char *this)
{
basic_string_char__Eos(this, 0);
}
/* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEX_N@Z */ /* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEX_N@Z */
/* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAX_N@Z */ /* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAX_N@Z */
DEFINE_THISCALL_WRAPPER(basic_string_char__Tidy, 8) DEFINE_THISCALL_WRAPPER(basic_string_char__Tidy, 8)
@ -431,6 +436,11 @@ basic_string_char* __thiscall basic_string_char_ctor_cstr_len_alloc(
return this; return this;
} }
basic_string_char* basic_string_char_ctor_cstr_len(basic_string_char *this, const char *str, MSVCP_size_t len)
{
return basic_string_char_ctor_cstr_len_alloc(this, str, len, NULL);
}
/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@IIABV?$allocator@D@1@@Z */ /* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@IIABV?$allocator@D@1@@Z */
/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@D@1@@Z */ /* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@D@1@@Z */
DEFINE_THISCALL_WRAPPER(basic_string_char_ctor_substr_alloc, 20) DEFINE_THISCALL_WRAPPER(basic_string_char_ctor_substr_alloc, 20)
@ -458,7 +468,7 @@ basic_string_char* __thiscall basic_string_char_ctor_cstr_alloc(
return this; return this;
} }
basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr( basic_string_char* basic_string_char_ctor_cstr(
basic_string_char *this, const char *str) basic_string_char *this, const char *str)
{ {
return basic_string_char_ctor_cstr_alloc(this, str, NULL); return basic_string_char_ctor_cstr_alloc(this, str, NULL);
@ -515,8 +525,8 @@ basic_string_char* __thiscall basic_string_char_ctor_alloc(
/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z */ /* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z */
/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z */ /* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_copy_ctor, 8) DEFINE_THISCALL_WRAPPER(basic_string_char_copy_ctor, 8)
basic_string_char* __thiscall MSVCP_basic_string_char_copy_ctor( basic_string_char* __thiscall basic_string_char_copy_ctor(
basic_string_char *this, const basic_string_char *copy) basic_string_char *this, const basic_string_char *copy)
{ {
TRACE("%p %p\n", this, copy); TRACE("%p %p\n", this, copy);
@ -528,8 +538,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_copy_ctor(
/* ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ */ /* ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ */
/* ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ */ /* ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ */
DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4) DEFINE_THISCALL_WRAPPER(basic_string_char_dtor, 4)
void __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) void __thiscall basic_string_char_dtor(basic_string_char *this)
{ {
TRACE("%p\n", this); TRACE("%p\n", this);
basic_string_char__Tidy(this, TRUE); basic_string_char__Tidy(this, TRUE);
@ -1233,7 +1243,7 @@ basic_string_char* __cdecl basic_string_char_concatenate(basic_string_char *ret,
{ {
TRACE("%p %p\n", left, right); TRACE("%p %p\n", left, right);
MSVCP_basic_string_char_copy_ctor(ret, left); basic_string_char_copy_ctor(ret, left);
basic_string_char_append(ret, right); basic_string_char_append(ret, right);
return ret; return ret;
} }
@ -1247,7 +1257,7 @@ basic_string_char* __cdecl basic_string_char_concatenate_bstr_ch(basic_string_ch
{ {
TRACE("%p %c\n", left, right); TRACE("%p %c\n", left, right);
MSVCP_basic_string_char_copy_ctor(ret, left); basic_string_char_copy_ctor(ret, left);
basic_string_char_append_ch(ret, right); basic_string_char_append_ch(ret, right);
return ret; return ret;
} }
@ -1261,7 +1271,7 @@ basic_string_char* __cdecl basic_string_char_concatenate_bstr_cstr(basic_string_
{ {
TRACE("%p %s\n", left, debugstr_a(right)); TRACE("%p %s\n", left, debugstr_a(right));
MSVCP_basic_string_char_copy_ctor(ret, left); basic_string_char_copy_ctor(ret, left);
basic_string_char_append_cstr(ret, right); basic_string_char_append_cstr(ret, right);
return ret; return ret;
} }
@ -1647,8 +1657,8 @@ String_reverse_iterator_char* __thiscall basic_string_char_rend(
/* ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ */ /* ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ */
/* ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ */ /* ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ */
/* ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ */ /* ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ */
DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_c_str, 4) DEFINE_THISCALL_WRAPPER(basic_string_char_c_str, 4)
const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char *this) const char* __thiscall basic_string_char_c_str(const basic_string_char *this)
{ {
TRACE("%p\n", this); TRACE("%p\n", this);
return this->ptr; return this->ptr;
@ -1659,7 +1669,7 @@ const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char *th
/* ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ */ /* ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ */
/* ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ */ /* ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ */
DEFINE_THISCALL_WRAPPER(basic_string_char_length, 4) DEFINE_THISCALL_WRAPPER(basic_string_char_length, 4)
MSVCP_size_t __thiscall basic_string_char_length(basic_string_char *this) MSVCP_size_t __thiscall basic_string_char_length(const basic_string_char *this)
{ {
TRACE("%p\n", this); TRACE("%p\n", this);
return this->size; return this->size;
@ -1847,6 +1857,11 @@ void __thiscall basic_string_wchar__Eos(basic_string_wchar *this, MSVCP_size_t l
this->ptr[len] = 0; this->ptr[len] = 0;
} }
void basic_string_wchar_clear(basic_string_wchar *this)
{
basic_string_wchar__Eos(this, 0);
}
/* ?_Tidy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEX_N@Z */ /* ?_Tidy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEX_N@Z */
/* ?_Tidy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAX_N@Z */ /* ?_Tidy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAX_N@Z */
DEFINE_THISCALL_WRAPPER(basic_string_wchar__Tidy, 8) DEFINE_THISCALL_WRAPPER(basic_string_wchar__Tidy, 8)
@ -2127,6 +2142,11 @@ basic_string_wchar* __thiscall basic_string_wchar_ctor_cstr_len_alloc(
return this; return this;
} }
basic_string_wchar* basic_string_wchar_ctor_cstr_len(basic_string_wchar *this, const wchar_t *str, MSVCP_size_t len)
{
return basic_string_wchar_ctor_cstr_len_alloc(this, str, len, NULL);
}
/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@IIABV?$allocator@G@1@@Z */ /* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@IIABV?$allocator@G@1@@Z */
/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@G@1@@Z */ /* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@G@1@@Z */
DEFINE_THISCALL_WRAPPER(basic_string_wchar_ctor_substr_alloc, 20) DEFINE_THISCALL_WRAPPER(basic_string_wchar_ctor_substr_alloc, 20)
@ -2154,6 +2174,11 @@ basic_string_wchar* __thiscall basic_string_wchar_ctor_cstr_alloc(
return this; return this;
} }
basic_string_wchar* 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@@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 */ /* ??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) DEFINE_THISCALL_WRAPPER(basic_string_wchar_ctor_ch_alloc, 16)
@ -2205,8 +2230,8 @@ basic_string_wchar* __thiscall basic_string_wchar_ctor_alloc(
/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@@Z */ /* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@@Z */
/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV01@@Z */ /* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_copy_ctor, 8) DEFINE_THISCALL_WRAPPER(basic_string_wchar_copy_ctor, 8)
basic_string_wchar* __thiscall MSVCP_basic_string_wchar_copy_ctor( basic_string_wchar* __thiscall basic_string_wchar_copy_ctor(
basic_string_wchar *this, const basic_string_wchar *copy) basic_string_wchar *this, const basic_string_wchar *copy)
{ {
TRACE("%p %p\n", this, copy); TRACE("%p %p\n", this, copy);
@ -2218,8 +2243,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_copy_ctor(
/* ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@XZ */ /* ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@XZ */
/* ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@XZ */ /* ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@XZ */
DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_dtor, 4) DEFINE_THISCALL_WRAPPER(basic_string_wchar_dtor, 4)
void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar *this) void __thiscall basic_string_wchar_dtor(basic_string_wchar *this)
{ {
TRACE("%p\n", this); TRACE("%p\n", this);
basic_string_wchar__Tidy(this, TRUE); basic_string_wchar__Tidy(this, TRUE);
@ -2923,7 +2948,7 @@ basic_string_wchar* __cdecl basic_string_wchar_concatenate(basic_string_wchar *r
{ {
TRACE("%p %p\n", left, right); TRACE("%p %p\n", left, right);
MSVCP_basic_string_wchar_copy_ctor(ret, left); basic_string_wchar_copy_ctor(ret, left);
basic_string_wchar_append(ret, right); basic_string_wchar_append(ret, right);
return ret; return ret;
} }
@ -2937,7 +2962,7 @@ basic_string_wchar* __cdecl basic_string_wchar_concatenate_bstr_ch(basic_string_
{ {
TRACE("%p %c\n", left, right); TRACE("%p %c\n", left, right);
MSVCP_basic_string_wchar_copy_ctor(ret, left); basic_string_wchar_copy_ctor(ret, left);
basic_string_wchar_append_ch(ret, right); basic_string_wchar_append_ch(ret, right);
return ret; return ret;
} }
@ -2951,7 +2976,7 @@ basic_string_wchar* __cdecl basic_string_wchar_concatenate_bstr_cstr(basic_strin
{ {
TRACE("%p %s\n", left, debugstr_w(right)); TRACE("%p %s\n", left, debugstr_w(right));
MSVCP_basic_string_wchar_copy_ctor(ret, left); basic_string_wchar_copy_ctor(ret, left);
basic_string_wchar_append_cstr(ret, right); basic_string_wchar_append_cstr(ret, right);
return ret; return ret;
} }
@ -3337,8 +3362,8 @@ String_reverse_iterator_wchar* __thiscall basic_string_wchar_rend(
/* ?c_str@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ */ /* ?c_str@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ */
/* ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPBGXZ */ /* ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPBGXZ */
/* ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ */ /* ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ */
DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_c_str, 4) DEFINE_THISCALL_WRAPPER(basic_string_wchar_c_str, 4)
const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar *this) const wchar_t* __thiscall basic_string_wchar_c_str(const basic_string_wchar *this)
{ {
TRACE("%p\n", this); TRACE("%p\n", this);
return this->ptr; return this->ptr;
@ -3349,7 +3374,7 @@ const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wcha
/* ?length@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ */ /* ?length@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ */
/* ?length@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KXZ */ /* ?length@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KXZ */
DEFINE_THISCALL_WRAPPER(basic_string_wchar_length, 4) DEFINE_THISCALL_WRAPPER(basic_string_wchar_length, 4)
MSVCP_size_t __thiscall basic_string_wchar_length(basic_string_wchar *this) MSVCP_size_t __thiscall basic_string_wchar_length(const basic_string_wchar *this)
{ {
TRACE("%p\n", this); TRACE("%p\n", this);
return this->size; return this->size;