From 62ae503fa1fe557feac9929589269ac6c8ad2faf Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 12 Mar 2015 19:06:35 +0900 Subject: [PATCH] msvcp60: Add MSVCP prefix on exported string functions. --- dlls/msvcp60/exception.c | 18 +++---- dlls/msvcp60/ios.c | 84 +++++++++++++++--------------- dlls/msvcp60/locale.c | 74 +++++++++++++------------- dlls/msvcp60/msvcp.h | 38 +++++++------- dlls/msvcp60/msvcp60.spec | 72 ++++++++++++------------- dlls/msvcp60/string.c | 107 ++++++++++++++++++++++++-------------- 6 files changed, 210 insertions(+), 183 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index f7b1784fe22..4dc5764a507 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -251,7 +251,7 @@ static logic_error* MSVCP_logic_error_ctor( this->e.vtable = &MSVCP_logic_error_vtable; this->e.name = NULL; this->e.do_free = FALSE; - basic_string_char_ctor_cstr(&this->str, name); + MSVCP_basic_string_char_ctor_cstr(&this->str, name); return this; } @@ -263,7 +263,7 @@ logic_error* __thiscall MSVCP_logic_error_copy_ctor( { TRACE("%p %p\n", this, rhs); MSVCP_exception_copy_ctor(&this->e, &rhs->e); - basic_string_char_copy_ctor(&this->str, &rhs->str); + MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str); this->e.vtable = &MSVCP_logic_error_vtable; return this; } @@ -274,7 +274,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) { TRACE("(%p %p)\n", this, str); - return MSVCP_logic_error_ctor(this, basic_string_char_c_str(str)); + return MSVCP_logic_error_ctor(this, MSVCP_basic_string_char_c_str(str)); } /* ??1logic_error@std@@UAE@XZ */ @@ -290,7 +290,7 @@ void __thiscall MSVCP_logic_error_dtor(logic_error *this) { TRACE("%p\n", this); MSVCP_exception_dtor(&this->e); - basic_string_char_dtor(&this->str); + MSVCP_basic_string_char_dtor(&this->str); } DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_vector_dtor, 8) @@ -329,7 +329,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_what, 4) const char* __thiscall MSVCP_logic_error_what(logic_error *this) { TRACE("%p\n", this); - return basic_string_char_c_str(&this->str); + return MSVCP_basic_string_char_c_str(&this->str); } DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error@std@@") @@ -365,7 +365,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) { TRACE("(%p %p)\n", this, str); - return MSVCP_length_error_ctor(this, basic_string_char_c_str(str)); + return MSVCP_length_error_ctor(this, MSVCP_basic_string_char_c_str(str)); } /* ??4length_error@std@@QAEAAV01@ABV01@@Z */ @@ -410,7 +410,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) { TRACE("(%p %p)\n", this, str); - return MSVCP_out_of_range_ctor(this, basic_string_char_c_str(str)); + return MSVCP_out_of_range_ctor(this, MSVCP_basic_string_char_c_str(str)); } /* ??4out_of_range@std@@QAEAAV01@ABV01@@Z */ @@ -480,7 +480,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) { TRACE("(%p %p)\n", this, str); - return MSVCP_runtime_error_ctor(this, basic_string_char_c_str(str)); + return MSVCP_runtime_error_ctor(this, MSVCP_basic_string_char_c_str(str)); } DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_vector_dtor, 8) @@ -509,7 +509,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_what, 4) const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) { TRACE("%p\n", this); - return basic_string_char_c_str(&this->str); + return MSVCP_basic_string_char_c_str(&this->str); } /* failure class data */ diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 913086a65e3..01c7697d50a 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2334,7 +2334,7 @@ void __thiscall basic_filebuf_char__Initcvt(basic_filebuf_char *this) this->cvt = NULL; }else { this->str = MSVCRT_operator_new(sizeof(basic_string_char)); - basic_string_char_ctor(this->str); + MSVCP_basic_string_char_ctor(this->str); } } @@ -2400,7 +2400,7 @@ void __thiscall basic_filebuf_char_dtor(basic_filebuf_char *this) if(this->close) basic_filebuf_char_close(this); if(this->str) { - basic_string_char_dtor(this->str); + MSVCP_basic_string_char_dtor(this->str); MSVCRT_operator_delete(this->str); } locale_dtor(&this->loc); @@ -2587,11 +2587,11 @@ int __thiscall basic_filebuf_char_overflow(basic_filebuf_char *this, int c) return fwrite(&ch, sizeof(char), 1, this->file) ? c : EOF; from_next = &ch; - basic_string_char_clear(this->str); - basic_string_char_append_len_ch(this->str, 8, '\0'); + MSVCP_basic_string_char_clear(this->str); + MSVCP_basic_string_char_append_len_ch(this->str, 8, '\0'); ptr = this->str->ptr; ret = codecvt_char_out(this->cvt, &this->state, from_next, &ch+1, &from_next, - ptr, ptr+basic_string_char_length(this->str), &to_next); + ptr, ptr+MSVCP_basic_string_char_length(this->str), &to_next); switch(ret) { case CODECVT_partial: @@ -2626,7 +2626,7 @@ int __thiscall basic_filebuf_char_pbackfail(basic_filebuf_char *this, int c) return EOF; }else if(!this->cvt) { return ungetc(c, this->file); - }else if(basic_string_char_length(this->str)) { + }else if(MSVCP_basic_string_char_length(this->str)) { char *b, *e, *cur; e = this->str->ptr; @@ -2638,7 +2638,7 @@ int __thiscall basic_filebuf_char_pbackfail(basic_filebuf_char *this, int c) return EOF; } } - basic_string_char_clear(this->str); + MSVCP_basic_string_char_clear(this->str); this->state = this->state0; return c; } @@ -2667,10 +2667,10 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) if(!this->cvt || c==EOF) return c; - basic_string_char_clear(this->str); + MSVCP_basic_string_char_clear(this->str); this->state0 = this->state; while(1) { - basic_string_char_append_ch(this->str, c); + MSVCP_basic_string_char_append_ch(this->str, c); this->state = this->state0; switch(codecvt_char_in(this->cvt, &this->state, this->str->ptr, @@ -2842,7 +2842,7 @@ void __thiscall basic_filebuf_wchar__Initcvt(basic_filebuf_wchar *this) this->cvt = NULL; }else { this->str = MSVCRT_operator_new(sizeof(basic_string_char)); - basic_string_char_ctor(this->str); + MSVCP_basic_string_char_ctor(this->str); } } @@ -2933,7 +2933,7 @@ void __thiscall basic_filebuf_wchar_dtor(basic_filebuf_wchar *this) if(this->close) basic_filebuf_wchar_close(this); if(this->str) { - basic_string_char_dtor(this->str); + MSVCP_basic_string_char_dtor(this->str); MSVCRT_operator_delete(this->str); } locale_dtor(&this->loc); @@ -3047,11 +3047,11 @@ unsigned short __thiscall basic_filebuf_wchar_overflow(basic_filebuf_wchar *this return fwrite(&ch, sizeof(wchar_t), 1, this->file) ? c : WEOF; from_next = &ch; - basic_string_char_clear(this->str); - basic_string_char_append_len_ch(this->str, 8, '\0'); + MSVCP_basic_string_char_clear(this->str); + MSVCP_basic_string_char_append_len_ch(this->str, 8, '\0'); ptr = this->str->ptr; ret = codecvt_wchar_out(this->cvt, &this->state, &ch, &ch+1, &from_next, - ptr, ptr+basic_string_char_length(this->str), &to_next); + ptr, ptr+MSVCP_basic_string_char_length(this->str), &to_next); switch(ret) { case CODECVT_partial: @@ -3089,7 +3089,7 @@ unsigned short __thiscall basic_filebuf_wchar_pbackfail(basic_filebuf_wchar *thi return WEOF; }else if(!this->cvt) { return ungetwc(c, this->file); - }else if(basic_string_char_length(this->str)) { + }else if(MSVCP_basic_string_char_length(this->str)) { char *b, *e, *cur; e = this->str->ptr; @@ -3101,7 +3101,7 @@ unsigned short __thiscall basic_filebuf_wchar_pbackfail(basic_filebuf_wchar *thi return WEOF; } } - basic_string_char_clear(this->str); + MSVCP_basic_string_char_clear(this->str); this->state = this->state0; return c; } @@ -3131,12 +3131,12 @@ unsigned short __thiscall basic_filebuf_wchar_uflow(basic_filebuf_wchar *this) if(!this->cvt) return fgetwc(this->file); - basic_string_char_clear(this->str); + MSVCP_basic_string_char_clear(this->str); this->state0 = this->state; while(1) { if((c = fgetc(this->file)) == EOF) return WEOF; - basic_string_char_append_ch(this->str, c); + MSVCP_basic_string_char_append_ch(this->str, c); this->state = this->state0; switch(codecvt_wchar_in(this->cvt, &this->state, this->str->ptr, @@ -3348,7 +3348,7 @@ basic_stringbuf_char* __thiscall basic_stringbuf_char_ctor_str(basic_stringbuf_c basic_streambuf_char_ctor(&this->base); this->base.vtable = &MSVCP_basic_stringbuf_char_vtable; - basic_stringbuf_char__Init(this, basic_string_char_c_str(str), + basic_stringbuf_char__Init(this, MSVCP_basic_string_char_c_str(str), str->size, basic_stringbuf_char__Getstate(this, mode)); return this; } @@ -3615,7 +3615,7 @@ void __thiscall basic_stringbuf_char_str_set(basic_stringbuf_char *this, const b TRACE("(%p %p)\n", this, str); basic_stringbuf_char__Tidy(this); - basic_stringbuf_char__Init(this, basic_string_char_c_str(str), str->size, this->state); + basic_stringbuf_char__Init(this, MSVCP_basic_string_char_c_str(str), str->size, this->state); } /* ?str@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ @@ -3633,15 +3633,15 @@ basic_string_char* __thiscall basic_stringbuf_char_str_get(const basic_stringbuf ptr = basic_streambuf_char_pbase(&this->base); pptr = basic_streambuf_char_pptr(&this->base); - return basic_string_char_ctor_cstr_len(ret, ptr, (this->seekhigh < pptr ? pptr : this->seekhigh) - ptr); + return MSVCP_basic_string_char_ctor_cstr_len(ret, ptr, (this->seekhigh < pptr ? pptr : this->seekhigh) - ptr); } if(!(this->state & STRINGBUF_no_read) && basic_streambuf_char_gptr(&this->base)) { ptr = basic_streambuf_char_eback(&this->base); - return basic_string_char_ctor_cstr_len(ret, ptr, basic_streambuf_char_egptr(&this->base) - ptr); + return MSVCP_basic_string_char_ctor_cstr_len(ret, ptr, basic_streambuf_char_egptr(&this->base) - ptr); } - return basic_string_char_ctor(ret); + return MSVCP_basic_string_char_ctor(ret); } /* ?_Getstate@?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@AAEHH@Z */ @@ -3718,7 +3718,7 @@ static basic_stringbuf_wchar* basic_stringbuf_wchar_ctor_str(basic_stringbuf_wch basic_streambuf_wchar_ctor(&this->base); this->base.vtable = &MSVCP_basic_stringbuf_wchar_vtable; - basic_stringbuf_wchar__Init(this, basic_string_wchar_c_str(str), + basic_stringbuf_wchar__Init(this, MSVCP_basic_string_wchar_c_str(str), str->size, basic_stringbuf_wchar__Getstate(this, mode)); return this; } @@ -4020,7 +4020,7 @@ void __thiscall basic_stringbuf_wchar_str_set(basic_stringbuf_wchar *this, const TRACE("(%p %p)\n", this, str); basic_stringbuf_wchar__Tidy(this); - basic_stringbuf_wchar__Init(this, basic_string_wchar_c_str(str), str->size, this->state); + basic_stringbuf_wchar__Init(this, MSVCP_basic_string_wchar_c_str(str), str->size, this->state); } /* ?str@?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */ @@ -4040,15 +4040,15 @@ basic_string_wchar* __thiscall basic_stringbuf_wchar_str_get(const basic_stringb ptr = basic_streambuf_wchar_pbase(&this->base); pptr = basic_streambuf_wchar_pptr(&this->base); - return basic_string_wchar_ctor_cstr_len(ret, ptr, (this->seekhigh < pptr ? pptr : this->seekhigh) - ptr); + return MSVCP_basic_string_wchar_ctor_cstr_len(ret, ptr, (this->seekhigh < pptr ? pptr : this->seekhigh) - ptr); } if(!(this->state & STRINGBUF_no_read) && basic_streambuf_wchar_gptr(&this->base)) { ptr = basic_streambuf_wchar_eback(&this->base); - return basic_string_wchar_ctor_cstr_len(ret, ptr, basic_streambuf_wchar_egptr(&this->base) - ptr); + return MSVCP_basic_string_wchar_ctor_cstr_len(ret, ptr, basic_streambuf_wchar_egptr(&this->base) - ptr); } - return basic_string_wchar_ctor(ret); + return MSVCP_basic_string_wchar_ctor(ret); } /* ??0ios_base@std@@IAE@XZ */ @@ -5664,7 +5664,7 @@ basic_ostream_char* __cdecl basic_ostream_char_print_bstr(basic_ostream_char *os TRACE("(%p %p)\n", ostr, str); if(basic_ostream_char_sentry_create(ostr)) { - MSVCP_size_t len = basic_string_char_length(str); + MSVCP_size_t len = MSVCP_basic_string_char_length(str); streamsize pad = (base->base.wide>len ? base->base.wide-len : 0); if((base->base.fmtfl & FMTFLAG_adjustfield) != FMTFLAG_left) { @@ -5677,7 +5677,7 @@ basic_ostream_char* __cdecl basic_ostream_char_print_bstr(basic_ostream_char *os } if(state == IOSTATE_goodbit) { - if(basic_streambuf_char_sputn(base->strbuf, basic_string_char_c_str(str), len) != len) + if(basic_streambuf_char_sputn(base->strbuf, MSVCP_basic_string_char_c_str(str), len) != len) state = IOSTATE_badbit; } @@ -6507,7 +6507,7 @@ basic_ostream_wchar* __cdecl basic_ostream_wchar_print_bstr(basic_ostream_wchar TRACE("(%p %p)\n", ostr, str); if(basic_ostream_wchar_sentry_create(ostr)) { - MSVCP_size_t len = basic_string_wchar_length(str); + MSVCP_size_t len = MSVCP_basic_string_wchar_length(str); streamsize pad = (base->base.wide>len ? base->base.wide-len : 0); if((base->base.fmtfl & FMTFLAG_adjustfield) != FMTFLAG_left) { @@ -6520,7 +6520,7 @@ basic_ostream_wchar* __cdecl basic_ostream_wchar_print_bstr(basic_ostream_wchar } if(state == IOSTATE_goodbit) { - if(basic_streambuf_wchar_sputn(base->strbuf, basic_string_wchar_c_str(str), len) != len) + if(basic_streambuf_wchar_sputn(base->strbuf, MSVCP_basic_string_wchar_c_str(str), len) != len) state = IOSTATE_badbit; } @@ -7670,17 +7670,17 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( TRACE("(%p %p %c)\n", istream, str, delim); - basic_string_char_clear(str); + MSVCP_basic_string_char_clear(str); if(basic_istream_char_sentry_create(istream, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); c = basic_streambuf_char_sgetc(strbuf); for(; c!=(unsigned char)delim && c!=EOF; c = basic_streambuf_char_snextc(strbuf)) - basic_string_char_append_ch(str, c); + MSVCP_basic_string_char_append_ch(str, c); if(c==EOF) state |= IOSTATE_eofbit; else if(c==(unsigned char)delim) basic_streambuf_char_sbumpc(strbuf); - if(!basic_string_char_length(str) && c!=(unsigned char)delim) state |= IOSTATE_failbit; + if(!MSVCP_basic_string_char_length(str) && c!=(unsigned char)delim) state |= IOSTATE_failbit; } basic_istream_char_sentry_destroy(istream); @@ -7714,13 +7714,13 @@ basic_istream_char* __cdecl basic_istream_char_read_bstr( if(!count) count = -1; - basic_string_char_clear(str); + MSVCP_basic_string_char_clear(str); for(c = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base)); c!=EOF && !ctype_char_is_ch(ctype, _SPACE|_BLANK, c) && count>0; c = basic_streambuf_char_snextc(basic_ios_char_rdbuf_get(base)), count--) { state = IOSTATE_goodbit; - basic_string_char_append_ch(str, c); + MSVCP_basic_string_char_append_ch(str, c); } } basic_istream_char_sentry_destroy(istream); @@ -8962,17 +8962,17 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( TRACE("(%p %p %c)\n", istream, str, delim); - basic_string_wchar_clear(str); + MSVCP_basic_string_wchar_clear(str); if(basic_istream_wchar_sentry_create(istream, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); c = basic_streambuf_wchar_sgetc(strbuf); for(; c!=delim && c!=WEOF; c = basic_streambuf_wchar_snextc(strbuf)) - basic_string_wchar_append_ch(str, c); + MSVCP_basic_string_wchar_append_ch(str, c); if(c==delim) basic_streambuf_wchar_sbumpc(strbuf); else if(c==WEOF) state |= IOSTATE_eofbit; - if(!basic_string_wchar_length(str) && c!=delim) state |= IOSTATE_failbit; + if(!MSVCP_basic_string_wchar_length(str) && c!=delim) state |= IOSTATE_failbit; } basic_istream_wchar_sentry_destroy(istream); @@ -9005,13 +9005,13 @@ static basic_istream_wchar* basic_istream_read_bstr(basic_istream_wchar *istream if(!count) count = -1; - basic_string_wchar_clear(str); + MSVCP_basic_string_wchar_clear(str); for(c = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); c!=WEOF && !ctype_wchar_is_ch(ctype, _SPACE|_BLANK, c) && count>0; c = basic_streambuf_wchar_snextc(basic_ios_wchar_rdbuf_get(base)), count--) { state = IOSTATE_goodbit; - basic_string_wchar_append_ch(str, c); + MSVCP_basic_string_wchar_append_ch(str, c); } } basic_istream_wchar_sentry_destroy(istream); diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 5028f7dbe45..6bbd151df3e 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -59,11 +59,11 @@ MSVCP_size_t __cdecl _Strftime(char*, MSVCP_size_t, const char*, LCID* __cdecl ___lc_handle_func(void); #define locale_string basic_string_char -#define locale_string_char_ctor_cstr(this,str) basic_string_char_ctor_cstr(this,str) -#define locale_string_char_copy_ctor(this,copy) basic_string_char_copy_ctor(this,copy) -#define locale_string_char_dtor(this) basic_string_char_dtor(this) -#define locale_string_char_c_str(this) basic_string_char_c_str(this) -#define locale_string_char_assign(this,assign) basic_string_char_assign(this,assign) +#define locale_string_char_ctor_cstr(this,str) MSVCP_basic_string_char_ctor_cstr(this,str) +#define locale_string_char_copy_ctor(this,copy) MSVCP_basic_string_char_copy_ctor(this,copy) +#define locale_string_char_dtor(this) MSVCP_basic_string_char_dtor(this) +#define locale_string_char_c_str(this) MSVCP_basic_string_char_c_str(this) +#define locale_string_char_assign(this,assign) MSVCP_basic_string_char_assign(this,assign) typedef int category; @@ -658,7 +658,7 @@ basic_string_char* __thiscall _Locinfo__Getname(const _Locinfo *this, basic_stri { TRACE("(%p)\n", this); - basic_string_char_copy_ctor(ret, &this->newlocname); + MSVCP_basic_string_char_copy_ctor(ret, &this->newlocname); return ret; } @@ -3411,7 +3411,7 @@ basic_string_char* __thiscall numpunct_char_do_grouping( const numpunct_char *this, basic_string_char *ret) { TRACE("(%p)\n", this); - return basic_string_char_ctor_cstr(ret, this->grouping); + return MSVCP_basic_string_char_ctor_cstr(ret, this->grouping); } /* ?grouping@?$numpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ @@ -3432,7 +3432,7 @@ basic_string_char* __thiscall numpunct_char_do_falsename( const numpunct_char *this, basic_string_char *ret) { TRACE("(%p)\n", this); - return basic_string_char_ctor_cstr(ret, this->false_name); + return MSVCP_basic_string_char_ctor_cstr(ret, this->false_name); } /* ?falsename@?$numpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ @@ -3453,7 +3453,7 @@ basic_string_char* __thiscall numpunct_char_do_truename( const numpunct_char *this, basic_string_char *ret) { TRACE("(%p)\n", this); - return basic_string_char_ctor_cstr(ret, this->true_name); + return MSVCP_basic_string_char_ctor_cstr(ret, this->true_name); } /* ?truename@?$numpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ @@ -3815,7 +3815,7 @@ DEFINE_THISCALL_WRAPPER(numpunct_wchar_do_grouping, 8) basic_string_char* __thiscall numpunct_wchar_do_grouping(const numpunct_wchar *this, basic_string_char *ret) { TRACE("(%p)\n", this); - return basic_string_char_ctor_cstr(ret, this->grouping); + return MSVCP_basic_string_char_ctor_cstr(ret, this->grouping); } /* ?grouping@?$numpunct@_W@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ @@ -3839,7 +3839,7 @@ DEFINE_THISCALL_WRAPPER(numpunct_wchar_do_falsename, 8) basic_string_wchar* __thiscall numpunct_wchar_do_falsename(const numpunct_wchar *this, basic_string_wchar *ret) { TRACE("(%p)\n", this); - return basic_string_wchar_ctor_cstr(ret, this->false_name); + return MSVCP_basic_string_wchar_ctor_cstr(ret, this->false_name); } /* ?falsename@?$numpunct@_W@std@@QBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */ @@ -3863,7 +3863,7 @@ DEFINE_THISCALL_WRAPPER(numpunct_wchar_do_truename, 8) basic_string_wchar* __thiscall numpunct_wchar_do_truename(const numpunct_wchar *this, basic_string_wchar *ret) { TRACE("(%p)\n", this); - return basic_string_wchar_ctor_cstr(ret, this->true_name); + return MSVCP_basic_string_wchar_ctor_cstr(ret, this->true_name); } /* ?truename@?$numpunct@_W@std@@QBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */ @@ -4928,8 +4928,8 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, numpunct_wchar_falsename(numpunct, &false_bstr); numpunct_wchar_truename(numpunct, &true_bstr); - pfalse = basic_string_wchar_c_str(&false_bstr); - ptrue = basic_string_wchar_c_str(&true_bstr); + pfalse = MSVCP_basic_string_wchar_c_str(&false_bstr); + ptrue = MSVCP_basic_string_wchar_c_str(&true_bstr); for(istreambuf_iterator_wchar_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) @@ -4961,8 +4961,8 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, else *state |= IOSTATE_failbit; - basic_string_wchar_dtor(&false_bstr); - basic_string_wchar_dtor(&true_bstr); + MSVCP_basic_string_wchar_dtor(&false_bstr); + MSVCP_basic_string_wchar_dtor(&true_bstr); }else { char tmp[25], *end; int err; @@ -5116,7 +5116,7 @@ MSVCP_size_t __cdecl num_get_char__Getcat(const locale_facet **facet, const loca return 0; } - _Locinfo_ctor_cstr(&locinfo, basic_string_char_c_str(&loc->ptr->name)); + _Locinfo_ctor_cstr(&locinfo, MSVCP_basic_string_char_c_str(&loc->ptr->name)); num_get_char_ctor_locinfo((num_get*)*facet, &locinfo, 0); _Locinfo_dtor(&locinfo); } @@ -5712,8 +5712,8 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi numpunct_char_falsename(numpunct, &false_bstr); numpunct_char_truename(numpunct, &true_bstr); - pfalse = basic_string_char_c_str(&false_bstr); - ptrue = basic_string_char_c_str(&true_bstr); + pfalse = MSVCP_basic_string_char_c_str(&false_bstr); + ptrue = MSVCP_basic_string_char_c_str(&true_bstr); for(istreambuf_iterator_char_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) @@ -5745,8 +5745,8 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi else *state |= IOSTATE_failbit; - basic_string_char_dtor(&false_bstr); - basic_string_char_dtor(&true_bstr); + MSVCP_basic_string_char_dtor(&false_bstr); + MSVCP_basic_string_char_dtor(&true_bstr); }else { char tmp[25], *end; int err; @@ -5874,7 +5874,7 @@ MSVCP_size_t __cdecl num_put_char__Getcat(const locale_facet **facet, const loca return 0; } - _Locinfo_ctor_cstr(&locinfo, basic_string_char_c_str(&loc->ptr->name)); + _Locinfo_ctor_cstr(&locinfo, MSVCP_basic_string_char_c_str(&loc->ptr->name)); num_put_char_ctor_locinfo((num_put*)*facet, &locinfo, 0); _Locinfo_dtor(&locinfo); } @@ -6056,7 +6056,7 @@ ostreambuf_iterator_char* __cdecl num_put_char__Iput(const num_put *this, ostrea /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); - grouping = basic_string_char_c_str(&grouping_bstr); + grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; for(p=buf+count-1; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { @@ -6071,7 +6071,7 @@ ostreambuf_iterator_char* __cdecl num_put_char__Iput(const num_put *this, ostrea count++; } } - basic_string_char_dtor(&grouping_bstr); + MSVCP_basic_string_char_dtor(&grouping_bstr); /* Display number with padding */ if(count >= base->wide) @@ -6318,7 +6318,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_bool(const num_put *thi else numpunct_char_falsename(numpunct, &str); - len = basic_string_char_length(&str); + len = MSVCP_basic_string_char_length(&str); pad = (len>base->wide ? 0 : base->wide-len); base->wide = 0; @@ -6326,8 +6326,8 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_bool(const num_put *thi num_put_char__Rep(this, &dest, dest, fill, pad); pad = 0; } - num_put_char__Putc(this, &dest, dest, basic_string_char_c_str(&str), len); - basic_string_char_dtor(&str); + num_put_char__Putc(this, &dest, dest, MSVCP_basic_string_char_c_str(&str), len); + MSVCP_basic_string_char_dtor(&str); return num_put_char__Rep(this, ret, dest, fill, pad); } @@ -6735,7 +6735,7 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_ /* Add separators to number */ numpunct_wchar_grouping(numpunct, &grouping_bstr); - grouping = basic_string_char_c_str(&grouping_bstr); + grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : '\0'; for(p=buf+count-1; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { @@ -6750,7 +6750,7 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_ count++; } } - basic_string_char_dtor(&grouping_bstr); + MSVCP_basic_string_char_dtor(&grouping_bstr); /* Display number with padding */ if(count >= base->wide) @@ -7131,7 +7131,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_bool(const num_put *t else numpunct_wchar_falsename(numpunct, &str); - len = basic_string_wchar_length(&str); + len = MSVCP_basic_string_wchar_length(&str); pad = (len>base->wide ? 0 : base->wide-len); base->wide = 0; @@ -7139,8 +7139,8 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_bool(const num_put *t num_put_wchar__Rep(this, &dest, dest, fill, pad); pad = 0; } - num_put_wchar__Put(this, &dest, dest, basic_string_wchar_c_str(&str), len); - basic_string_wchar_dtor(&str); + num_put_wchar__Put(this, &dest, dest, MSVCP_basic_string_wchar_c_str(&str), len); + MSVCP_basic_string_wchar_dtor(&str); return num_put_wchar__Rep(this, ret, dest, fill, pad); } @@ -7165,7 +7165,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_bool(const num_put *t else numpunct_wchar_falsename(numpunct, &str); - len = basic_string_wchar_length(&str); + len = MSVCP_basic_string_wchar_length(&str); pad = (len>base->wide ? 0 : base->wide-len); base->wide = 0; @@ -7173,8 +7173,8 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_bool(const num_put *t num_put_wchar__Rep(this, &dest, dest, fill, pad); pad = 0; } - num_put_wchar__Put(this, &dest, dest, basic_string_wchar_c_str(&str), len); - basic_string_wchar_dtor(&str); + num_put_wchar__Put(this, &dest, dest, MSVCP_basic_string_wchar_c_str(&str), len); + MSVCP_basic_string_wchar_dtor(&str); return num_put_wchar__Rep(this, ret, dest, fill, pad); } @@ -8537,7 +8537,7 @@ DEFINE_THISCALL_WRAPPER(locale_name, 8) basic_string_char* __thiscall locale_name(const locale *this, basic_string_char *ret) { TRACE( "(%p)\n", this); - basic_string_char_copy_ctor(ret, &this->ptr->name); + MSVCP_basic_string_char_copy_ctor(ret, &this->ptr->name); return ret; } @@ -8561,7 +8561,7 @@ locale* __cdecl locale_global(locale *ret, const locale *loc) for(i=LC_ALL+1; i<=LC_MAX; i++) { if((global_locale->catmask & (1<<(i-1))) == 0) continue; - setlocale(i, basic_string_char_c_str(&global_locale->name)); + setlocale(i, MSVCP_basic_string_char_c_str(&global_locale->name)); } } _Lockit_dtor(&lock); diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index 79744793c30..bdae8760272 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -41,17 +41,17 @@ typedef struct MSVCP_size_t res; } basic_string_char; -basic_string_char* __thiscall basic_string_char_ctor(basic_string_char*); -basic_string_char* basic_string_char_ctor_cstr(basic_string_char*, const char*); -basic_string_char* basic_string_char_ctor_cstr_len(basic_string_char*, const char*, MSVCP_size_t); -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*); -basic_string_char* __thiscall basic_string_char_append_len_ch(basic_string_char*, MSVCP_size_t, char); -basic_string_char* __thiscall basic_string_char_assign(basic_string_char*, const basic_string_char*); +basic_string_char* __thiscall MSVCP_basic_string_char_ctor(basic_string_char*); +basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); +basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr_len(basic_string_char*, const char*, MSVCP_size_t); +basic_string_char* __thiscall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); +void __thiscall MSVCP_basic_string_char_dtor(basic_string_char*); +const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char*); +void __thiscall MSVCP_basic_string_char_clear(basic_string_char*); +basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char); +MSVCP_size_t __thiscall MSVCP_basic_string_char_length(const basic_string_char*); +basic_string_char* __thiscall MSVCP_basic_string_char_append_len_ch(basic_string_char*, MSVCP_size_t, char); +basic_string_char* __thiscall MSVCP_basic_string_char_assign(basic_string_char*, const basic_string_char*); typedef struct { @@ -61,14 +61,14 @@ typedef struct MSVCP_size_t res; } basic_string_wchar; -basic_string_wchar* __thiscall basic_string_wchar_ctor(basic_string_wchar*); -basic_string_wchar* basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*); -basic_string_wchar* basic_string_wchar_ctor_cstr_len(basic_string_wchar*, const wchar_t*, MSVCP_size_t); -void __thiscall basic_string_wchar_dtor(basic_string_wchar*); -const wchar_t* __thiscall basic_string_wchar_c_str(const basic_string_wchar*); -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*); +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor(basic_string_wchar*); +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*); +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr_len(basic_string_wchar*, const wchar_t*, MSVCP_size_t); +void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar*); +const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar*); +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); +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(const basic_string_wchar*); char* __thiscall MSVCP_allocator_char_allocate(void*, MSVCP_size_t); void __thiscall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 1c94542e627..83c444ea8fa 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -645,8 +645,8 @@ @ cdecl -arch=win64 ??0?$basic_streambuf@GU?$char_traits@G@std@@@std@@IEAA@XZ(ptr) basic_streambuf_short_ctor @ stub -arch=win32 ??0?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAE@ABV01@@Z @ stub -arch=win64 ??0?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAA@AEBV01@@Z -@ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z(ptr ptr) basic_string_char_copy_ctor -@ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z(ptr ptr) basic_string_char_copy_ctor +@ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z(ptr ptr) MSVCP_basic_string_char_copy_ctor +@ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_copy_ctor @ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@IIABV?$allocator@D@1@@Z(ptr ptr long long ptr) basic_string_char_ctor_substr_alloc @ cdecl -arch=win64 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV01@_K1AEBV?$allocator@D@1@@Z(ptr ptr long long ptr) basic_string_char_ctor_substr_alloc @ thiscall -arch=win32 ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV?$allocator@D@1@@Z(ptr ptr) basic_string_char_ctor_alloc @@ -971,10 +971,10 @@ @ cdecl -arch=win64 ??1?$basic_streambuf@DU?$char_traits@D@std@@@std@@UEAA@XZ(ptr) basic_streambuf_char_dtor @ thiscall -arch=win32 ??1?$basic_streambuf@GU?$char_traits@G@std@@@std@@UAE@XZ(ptr) basic_streambuf_wchar_dtor @ cdecl -arch=win64 ??1?$basic_streambuf@GU?$char_traits@G@std@@@std@@UEAA@XZ(ptr) basic_streambuf_wchar_dtor -@ thiscall -arch=win32 ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ(ptr) basic_string_char_dtor -@ cdecl -arch=win64 ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ(ptr) basic_string_char_dtor -@ thiscall -arch=win32 ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@XZ(ptr) basic_string_wchar_dtor -@ cdecl -arch=win64 ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@XZ(ptr) basic_string_wchar_dtor +@ thiscall -arch=win32 ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ(ptr) MSVCP_basic_string_char_dtor +@ cdecl -arch=win64 ??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ(ptr) MSVCP_basic_string_char_dtor +@ thiscall -arch=win32 ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@XZ(ptr) MSVCP_basic_string_wchar_dtor +@ cdecl -arch=win64 ??1?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@XZ(ptr) MSVCP_basic_string_wchar_dtor @ thiscall -arch=win32 ??1?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UAE@XZ(ptr) basic_stringbuf_char_dtor @ cdecl -arch=win64 ??1?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UEAA@XZ(ptr) basic_stringbuf_char_dtor @ thiscall -arch=win32 ??1?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@UAE@XZ(ptr) basic_stringbuf_wchar_dtor @@ -1153,8 +1153,8 @@ @ stub -arch=win64 ??4?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAAAEAV01@AEBV01@@Z @ stub -arch=win32 ??4?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAEAAV01@ABV01@@Z @ stub -arch=win64 ??4?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEBV01@@Z -@ thiscall -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@ABV01@@Z(ptr ptr) basic_string_char_assign -@ cdecl -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) basic_string_char_assign +@ thiscall -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@ABV01@@Z(ptr ptr) MSVCP_basic_string_char_assign +@ cdecl -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_assign @ thiscall -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@D@Z(ptr long) basic_string_char_assign_ch @ cdecl -arch=win64 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@D@Z(ptr long) basic_string_char_assign_ch @ thiscall -arch=win32 ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@PBD@Z(ptr str) basic_string_char_assign_cstr @@ -1719,14 +1719,14 @@ @ stub -arch=win64 ??Y?$_Complex_base@O@std@@QEAAAEAV01@AEBO@Z @ thiscall -arch=win32 ??Y?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@ABV01@@Z(ptr ptr) basic_string_char_append @ cdecl -arch=win64 ??Y?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) basic_string_char_append -@ thiscall -arch=win32 ??Y?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@D@Z(ptr long) basic_string_char_append_ch -@ cdecl -arch=win64 ??Y?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@D@Z(ptr long) basic_string_char_append_ch +@ thiscall -arch=win32 ??Y?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@D@Z(ptr long) MSVCP_basic_string_char_append_ch +@ cdecl -arch=win64 ??Y?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@D@Z(ptr long) MSVCP_basic_string_char_append_ch @ thiscall -arch=win32 ??Y?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@PBD@Z(ptr str) basic_string_char_append_cstr @ cdecl -arch=win64 ??Y?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@PEBD@Z(ptr str) basic_string_char_append_cstr @ thiscall -arch=win32 ??Y?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV01@ABV01@@Z(ptr ptr) basic_string_wchar_append @ cdecl -arch=win64 ??Y?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) basic_string_wchar_append -@ thiscall -arch=win32 ??Y?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV01@G@Z(ptr long) basic_string_wchar_append_ch -@ cdecl -arch=win64 ??Y?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAV01@G@Z(ptr long) basic_string_wchar_append_ch +@ thiscall -arch=win32 ??Y?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV01@G@Z(ptr long) MSVCP_basic_string_wchar_append_ch +@ cdecl -arch=win64 ??Y?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAV01@G@Z(ptr long) MSVCP_basic_string_wchar_append_ch @ thiscall -arch=win32 ??Y?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV01@PBG@Z(ptr wstr) basic_string_wchar_append_cstr @ cdecl -arch=win64 ??Y?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAV01@PEBG@Z(ptr wstr) basic_string_wchar_append_cstr @ stub -arch=win32 ??Ystd@@YAAAV?$complex@M@0@AAV10@ABV10@@Z @@ -1905,10 +1905,10 @@ @ cdecl -arch=win64 ??_F?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXXZ(ptr) basic_ostringstream_char_ctor @ thiscall -arch=win32 ??_F?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXXZ(ptr) basic_ostringstream_short_ctor @ cdecl -arch=win64 ??_F?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXXZ(ptr) basic_ostringstream_short_ctor -@ thiscall -arch=win32 ??_F?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXXZ(ptr) basic_string_char_ctor -@ cdecl -arch=win64 ??_F?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXXZ(ptr) basic_string_char_ctor -@ thiscall -arch=win32 ??_F?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXXZ(ptr) basic_string_wchar_ctor -@ cdecl -arch=win64 ??_F?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXXZ(ptr) basic_string_wchar_ctor +@ thiscall -arch=win32 ??_F?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXXZ(ptr) MSVCP_basic_string_char_ctor +@ cdecl -arch=win64 ??_F?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXXZ(ptr) MSVCP_basic_string_char_ctor +@ thiscall -arch=win32 ??_F?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXXZ(ptr) MSVCP_basic_string_wchar_ctor +@ cdecl -arch=win64 ??_F?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXXZ(ptr) MSVCP_basic_string_wchar_ctor @ thiscall -arch=win32 ??_F?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXXZ(ptr) basic_stringbuf_char_ctor @ cdecl -arch=win64 ??_F?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXXZ(ptr) basic_stringbuf_char_ctor @ thiscall -arch=win32 ??_F?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXXZ(ptr) basic_stringbuf_short_ctor @@ -2410,14 +2410,14 @@ @ cdecl -arch=win64 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@@Z(ptr ptr) basic_string_char_append @ thiscall -arch=win32 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@II@Z(ptr ptr long long) basic_string_char_append_substr @ cdecl -arch=win64 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@_K1@Z(ptr ptr long long) basic_string_char_append_substr -@ thiscall -arch=win32 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ID@Z(ptr long long) basic_string_char_append_len_ch +@ thiscall -arch=win32 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ID@Z(ptr long long) MSVCP_basic_string_char_append_len_ch @ cdecl -arch=win64 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD0@Z(ptr ptr ptr) basic_string_char_append_beg_end @ thiscall -arch=win32 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD0@Z(ptr ptr ptr) basic_string_char_append_beg_end @ cdecl -arch=win64 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD@Z(ptr str) basic_string_char_append_cstr @ thiscall -arch=win32 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD@Z(ptr str) basic_string_char_append_cstr @ cdecl -arch=win64 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@PEBD_K@Z(ptr ptr long) basic_string_char_append_cstr_len @ thiscall -arch=win32 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBDI@Z(ptr ptr long) basic_string_char_append_cstr_len -@ cdecl -arch=win64 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_KD@Z(ptr long long) basic_string_char_append_len_ch +@ cdecl -arch=win64 ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_KD@Z(ptr long long) MSVCP_basic_string_char_append_len_ch @ thiscall -arch=win32 ?append@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV12@ABV12@@Z(ptr ptr) basic_string_wchar_append @ cdecl -arch=win64 ?append@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAV12@AEBV12@@Z(ptr ptr) basic_string_wchar_append @ thiscall -arch=win32 ?append@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV12@ABV12@II@Z(ptr ptr long long) basic_string_wchar_append_substr @@ -2436,8 +2436,8 @@ @ stub -arch=win64 ?arg@std@@YANAEBV?$complex@N@1@@Z @ stub -arch=win32 ?arg@std@@YAOABV?$complex@O@1@@Z @ stub -arch=win64 ?arg@std@@YAOAEBV?$complex@O@1@@Z -@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@@Z(ptr ptr) basic_string_char_assign -@ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@@Z(ptr ptr) basic_string_char_assign +@ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@@Z(ptr ptr) MSVCP_basic_string_char_assign +@ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@@Z(ptr ptr) MSVCP_basic_string_char_assign @ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ABV12@II@Z(ptr ptr long long) basic_string_char_assign_substr @ cdecl -arch=win64 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@_K1@Z(ptr ptr long long) basic_string_char_assign_substr @ thiscall -arch=win32 ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ID@Z(ptr long long) basic_string_char_assignn @@ -2489,10 +2489,10 @@ @ cdecl -arch=win64 ?begin@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAPEAGXZ(ptr) basic_string_wchar_begin @ thiscall -arch=win32 ?begin@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPBGXZ(ptr) basic_string_wchar_begin @ cdecl -arch=win64 ?begin@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ(ptr) basic_string_wchar_begin -@ thiscall -arch=win32 ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ(ptr) basic_string_char_c_str -@ cdecl -arch=win64 ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ(ptr) basic_string_char_c_str -@ thiscall -arch=win32 ?c_str@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPBGXZ(ptr) basic_string_wchar_c_str -@ cdecl -arch=win64 ?c_str@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ(ptr) basic_string_wchar_c_str +@ thiscall -arch=win32 ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ(ptr) MSVCP_basic_string_char_c_str +@ cdecl -arch=win64 ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ(ptr) MSVCP_basic_string_char_c_str +@ thiscall -arch=win32 ?c_str@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPBGXZ(ptr) MSVCP_basic_string_wchar_c_str +@ cdecl -arch=win64 ?c_str@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ(ptr) MSVCP_basic_string_wchar_c_str @ thiscall -arch=win32 ?capacity@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ(ptr) basic_string_char_capacity @ cdecl -arch=win64 ?capacity@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ(ptr) basic_string_char_capacity @ thiscall -arch=win32 ?capacity@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ(ptr) basic_string_wchar_capacity @@ -2608,10 +2608,10 @@ @ stub -arch=win64 ?curr_symbol@?$_Mpunct@D@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ @ stub -arch=win32 ?curr_symbol@?$_Mpunct@G@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ @ stub -arch=win64 ?curr_symbol@?$_Mpunct@G@std@@QEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ -@ thiscall -arch=win32 ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ(ptr) basic_string_char_c_str -@ cdecl -arch=win64 ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ(ptr) basic_string_char_c_str -@ thiscall -arch=win32 ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPBGXZ(ptr) basic_string_wchar_c_str -@ cdecl -arch=win64 ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ(ptr) basic_string_wchar_c_str +@ thiscall -arch=win32 ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ(ptr) MSVCP_basic_string_char_c_str +@ cdecl -arch=win64 ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ(ptr) MSVCP_basic_string_char_c_str +@ thiscall -arch=win32 ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPBGXZ(ptr) MSVCP_basic_string_wchar_c_str +@ cdecl -arch=win64 ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ(ptr) MSVCP_basic_string_wchar_c_str @ stub -arch=win32 ?date_order@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QBEHXZ @ stub -arch=win64 ?date_order@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBAHXZ @ stub -arch=win32 ?date_order@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@QBEHXZ @@ -3394,10 +3394,10 @@ @ stub ?ldexp@?$_Ctr@M@std@@SAMMH@Z @ stub ?ldexp@?$_Ctr@N@std@@SANNH@Z @ stub ?ldexp@?$_Ctr@O@std@@SAOOH@Z -@ thiscall -arch=win32 ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ(ptr) basic_string_char_length -@ cdecl -arch=win64 ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ(ptr) basic_string_char_length -@ thiscall -arch=win32 ?length@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ(ptr) basic_string_wchar_length -@ cdecl -arch=win64 ?length@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KXZ(ptr) basic_string_wchar_length +@ thiscall -arch=win32 ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ(ptr) MSVCP_basic_string_char_length +@ cdecl -arch=win64 ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_char_length +@ thiscall -arch=win32 ?length@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ(ptr) MSVCP_basic_string_wchar_length +@ cdecl -arch=win64 ?length@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_wchar_length @ cdecl -arch=win32 ?length@?$char_traits@D@std@@SAIPBD@Z(ptr) msvcp90.?length@?$char_traits@D@std@@SAIPBD@Z @ cdecl -arch=win64 ?length@?$char_traits@D@std@@SA_KPEBD@Z(ptr) msvcp90.?length@?$char_traits@D@std@@SA_KPEBD@Z @ cdecl -arch=win32 ?length@?$char_traits@G@std@@SAIPBG@Z(ptr) msvcp90.?length@?$char_traits@G@std@@SAIPBG@Z @@ -4034,10 +4034,10 @@ @ stub -arch=win64 ?sinh@std@@YA?AV?$complex@N@1@AEBV21@@Z @ stub -arch=win32 ?sinh@std@@YA?AV?$complex@O@1@ABV21@@Z @ stub -arch=win64 ?sinh@std@@YA?AV?$complex@O@1@AEBV21@@Z -@ thiscall -arch=win32 ?size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ(ptr) basic_string_char_length -@ cdecl -arch=win64 ?size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ(ptr) basic_string_char_length -@ thiscall -arch=win32 ?size@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ(ptr) basic_string_wchar_length -@ cdecl -arch=win64 ?size@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KXZ(ptr) basic_string_wchar_length +@ thiscall -arch=win32 ?size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ(ptr) MSVCP_basic_string_char_length +@ cdecl -arch=win64 ?size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_char_length +@ thiscall -arch=win32 ?size@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ(ptr) MSVCP_basic_string_wchar_length +@ cdecl -arch=win64 ?size@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_wchar_length @ thiscall -arch=win32 ?snextc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAEHXZ(ptr) basic_streambuf_char_snextc @ cdecl -arch=win64 ?snextc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAAHXZ(ptr) basic_streambuf_char_snextc @ thiscall -arch=win32 ?snextc@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAEGXZ(ptr) basic_streambuf_wchar_snextc diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index f1b2b8e7004..5bd7a192272 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -151,7 +151,10 @@ void __thiscall basic_string_char__Eos(basic_string_char *this, MSVCP_size_t len this->ptr[len] = 0; } -void basic_string_char_clear(basic_string_char *this) +/* ?clear@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXXZ */ +/* ?clear@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_clear, 4) +void __thiscall MSVCP_basic_string_char_clear(basic_string_char *this) { if(this->ptr) basic_string_char__Eos(this, 0); @@ -375,8 +378,8 @@ basic_string_char* __thiscall basic_string_char_assign_cstr_len( /* ?assign@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@AEBV12@@Z */ /* ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@ABV01@@Z */ /* ??4?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@AEBV01@@Z */ -DEFINE_THISCALL_WRAPPER(basic_string_char_assign, 8) -basic_string_char* __thiscall basic_string_char_assign( +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_assign, 8) +basic_string_char* __thiscall MSVCP_basic_string_char_assign( basic_string_char *this, const basic_string_char *assign) { return basic_string_char_assign_substr(this, assign, @@ -440,7 +443,11 @@ basic_string_char* __thiscall basic_string_char_ctor_cstr_len_alloc( return this; } -basic_string_char* basic_string_char_ctor_cstr_len(basic_string_char *this, const char *str, MSVCP_size_t len) +/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBDI@Z */ +/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_cstr_len, 12) +basic_string_char* __thiscall MSVCP_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); } @@ -472,7 +479,10 @@ basic_string_char* __thiscall basic_string_char_ctor_cstr_alloc( return this; } -basic_string_char* basic_string_char_ctor_cstr( +/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBD@Z */ +/* ??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@PEBD@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_cstr, 8) +basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr( basic_string_char *this, const char *str) { return basic_string_char_ctor_cstr_alloc(this, str, NULL); @@ -506,8 +516,8 @@ basic_string_char* __thiscall basic_string_char_ctor_iter(basic_string_char *thi /* ??_F?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXXZ */ /* ??_F?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(basic_string_char_ctor, 4) -basic_string_char* __thiscall basic_string_char_ctor(basic_string_char *this) +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor, 4) +basic_string_char* __thiscall MSVCP_basic_string_char_ctor(basic_string_char *this) { TRACE("%p\n", this); @@ -529,21 +539,21 @@ 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@@QEAA@AEBV01@@Z */ -DEFINE_THISCALL_WRAPPER(basic_string_char_copy_ctor, 8) -basic_string_char* __thiscall basic_string_char_copy_ctor( +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_copy_ctor, 8) +basic_string_char* __thiscall MSVCP_basic_string_char_copy_ctor( basic_string_char *this, const basic_string_char *copy) { TRACE("%p %p\n", this, copy); basic_string_char__Tidy(this, FALSE); - basic_string_char_assign(this, copy); + MSVCP_basic_string_char_assign(this, copy); return this; } /* ??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 */ -DEFINE_THISCALL_WRAPPER(basic_string_char_dtor, 4) -void __thiscall basic_string_char_dtor(basic_string_char *this) +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_dtor, 4) +void __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) { TRACE("%p\n", this); basic_string_char__Tidy(this, TRUE); @@ -1183,8 +1193,8 @@ basic_string_char* __thiscall basic_string_char_append_cstr_len( /* ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@ID@Z */ /* ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_KD@Z */ -DEFINE_THISCALL_WRAPPER(basic_string_char_append_len_ch, 12) -basic_string_char* __thiscall basic_string_char_append_len_ch( +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_len_ch, 12) +basic_string_char* __thiscall MSVCP_basic_string_char_append_len_ch( basic_string_char *this, MSVCP_size_t count, char ch) { TRACE("%p %lu %c\n", this, count, ch); @@ -1214,11 +1224,11 @@ basic_string_char* __thiscall basic_string_char_append( /* ??Y?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV01@D@Z */ /* ??Y?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV01@D@Z */ -DEFINE_THISCALL_WRAPPER(basic_string_char_append_ch, 8) -basic_string_char* __thiscall basic_string_char_append_ch( +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_ch, 8) +basic_string_char* __thiscall MSVCP_basic_string_char_append_ch( basic_string_char *this, char ch) { - return basic_string_char_append_len_ch(this, 1, ch); + return MSVCP_basic_string_char_append_len_ch(this, 1, ch); } /* ?append@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@PBD0@Z */ @@ -1250,7 +1260,7 @@ basic_string_char* __cdecl basic_string_char_concatenate(basic_string_char *ret, { TRACE("%p %p\n", left, right); - basic_string_char_copy_ctor(ret, left); + MSVCP_basic_string_char_copy_ctor(ret, left); basic_string_char_append(ret, right); return ret; } @@ -1264,8 +1274,8 @@ basic_string_char* __cdecl basic_string_char_concatenate_bstr_ch(basic_string_ch { TRACE("%p %c\n", left, right); - basic_string_char_copy_ctor(ret, left); - basic_string_char_append_ch(ret, right); + MSVCP_basic_string_char_copy_ctor(ret, left); + MSVCP_basic_string_char_append_ch(ret, right); return ret; } @@ -1278,7 +1288,7 @@ basic_string_char* __cdecl basic_string_char_concatenate_bstr_cstr(basic_string_ { TRACE("%p %s\n", left, debugstr_a(right)); - basic_string_char_copy_ctor(ret, left); + MSVCP_basic_string_char_copy_ctor(ret, left); basic_string_char_append_cstr(ret, right); return ret; } @@ -1599,7 +1609,7 @@ void __thiscall basic_string_char_resize_ch( if(size <= this->size) basic_string_char_erase(this, size, this->size); else - basic_string_char_append_len_ch(this, size-this->size, ch); + MSVCP_basic_string_char_append_len_ch(this, size-this->size, ch); } /* ?resize@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXI@Z */ @@ -1665,8 +1675,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 */ /* ?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 */ -DEFINE_THISCALL_WRAPPER(basic_string_char_c_str, 4) -const char* __thiscall basic_string_char_c_str(const basic_string_char *this) +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_c_str, 4) +const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char *this) { TRACE("%p\n", this); return this->ptr ? this->ptr : basic_string_char__Nullstr(); @@ -1676,8 +1686,8 @@ const char* __thiscall basic_string_char_c_str(const basic_string_char *this) /* ?size@?$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@@QBEIXZ */ /* ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ */ -DEFINE_THISCALL_WRAPPER(basic_string_char_length, 4) -MSVCP_size_t __thiscall basic_string_char_length(const basic_string_char *this) +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_length, 4) +MSVCP_size_t __thiscall MSVCP_basic_string_char_length(const basic_string_char *this) { TRACE("%p\n", this); return this->size; @@ -1872,7 +1882,12 @@ void __thiscall basic_string_wchar__Eos(basic_string_wchar *this, MSVCP_size_t l this->ptr[len] = 0; } -void basic_string_wchar_clear(basic_string_wchar *this) +/* ?clear@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEXXZ */ +/* ?clear@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAXXZ */ +/* ?clear@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXXZ */ +/* ?clear@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_clear, 4) +void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar *this) { if(this->ptr) basic_string_wchar__Eos(this, 0); @@ -2162,7 +2177,13 @@ basic_string_wchar* __thiscall basic_string_wchar_ctor_cstr_len_alloc( return this; } -basic_string_wchar* basic_string_wchar_ctor_cstr_len(basic_string_wchar *this, const wchar_t *str, MSVCP_size_t len) +/* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@PB_WI@Z */ +/* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_W_K@Z */ +/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@PBGI@Z */ +/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@PEBG_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_cstr_len, 12) +basic_string_wchar* __thiscall MSVCP_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); } @@ -2194,7 +2215,13 @@ basic_string_wchar* __thiscall basic_string_wchar_ctor_cstr_alloc( return this; } -basic_string_wchar* basic_string_wchar_ctor_cstr(basic_string_wchar *this, const wchar_t *str) +/* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@PB_W@Z */ +/* ??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@PEB_W@Z */ +/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@PBG@Z */ +/* ??0?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@PEBG@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor_cstr, 8) +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); } @@ -2227,8 +2254,8 @@ basic_string_wchar* __thiscall basic_string_wchar_ctor_iter(basic_string_wchar * /* ??_F?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXXZ */ /* ??_F?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(basic_string_wchar_ctor, 4) -basic_string_wchar* __thiscall basic_string_wchar_ctor(basic_string_wchar *this) +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor, 4) +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor(basic_string_wchar *this) { TRACE("%p\n", this); @@ -2263,8 +2290,8 @@ basic_string_wchar* __thiscall 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@@QEAA@XZ */ -DEFINE_THISCALL_WRAPPER(basic_string_wchar_dtor, 4) -void __thiscall basic_string_wchar_dtor(basic_string_wchar *this) +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_dtor, 4) +void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar *this) { TRACE("%p\n", this); basic_string_wchar__Tidy(this, TRUE); @@ -2935,8 +2962,8 @@ basic_string_wchar* __thiscall basic_string_wchar_append( /* ??Y?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV01@G@Z */ /* ??Y?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAAEAV01@G@Z */ -DEFINE_THISCALL_WRAPPER(basic_string_wchar_append_ch, 8) -basic_string_wchar* __thiscall basic_string_wchar_append_ch( +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_ch, 8) +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch( basic_string_wchar *this, wchar_t ch) { return basic_string_wchar_append_len_ch(this, 1, ch); @@ -2986,7 +3013,7 @@ basic_string_wchar* __cdecl basic_string_wchar_concatenate_bstr_ch(basic_string_ TRACE("%p %c\n", left, right); basic_string_wchar_copy_ctor(ret, left); - basic_string_wchar_append_ch(ret, right); + MSVCP_basic_string_wchar_append_ch(ret, right); return ret; } @@ -3386,8 +3413,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 */ /* ?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 */ -DEFINE_THISCALL_WRAPPER(basic_string_wchar_c_str, 4) -const wchar_t* __thiscall basic_string_wchar_c_str(const basic_string_wchar *this) +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_c_str, 4) +const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar *this) { TRACE("%p\n", this); return this->ptr ? this->ptr : basic_string_wchar__Nullstr(); @@ -3397,8 +3424,8 @@ const wchar_t* __thiscall basic_string_wchar_c_str(const basic_string_wchar *thi /* ?size@?$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@@QBEIXZ */ /* ?length@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KXZ */ -DEFINE_THISCALL_WRAPPER(basic_string_wchar_length, 4) -MSVCP_size_t __thiscall basic_string_wchar_length(const basic_string_wchar *this) +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_length, 4) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(const basic_string_wchar *this) { TRACE("%p\n", this); return this->size;