diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 227d7a43abe..ba353d08e81 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -369,11 +369,6 @@ const int basic_istream_char_vbtable[] = {0, ALIGNED_SIZE(sizeof(basic_istream_c /* ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@ */ extern const vtable_ptr basic_istream_char_vtable; -/* ??_8?$basic_istream@_WU?$char_traits@_W@std@@@std@@7B@ */ -const int basic_istream_wchar_vbtable[] = {0, ALIGNED_SIZE(sizeof(basic_istream_wchar), VBTABLE_ALIGN)}; -/* ??_7?$basic_istream@_WU?$char_traits@_W@std@@@std@@6B@ */ -extern const vtable_ptr basic_istream_wchar_vtable; - /* ??_8?$basic_istream@GU?$char_traits@G@std@@@std@@7B@ */ const int basic_istream_short_vbtable[] = {0, ALIGNED_SIZE(sizeof(basic_istream_wchar), VBTABLE_ALIGN)}; /* ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@ */ @@ -511,9 +506,6 @@ DEFINE_RTTI_DATA3(basic_ostream_short, sizeof(basic_ostream_wchar), &basic_ios_s DEFINE_RTTI_DATA3(basic_istream_char, sizeof(basic_istream_char), &basic_ios_char_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, ".?AV?$basic_istream@DU?$char_traits@D@std@@@std@@") -DEFINE_RTTI_DATA3(basic_istream_wchar, sizeof(basic_istream_wchar), &basic_ios_wchar_rtti_base_descriptor, - &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, - ".?AV?$basic_istream@_WU?$char_traits@_W@std@@@std@@") DEFINE_RTTI_DATA3(basic_istream_short, sizeof(basic_istream_wchar), &basic_ios_short_rtti_base_descriptor, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, ".?AV?$basic_istream@GU?$char_traits@G@std@@@std@@") @@ -743,10 +735,8 @@ __ASM_BLOCK_BEGIN(ios_vtables) VTABLE_ADD_FUNC(basic_ostream_wchar_vector_dtor)); __ASM_VTABLE(basic_istream_char, VTABLE_ADD_FUNC(basic_istream_char_vector_dtor)); - __ASM_VTABLE(basic_istream_wchar, - VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor)); __ASM_VTABLE(basic_istream_short, - VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor)); + VTABLE_ADD_FUNC(basic_istream_short_vector_dtor)); __ASM_VTABLE(basic_iostream_char, VTABLE_ADD_FUNC(basic_iostream_char_vector_dtor)); __ASM_VTABLE(basic_iostream_short, @@ -8563,44 +8553,19 @@ void __thiscall basic_istream_char_swap(basic_istream_char *this, basic_istream_ } /* Caution: basic_istream uses virtual inheritance. */ -static inline basic_ios_wchar* basic_istream_wchar_get_basic_ios(basic_istream_wchar *this) +static inline basic_ios_wchar* basic_istream_short_get_basic_ios(basic_istream_wchar *this) { return (basic_ios_wchar*)((char*)this+this->vbtable[1]); } -static inline basic_ios_wchar* basic_istream_wchar_to_basic_ios(basic_istream_wchar *ptr) +static inline basic_ios_wchar* basic_istream_short_to_basic_ios(basic_istream_wchar *ptr) { - return (basic_ios_wchar*)((char*)ptr+basic_istream_wchar_vbtable[1]); + return (basic_ios_wchar*)((char*)ptr+basic_istream_short_vbtable[1]); } -static inline basic_istream_wchar* basic_istream_wchar_from_basic_ios(basic_ios_wchar *ptr) +static inline basic_istream_wchar* basic_istream_short_from_basic_ios(basic_ios_wchar *ptr) { - return (basic_istream_wchar*)((char*)ptr-basic_istream_wchar_vbtable[1]); -} - -/* ??0?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAE@PAV?$basic_streambuf@_WU?$char_traits@_W@std@@@1@_N1@Z */ -/* ??0?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAA@PEAV?$basic_streambuf@_WU?$char_traits@_W@std@@@1@_N1@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_ctor_init, 20) -basic_istream_wchar* __thiscall basic_istream_wchar_ctor_init(basic_istream_wchar *this, - basic_streambuf_wchar *strbuf, bool isstd, bool noinit, bool virt_init) -{ - basic_ios_wchar *base; - - TRACE("(%p %p %d %d %d)\n", this, strbuf, isstd, noinit, virt_init); - - if(virt_init) { - this->vbtable = basic_istream_wchar_vbtable; - base = basic_istream_wchar_get_basic_ios(this); - basic_ios_wchar_ctor(base); - }else { - base = basic_istream_wchar_get_basic_ios(this); - } - - base->base.vtable = &basic_istream_wchar_vtable; - this->count = 0; - if(!noinit) - basic_ios_wchar_init(base, strbuf, isstd); - return this; + return (basic_istream_wchar*)((char*)ptr-basic_istream_short_vbtable[1]); } /* ??0?$basic_istream@GU?$char_traits@G@std@@@std@@QAE@PAV?$basic_streambuf@GU?$char_traits@G@std@@@1@_N1@Z */ @@ -8609,18 +8574,23 @@ DEFINE_THISCALL_WRAPPER(basic_istream_short_ctor_init, 20) basic_istream_wchar* __thiscall basic_istream_short_ctor_init(basic_istream_wchar *this, basic_streambuf_wchar *strbuf, bool isstd, bool noinit, bool virt_init) { - basic_istream_wchar_ctor_init(this, strbuf, isstd, noinit, virt_init); - basic_istream_wchar_get_basic_ios(this)->base.vtable = &basic_istream_short_vtable; - return this; -} + basic_ios_wchar *base; -/* ??0?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAE@PAV?$basic_streambuf@_WU?$char_traits@_W@std@@@1@_N@Z */ -/* ??0?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAA@PEAV?$basic_streambuf@_WU?$char_traits@_W@std@@@1@_N@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_ctor, 16) -basic_istream_wchar* __thiscall basic_istream_wchar_ctor(basic_istream_wchar *this, - basic_streambuf_wchar *strbuf, bool isstd, bool virt_init) -{ - return basic_istream_wchar_ctor_init(this, strbuf, isstd, FALSE, virt_init); + TRACE("(%p %p %d %d %d)\n", this, strbuf, isstd, noinit, virt_init); + + if(virt_init) { + this->vbtable = basic_istream_short_vbtable; + base = basic_istream_short_get_basic_ios(this); + basic_ios_wchar_ctor(base); + }else { + base = basic_istream_short_get_basic_ios(this); + } + + base->base.vtable = &basic_istream_short_vtable; + this->count = 0; + if(!noinit) + basic_ios_wchar_init(base, strbuf, isstd); + return this; } /* ??0?$basic_istream@GU?$char_traits@G@std@@@std@@QAE@PAV?$basic_streambuf@GU?$char_traits@G@std@@@1@_N@Z */ @@ -8632,10 +8602,10 @@ basic_istream_wchar* __thiscall basic_istream_short_ctor(basic_istream_wchar *th return basic_istream_short_ctor_init(this, strbuf, isstd, FALSE, virt_init); } -/* ??0?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAE@W4_Uninitialized@1@@Z */ -/* ??0?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAA@W4_Uninitialized@1@@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_ctor_uninitialized, 12) -basic_istream_wchar* __thiscall basic_istream_wchar_ctor_uninitialized( +/* ??0?$basic_istream@GU?$char_traits@G@std@@@std@@QAE@W4_Uninitialized@1@@Z */ +/* ??0?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA@W4_Uninitialized@1@@Z */ +DEFINE_THISCALL_WRAPPER(basic_istream_short_ctor_uninitialized, 12) +basic_istream_wchar* __thiscall basic_istream_short_ctor_uninitialized( basic_istream_wchar *this, int uninitialized, bool virt_init) { basic_ios_wchar *base; @@ -8643,58 +8613,43 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ctor_uninitialized( TRACE("(%p %d %d)\n", this, uninitialized, virt_init); if(virt_init) { - this->vbtable = basic_istream_wchar_vbtable; - base = basic_istream_wchar_get_basic_ios(this); + this->vbtable = basic_istream_short_vbtable; + base = basic_istream_short_get_basic_ios(this); basic_ios_wchar_ctor(base); }else { - base = basic_istream_wchar_get_basic_ios(this); + base = basic_istream_short_get_basic_ios(this); } - base->base.vtable = &basic_istream_wchar_vtable; + base->base.vtable = &basic_istream_short_vtable; ios_base_Addstd(&base->base); return this; } -/* ??0?$basic_istream@GU?$char_traits@G@std@@@std@@QAE@W4_Uninitialized@1@@Z */ -/* ??0?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA@W4_Uninitialized@1@@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_short_ctor_uninitialized, 12) -basic_istream_wchar* __thiscall basic_istream_short_ctor_uninitialized( - basic_istream_wchar *this, int uninitialized, bool virt_init) -{ - basic_istream_wchar_ctor_uninitialized(this, uninitialized, virt_init); - basic_istream_wchar_get_basic_ios(this)->base.vtable = &basic_istream_short_vtable; - return this; -} - -/* ??1?$basic_istream@_WU?$char_traits@_W@std@@@std@@UAE@XZ */ -/* ??1?$basic_istream@_WU?$char_traits@_W@std@@@std@@UEAA@XZ */ /* ??1?$basic_istream@GU?$char_traits@G@std@@@std@@UAE@XZ */ /* ??1?$basic_istream@GU?$char_traits@G@std@@@std@@UEAA@XZ */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_dtor, 4) -void __thiscall basic_istream_wchar_dtor(basic_ios_wchar *base) +DEFINE_THISCALL_WRAPPER(basic_istream_short_dtor, 4) +void __thiscall basic_istream_short_dtor(basic_ios_wchar *base) { - basic_istream_wchar *this = basic_istream_wchar_from_basic_ios(base); + basic_istream_wchar *this = basic_istream_short_from_basic_ios(base); /* don't destroy virtual base here */ TRACE("(%p)\n", this); } -/* ??_D?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEXXZ */ -/* ??_D?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAXXZ */ /* ??_D?$basic_istream@GU?$char_traits@G@std@@@std@@QAEXXZ */ /* ??_D?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_vbase_dtor, 4) -void __thiscall basic_istream_wchar_vbase_dtor(basic_istream_wchar *this) +DEFINE_THISCALL_WRAPPER(basic_istream_short_vbase_dtor, 4) +void __thiscall basic_istream_short_vbase_dtor(basic_istream_wchar *this) { TRACE("(%p)\n", this); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(this)); - basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(this)); + basic_istream_short_dtor(basic_istream_short_to_basic_ios(this)); + basic_ios_wchar_dtor(basic_istream_short_get_basic_ios(this)); } -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_vector_dtor, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_istream_short_vector_dtor, 8) +basic_istream_wchar* __thiscall basic_istream_short_vector_dtor(basic_ios_wchar *base, unsigned int flags) { - basic_istream_wchar *this = basic_istream_wchar_from_basic_ios(base); + basic_istream_wchar *this = basic_istream_short_from_basic_ios(base); TRACE("(%p %x)\n", this, flags); @@ -8703,10 +8658,10 @@ basic_istream_wchar* __thiscall basic_istream_wchar_vector_dtor(basic_ios_wchar INT_PTR i, *ptr = (INT_PTR *)this-1; for(i=*ptr-1; i>=0; i--) - basic_istream_wchar_vbase_dtor(this+i); + basic_istream_short_vbase_dtor(this+i); operator_delete(ptr); } else { - basic_istream_wchar_vbase_dtor(this); + basic_istream_short_vbase_dtor(this); if(flags & 1) operator_delete(this); } @@ -8714,14 +8669,12 @@ basic_istream_wchar* __thiscall basic_istream_wchar_vector_dtor(basic_ios_wchar return this; } -/* ?_Ipfx@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAE_N_N@Z */ -/* ?_Ipfx@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAA_N_N@Z */ /* ?_Ipfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QAE_N_N@Z */ /* ?_Ipfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA_N_N@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar__Ipfx, 8) -bool __thiscall basic_istream_wchar__Ipfx(basic_istream_wchar *this, bool noskip) +DEFINE_THISCALL_WRAPPER(basic_istream_short__Ipfx, 8) +bool __thiscall basic_istream_short__Ipfx(basic_istream_wchar *this, bool noskip) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); TRACE("(%p %d)\n", this, noskip); @@ -8749,80 +8702,70 @@ bool __thiscall basic_istream_wchar__Ipfx(basic_istream_wchar *this, bool noskip return TRUE; } -/* ?ipfx@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAE_N_N@Z */ -/* ?ipfx@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAA_N_N@Z */ /* ?ipfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QAE_N_N@Z */ /* ?ipfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA_N_N@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_ipfx, 8) -bool __thiscall basic_istream_wchar_ipfx(basic_istream_wchar *this, bool noskip) +DEFINE_THISCALL_WRAPPER(basic_istream_short_ipfx, 8) +bool __thiscall basic_istream_short_ipfx(basic_istream_wchar *this, bool noskip) { - return basic_istream_wchar__Ipfx(this, noskip); + return basic_istream_short__Ipfx(this, noskip); } -/* ?isfx@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEXXZ */ -/* ?isfx@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAXXZ */ /* ?isfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEXXZ */ /* ?isfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_isfx, 4) -void __thiscall basic_istream_wchar_isfx(basic_istream_wchar *this) +DEFINE_THISCALL_WRAPPER(basic_istream_short_isfx, 4) +void __thiscall basic_istream_short_isfx(basic_istream_wchar *this) { TRACE("(%p)\n", this); } -static BOOL basic_istream_wchar_sentry_create(basic_istream_wchar *istr, bool noskip) +static BOOL basic_istream_short_sentry_create(basic_istream_wchar *istr, bool noskip) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istr); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(istr); if(basic_ios_wchar_rdbuf_get(base)) basic_streambuf_wchar__Lock(base->strbuf); - return basic_istream_wchar_ipfx(istr, noskip); + return basic_istream_short_ipfx(istr, noskip); } -static void basic_istream_wchar_sentry_destroy(basic_istream_wchar *istr) +static void basic_istream_short_sentry_destroy(basic_istream_wchar *istr) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istr); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(istr); if(basic_ios_wchar_rdbuf_get(base)) basic_streambuf_wchar__Unlock(base->strbuf); } -/* ?gcount@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QBEHXZ */ -/* ?gcount@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEBA_JXZ */ /* ?gcount@?$basic_istream@GU?$char_traits@G@std@@@std@@QBEHXZ */ /* ?gcount@?$basic_istream@GU?$char_traits@G@std@@@std@@QEBA_JXZ */ /* ?gcount@?$basic_istream@GU?$char_traits@G@std@@@std@@QBA_JXZ */ /* ?gcount@?$basic_istream@GU?$char_traits@G@std@@@std@@QBE_JXZ */ -/* ?gcount@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QBA_JXZ */ -/* ?gcount@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QBE_JXZ */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_gcount, 4) -streamsize __thiscall basic_istream_wchar_gcount(const basic_istream_wchar *this) +DEFINE_THISCALL_WRAPPER(basic_istream_short_gcount, 4) +streamsize __thiscall basic_istream_short_gcount(const basic_istream_wchar *this) { TRACE("(%p)\n", this); return this->count; } -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEGXZ */ -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAGXZ */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEGXZ */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAGXZ */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_get, 4) -unsigned short __thiscall basic_istream_wchar_get(basic_istream_wchar *this) +DEFINE_THISCALL_WRAPPER(basic_istream_short_get, 4) +unsigned short __thiscall basic_istream_short_get(basic_istream_wchar *this) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); int ret; TRACE("(%p)\n", this); this->count = 0; - if(!basic_istream_wchar_sentry_create(this, TRUE)) { - basic_istream_wchar_sentry_destroy(this); + if(!basic_istream_short_sentry_create(this, TRUE)) { + basic_istream_short_sentry_destroy(this); return WEOF; } ret = basic_streambuf_wchar_sbumpc(basic_ios_wchar_rdbuf_get(base)); - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); if(ret == WEOF) basic_ios_wchar_setstate(base, IOSTATE_eofbit|IOSTATE_failbit); else @@ -8831,38 +8774,34 @@ unsigned short __thiscall basic_istream_wchar_get(basic_istream_wchar *this) return ret; } -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@AA_W@Z */ -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@AEA_W@Z */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@AAG@Z */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@AEAG@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_get_ch, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_get_ch(basic_istream_wchar *this, wchar_t *ch) +DEFINE_THISCALL_WRAPPER(basic_istream_short_get_ch, 8) +basic_istream_wchar* __thiscall basic_istream_short_get_ch(basic_istream_wchar *this, wchar_t *ch) { unsigned short ret; TRACE("(%p %p)\n", this, ch); - ret = basic_istream_wchar_get(this); + ret = basic_istream_short_get(this); if(ret != WEOF) *ch = (wchar_t)ret; return this; } -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@PA_WH_W@Z */ -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@PEA_W_J_W@Z */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGHG@Z */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_JG@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_get_str_delim, 16) -basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_wchar *this, wchar_t *str, streamsize count, wchar_t delim) +DEFINE_THISCALL_WRAPPER(basic_istream_short_get_str_delim, 16) +basic_istream_wchar* __thiscall basic_istream_short_get_str_delim(basic_istream_wchar *this, wchar_t *str, streamsize count, wchar_t delim) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); unsigned short ch = delim; TRACE("(%p %p %Id %s)\n", this, str, count, debugstr_wn(&delim, 1)); this->count = 0; - if(basic_istream_wchar_sentry_create(this, TRUE)) { + if(basic_istream_short_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); for(ch = basic_streambuf_wchar_sgetc(strbuf); count>1; @@ -8875,7 +8814,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_ count--; } } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, (!this->count ? IOSTATE_failbit : IOSTATE_goodbit) | (ch==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); @@ -8884,31 +8823,27 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_ return this; } -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@PA_WH@Z */ -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@PEA_W_J@Z */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGH@Z */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_J@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_get_str, 12) -basic_istream_wchar* __thiscall basic_istream_wchar_get_str(basic_istream_wchar *this, wchar_t *str, streamsize count) +DEFINE_THISCALL_WRAPPER(basic_istream_short_get_str, 12) +basic_istream_wchar* __thiscall basic_istream_short_get_str(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar_get_str_delim(this, str, count, '\n'); + return basic_istream_short_get_str_delim(this, str, count, '\n'); } -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@AAV?$basic_streambuf@_WU?$char_traits@_W@std@@@2@_W@Z */ -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@AEAV?$basic_streambuf@_WU?$char_traits@_W@std@@@2@_W@Z */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@AAV?$basic_streambuf@GU?$char_traits@G@std@@@2@G@Z */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@AEAV?$basic_streambuf@GU?$char_traits@G@std@@@2@G@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_get_streambuf_delim, 12) -basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_istream_wchar *this, basic_streambuf_wchar *strbuf, wchar_t delim) +DEFINE_THISCALL_WRAPPER(basic_istream_short_get_streambuf_delim, 12) +basic_istream_wchar* __thiscall basic_istream_short_get_streambuf_delim(basic_istream_wchar *this, basic_streambuf_wchar *strbuf, wchar_t delim) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); unsigned short ch = delim; TRACE("(%p %p %s)\n", this, strbuf, debugstr_wn(&delim, 1)); this->count = 0; - if(basic_istream_wchar_sentry_create(this, TRUE)) { + if(basic_istream_short_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf_read = basic_ios_wchar_rdbuf_get(base); for(ch = basic_streambuf_wchar_sgetc(strbuf_read); ; @@ -8921,38 +8856,34 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_is this->count++; } } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, (!this->count ? IOSTATE_failbit : IOSTATE_goodbit) | (ch==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return this; } -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@AAV?$basic_streambuf@_WU?$char_traits@_W@std@@@2@@Z */ -/* ?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@AEAV?$basic_streambuf@_WU?$char_traits@_W@std@@@2@@Z */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@AAV?$basic_streambuf@GU?$char_traits@G@std@@@2@@Z */ /* ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@AEAV?$basic_streambuf@GU?$char_traits@G@std@@@2@@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_get_streambuf, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf(basic_istream_wchar *this, basic_streambuf_wchar *strbuf) +DEFINE_THISCALL_WRAPPER(basic_istream_short_get_streambuf, 8) +basic_istream_wchar* __thiscall basic_istream_short_get_streambuf(basic_istream_wchar *this, basic_streambuf_wchar *strbuf) { - return basic_istream_wchar_get_streambuf_delim(this, strbuf, '\n'); + return basic_istream_short_get_streambuf_delim(this, strbuf, '\n'); } -/* ?getline@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@PA_WH_W@Z */ -/* ?getline@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@PEA_W_J_W@Z */ /* ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGHG@Z */ /* ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_JG@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_getline_delim, 16) -basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_wchar *this, wchar_t *str, streamsize count, wchar_t delim) +DEFINE_THISCALL_WRAPPER(basic_istream_short_getline_delim, 16) +basic_istream_wchar* __thiscall basic_istream_short_getline_delim(basic_istream_wchar *this, wchar_t *str, streamsize count, wchar_t delim) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); unsigned short ch = delim; TRACE("(%p %p %Id %s)\n", this, str, count, debugstr_wn(&delim, 1)); this->count = 0; - if(basic_istream_wchar_sentry_create(this, TRUE) && count>0) { + if(basic_istream_short_sentry_create(this, TRUE) && count>0) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); while(count > 1) { @@ -8977,7 +8908,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_ } } } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, (ch==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit) | (!this->count || (ch!=delim && ch!=WEOF) ? IOSTATE_failbit : IOSTATE_goodbit)); @@ -8986,24 +8917,20 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_ return this; } -/* ?getline@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@PA_WH@Z */ -/* ?getline@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@PEA_W_J@Z */ /* ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGH@Z */ /* ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_J@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_getline, 12) -basic_istream_wchar* __thiscall basic_istream_wchar_getline(basic_istream_wchar *this, wchar_t *str, streamsize count) +DEFINE_THISCALL_WRAPPER(basic_istream_short_getline, 12) +basic_istream_wchar* __thiscall basic_istream_short_getline(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar_getline_delim(this, str, count, '\n'); + return basic_istream_short_getline_delim(this, str, count, '\n'); } -/* ?ignore@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@HG@Z */ -/* ?ignore@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@_JG@Z */ /* ?ignore@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@HG@Z */ /* ?ignore@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@_JG@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_ignore, 12) -basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar *this, streamsize count, unsigned short delim) +DEFINE_THISCALL_WRAPPER(basic_istream_short_ignore, 12) +basic_istream_wchar* __thiscall basic_istream_short_ignore(basic_istream_wchar *this, streamsize count, unsigned short delim) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); unsigned short ch = delim; unsigned int state; @@ -9011,7 +8938,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * this->count = 0; - if(basic_istream_wchar_sentry_create(this, TRUE)) { + if(basic_istream_short_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); state = IOSTATE_goodbit; @@ -9032,24 +8959,22 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * } }else state = IOSTATE_failbit; - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ?ws@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@1@AAV21@@Z */ -/* ?ws@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@1@AEAV21@@Z */ /* ?ws@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@@Z */ /* ?ws@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@@Z */ -basic_istream_wchar* __cdecl ws_basic_istream_wchar(basic_istream_wchar *istream) +basic_istream_wchar* __cdecl ws_basic_istream_short(basic_istream_wchar *istream) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(istream); unsigned short ch = '\n'; TRACE("(%p)\n", istream); - if(basic_istream_wchar_sentry_create(istream, TRUE)) { + if(basic_istream_short_sentry_create(istream, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); const ctype_wchar *ctype = ctype_wchar_use_facet(IOS_LOCALE(strbuf)); @@ -9059,30 +8984,28 @@ basic_istream_wchar* __cdecl ws_basic_istream_wchar(basic_istream_wchar *istream break; } } - basic_istream_wchar_sentry_destroy(istream); + basic_istream_short_sentry_destroy(istream); if(ch == WEOF) basic_ios_wchar_setstate(base, IOSTATE_eofbit); return istream; } -/* ?peek@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEGXZ */ -/* ?peek@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAGXZ */ /* ?peek@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEGXZ */ /* ?peek@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAGXZ */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_peek, 4) -unsigned short __thiscall basic_istream_wchar_peek(basic_istream_wchar *this) +DEFINE_THISCALL_WRAPPER(basic_istream_short_peek, 4) +unsigned short __thiscall basic_istream_short_peek(basic_istream_wchar *this) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); unsigned short ret = WEOF; TRACE("(%p)\n", this); this->count = 0; - if(basic_istream_wchar_sentry_create(this, TRUE)) + if(basic_istream_short_sentry_create(this, TRUE)) ret = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); if (ret == WEOF) basic_ios_wchar_setstate(base, IOSTATE_eofbit); @@ -9090,19 +9013,17 @@ unsigned short __thiscall basic_istream_wchar_peek(basic_istream_wchar *this) return ret; } -/* ?_Read_s@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@PA_WIH@Z */ -/* ?_Read_s@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@PEA_W_K_J@Z */ /* ?_Read_s@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGIH@Z */ /* ?_Read_s@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_K_J@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar__Read_s, 16) -basic_istream_wchar* __thiscall basic_istream_wchar__Read_s(basic_istream_wchar *this, wchar_t *str, size_t size, streamsize count) +DEFINE_THISCALL_WRAPPER(basic_istream_short__Read_s, 16) +basic_istream_wchar* __thiscall basic_istream_short__Read_s(basic_istream_wchar *this, wchar_t *str, size_t size, streamsize count) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); IOSB_iostate state = IOSTATE_goodbit; TRACE("(%p %p %Iu %Id)\n", this, str, size, count); - if(basic_istream_wchar_sentry_create(this, TRUE)) { + if(basic_istream_short_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); this->count = basic_streambuf_wchar__Sgetn_s(strbuf, str, size, count); @@ -9111,37 +9032,33 @@ basic_istream_wchar* __thiscall basic_istream_wchar__Read_s(basic_istream_wchar }else { this->count = 0; } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ?read@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@PA_WH@Z */ -/* ?read@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@PEA_W_J@Z */ /* ?read@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGH@Z */ /* ?read@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_J@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read, 12) -basic_istream_wchar* __thiscall basic_istream_wchar_read(basic_istream_wchar *this, wchar_t *str, streamsize count) +DEFINE_THISCALL_WRAPPER(basic_istream_short_read, 12) +basic_istream_wchar* __thiscall basic_istream_short_read(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar__Read_s(this, str, -1, count); + return basic_istream_short__Read_s(this, str, -1, count); } -/* ?_Readsome_s@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEHPA_WIH@Z */ -/* ?_Readsome_s@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAA_JPEA_W_K_J@Z */ /* ?_Readsome_s@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEHPAGIH@Z */ /* ?_Readsome_s@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA_JPEAG_K_J@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar__Readsome_s, 16) -streamsize __thiscall basic_istream_wchar__Readsome_s(basic_istream_wchar *this, wchar_t *str, size_t size, streamsize count) +DEFINE_THISCALL_WRAPPER(basic_istream_short__Readsome_s, 16) +streamsize __thiscall basic_istream_short__Readsome_s(basic_istream_wchar *this, wchar_t *str, size_t size, streamsize count) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); IOSB_iostate state = IOSTATE_goodbit; TRACE("(%p %p %Iu %Id)\n", this, str, size, count); this->count = 0; - if(basic_istream_wchar_sentry_create(this, TRUE)) { + if(basic_istream_short_sentry_create(this, TRUE)) { streamsize avail = basic_streambuf_wchar_in_avail(basic_ios_wchar_rdbuf_get(base)); if(avail > count) avail = count; @@ -9149,41 +9066,37 @@ streamsize __thiscall basic_istream_wchar__Readsome_s(basic_istream_wchar *this, if(avail == -1) state |= IOSTATE_eofbit; else if(avail > 0) - basic_istream_wchar__Read_s(this, str, size, avail); + basic_istream_short__Read_s(this, str, size, avail); }else { state |= IOSTATE_failbit; } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this->count; } -/* ?readsome@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEHPA_WH@Z */ -/* ?readsome@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAA_JPEA_W_J@Z */ /* ?readsome@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEHPAGH@Z */ /* ?readsome@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA_JPEAG_J@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_readsome, 12) -streamsize __thiscall basic_istream_wchar_readsome(basic_istream_wchar *this, wchar_t *str, streamsize count) +DEFINE_THISCALL_WRAPPER(basic_istream_short_readsome, 12) +streamsize __thiscall basic_istream_short_readsome(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar__Readsome_s(this, str, count, count); + return basic_istream_short__Readsome_s(this, str, count, count); } -/* ?putback@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@_W@Z */ -/* ?putback@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@_W@Z */ /* ?putback@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@G@Z */ /* ?putback@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@G@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_putback, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_putback(basic_istream_wchar *this, wchar_t ch) +DEFINE_THISCALL_WRAPPER(basic_istream_short_putback, 8) +basic_istream_wchar* __thiscall basic_istream_short_putback(basic_istream_wchar *this, wchar_t ch) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); IOSB_iostate state = IOSTATE_goodbit; TRACE("(%p %c)\n", this, ch); this->count = 0; - if(basic_istream_wchar_sentry_create(this, TRUE)) { + if(basic_istream_short_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); if(!ios_base_good(&base->base)) @@ -9191,27 +9104,25 @@ basic_istream_wchar* __thiscall basic_istream_wchar_putback(basic_istream_wchar else if(!strbuf || basic_streambuf_wchar_sputbackc(strbuf, ch)==WEOF) state |= IOSTATE_badbit; } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ?unget@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@XZ */ -/* ?unget@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@XZ */ /* ?unget@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@XZ */ /* ?unget@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@XZ */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_unget, 4) -basic_istream_wchar* __thiscall basic_istream_wchar_unget(basic_istream_wchar *this) +DEFINE_THISCALL_WRAPPER(basic_istream_short_unget, 4) +basic_istream_wchar* __thiscall basic_istream_short_unget(basic_istream_wchar *this) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); IOSB_iostate state = IOSTATE_goodbit; TRACE("(%p)\n", this); this->count = 0; - if(basic_istream_wchar_sentry_create(this, TRUE)) { + if(basic_istream_short_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); if(!ios_base_good(&base->base)) @@ -9219,20 +9130,18 @@ basic_istream_wchar* __thiscall basic_istream_wchar_unget(basic_istream_wchar *t else if(!strbuf || basic_streambuf_wchar_sungetc(strbuf)==WEOF) state |= IOSTATE_badbit; } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ?sync@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEHXZ */ -/* ?sync@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAHXZ */ /* ?sync@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEHXZ */ /* ?sync@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAHXZ */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_sync, 4) -int __thiscall basic_istream_wchar_sync(basic_istream_wchar *this) +DEFINE_THISCALL_WRAPPER(basic_istream_short_sync, 4) +int __thiscall basic_istream_short_sync(basic_istream_wchar *this) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); TRACE("(%p)\n", this); @@ -9240,26 +9149,24 @@ int __thiscall basic_istream_wchar_sync(basic_istream_wchar *this) if(!strbuf) return -1; - if(basic_istream_wchar_sentry_create(this, TRUE)) { + if(basic_istream_short_sentry_create(this, TRUE)) { if(basic_streambuf_wchar_pubsync(strbuf) != -1) { - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); return 0; } } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, IOSTATE_badbit); return -1; } -/* ?tellg@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAE?AV?$fpos@H@2@XZ */ -/* ?tellg@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAA?AV?$fpos@H@2@XZ */ /* ?tellg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAE?AV?$fpos@H@2@XZ */ /* ?tellg@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA?AV?$fpos@H@2@XZ */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_tellg, 8) -fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_int *ret) +DEFINE_THISCALL_WRAPPER(basic_istream_short_tellg, 8) +fpos_int* __thiscall basic_istream_short_tellg(basic_istream_wchar *this, fpos_int *ret) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); TRACE("(%p %p)\n", this, ret); @@ -9278,14 +9185,12 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i /* ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@JW4seekdir@ios_base@2@@Z */ /* ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@_JW4seekdir@ios_base@2@@Z */ -/* ?seekg@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@JH@Z */ -/* ?seekg@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@_JH@Z */ /* ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@JH@Z */ /* ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@_JH@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_seekg, 12) -basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *this, streamoff off, int dir) +DEFINE_THISCALL_WRAPPER(basic_istream_short_seekg, 12) +basic_istream_wchar* __thiscall basic_istream_short_seekg(basic_istream_wchar *this, streamoff off, int dir) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); TRACE("(%p %Id %d)\n", this, off, dir); @@ -9299,14 +9204,12 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t return this; } -/* ?seekg@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@V?$fpos@H@2@@Z */ -/* ?seekg@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@V?$fpos@H@2@@Z */ /* ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@V?$fpos@H@2@@Z */ /* ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@V?$fpos@H@2@@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_seekg_fpos, 28) -basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wchar *this, fpos_int pos) +DEFINE_THISCALL_WRAPPER(basic_istream_short_seekg_fpos, 28) +basic_istream_wchar* __thiscall basic_istream_short_seekg_fpos(basic_istream_wchar *this, fpos_int pos) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); TRACE("(%p %s)\n", this, debugstr_fpos_int(&pos)); @@ -9320,14 +9223,18 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch return this; } -static basic_istream_wchar* basic_istream_read_short(basic_istream_wchar *this, short *v, const num_get *numget) +/* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AAF@Z */ +/* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEAF@Z */ +DEFINE_THISCALL_WRAPPER(basic_istream_short_read_short, 8) +basic_istream_wchar* __thiscall basic_istream_short_read_short(basic_istream_wchar *this, short *v) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); int state = IOSTATE_goodbit; TRACE("(%p %p)\n", this, v); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); istreambuf_iterator_wchar first={0}, last={0}; LONG tmp; @@ -9340,487 +9247,289 @@ static basic_istream_wchar* basic_istream_read_short(basic_istream_wchar *this, else state |= IOSTATE_failbit; } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AAF@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEAF@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_short, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_short(basic_istream_wchar *this, short *v) -{ - return basic_istream_read_short(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -/* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AAF@Z */ -/* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEAF@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_short_read_short, 8) -basic_istream_wchar* __thiscall basic_istream_short_read_short(basic_istream_wchar *this, short *v) -{ - return basic_istream_read_short(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AAG@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEAG@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_ushort, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_ushort(basic_istream_wchar *this, unsigned short *v) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); - int state = IOSTATE_goodbit; - - TRACE("(%p %p)\n", this, v); - - if(basic_istream_wchar_sentry_create(this, FALSE)) { - basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); - const num_get *numget = num_get_wchar_use_facet(IOS_LOCALE(strbuf)); - istreambuf_iterator_wchar first={0}, last={0}; - - first.strbuf = strbuf; - num_get_wchar_get_ushort(numget, &last, first, last, &base->base, &state, v); - } - basic_istream_wchar_sentry_destroy(this); - - basic_ios_wchar_setstate(base, state); - return this; -} - -static basic_istream_wchar* basic_istream_read_int(basic_istream_wchar *this, int *v, const num_get *numget) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); - int state = IOSTATE_goodbit; - - TRACE("(%p %p)\n", this, v); - - if(basic_istream_wchar_sentry_create(this, FALSE)) { - basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); - istreambuf_iterator_wchar first={0}, last={0}; - - first.strbuf = strbuf; - num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v); - } - basic_istream_wchar_sentry_destroy(this); - - basic_ios_wchar_setstate(base, state); - return this; -} - -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AAH@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEAH@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_int, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_int(basic_istream_wchar *this, int *v) -{ - return basic_istream_read_int(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AAH@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEAH@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_int, 8) basic_istream_wchar* __thiscall basic_istream_short_read_int(basic_istream_wchar *this, int *v) { - return basic_istream_read_int(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -static basic_istream_wchar* basic_istream_read_uint(basic_istream_wchar *this, unsigned int *v, const num_get *numget) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); int state = IOSTATE_goodbit; TRACE("(%p %p)\n", this, v); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_uint(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v); } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AAI@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEAI@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_uint, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_uint(basic_istream_wchar *this, unsigned int *v) -{ - return basic_istream_read_uint(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AAI@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEAI@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_uint, 8) basic_istream_wchar* __thiscall basic_istream_short_read_uint(basic_istream_wchar *this, unsigned int *v) { - return basic_istream_read_uint(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -static basic_istream_wchar* basic_istream_read_long(basic_istream_wchar *this, LONG *v, const num_get *numget) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); int state = IOSTATE_goodbit; TRACE("(%p %p)\n", this, v); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_uint(numget, &last, first, last, &base->base, &state, v); } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AAJ@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEAJ@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_long, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_long(basic_istream_wchar *this, LONG *v) -{ - return basic_istream_read_long(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AAJ@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEAJ@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_long, 8) basic_istream_wchar* __thiscall basic_istream_short_read_long(basic_istream_wchar *this, LONG *v) { - return basic_istream_read_long(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -static basic_istream_wchar* basic_istream_read_ulong(basic_istream_wchar *this, ULONG *v, const num_get *numget) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); int state = IOSTATE_goodbit; TRACE("(%p %p)\n", this, v); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_ulong(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, v); } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AAK@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEAK@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_ulong, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_ulong(basic_istream_wchar *this, ULONG *v) -{ - return basic_istream_read_ulong(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AAK@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEAK@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_ulong, 8) basic_istream_wchar* __thiscall basic_istream_short_read_ulong(basic_istream_wchar *this, ULONG *v) { - return basic_istream_read_ulong(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -static basic_istream_wchar* basic_istream_read_float(basic_istream_wchar *this, float *v, const num_get *numget) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); int state = IOSTATE_goodbit; TRACE("(%p %p)\n", this, v); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_float(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_ulong(numget, &last, first, last, &base->base, &state, v); } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AAM@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEAM@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_float, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_float(basic_istream_wchar *this, float *v) -{ - return basic_istream_read_float(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AAM@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEAM@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_float, 8) basic_istream_wchar* __thiscall basic_istream_short_read_float(basic_istream_wchar *this, float *v) { - return basic_istream_read_float(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -static basic_istream_wchar* basic_istream_read_double(basic_istream_wchar *this, double *v, const num_get *numget) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); int state = IOSTATE_goodbit; TRACE("(%p %p)\n", this, v); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_double(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_float(numget, &last, first, last, &base->base, &state, v); } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AAN@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEAN@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_double, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_double(basic_istream_wchar *this, double *v) -{ - return basic_istream_read_double(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AAN@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEAN@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_double, 8) basic_istream_wchar* __thiscall basic_istream_short_read_double(basic_istream_wchar *this, double *v) { - return basic_istream_read_double(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -static basic_istream_wchar* basic_istream_read_ldouble(basic_istream_wchar *this, double *v, const num_get *numget) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); int state = IOSTATE_goodbit; TRACE("(%p %p)\n", this, v); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_ldouble(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_double(numget, &last, first, last, &base->base, &state, v); } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AAO@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEAO@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_ldouble, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_ldouble(basic_istream_wchar *this, double *v) -{ - return basic_istream_read_ldouble(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AAO@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEAO@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_ldouble, 8) basic_istream_wchar* __thiscall basic_istream_short_read_ldouble(basic_istream_wchar *this, double *v) { - return basic_istream_read_ldouble(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -static basic_istream_wchar* basic_istream_read_ptr(basic_istream_wchar *this, void **v, const num_get *numget) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); int state = IOSTATE_goodbit; TRACE("(%p %p)\n", this, v); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_void(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_ldouble(numget, &last, first, last, &base->base, &state, v); } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AAPAX@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEAPEAX@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_ptr, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_ptr(basic_istream_wchar *this, void **v) -{ - return basic_istream_read_ptr(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AAPAX@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEAPEAX@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_ptr, 8) basic_istream_wchar* __thiscall basic_istream_short_read_ptr(basic_istream_wchar *this, void **v) { - return basic_istream_read_ptr(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -static basic_istream_wchar* basic_istream_read_int64(basic_istream_wchar *this, __int64 *v, const num_get *numget) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); int state = IOSTATE_goodbit; TRACE("(%p %p)\n", this, v); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_int64(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_void(numget, &last, first, last, &base->base, &state, v); } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AA_J@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEA_J@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_int64, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_int64(basic_istream_wchar *this, __int64 *v) -{ - return basic_istream_read_int64(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AA_J@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEA_J@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_int64, 8) basic_istream_wchar* __thiscall basic_istream_short_read_int64(basic_istream_wchar *this, __int64 *v) { - return basic_istream_read_int64(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -static basic_istream_wchar* basic_istream_read_uint64(basic_istream_wchar *this, unsigned __int64 *v, const num_get *numget) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); int state = IOSTATE_goodbit; TRACE("(%p %p)\n", this, v); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_uint64(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_int64(numget, &last, first, last, &base->base, &state, v); } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AA_K@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEA_K@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_uint64, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_uint64(basic_istream_wchar *this, unsigned __int64 *v) -{ - return basic_istream_read_uint64(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AA_K@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEA_K@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_uint64, 8) basic_istream_wchar* __thiscall basic_istream_short_read_uint64(basic_istream_wchar *this, unsigned __int64 *v) { - return basic_istream_read_uint64(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - -static basic_istream_wchar* basic_istream_read_bool(basic_istream_wchar *this, bool *v, const num_get *numget) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); int state = IOSTATE_goodbit; TRACE("(%p %p)\n", this, v); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); istreambuf_iterator_wchar first={0}, last={0}; first.strbuf = strbuf; - num_get_wchar_get_bool(numget, &last, first, last, &base->base, &state, v); + num_get_wchar_get_uint64(numget, &last, first, last, &base->base, &state, v); } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AA_N@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEA_N@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_bool, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_bool(basic_istream_wchar *this, bool *v) -{ - return basic_istream_read_bool(this, v, num_get_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); -} - /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AA_N@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEA_N@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_read_bool, 8) basic_istream_wchar* __thiscall basic_istream_short_read_bool(basic_istream_wchar *this, bool *v) { - return basic_istream_read_bool(this, v, num_get_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); + const num_get *numget = num_get_short_use_facet(IOS_LOCALE(base->strbuf)); + int state = IOSTATE_goodbit; + + TRACE("(%p %p)\n", this, v); + + if(basic_istream_short_sentry_create(this, FALSE)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + istreambuf_iterator_wchar first={0}, last={0}; + + first.strbuf = strbuf; + num_get_wchar_get_bool(numget, &last, first, last, &base->base, &state, v); + } + basic_istream_short_sentry_destroy(this); + + basic_ios_wchar_setstate(base, state); + return this; } -/* ??$getline@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@_W@Z */ -/* ??$getline@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@AEAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@_W@Z */ /* ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@G@Z */ /* ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@G@Z */ -basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( +basic_istream_wchar* __cdecl basic_istream_short_getline_bstr_delim( basic_istream_wchar *istream, basic_string_wchar *str, wchar_t delim) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(istream); IOSB_iostate state = IOSTATE_goodbit; int c = delim; TRACE("(%p %p %s)\n", istream, str, debugstr_wn(&delim, 1)); MSVCP_basic_string_wchar_clear(str); - if(basic_istream_wchar_sentry_create(istream, TRUE)) { + if(basic_istream_short_sentry_create(istream, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); c = basic_streambuf_wchar_sgetc(strbuf); @@ -9831,32 +9540,33 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( if(!MSVCP_basic_string_wchar_length(str) && c!=delim) state |= IOSTATE_failbit; } - basic_istream_wchar_sentry_destroy(istream); + basic_istream_short_sentry_destroy(istream); - basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), state); + basic_ios_wchar_setstate(basic_istream_short_get_basic_ios(istream), state); return istream; } -/* ??$getline@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@@Z */ -/* ??$getline@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@AEAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@@Z */ /* ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ -basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr( +basic_istream_wchar* __cdecl basic_istream_short_getline_bstr( basic_istream_wchar *istream, basic_string_wchar *str) { - return basic_istream_wchar_getline_bstr_delim(istream, str, '\n'); + return basic_istream_short_getline_bstr_delim(istream, str, '\n'); } -static basic_istream_wchar* basic_istream_read_bstr(basic_istream_wchar *istream, - basic_string_wchar *str, const ctype_wchar *ctype) +/* ??$?5GU?$char_traits@G@std@@V?$allocator@G@1@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ +/* ??$?5GU?$char_traits@G@std@@V?$allocator@G@1@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ +basic_istream_wchar* __cdecl basic_istream_short_read_bstr( + basic_istream_wchar *istream, basic_string_wchar *str) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(istream); + const ctype_wchar *ctype = ctype_short_use_facet(IOS_LOCALE(base->strbuf)); IOSB_iostate state = IOSTATE_failbit; int c = '\n'; TRACE("(%p %p)\n", istream, str); - if(basic_istream_wchar_sentry_create(istream, FALSE)) { + if(basic_istream_short_sentry_create(istream, FALSE)) { size_t count = ios_base_width_get(&base->base); if(!count) @@ -9871,40 +9581,25 @@ static basic_istream_wchar* basic_istream_read_bstr(basic_istream_wchar *istream MSVCP_basic_string_wchar_append_ch(str, c); } } - basic_istream_wchar_sentry_destroy(istream); + basic_istream_short_sentry_destroy(istream); ios_base_width_set(&base->base, 0); basic_ios_wchar_setstate(base, state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } -/* ??$?5_WU?$char_traits@_W@std@@V?$allocator@_W@1@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@@Z */ -/* ??$?5_WU?$char_traits@_W@std@@V?$allocator@_W@1@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@AEAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@@Z */ -basic_istream_wchar* __cdecl basic_istream_wchar_read_bstr( - basic_istream_wchar *istream, basic_string_wchar *str) +/* ??$?5GU?$char_traits@G@std@@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@PAG@Z */ +/* ??$?5GU?$char_traits@G@std@@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@PEAG@Z */ +basic_istream_wchar* __cdecl basic_istream_short_read_str(basic_istream_wchar *istream, wchar_t *str) { - return basic_istream_read_bstr(istream, str, ctype_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(istream)->strbuf))); -} - -/* ??$?5GU?$char_traits@G@std@@V?$allocator@G@1@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ -/* ??$?5GU?$char_traits@G@std@@V?$allocator@G@1@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ -basic_istream_wchar* __cdecl basic_istream_short_read_bstr( - basic_istream_wchar *istream, basic_string_wchar *str) -{ - return basic_istream_read_bstr(istream, str, ctype_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(istream)->strbuf))); -} - -static basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream, wchar_t *str, const ctype_wchar *ctype) -{ - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(istream); + const ctype_wchar *ctype = ctype_short_use_facet(IOS_LOCALE(base->strbuf)); IOSB_iostate state = IOSTATE_failbit; unsigned short c = '\n'; TRACE("(%p %p)\n", istream, str); - if(basic_istream_wchar_sentry_create(istream, FALSE)) { + if(basic_istream_short_sentry_create(istream, FALSE)) { size_t count = ios_base_width_get(&base->base)-1; for(c = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); @@ -9914,7 +9609,7 @@ static basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream, *str++ = c; } } - basic_istream_wchar_sentry_destroy(istream); + basic_istream_short_sentry_destroy(istream); *str = 0; ios_base_width_set(&base->base, 0); @@ -9922,63 +9617,43 @@ static basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream, return istream; } -/* ??$?5_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@PA_W@Z */ -/* ??$?5_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@PEA_W@Z */ -basic_istream_wchar* __cdecl basic_istream_wchar_read_str(basic_istream_wchar *istream, wchar_t *str) -{ - return basic_istream_read_str(istream, str, ctype_wchar_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(istream)->strbuf))); -} - -/* ??$?5GU?$char_traits@G@std@@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@PAG@Z */ -/* ??$?5GU?$char_traits@G@std@@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@PEAG@Z */ -basic_istream_wchar* __cdecl basic_istream_short_read_str(basic_istream_wchar *istream, wchar_t *str) -{ - return basic_istream_read_str(istream, str, ctype_short_use_facet( - IOS_LOCALE(basic_istream_wchar_get_basic_ios(istream)->strbuf))); -} - -/* ??$?5_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AA_W@Z */ -/* ??$?5_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@AEA_W@Z */ /* ??$?5GU?$char_traits@G@std@@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAG@Z */ /* ??$?5GU?$char_traits@G@std@@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAG@Z */ -basic_istream_wchar* __cdecl basic_istream_wchar_read_ch(basic_istream_wchar *istream, wchar_t *ch) +basic_istream_wchar* __cdecl basic_istream_short_read_ch(basic_istream_wchar *istream, wchar_t *ch) { IOSB_iostate state = IOSTATE_failbit; unsigned short c = 0; TRACE("(%p %p)\n", istream, ch); - if(basic_istream_wchar_sentry_create(istream, FALSE)) { + if(basic_istream_short_sentry_create(istream, FALSE)) { c = basic_streambuf_wchar_sbumpc(basic_ios_wchar_rdbuf_get( - basic_istream_wchar_get_basic_ios(istream))); + basic_istream_short_get_basic_ios(istream))); if(c != WEOF) { state = IOSTATE_goodbit; *ch = c; } } - basic_istream_wchar_sentry_destroy(istream); + basic_istream_short_sentry_destroy(istream); - basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), + basic_ios_wchar_setstate(basic_istream_short_get_basic_ios(istream), state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@PAV?$basic_streambuf@_WU?$char_traits@_W@std@@@1@@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@PEAV?$basic_streambuf@_WU?$char_traits@_W@std@@@1@@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@PAV?$basic_streambuf@GU?$char_traits@G@std@@@1@@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@PEAV?$basic_streambuf@GU?$char_traits@G@std@@@1@@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_streambuf, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_streambuf( +DEFINE_THISCALL_WRAPPER(basic_istream_short_read_streambuf, 8) +basic_istream_wchar* __thiscall basic_istream_short_read_streambuf( basic_istream_wchar *this, basic_streambuf_wchar *streambuf) { - basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); + basic_ios_wchar *base = basic_istream_short_get_basic_ios(this); IOSB_iostate state = IOSTATE_failbit; unsigned short c = '\n'; TRACE("(%p %p)\n", this, streambuf); - if(basic_istream_wchar_sentry_create(this, FALSE)) { + if(basic_istream_short_sentry_create(this, FALSE)) { for(c = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); c!=WEOF; c = basic_streambuf_wchar_snextc(basic_ios_wchar_rdbuf_get(base))) { state = IOSTATE_goodbit; @@ -9986,18 +9661,16 @@ basic_istream_wchar* __thiscall basic_istream_wchar_read_streambuf( break; } } - basic_istream_wchar_sentry_destroy(this); + basic_istream_short_sentry_destroy(this); basic_ios_wchar_setstate(base, state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@P6AAAV01@AAV01@@Z@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@P6AAEAV01@AEAV01@@Z@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@P6AAAV01@AAV01@@Z@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@P6AAEAV01@AEAV01@@Z@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_func, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_func(basic_istream_wchar *this, +DEFINE_THISCALL_WRAPPER(basic_istream_short_read_func, 8) +basic_istream_wchar* __thiscall basic_istream_short_read_func(basic_istream_wchar *this, basic_istream_wchar* (__cdecl *pfunc)(basic_istream_wchar*)) { TRACE("(%p %p)\n", this, pfunc); @@ -10005,46 +9678,40 @@ basic_istream_wchar* __thiscall basic_istream_wchar_read_func(basic_istream_wcha return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@P6AAAV?$basic_ios@_WU?$char_traits@_W@std@@@1@AAV21@@Z@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@P6AAEAV?$basic_ios@_WU?$char_traits@_W@std@@@1@AEAV21@@Z@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@P6AAAV?$basic_ios@GU?$char_traits@G@std@@@1@AAV21@@Z@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@P6AAEAV?$basic_ios@GU?$char_traits@G@std@@@1@AEAV21@@Z@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_func_basic_ios, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_func_basic_ios(basic_istream_wchar *this, +DEFINE_THISCALL_WRAPPER(basic_istream_short_read_func_basic_ios, 8) +basic_istream_wchar* __thiscall basic_istream_short_read_func_basic_ios(basic_istream_wchar *this, basic_ios_wchar* (__cdecl *pfunc)(basic_ios_wchar*)) { TRACE("(%p %p)\n", this, pfunc); - pfunc(basic_istream_wchar_get_basic_ios(this)); + pfunc(basic_istream_short_get_basic_ios(this)); return this; } -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@P6AAAVios_base@1@AAV21@@Z@Z */ -/* ??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@P6AAEAVios_base@1@AEAV21@@Z@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@P6AAAVios_base@1@AAV21@@Z@Z */ /* ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@P6AAEAVios_base@1@AEAV21@@Z@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read_func_ios_base, 8) -basic_istream_wchar* __thiscall basic_istream_wchar_read_func_ios_base( +DEFINE_THISCALL_WRAPPER(basic_istream_short_read_func_ios_base, 8) +basic_istream_wchar* __thiscall basic_istream_short_read_func_ios_base( basic_istream_wchar *this, ios_base* (__cdecl *pfunc)(ios_base*)) { TRACE("(%p %p)\n", this, pfunc); - pfunc(&basic_istream_wchar_get_basic_ios(this)->base); + pfunc(&basic_istream_short_get_basic_ios(this)->base); return this; } /* ?swap@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEXAAV12@@Z */ /* ?swap@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAXAEAV12@@Z */ -/* ?swap@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEXAAV12@@Z */ -/* ?swap@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAXAEAV12@@Z */ -DEFINE_THISCALL_WRAPPER(basic_istream_wchar_swap, 8) -void __thiscall basic_istream_wchar_swap(basic_istream_wchar *this, basic_istream_wchar *r) +DEFINE_THISCALL_WRAPPER(basic_istream_short_swap, 8) +void __thiscall basic_istream_short_swap(basic_istream_wchar *this, basic_istream_wchar *r) { TRACE("(%p %p)\n", this, r); if(this == r) return; - basic_ios_wchar_swap(basic_istream_wchar_get_basic_ios(this), - basic_istream_wchar_get_basic_ios(r)); + basic_ios_wchar_swap(basic_istream_short_get_basic_ios(this), + basic_istream_short_get_basic_ios(r)); this->count ^= r->count; r->count ^= this->count; this->count ^= r->count; @@ -10167,13 +9834,13 @@ basic_iostream_wchar* __thiscall basic_iostream_short_ctor(basic_iostream_wchar if(virt_init) { this->base1.vbtable = basic_iostream_short_vbtable1; this->base2.vbtable = basic_iostream_short_vbtable2; - basic_ios = basic_istream_wchar_get_basic_ios(&this->base1); + basic_ios = basic_istream_short_get_basic_ios(&this->base1); basic_ios_wchar_ctor(basic_ios); }else { - basic_ios = basic_istream_wchar_get_basic_ios(&this->base1); + basic_ios = basic_istream_short_get_basic_ios(&this->base1); } - basic_istream_wchar_ctor(&this->base1, strbuf, FALSE, FALSE); + basic_istream_short_ctor(&this->base1, strbuf, FALSE, FALSE); basic_ostream_short_ctor(&this->base2, NULL, FALSE, FALSE, FALSE); basic_ios->base.vtable = &basic_iostream_short_vtable; @@ -10189,7 +9856,7 @@ void __thiscall basic_iostream_short_dtor(basic_ios_wchar *base) TRACE("(%p)\n", this); basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&this->base2)); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&this->base1)); + basic_istream_short_dtor(basic_istream_short_to_basic_ios(&this->base1)); } /* ??_D?$basic_iostream@GU?$char_traits@G@std@@@std@@QAEXXZ */ @@ -10199,7 +9866,7 @@ void __thiscall basic_iostream_short_vbase_dtor(basic_iostream_wchar *this) { TRACE("(%p)\n", this); basic_iostream_short_dtor(basic_iostream_short_to_basic_ios(this)); - basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(&this->base1)); + basic_ios_wchar_dtor(basic_istream_short_get_basic_ios(&this->base1)); } DEFINE_THISCALL_WRAPPER(basic_iostream_short_vector_dtor, 8) @@ -10235,8 +9902,8 @@ void __thiscall basic_iostream_short_swap(basic_iostream_wchar *this, basic_iost if(this == r) return; - basic_ios_wchar_swap(basic_istream_wchar_get_basic_ios(&this->base1), - basic_istream_wchar_get_basic_ios(&r->base1)); + basic_ios_wchar_swap(basic_istream_short_get_basic_ios(&this->base1), + basic_istream_short_get_basic_ios(&r->base1)); } static inline basic_ios_char* basic_ofstream_char_to_basic_ios(basic_ofstream_char *ptr) @@ -10815,14 +10482,14 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor(basic_ifstream_wchar if(virt_init) { this->base.vbtable = basic_ifstream_short_vbtable; - basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios = basic_istream_short_get_basic_ios(&this->base); basic_ios_wchar_ctor(basic_ios); }else { - basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios = basic_istream_short_get_basic_ios(&this->base); } basic_filebuf_wchar_ctor(&this->filebuf); - basic_istream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); + basic_istream_short_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); basic_ios->base.vtable = &basic_ifstream_short_vtable; return this; } @@ -10839,14 +10506,14 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_file( if(virt_init) { this->base.vbtable = basic_ifstream_short_vbtable; - basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios = basic_istream_short_get_basic_ios(&this->base); basic_ios_wchar_ctor(basic_ios); }else { - basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios = basic_istream_short_get_basic_ios(&this->base); } basic_filebuf_wchar_ctor_file(&this->filebuf, file); - basic_istream_wchar_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); + basic_istream_short_ctor(&this->base, &this->filebuf.base, FALSE, FALSE); basic_ios->base.vtable = &basic_ifstream_short_vtable; return this; } @@ -10872,7 +10539,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name(basic_ifstream_w basic_ifstream_short_ctor(this, virt_init); if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) { - basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base); basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); } return this; @@ -10887,7 +10554,7 @@ void __thiscall basic_ifstream_short_dtor(basic_ios_wchar *base) TRACE("(%p)\n", this); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&this->base)); + basic_istream_short_dtor(basic_istream_short_to_basic_ios(&this->base)); basic_filebuf_wchar_dtor(&this->filebuf); } @@ -10899,7 +10566,7 @@ void __thiscall basic_ifstream_short_vbase_dtor(basic_ifstream_wchar *this) TRACE("(%p)\n", this); basic_ifstream_short_dtor(basic_ifstream_short_to_basic_ios(this)); - basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(&this->base)); + basic_ios_wchar_dtor(basic_istream_short_get_basic_ios(&this->base)); } DEFINE_THISCALL_WRAPPER(basic_ifstream_short_vector_dtor, 8) @@ -10933,7 +10600,7 @@ void __thiscall basic_ifstream_short_close(basic_ifstream_wchar *this) TRACE("(%p)\n", this); if(!basic_filebuf_wchar_close(&this->filebuf)) { - basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base); basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); } } @@ -10956,7 +10623,7 @@ void __thiscall basic_ifstream_short_open(basic_ifstream_wchar *this, TRACE("(%p %s %d)\n", this, name, mode); if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) { - basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base); basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); } } @@ -11188,10 +10855,10 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor(basic_fstream_wchar *th if(virt_init) { this->base.base1.vbtable = basic_fstream_short_vbtable1; this->base.base2.vbtable = basic_fstream_short_vbtable2; - basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios = basic_istream_short_get_basic_ios(&this->base.base1); basic_ios_wchar_ctor(basic_ios); }else { - basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios = basic_istream_short_get_basic_ios(&this->base.base1); } basic_filebuf_wchar_ctor(&this->filebuf); @@ -11213,10 +10880,10 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_file(basic_fstream_wcha if(virt_init) { this->base.base1.vbtable = basic_fstream_short_vbtable1; this->base.base2.vbtable = basic_fstream_short_vbtable2; - basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios = basic_istream_short_get_basic_ios(&this->base.base1); basic_ios_wchar_ctor(basic_ios); }else { - basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios = basic_istream_short_get_basic_ios(&this->base.base1); } basic_filebuf_wchar_ctor_file(&this->filebuf, file); @@ -11246,7 +10913,7 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name(basic_fstream_wcha basic_fstream_short_ctor(this, virt_init); if(!basic_filebuf_wchar_open(&this->filebuf, name, mode, _SH_DENYNO)) { - basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base.base1); basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); } return this; @@ -11273,7 +10940,7 @@ void __thiscall basic_fstream_short_vbase_dtor(basic_fstream_wchar *this) TRACE("(%p)\n", this); basic_fstream_short_dtor(basic_fstream_short_to_basic_ios(this)); - basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(&this->base.base1)); + basic_ios_wchar_dtor(basic_istream_short_get_basic_ios(&this->base.base1)); } DEFINE_THISCALL_WRAPPER(basic_fstream_short_vector_dtor, 8) @@ -11307,7 +10974,7 @@ void __thiscall basic_fstream_short_close(basic_fstream_wchar *this) TRACE("(%p)\n", this); if(!basic_filebuf_wchar_close(&this->filebuf)) { - basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base.base1); basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); } } @@ -11330,7 +10997,7 @@ void __thiscall basic_fstream_short_open(basic_fstream_wchar *this, TRACE("(%p %s %d)\n", this, name, mode); if(!basic_filebuf_wchar_open(&this->filebuf, name, mode, _SH_DENYNO)) { - basic_ios_wchar *basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base.base1); basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit); } } @@ -11798,14 +11465,14 @@ basic_istringstream_wchar* __thiscall basic_istringstream_short_ctor_str(basic_i if(virt_init) { this->base.vbtable = basic_istringstream_short_vbtable; - basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios = basic_istream_short_get_basic_ios(&this->base); basic_ios_wchar_ctor(basic_ios); }else { - basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios = basic_istream_short_get_basic_ios(&this->base); } basic_stringbuf_wchar_ctor_str(&this->strbuf, str, mode|OPENMODE_in); - basic_istream_wchar_ctor(&this->base, &this->strbuf.base, FALSE, FALSE); + basic_istream_short_ctor(&this->base, &this->strbuf.base, FALSE, FALSE); basic_ios->base.vtable = &basic_istringstream_short_vtable; return this; } @@ -11822,14 +11489,14 @@ basic_istringstream_wchar* __thiscall basic_istringstream_short_ctor_mode( if(virt_init) { this->base.vbtable = basic_istringstream_short_vbtable; - basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios = basic_istream_short_get_basic_ios(&this->base); basic_ios_wchar_ctor(basic_ios); }else { - basic_ios = basic_istream_wchar_get_basic_ios(&this->base); + basic_ios = basic_istream_short_get_basic_ios(&this->base); } basic_stringbuf_wchar_ctor_mode(&this->strbuf, mode|OPENMODE_in); - basic_istream_wchar_ctor(&this->base, &this->strbuf.base, FALSE, FALSE); + basic_istream_short_ctor(&this->base, &this->strbuf.base, FALSE, FALSE); basic_ios->base.vtable = &basic_istringstream_short_vtable; return this; } @@ -11853,7 +11520,7 @@ void __thiscall basic_istringstream_short_dtor(basic_ios_wchar *base) TRACE("(%p)\n", this); basic_stringbuf_wchar_dtor(&this->strbuf); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&this->base)); + basic_istream_short_dtor(basic_istream_short_to_basic_ios(&this->base)); } /* ??_D?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXXZ */ @@ -11864,7 +11531,7 @@ void __thiscall basic_istringstream_short_vbase_dtor(basic_istringstream_wchar * TRACE("(%p)\n", this); basic_istringstream_short_dtor(basic_istringstream_short_to_basic_ios(this)); - basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(&this->base)); + basic_ios_wchar_dtor(basic_istream_short_get_basic_ios(&this->base)); } DEFINE_THISCALL_WRAPPER(basic_istringstream_short_vector_dtor, 8) @@ -12084,10 +11751,10 @@ basic_stringstream_wchar* __thiscall basic_stringstream_short_ctor_str(basic_str if(virt_init) { this->base.base1.vbtable = basic_stringstream_short_vbtable1; this->base.base2.vbtable = basic_stringstream_short_vbtable2; - basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios = basic_istream_short_get_basic_ios(&this->base.base1); basic_ios_short_ctor(basic_ios); }else { - basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios = basic_istream_short_get_basic_ios(&this->base.base1); } basic_stringbuf_short_ctor_str(&this->strbuf, str, mode); @@ -12109,10 +11776,10 @@ basic_stringstream_wchar* __thiscall basic_stringstream_short_ctor_mode( if(virt_init) { this->base.base1.vbtable = basic_stringstream_short_vbtable1; this->base.base2.vbtable = basic_stringstream_short_vbtable2; - basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios = basic_istream_short_get_basic_ios(&this->base.base1); basic_ios_short_ctor(basic_ios); }else { - basic_ios = basic_istream_wchar_get_basic_ios(&this->base.base1); + basic_ios = basic_istream_short_get_basic_ios(&this->base.base1); } basic_stringbuf_short_ctor_mode(&this->strbuf, mode); @@ -12152,7 +11819,7 @@ void __thiscall basic_stringstream_short_vbase_dtor(basic_stringstream_wchar *th TRACE("(%p)\n", this); basic_stringstream_short_dtor(basic_stringstream_short_to_basic_ios(this)); - basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(&this->base.base1)); + basic_ios_wchar_dtor(basic_istream_short_get_basic_ios(&this->base.base1)); } DEFINE_THISCALL_WRAPPER(basic_stringstream_short_vector_dtor, 8) @@ -12961,16 +12628,6 @@ struct { /* ?_Ptr_wcin@std@@3PEAV?$basic_istream@GU?$char_traits@G@std@@@1@EA */ basic_istream_wchar *_Ptr_ucin = &ucin.obj; -static basic_filebuf_wchar filebuf_wchar_stdin; -/* ?wcin@std@@3V?$basic_istream@_WU?$char_traits@_W@std@@@1@A */ -struct { - basic_istream_wchar obj; - basic_ios_wchar vbase; -} wcin = { { 0 } }; -/* ?_Ptr_wcin@std@@3PAV?$basic_istream@_WU?$char_traits@_W@std@@@1@A */ -/* ?_Ptr_wcin@std@@3PEAV?$basic_istream@_WU?$char_traits@_W@std@@@1@EA */ -basic_istream_wchar *_Ptr_wcin = &wcin.obj; - static basic_filebuf_char filebuf_char_stdout; /* ?cout@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A */ struct { @@ -13186,7 +12843,6 @@ void init_io(void *base) init_basic_ostream_wchar_rtti(base); init_basic_ostream_short_rtti(base); init_basic_istream_char_rtti(base); - init_basic_istream_wchar_rtti(base); init_basic_istream_short_rtti(base); init_basic_iostream_char_rtti(base); init_basic_iostream_short_rtti(base); @@ -13213,9 +12869,6 @@ void init_io(void *base) basic_filebuf_short_ctor_file(&filebuf_short_stdin, stdin); basic_istream_short_ctor(&ucin.obj, &filebuf_short_stdin.base, FALSE/*FIXME*/, TRUE); - basic_filebuf_wchar_ctor_file(&filebuf_wchar_stdin, stdin); - basic_istream_wchar_ctor(&wcin.obj, &filebuf_wchar_stdin.base, FALSE/*FIXME*/, TRUE); - basic_filebuf_char_ctor_file(&filebuf_char_stdout, stdout); basic_ostream_char_ctor(&cout.obj, &filebuf_char_stdout.base, FALSE/*FIXME*/, TRUE, TRUE); @@ -13249,12 +12902,9 @@ void free_io(void) basic_istream_char_vbase_dtor(&cin.obj); basic_filebuf_char_dtor(&filebuf_char_stdin); - basic_istream_wchar_vbase_dtor(&ucin.obj); + basic_istream_short_vbase_dtor(&ucin.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdin); - basic_istream_wchar_vbase_dtor(&wcin.obj); - basic_filebuf_wchar_dtor(&filebuf_wchar_stdin); - basic_ostream_char_vbase_dtor(&cout.obj); basic_filebuf_char_dtor(&filebuf_char_stdout); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index ae0a080e136..7a679851c5a 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -18,8 +18,8 @@ @ stub -arch=win64 ??$?5DU?$char_traits@D@std@@O@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAV?$complex@O@0@@Z @ cdecl -arch=win32 ??$?5DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z(ptr ptr) basic_istream_char_read_bstr @ cdecl -arch=win64 ??$?5DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z(ptr ptr) basic_istream_char_read_bstr -@ cdecl -arch=win32 ??$?5GU?$char_traits@G@std@@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAG@Z(ptr ptr) basic_istream_wchar_read_ch -@ cdecl -arch=win64 ??$?5GU?$char_traits@G@std@@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAG@Z(ptr ptr) basic_istream_wchar_read_ch +@ cdecl -arch=win32 ??$?5GU?$char_traits@G@std@@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAG@Z(ptr ptr) basic_istream_short_read_ch +@ cdecl -arch=win64 ??$?5GU?$char_traits@G@std@@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAG@Z(ptr ptr) basic_istream_short_read_ch @ stub -arch=win32 ??$?5GU?$char_traits@G@std@@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@PAF@Z @ stub -arch=win64 ??$?5GU?$char_traits@G@std@@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@PEAF@Z @ cdecl -arch=win32 ??$?5GU?$char_traits@G@std@@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@PAG@Z(ptr ptr) basic_istream_short_read_str @@ -371,11 +371,11 @@ @ cdecl -arch=win32 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim @ cdecl -arch=win64 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim @ stub -arch=win64 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@AEAV21@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z -@ cdecl -arch=win32 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z(ptr ptr) basic_istream_wchar_getline_bstr -@ cdecl -arch=win64 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z(ptr ptr) basic_istream_wchar_getline_bstr +@ cdecl -arch=win32 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z(ptr ptr) basic_istream_short_getline_bstr +@ cdecl -arch=win64 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z(ptr ptr) basic_istream_short_getline_bstr @ stub -arch=win64 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@@Z -@ cdecl -arch=win32 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@G@Z(ptr ptr long) basic_istream_wchar_getline_bstr_delim -@ cdecl -arch=win64 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@G@Z(ptr ptr long) basic_istream_wchar_getline_bstr_delim +@ cdecl -arch=win32 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@G@Z(ptr ptr long) basic_istream_short_getline_bstr_delim +@ cdecl -arch=win64 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@G@Z(ptr ptr long) basic_istream_short_getline_bstr_delim @ stub -arch=win64 ??$getline@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@G@Z @ cdecl -arch=win32 ??$imag@M@std@@YAMABV?$complex@M@0@@Z(ptr) complex_float_imag @ cdecl -arch=win64 ??$imag@M@std@@YAMAEBV?$complex@M@0@@Z(ptr) complex_float_imag @@ -949,8 +949,8 @@ @ cdecl -arch=win64 ??1?$basic_iostream@GU?$char_traits@G@std@@@std@@UEAA@XZ(ptr) basic_iostream_short_dtor @ thiscall -arch=win32 ??1?$basic_istream@DU?$char_traits@D@std@@@std@@UAE@XZ(ptr) basic_istream_char_dtor @ cdecl -arch=win64 ??1?$basic_istream@DU?$char_traits@D@std@@@std@@UEAA@XZ(ptr) basic_istream_char_dtor -@ thiscall -arch=win32 ??1?$basic_istream@GU?$char_traits@G@std@@@std@@UAE@XZ(ptr) basic_istream_wchar_dtor -@ cdecl -arch=win64 ??1?$basic_istream@GU?$char_traits@G@std@@@std@@UEAA@XZ(ptr) basic_istream_wchar_dtor +@ thiscall -arch=win32 ??1?$basic_istream@GU?$char_traits@G@std@@@std@@UAE@XZ(ptr) basic_istream_short_dtor +@ cdecl -arch=win64 ??1?$basic_istream@GU?$char_traits@G@std@@@std@@UEAA@XZ(ptr) basic_istream_short_dtor @ thiscall -arch=win32 ??1?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UAE@XZ(ptr) basic_istringstream_char_dtor @ cdecl -arch=win64 ??1?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UEAA@XZ(ptr) basic_istringstream_char_dtor @ thiscall -arch=win32 ??1?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@UAE@XZ(ptr) basic_istringstream_short_dtor @@ -1323,14 +1323,14 @@ @ cdecl -arch=win64 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEA_K@Z(ptr ptr) basic_istream_short_read_uint64 @ thiscall -arch=win32 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@AA_N@Z(ptr ptr) basic_istream_short_read_bool @ cdecl -arch=win64 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@AEA_N@Z(ptr ptr) basic_istream_short_read_bool -@ thiscall -arch=win32 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@P6AAAV01@AAV01@@Z@Z(ptr ptr) basic_istream_wchar_read_func -@ cdecl -arch=win64 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@P6AAEAV01@AEAV01@@Z@Z(ptr ptr) basic_istream_wchar_read_func -@ thiscall -arch=win32 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@P6AAAV?$basic_ios@GU?$char_traits@G@std@@@1@AAV21@@Z@Z(ptr ptr) basic_istream_wchar_read_func_basic_ios -@ cdecl -arch=win64 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@P6AAEAV?$basic_ios@GU?$char_traits@G@std@@@1@AEAV21@@Z@Z(ptr ptr) basic_istream_wchar_read_func_basic_ios -@ thiscall -arch=win32 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@P6AAAVios_base@1@AAV21@@Z@Z(ptr ptr) basic_istream_wchar_read_func_ios_base -@ cdecl -arch=win64 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@P6AAEAVios_base@1@AEAV21@@Z@Z(ptr ptr) basic_istream_wchar_read_func_ios_base -@ thiscall -arch=win32 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@PAV?$basic_streambuf@GU?$char_traits@G@std@@@1@@Z(ptr ptr) basic_istream_wchar_read_streambuf -@ cdecl -arch=win64 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@PEAV?$basic_streambuf@GU?$char_traits@G@std@@@1@@Z(ptr ptr) basic_istream_wchar_read_streambuf +@ thiscall -arch=win32 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@P6AAAV01@AAV01@@Z@Z(ptr ptr) basic_istream_short_read_func +@ cdecl -arch=win64 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@P6AAEAV01@AEAV01@@Z@Z(ptr ptr) basic_istream_short_read_func +@ thiscall -arch=win32 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@P6AAAV?$basic_ios@GU?$char_traits@G@std@@@1@AAV21@@Z@Z(ptr ptr) basic_istream_short_read_func_basic_ios +@ cdecl -arch=win64 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@P6AAEAV?$basic_ios@GU?$char_traits@G@std@@@1@AEAV21@@Z@Z(ptr ptr) basic_istream_short_read_func_basic_ios +@ thiscall -arch=win32 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@P6AAAVios_base@1@AAV21@@Z@Z(ptr ptr) basic_istream_short_read_func_ios_base +@ cdecl -arch=win64 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@P6AAEAVios_base@1@AEAV21@@Z@Z(ptr ptr) basic_istream_short_read_func_ios_base +@ thiscall -arch=win32 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV01@PAV?$basic_streambuf@GU?$char_traits@G@std@@@1@@Z(ptr ptr) basic_istream_short_read_streambuf +@ cdecl -arch=win64 ??5?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@PEAV?$basic_streambuf@GU?$char_traits@G@std@@@1@@Z(ptr ptr) basic_istream_short_read_streambuf @ cdecl -arch=win32 ??5std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAC@Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win64 ??5std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAC@Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??5std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAD@Z(ptr ptr) basic_istream_char_read_ch @@ -1351,10 +1351,10 @@ @ cdecl -arch=win64 ??5std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@PEAD@Z(ptr ptr) basic_istream_char_read_str @ cdecl -arch=win32 ??5std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@PAE@Z(ptr ptr) basic_istream_char_read_str @ cdecl -arch=win64 ??5std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@PEAE@Z(ptr ptr) basic_istream_char_read_str -@ cdecl -arch=win32 ??5std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAG@Z(ptr ptr) basic_istream_wchar_read_ch -@ cdecl -arch=win64 ??5std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAG@Z(ptr ptr) basic_istream_wchar_read_ch -@ cdecl -arch=win32 ??5std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z(ptr ptr) basic_istream_wchar_read_bstr -@ cdecl -arch=win64 ??5std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z(ptr ptr) basic_istream_wchar_read_bstr +@ cdecl -arch=win32 ??5std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAG@Z(ptr ptr) basic_istream_short_read_ch +@ cdecl -arch=win64 ??5std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAG@Z(ptr ptr) basic_istream_short_read_ch +@ cdecl -arch=win32 ??5std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z(ptr ptr) basic_istream_short_read_bstr +@ cdecl -arch=win64 ??5std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z(ptr ptr) basic_istream_short_read_bstr @ stub -arch=win32 ??5std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$complex@M@0@@Z @ stub -arch=win64 ??5std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$complex@M@0@@Z @ stub -arch=win32 ??5std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@AAV?$complex@N@0@@Z @@ -1363,8 +1363,8 @@ @ stub -arch=win64 ??5std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@AEAV?$complex@O@0@@Z @ stub -arch=win32 ??5std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@PAF@Z @ stub -arch=win64 ??5std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@PEAF@Z -@ cdecl -arch=win32 ??5std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@PAG@Z(ptr ptr) basic_istream_wchar_read_ch -@ cdecl -arch=win64 ??5std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@PEAG@Z(ptr ptr) basic_istream_wchar_read_ch +@ cdecl -arch=win32 ??5std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@0@AAV10@PAG@Z(ptr ptr) basic_istream_short_read_ch +@ cdecl -arch=win64 ??5std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@0@AEAV10@PEAG@Z(ptr ptr) basic_istream_short_read_ch @ thiscall -arch=win32 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@F@Z(ptr long) basic_ostream_char_print_short @ cdecl -arch=win64 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@F@Z(ptr long) basic_ostream_char_print_short @ thiscall -arch=win32 ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@G@Z(ptr long) basic_ostream_char_print_ushort @@ -1871,8 +1871,8 @@ @ cdecl -arch=win64 ??_D?$basic_iostream@GU?$char_traits@G@std@@@std@@QEAAXXZ(ptr) basic_iostream_short_vbase_dtor @ thiscall -arch=win32 ??_D?$basic_istream@DU?$char_traits@D@std@@@std@@QAEXXZ(ptr) basic_istream_char_vbase_dtor @ cdecl -arch=win64 ??_D?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAXXZ(ptr) basic_istream_char_vbase_dtor -@ thiscall -arch=win32 ??_D?$basic_istream@GU?$char_traits@G@std@@@std@@QAEXXZ(ptr) basic_istream_wchar_vbase_dtor -@ cdecl -arch=win64 ??_D?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAXXZ(ptr) basic_istream_wchar_vbase_dtor +@ thiscall -arch=win32 ??_D?$basic_istream@GU?$char_traits@G@std@@@std@@QAEXXZ(ptr) basic_istream_short_vbase_dtor +@ cdecl -arch=win64 ??_D?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAXXZ(ptr) basic_istream_short_vbase_dtor @ thiscall -arch=win32 ??_D?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXXZ(ptr) basic_istringstream_char_vbase_dtor @ cdecl -arch=win64 ??_D?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXXZ(ptr) basic_istringstream_char_vbase_dtor @ thiscall -arch=win32 ??_D?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXXZ(ptr) basic_istringstream_short_vbase_dtor @@ -3094,8 +3094,8 @@ @ cdecl -arch=win64 ?gbump@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IEAAXH@Z(ptr long) basic_streambuf_wchar_gbump @ thiscall -arch=win32 ?gcount@?$basic_istream@DU?$char_traits@D@std@@@std@@QBEHXZ(ptr) basic_istream_char_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream@DU?$char_traits@D@std@@@std@@QEBA_JXZ(ptr) basic_istream_char_gcount -@ thiscall -arch=win32 ?gcount@?$basic_istream@GU?$char_traits@G@std@@@std@@QBEHXZ(ptr) basic_istream_wchar_gcount -@ cdecl -arch=win64 ?gcount@?$basic_istream@GU?$char_traits@G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount +@ thiscall -arch=win32 ?gcount@?$basic_istream@GU?$char_traits@G@std@@@std@@QBEHXZ(ptr) basic_istream_short_gcount +@ cdecl -arch=win64 ?gcount@?$basic_istream@GU?$char_traits@G@std@@@std@@QEBA_JXZ(ptr) basic_istream_short_gcount @ thiscall -arch=win32 ?get@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@AAD@Z(ptr ptr) basic_istream_char_get_ch @ cdecl -arch=win64 ?get@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@AEAD@Z(ptr ptr) basic_istream_char_get_ch @ thiscall -arch=win32 ?get@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@AAV?$basic_streambuf@DU?$char_traits@D@std@@@2@@Z(ptr ptr) basic_istream_char_get_streambuf @@ -3108,18 +3108,18 @@ @ cdecl -arch=win64 ?get@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@PEAD_JD@Z(ptr ptr long long) basic_istream_char_get_str_delim @ thiscall -arch=win32 ?get@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEHXZ(ptr) basic_istream_char_get @ cdecl -arch=win64 ?get@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAHXZ(ptr) basic_istream_char_get -@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@AAG@Z(ptr ptr) basic_istream_wchar_get_ch -@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@AEAG@Z(ptr ptr) basic_istream_wchar_get_ch -@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@AAV?$basic_streambuf@GU?$char_traits@G@std@@@2@@Z(ptr ptr) basic_istream_wchar_get_streambuf -@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@AEAV?$basic_streambuf@GU?$char_traits@G@std@@@2@@Z(ptr ptr) basic_istream_wchar_get_streambuf -@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@AAV?$basic_streambuf@GU?$char_traits@G@std@@@2@G@Z(ptr ptr long) basic_istream_wchar_get_streambuf_delim -@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@AEAV?$basic_streambuf@GU?$char_traits@G@std@@@2@G@Z(ptr ptr long) basic_istream_wchar_get_streambuf_delim -@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGH@Z(ptr ptr long) basic_istream_wchar_get_str -@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_J@Z(ptr ptr long) basic_istream_wchar_get_str -@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGHG@Z(ptr ptr long long) basic_istream_wchar_get_str_delim -@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_JG@Z(ptr ptr long long) basic_istream_wchar_get_str_delim -@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEGXZ(ptr) basic_istream_wchar_get -@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAGXZ(ptr) basic_istream_wchar_get +@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@AAG@Z(ptr ptr) basic_istream_short_get_ch +@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@AEAG@Z(ptr ptr) basic_istream_short_get_ch +@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@AAV?$basic_streambuf@GU?$char_traits@G@std@@@2@@Z(ptr ptr) basic_istream_short_get_streambuf +@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@AEAV?$basic_streambuf@GU?$char_traits@G@std@@@2@@Z(ptr ptr) basic_istream_short_get_streambuf +@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@AAV?$basic_streambuf@GU?$char_traits@G@std@@@2@G@Z(ptr ptr long) basic_istream_short_get_streambuf_delim +@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@AEAV?$basic_streambuf@GU?$char_traits@G@std@@@2@G@Z(ptr ptr long) basic_istream_short_get_streambuf_delim +@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGH@Z(ptr ptr long) basic_istream_short_get_str +@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_J@Z(ptr ptr long) basic_istream_short_get_str +@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGHG@Z(ptr ptr long long) basic_istream_short_get_str_delim +@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_JG@Z(ptr ptr long long) basic_istream_short_get_str_delim +@ thiscall -arch=win32 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEGXZ(ptr) basic_istream_short_get +@ cdecl -arch=win64 ?get@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAGXZ(ptr) basic_istream_short_get @ stub -arch=win32 ?get@?$messages@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@HHHABV32@@Z @ stub -arch=win64 ?get@?$messages@D@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@HHHAEBV32@@Z @ stub -arch=win32 ?get@?$messages@G@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@HHHABV32@@Z @@ -3200,18 +3200,18 @@ @ cdecl -arch=win64 ?getline@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@PEAD_J@Z(ptr ptr long) basic_istream_char_getline @ thiscall -arch=win32 ?getline@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@PADHD@Z(ptr ptr long long) basic_istream_char_getline_delim @ cdecl -arch=win64 ?getline@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@PEAD_JD@Z(ptr ptr long long) basic_istream_char_getline_delim -@ thiscall -arch=win32 ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGH@Z(ptr ptr long) basic_istream_wchar_getline -@ cdecl -arch=win64 ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_J@Z(ptr ptr long) basic_istream_wchar_getline -@ thiscall -arch=win32 ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGHG@Z(ptr ptr long long) basic_istream_wchar_getline_delim -@ cdecl -arch=win64 ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_JG@Z(ptr ptr long long) basic_istream_wchar_getline_delim +@ thiscall -arch=win32 ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGH@Z(ptr ptr long) basic_istream_short_getline +@ cdecl -arch=win64 ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_J@Z(ptr ptr long) basic_istream_short_getline +@ thiscall -arch=win32 ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGHG@Z(ptr ptr long long) basic_istream_short_getline_delim +@ cdecl -arch=win64 ?getline@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_JG@Z(ptr ptr long long) basic_istream_short_getline_delim @ cdecl -arch=win32 ?getline@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@1@AAV21@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) basic_istream_char_getline_bstr @ cdecl -arch=win64 ?getline@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@AEAV21@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@@Z(ptr ptr) basic_istream_char_getline_bstr @ cdecl -arch=win32 ?getline@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@1@AAV21@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim @ cdecl -arch=win64 ?getline@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@AEAV21@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim -@ cdecl -arch=win32 ?getline@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@@Z(ptr ptr) basic_istream_wchar_getline_bstr -@ cdecl -arch=win64 ?getline@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@@Z(ptr ptr) basic_istream_wchar_getline_bstr -@ cdecl -arch=win32 ?getline@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@G@Z(ptr ptr long) basic_istream_wchar_getline_bstr_delim -@ cdecl -arch=win64 ?getline@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@G@Z(ptr ptr long) basic_istream_wchar_getline_bstr_delim +@ cdecl -arch=win32 ?getline@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@@Z(ptr ptr) basic_istream_short_getline_bstr +@ cdecl -arch=win64 ?getline@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@@Z(ptr ptr) basic_istream_short_getline_bstr +@ cdecl -arch=win32 ?getline@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@AAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@G@Z(ptr ptr long) basic_istream_short_getline_bstr_delim +@ cdecl -arch=win64 ?getline@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@AEAV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@G@Z(ptr ptr long) basic_istream_short_getline_bstr_delim @ thiscall -arch=win32 ?getloc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AVlocale@2@XZ(ptr ptr) basic_streambuf_char_getloc @ cdecl -arch=win64 ?getloc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AVlocale@2@XZ(ptr ptr) basic_streambuf_char_getloc @ stub -arch=win32 ?getloc@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAE?AVlocale@2@XZ @@ -3266,8 +3266,8 @@ @ extern ?id@?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A time_put_short_id @ thiscall -arch=win32 ?ignore@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@HH@Z(ptr long long) basic_istream_char_ignore @ cdecl -arch=win64 ?ignore@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@_JH@Z(ptr long long) basic_istream_char_ignore -@ thiscall -arch=win32 ?ignore@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@HG@Z(ptr long long) basic_istream_wchar_ignore -@ cdecl -arch=win64 ?ignore@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@_JG@Z(ptr long long) basic_istream_wchar_ignore +@ thiscall -arch=win32 ?ignore@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@HG@Z(ptr long long) basic_istream_short_ignore +@ cdecl -arch=win64 ?ignore@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@_JG@Z(ptr long long) basic_istream_short_ignore @ stub -arch=win32 ?imag@?$_Complex_base@M@std@@QAEMABM@Z @ stub -arch=win64 ?imag@?$_Complex_base@M@std@@QEAAMAEBM@Z @ stub -arch=win32 ?imag@?$_Complex_base@M@std@@QBEMXZ @@ -3359,8 +3359,8 @@ # extern ?intl@?$moneypunct@G$0A@@std@@2_NB @ thiscall -arch=win32 ?ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAE_N_N@Z(ptr long) basic_istream_char_ipfx @ cdecl -arch=win64 ?ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAA_N_N@Z(ptr long) basic_istream_char_ipfx -@ thiscall -arch=win32 ?ipfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QAE_N_N@Z(ptr long) basic_istream_wchar_ipfx -@ cdecl -arch=win64 ?ipfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA_N_N@Z(ptr long) basic_istream_wchar_ipfx +@ thiscall -arch=win32 ?ipfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QAE_N_N@Z(ptr long) basic_istream_short_ipfx +@ cdecl -arch=win64 ?ipfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA_N_N@Z(ptr long) basic_istream_short_ipfx @ thiscall -arch=win32 ?is@?$ctype@D@std@@QBEPBDPBD0PAF@Z(ptr ptr ptr ptr) ctype_char_is @ cdecl -arch=win64 ?is@?$ctype@D@std@@QEBAPEBDPEBD0PEAF@Z(ptr ptr ptr ptr) ctype_char_is @ thiscall -arch=win32 ?is@?$ctype@D@std@@QBE_NFD@Z(ptr long long) ctype_char_is_ch @@ -3387,8 +3387,8 @@ @ cdecl -arch=win64 ?is_open@?$basic_ofstream@GU?$char_traits@G@std@@@std@@QEBA_NXZ(ptr) basic_ofstream_short_is_open @ thiscall -arch=win32 ?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx @ cdecl -arch=win64 ?isfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAXXZ(ptr) basic_istream_char_isfx -@ thiscall -arch=win32 ?isfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEXXZ(ptr) basic_istream_wchar_isfx -@ cdecl -arch=win64 ?isfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAXXZ(ptr) basic_istream_wchar_isfx +@ thiscall -arch=win32 ?isfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEXXZ(ptr) basic_istream_short_isfx +@ cdecl -arch=win64 ?isfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAXXZ(ptr) basic_istream_short_isfx @ thiscall -arch=win32 ?iword@ios_base@std@@QAEAAJH@Z(ptr long) ios_base_iword @ cdecl -arch=win64 ?iword@ios_base@std@@QEAAAEAJH@Z(ptr long) ios_base_iword @ stub ?ldexp@?$_Ctr@M@std@@SAMMH@Z @@ -3584,8 +3584,8 @@ @ cdecl -arch=win64 ?pbump@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IEAAXH@Z(ptr long) basic_streambuf_wchar_pbump @ thiscall -arch=win32 ?peek@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEHXZ(ptr) basic_istream_char_peek @ cdecl -arch=win64 ?peek@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAHXZ(ptr) basic_istream_char_peek -@ thiscall -arch=win32 ?peek@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEGXZ(ptr) basic_istream_wchar_peek -@ cdecl -arch=win64 ?peek@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAGXZ(ptr) basic_istream_wchar_peek +@ thiscall -arch=win32 ?peek@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEGXZ(ptr) basic_istream_short_peek +@ cdecl -arch=win64 ?peek@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAGXZ(ptr) basic_istream_short_peek @ stub -arch=win32 ?polar@std@@YA?AV?$complex@M@1@ABM0@Z @ stub -arch=win64 ?polar@std@@YA?AV?$complex@M@1@AEBM0@Z @ stub -arch=win32 ?polar@std@@YA?AV?$complex@M@1@ABM@Z @@ -3719,8 +3719,8 @@ @ cdecl -arch=win64 ?put@?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@QEBA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AEAVios_base@2@PEBUtm@@PEBG3@Z(ptr ptr ptr ptr ptr ptr ptr) time_put_wchar_put_format @ thiscall -arch=win32 ?putback@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@D@Z(ptr long) basic_istream_char_putback @ cdecl -arch=win64 ?putback@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@D@Z(ptr long) basic_istream_char_putback -@ thiscall -arch=win32 ?putback@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@G@Z(ptr long) basic_istream_wchar_putback -@ cdecl -arch=win64 ?putback@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@G@Z(ptr long) basic_istream_wchar_putback +@ thiscall -arch=win32 ?putback@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@G@Z(ptr long) basic_istream_short_putback +@ cdecl -arch=win64 ?putback@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@G@Z(ptr long) basic_istream_short_putback @ thiscall -arch=win32 ?pword@ios_base@std@@QAEAAPAXH@Z(ptr long) ios_base_pword @ cdecl -arch=win64 ?pword@ios_base@std@@QEAAAEAPEAXH@Z(ptr long) ios_base_pword @ cdecl ?quiet_NaN@?$numeric_limits@C@std@@SACXZ() std_numeric_limits_signed_char_quiet_NaN @@ -3780,12 +3780,12 @@ @ cdecl -arch=win64 ?rdstate@ios_base@std@@QEBAHXZ(ptr) ios_base_rdstate @ thiscall -arch=win32 ?read@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@PADH@Z(ptr ptr long) basic_istream_char_read @ cdecl -arch=win64 ?read@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@PEAD_J@Z(ptr ptr long) basic_istream_char_read -@ thiscall -arch=win32 ?read@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGH@Z(ptr ptr long) basic_istream_wchar_read -@ cdecl -arch=win64 ?read@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_J@Z(ptr ptr long) basic_istream_wchar_read +@ thiscall -arch=win32 ?read@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@PAGH@Z(ptr ptr long) basic_istream_short_read +@ cdecl -arch=win64 ?read@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEAG_J@Z(ptr ptr long) basic_istream_short_read @ thiscall -arch=win32 ?readsome@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEHPADH@Z(ptr ptr long) basic_istream_char_readsome @ cdecl -arch=win64 ?readsome@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAA_JPEAD_J@Z(ptr ptr long) basic_istream_char_readsome -@ thiscall -arch=win32 ?readsome@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEHPAGH@Z(ptr ptr long) basic_istream_wchar_readsome -@ cdecl -arch=win64 ?readsome@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA_JPEAG_J@Z(ptr ptr long) basic_istream_wchar_readsome +@ thiscall -arch=win32 ?readsome@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEHPAGH@Z(ptr ptr long) basic_istream_short_readsome +@ cdecl -arch=win64 ?readsome@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA_JPEAG_J@Z(ptr ptr long) basic_istream_short_readsome @ stub -arch=win32 ?real@?$_Complex_base@M@std@@QAEMABM@Z @ stub -arch=win64 ?real@?$_Complex_base@M@std@@QEAAMAEBM@Z @ stub -arch=win32 ?real@?$_Complex_base@M@std@@QBEMXZ @@ -3912,10 +3912,10 @@ @ cdecl -arch=win64 ?seekg@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@V?$fpos@H@2@@Z(ptr ptr) basic_istream_char_seekg_fpos @ thiscall -arch=win32 ?seekg@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@V?$fpos@H@2@@Z(ptr long long int64 long long) basic_istream_char_seekg_fpos @ cdecl -arch=win64 ?seekg@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@_JW4seekdir@ios_base@2@@Z(ptr long long) basic_istream_char_seekg -@ thiscall -arch=win32 ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@JW4seekdir@ios_base@2@@Z(ptr long long) basic_istream_wchar_seekg -@ cdecl -arch=win64 ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@V?$fpos@H@2@@Z(ptr ptr) basic_istream_wchar_seekg_fpos -@ thiscall -arch=win32 ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@V?$fpos@H@2@@Z(ptr long long int64 long long) basic_istream_wchar_seekg_fpos -@ cdecl -arch=win64 ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@_JW4seekdir@ios_base@2@@Z(ptr long long) basic_istream_wchar_seekg +@ thiscall -arch=win32 ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@JW4seekdir@ios_base@2@@Z(ptr long long) basic_istream_short_seekg +@ cdecl -arch=win64 ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@V?$fpos@H@2@@Z(ptr ptr) basic_istream_short_seekg_fpos +@ thiscall -arch=win32 ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@V?$fpos@H@2@@Z(ptr long long int64 long long) basic_istream_short_seekg_fpos +@ cdecl -arch=win64 ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@_JW4seekdir@ios_base@2@@Z(ptr long long) basic_istream_short_seekg @ thiscall -arch=win32 ?seekoff@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_filebuf_char_seekoff @ cdecl -arch=win64 ?seekoff@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAA?AV?$fpos@H@2@_JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_filebuf_char_seekoff @ thiscall -arch=win32 ?seekoff@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_filebuf_wchar_seekoff @@ -4117,8 +4117,8 @@ @ cdecl -arch=win64 ?sync@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAHXZ(ptr) basic_filebuf_wchar_sync @ thiscall -arch=win32 ?sync@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEHXZ(ptr) basic_istream_char_sync @ cdecl -arch=win64 ?sync@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAHXZ(ptr) basic_istream_char_sync -@ thiscall -arch=win32 ?sync@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEHXZ(ptr) basic_istream_wchar_sync -@ cdecl -arch=win64 ?sync@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAHXZ(ptr) basic_istream_wchar_sync +@ thiscall -arch=win32 ?sync@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEHXZ(ptr) basic_istream_short_sync +@ cdecl -arch=win64 ?sync@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAHXZ(ptr) basic_istream_short_sync @ thiscall -arch=win32 ?sync@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_sync @ cdecl -arch=win64 ?sync@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_sync @ thiscall -arch=win32 ?sync@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_sync @@ -4130,8 +4130,8 @@ @ extern -arch=win64 ?table_size@?$ctype@D@std@@2_KB ctype_char_table_size @ thiscall -arch=win32 ?tellg@?$basic_istream@DU?$char_traits@D@std@@@std@@QAE?AV?$fpos@H@2@XZ(ptr ptr) basic_istream_char_tellg @ cdecl -arch=win64 ?tellg@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAA?AV?$fpos@H@2@XZ(ptr ptr) basic_istream_char_tellg -@ thiscall -arch=win32 ?tellg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAE?AV?$fpos@H@2@XZ(ptr ptr) basic_istream_wchar_tellg -@ cdecl -arch=win64 ?tellg@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA?AV?$fpos@H@2@XZ(ptr ptr) basic_istream_wchar_tellg +@ thiscall -arch=win32 ?tellg@?$basic_istream@GU?$char_traits@G@std@@@std@@QAE?AV?$fpos@H@2@XZ(ptr ptr) basic_istream_short_tellg +@ cdecl -arch=win64 ?tellg@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA?AV?$fpos@H@2@XZ(ptr ptr) basic_istream_short_tellg @ thiscall -arch=win32 ?tellp@?$basic_ostream@DU?$char_traits@D@std@@@std@@QAE?AV?$fpos@H@2@XZ(ptr ptr) basic_ostream_char_tellp @ cdecl -arch=win64 ?tellp@?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAA?AV?$fpos@H@2@XZ(ptr ptr) basic_ostream_char_tellp @ thiscall -arch=win32 ?tellp@?$basic_ostream@GU?$char_traits@G@std@@@std@@QAE?AV?$fpos@H@2@XZ(ptr ptr) basic_ostream_wchar_tellp @@ -4209,8 +4209,8 @@ @ cdecl -arch=win64 ?underflow@strstreambuf@std@@MEAAHXZ(ptr) strstreambuf_underflow @ thiscall -arch=win32 ?unget@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@XZ(ptr) basic_istream_char_unget @ cdecl -arch=win64 ?unget@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@XZ(ptr) basic_istream_char_unget -@ thiscall -arch=win32 ?unget@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@XZ(ptr) basic_istream_wchar_unget -@ cdecl -arch=win64 ?unget@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@XZ(ptr) basic_istream_wchar_unget +@ thiscall -arch=win32 ?unget@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@XZ(ptr) basic_istream_short_unget +@ cdecl -arch=win64 ?unget@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@XZ(ptr) basic_istream_short_unget @ thiscall -arch=win32 ?unsetf@ios_base@std@@QAEXH@Z(ptr long) ios_base_unsetf @ cdecl -arch=win64 ?unsetf@ios_base@std@@QEAAXH@Z(ptr long) ios_base_unsetf @ extern ?wcerr@std@@3V?$basic_ostream@GU?$char_traits@G@std@@@1@A ucerr @@ -4243,8 +4243,8 @@ @ cdecl -arch=win64 ?write@?$basic_ostream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@PEBG_J@Z(ptr wstr long) basic_ostream_wchar_write @ cdecl -arch=win32 ?ws@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@1@AAV21@@Z(ptr) ws_basic_istream_char @ cdecl -arch=win64 ?ws@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@AEAV21@@Z(ptr) ws_basic_istream_char -@ cdecl -arch=win32 ?ws@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@@Z(ptr) ws_basic_istream_wchar -@ cdecl -arch=win64 ?ws@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@@Z(ptr) ws_basic_istream_wchar +@ cdecl -arch=win32 ?ws@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@@Z(ptr) ws_basic_istream_short +@ cdecl -arch=win64 ?ws@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@@Z(ptr) ws_basic_istream_short @ cdecl ?xalloc@ios_base@std@@SAHXZ() ios_base_xalloc @ thiscall -arch=win32 ?xsgetn@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHPADH@Z(ptr ptr long) basic_streambuf_char_xsgetn @ cdecl -arch=win64 ?xsgetn@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA_JPEAD_J@Z(ptr ptr long) basic_streambuf_char_xsgetn