diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 93bd693890c..12222dc6260 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); /* ?_Index@ios_base@std@@0HA */ int ios_base_Index = 0; /* ?_Sync@ios_base@std@@0_NA */ -MSVCP_bool ios_base_Sync = FALSE; +bool ios_base_Sync = FALSE; typedef struct { streamoff off; @@ -67,7 +67,7 @@ typedef struct { int state0; int state; basic_string_char *str; - MSVCP_bool close; + bool close; #if _MSVCP_VER <= 70 locale loc; #endif @@ -80,7 +80,7 @@ typedef struct { int state0; int state; basic_string_char *str; - MSVCP_bool close; + bool close; #if _MSVCP_VER <= 70 locale loc; #endif @@ -2868,7 +2868,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_vector_dtor(basic_filebuf_char /* ?is_open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QBE_NXZ */ /* ?is_open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(basic_filebuf_char_is_open, 4) -MSVCP_bool __thiscall basic_filebuf_char_is_open(const basic_filebuf_char *this) +bool __thiscall basic_filebuf_char_is_open(const basic_filebuf_char *this) { TRACE("(%p)\n", this); return this->file != NULL; @@ -3462,7 +3462,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_vector_dtor(basic_filebuf_wc /* ?is_open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QBE_NXZ */ /* ?is_open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_is_open, 4) -MSVCP_bool __thiscall basic_filebuf_wchar_is_open(const basic_filebuf_wchar *this) +bool __thiscall basic_filebuf_wchar_is_open(const basic_filebuf_wchar *this) { TRACE("(%p)\n", this); return this->file != NULL; @@ -4854,7 +4854,7 @@ void __thiscall ios_base_register_callback(ios_base *this, IOS_BASE_event_callba /* ?clear@ios_base@std@@QAEXH_N@Z */ /* ?clear@ios_base@std@@QEAAXH_N@Z */ DEFINE_THISCALL_WRAPPER(ios_base_clear_reraise, 12) -void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, MSVCP_bool reraise) +void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, bool reraise) { TRACE("(%p %x %x)\n", this, state, reraise); @@ -4971,7 +4971,7 @@ ios_base* __thiscall ios_base_assign(ios_base *this, const ios_base *right) /* ?fail@ios_base@std@@QBE_NXZ */ /* ?fail@ios_base@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(ios_base_fail, 4) -MSVCP_bool __thiscall ios_base_fail(const ios_base *this) +bool __thiscall ios_base_fail(const ios_base *this) { TRACE("(%p)\n", this); return (this->state & (IOSTATE_failbit|IOSTATE_badbit)) != 0; @@ -4980,7 +4980,7 @@ MSVCP_bool __thiscall ios_base_fail(const ios_base *this) /* ??7ios_base@std@@QBE_NXZ */ /* ??7ios_base@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(ios_base_op_succ, 4) -MSVCP_bool __thiscall ios_base_op_succ(const ios_base *this) +bool __thiscall ios_base_op_succ(const ios_base *this) { TRACE("(%p)\n", this); return ios_base_fail(this); @@ -4999,7 +4999,7 @@ void* __thiscall ios_base_op_fail(const ios_base *this) /* ??Bios_base@std@@QBE_NXZ */ /* ??Bios_base@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(ios_base_operator_bool, 4) -MSVCP_bool __thiscall ios_base_operator_bool(const ios_base *this) +bool __thiscall ios_base_operator_bool(const ios_base *this) { TRACE("(%p)\n", this); return (this->state & (IOSTATE_failbit|IOSTATE_badbit)) == 0; @@ -5042,7 +5042,7 @@ void __thiscall ios_base__Init(ios_base *this) /* ?_Sync_func@ios_base@std@@CAAA_NXZ */ /* ?_Sync_func@ios_base@std@@CAAEA_NXZ */ -MSVCP_bool* __cdecl ios_base_Sync_func(void) +bool* __cdecl ios_base_Sync_func(void) { TRACE("\n"); return &ios_base_Sync; @@ -5051,7 +5051,7 @@ MSVCP_bool* __cdecl ios_base_Sync_func(void) /* ?bad@ios_base@std@@QBE_NXZ */ /* ?bad@ios_base@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(ios_base_bad, 4) -MSVCP_bool __thiscall ios_base_bad(const ios_base *this) +bool __thiscall ios_base_bad(const ios_base *this) { TRACE("(%p)\n", this); return (this->state & IOSTATE_badbit) != 0; @@ -5060,7 +5060,7 @@ MSVCP_bool __thiscall ios_base_bad(const ios_base *this) /* ?eof@ios_base@std@@QBE_NXZ */ /* ?eof@ios_base@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(ios_base_eof, 4) -MSVCP_bool __thiscall ios_base_eof(const ios_base *this) +bool __thiscall ios_base_eof(const ios_base *this) { TRACE("(%p)\n", this); return (this->state & IOSTATE_eofbit) != 0; @@ -5100,7 +5100,7 @@ locale* __thiscall ios_base_getloc(const ios_base *this, locale *ret) /* ?good@ios_base@std@@QBE_NXZ */ /* ?good@ios_base@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(ios_base_good, 4) -MSVCP_bool __thiscall ios_base_good(const ios_base *this) +bool __thiscall ios_base_good(const ios_base *this) { TRACE("(%p)\n", this); return this->state == IOSTATE_goodbit; @@ -5181,7 +5181,7 @@ IOSB_fmtflags __thiscall ios_base_setf(ios_base *this, IOSB_fmtflags flags) /* ?setstate@ios_base@std@@QAEXH_N@Z */ /* ?setstate@ios_base@std@@QEAAXH_N@Z */ DEFINE_THISCALL_WRAPPER(ios_base_setstate_reraise, 12) -void __thiscall ios_base_setstate_reraise(ios_base *this, IOSB_iostate state, MSVCP_bool reraise) +void __thiscall ios_base_setstate_reraise(ios_base *this, IOSB_iostate state, bool reraise) { TRACE("(%p %x %x)\n", this, state, reraise); @@ -5206,10 +5206,10 @@ void __thiscall ios_base_setstate_unsigned(ios_base *this, unsigned int state) } /* ?sync_with_stdio@ios_base@std@@SA_N_N@Z */ -MSVCP_bool __cdecl ios_base_sync_with_stdio(MSVCP_bool sync) +bool __cdecl ios_base_sync_with_stdio(bool sync) { _Lockit lock; - MSVCP_bool ret; + bool ret; TRACE("(%x)\n", sync); @@ -5303,7 +5303,7 @@ basic_ios_char* __thiscall basic_ios_char_ctor(basic_ios_char *this) /* ?init@?$basic_ios@DU?$char_traits@D@std@@@std@@IAEXPAV?$basic_streambuf@DU?$char_traits@D@std@@@2@_N@Z */ /* ?init@?$basic_ios@DU?$char_traits@D@std@@@std@@IEAAXPEAV?$basic_streambuf@DU?$char_traits@D@std@@@2@_N@Z */ DEFINE_THISCALL_WRAPPER(basic_ios_char_init, 12) -void __thiscall basic_ios_char_init(basic_ios_char *this, basic_streambuf_char *streambuf, MSVCP_bool isstd) +void __thiscall basic_ios_char_init(basic_ios_char *this, basic_streambuf_char *streambuf, bool isstd) { TRACE("(%p %p %x)\n", this, streambuf, isstd); ios_base__Init(&this->base); @@ -5362,7 +5362,7 @@ basic_ios_char* __thiscall basic_ios_char_vector_dtor(basic_ios_char *this, unsi /* ?clear@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEXH_N@Z */ /* ?clear@?$basic_ios@DU?$char_traits@D@std@@@std@@QEAAXH_N@Z */ DEFINE_THISCALL_WRAPPER(basic_ios_char_clear_reraise, 12) -void __thiscall basic_ios_char_clear_reraise(basic_ios_char *this, IOSB_iostate state, MSVCP_bool reraise) +void __thiscall basic_ios_char_clear_reraise(basic_ios_char *this, IOSB_iostate state, bool reraise) { TRACE("(%p %x %x)\n", this, state, reraise); ios_base_clear_reraise(&this->base, state | (this->strbuf ? IOSTATE_goodbit : IOSTATE_badbit), reraise); @@ -5463,7 +5463,7 @@ basic_streambuf_char* __thiscall basic_ios_char_rdbuf_get(const basic_ios_char * /* ?setstate@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEXH_N@Z */ /* ?setstate@?$basic_ios@DU?$char_traits@D@std@@@std@@QEAAXH_N@Z */ DEFINE_THISCALL_WRAPPER(basic_ios_char_setstate_reraise, 12) -void __thiscall basic_ios_char_setstate_reraise(basic_ios_char *this, IOSB_iostate state, MSVCP_bool reraise) +void __thiscall basic_ios_char_setstate_reraise(basic_ios_char *this, IOSB_iostate state, bool reraise) { TRACE("(%p %x %x)\n", this, state, reraise); @@ -5558,7 +5558,7 @@ basic_ios_wchar* __thiscall basic_ios_short_ctor(basic_ios_wchar *this) /* ?init@?$basic_ios@GU?$char_traits@G@std@@@std@@IAEXPAV?$basic_streambuf@GU?$char_traits@G@std@@@2@_N@Z */ /* ?init@?$basic_ios@GU?$char_traits@G@std@@@std@@IEAAXPEAV?$basic_streambuf@GU?$char_traits@G@std@@@2@_N@Z */ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_init, 12) -void __thiscall basic_ios_wchar_init(basic_ios_wchar *this, basic_streambuf_wchar *streambuf, MSVCP_bool isstd) +void __thiscall basic_ios_wchar_init(basic_ios_wchar *this, basic_streambuf_wchar *streambuf, bool isstd) { TRACE("(%p %p %x)\n", this, streambuf, isstd); ios_base__Init(&this->base); @@ -5631,7 +5631,7 @@ basic_ios_wchar* __thiscall basic_ios_wchar_vector_dtor(basic_ios_wchar *this, u /* ?clear@?$basic_ios@GU?$char_traits@G@std@@@std@@QAEXH_N@Z */ /* ?clear@?$basic_ios@GU?$char_traits@G@std@@@std@@QEAAXH_N@Z */ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_clear_reraise, 12) -void __thiscall basic_ios_wchar_clear_reraise(basic_ios_wchar *this, IOSB_iostate state, MSVCP_bool reraise) +void __thiscall basic_ios_wchar_clear_reraise(basic_ios_wchar *this, IOSB_iostate state, bool reraise) { TRACE("(%p %x %x)\n", this, state, reraise); ios_base_clear_reraise(&this->base, state | (this->strbuf ? IOSTATE_goodbit : IOSTATE_badbit), reraise); @@ -5750,7 +5750,7 @@ basic_streambuf_wchar* __thiscall basic_ios_wchar_rdbuf_get(const basic_ios_wcha /* ?setstate@?$basic_ios@GU?$char_traits@G@std@@@std@@QAEXH_N@Z */ /* ?setstate@?$basic_ios@GU?$char_traits@G@std@@@std@@QEAAXH_N@Z */ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_setstate_reraise, 12) -void __thiscall basic_ios_wchar_setstate_reraise(basic_ios_wchar *this, IOSB_iostate state, MSVCP_bool reraise) +void __thiscall basic_ios_wchar_setstate_reraise(basic_ios_wchar *this, IOSB_iostate state, bool reraise) { TRACE("(%p %x %x)\n", this, state, reraise); @@ -5851,7 +5851,7 @@ static inline basic_ostream_char* basic_ostream_char_from_basic_ios(basic_ios_ch /* ??0?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAA@PEAV?$basic_streambuf@DU?$char_traits@D@std@@@1@_N1@Z */ DEFINE_THISCALL_WRAPPER(basic_ostream_char_ctor, 20) basic_ostream_char* __thiscall basic_ostream_char_ctor(basic_ostream_char *this, - basic_streambuf_char *strbuf, MSVCP_bool isstd, MSVCP_bool init, MSVCP_bool virt_init) + basic_streambuf_char *strbuf, bool isstd, bool init, bool virt_init) { basic_ios_char *base; @@ -5875,7 +5875,7 @@ basic_ostream_char* __thiscall basic_ostream_char_ctor(basic_ostream_char *this, /* ??0?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAA@W4_Uninitialized@1@@Z */ DEFINE_THISCALL_WRAPPER(basic_ostream_char_ctor_uninitialized, 12) basic_ostream_char* __thiscall basic_ostream_char_ctor_uninitialized(basic_ostream_char *this, - int uninitialized, MSVCP_bool virt_init) + int uninitialized, bool virt_init) { basic_ios_char *base; @@ -6010,7 +6010,7 @@ static void basic_ostream_char_sentry_destroy(basic_ostream_char *ostr) /* ?opfx@?$basic_ostream@DU?$char_traits@D@std@@@std@@QAE_NXZ */ /* ?opfx@?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAA_NXZ */ DEFINE_THISCALL_WRAPPER(basic_ostream_char_opfx, 4) -MSVCP_bool __thiscall basic_ostream_char_opfx(basic_ostream_char *this) +bool __thiscall basic_ostream_char_opfx(basic_ostream_char *this) { basic_ios_char *base = basic_ostream_char_get_basic_ios(this); @@ -6419,7 +6419,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_uint64(basic_ostream_cha /* ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@_N@Z */ /* ??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@_N@Z */ DEFINE_THISCALL_WRAPPER(basic_ostream_char_print_bool, 8) -basic_ostream_char* __thiscall basic_ostream_char_print_bool(basic_ostream_char *this, MSVCP_bool val) +basic_ostream_char* __thiscall basic_ostream_char_print_bool(basic_ostream_char *this, bool val) { basic_ios_char *base = basic_ostream_char_get_basic_ios(this); int state = IOSTATE_goodbit; @@ -6674,7 +6674,7 @@ static inline basic_ostream_wchar* basic_ostream_wchar_from_basic_ios(basic_ios_ /* ??0?$basic_ostream@GU?$char_traits@G@std@@@std@@QEAA@PEAV?$basic_streambuf@GU?$char_traits@G@std@@@1@_N1@Z */ DEFINE_THISCALL_WRAPPER(basic_ostream_short_ctor, 20) basic_ostream_wchar* __thiscall basic_ostream_short_ctor(basic_ostream_wchar *this, - basic_streambuf_wchar *strbuf, MSVCP_bool isstd, MSVCP_bool init, MSVCP_bool virt_init) + basic_streambuf_wchar *strbuf, bool isstd, bool init, bool virt_init) { basic_ios_wchar *base; @@ -6698,7 +6698,7 @@ basic_ostream_wchar* __thiscall basic_ostream_short_ctor(basic_ostream_wchar *th /* ??0?$basic_ostream@GU?$char_traits@G@std@@@std@@QEAA@W4_Uninitialized@1@@Z */ DEFINE_THISCALL_WRAPPER(basic_ostream_short_ctor_uninitialized, 12) basic_ostream_wchar* __thiscall basic_ostream_short_ctor_uninitialized(basic_ostream_wchar *this, - int uninitialized, MSVCP_bool virt_init) + int uninitialized, bool virt_init) { basic_ios_wchar *base; @@ -6847,7 +6847,7 @@ static void basic_ostream_wchar_sentry_destroy(basic_ostream_wchar *ostr) /* ?opfx@?$basic_ostream@GU?$char_traits@G@std@@@std@@QAE_NXZ */ /* ?opfx@?$basic_ostream@GU?$char_traits@G@std@@@std@@QEAA_NXZ */ DEFINE_THISCALL_WRAPPER(basic_ostream_wchar_opfx, 4) -MSVCP_bool __thiscall basic_ostream_wchar_opfx(basic_ostream_wchar *this) +bool __thiscall basic_ostream_wchar_opfx(basic_ostream_wchar *this) { basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(this); @@ -7417,7 +7417,7 @@ basic_ostream_wchar* __thiscall basic_ostream_short_print_uint64(basic_ostream_w IOS_LOCALE(basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))))); } -static basic_ostream_wchar* basic_ostream_print_bool(basic_ostream_wchar *this, MSVCP_bool val, const num_put *numput) +static basic_ostream_wchar* basic_ostream_print_bool(basic_ostream_wchar *this, bool val, const num_put *numput) { basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(this); int state = IOSTATE_goodbit; @@ -7441,7 +7441,7 @@ static basic_ostream_wchar* basic_ostream_print_bool(basic_ostream_wchar *this, /* ??6?$basic_ostream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@_N@Z */ /* ??6?$basic_ostream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@_N@Z */ DEFINE_THISCALL_WRAPPER(basic_ostream_wchar_print_bool, 8) -basic_ostream_wchar* __thiscall basic_ostream_wchar_print_bool(basic_ostream_wchar *this, MSVCP_bool val) +basic_ostream_wchar* __thiscall basic_ostream_wchar_print_bool(basic_ostream_wchar *this, bool val) { return basic_ostream_print_bool(this, val, num_put_wchar_use_facet( IOS_LOCALE(basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))))); @@ -7450,7 +7450,7 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_print_bool(basic_ostream_wch /* ??6?$basic_ostream@GU?$char_traits@G@std@@@std@@QAEAAV01@_N@Z */ /* ??6?$basic_ostream@GU?$char_traits@G@std@@@std@@QEAAAEAV01@_N@Z */ DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_bool, 8) -basic_ostream_wchar* __thiscall basic_ostream_short_print_bool(basic_ostream_wchar *this, MSVCP_bool val) +basic_ostream_wchar* __thiscall basic_ostream_short_print_bool(basic_ostream_wchar *this, bool val) { return basic_ostream_print_bool(this, val, num_put_short_use_facet( IOS_LOCALE(basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))))); @@ -7698,7 +7698,7 @@ static inline basic_istream_char* basic_istream_char_from_basic_ios(basic_ios_ch /* ??0?$basic_istream@DU?$char_traits@D@std@@@std@@QAE@PAV?$basic_streambuf@DU?$char_traits@D@std@@@1@_N1@Z */ /* ??0?$basic_istream@DU?$char_traits@D@std@@@std@@QEAA@PEAV?$basic_streambuf@DU?$char_traits@D@std@@@1@_N1@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_char_ctor_init, 20) -basic_istream_char* __thiscall basic_istream_char_ctor_init(basic_istream_char *this, basic_streambuf_char *strbuf, MSVCP_bool isstd, MSVCP_bool noinit, MSVCP_bool virt_init) +basic_istream_char* __thiscall basic_istream_char_ctor_init(basic_istream_char *this, basic_streambuf_char *strbuf, bool isstd, bool noinit, bool virt_init) { basic_ios_char *base; @@ -7722,7 +7722,7 @@ basic_istream_char* __thiscall basic_istream_char_ctor_init(basic_istream_char * /* ??0?$basic_istream@DU?$char_traits@D@std@@@std@@QAE@PAV?$basic_streambuf@DU?$char_traits@D@std@@@1@_N@Z */ /* ??0?$basic_istream@DU?$char_traits@D@std@@@std@@QEAA@PEAV?$basic_streambuf@DU?$char_traits@D@std@@@1@_N@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_char_ctor, 16) -basic_istream_char* __thiscall basic_istream_char_ctor(basic_istream_char *this, basic_streambuf_char *strbuf, MSVCP_bool isstd, MSVCP_bool virt_init) +basic_istream_char* __thiscall basic_istream_char_ctor(basic_istream_char *this, basic_streambuf_char *strbuf, bool isstd, bool virt_init) { return basic_istream_char_ctor_init(this, strbuf, isstd, FALSE, virt_init); } @@ -7730,7 +7730,7 @@ basic_istream_char* __thiscall basic_istream_char_ctor(basic_istream_char *this, /* ??0?$basic_istream@DU?$char_traits@D@std@@@std@@QAE@W4_Uninitialized@1@@Z */ /* ??0?$basic_istream@DU?$char_traits@D@std@@@std@@QEAA@W4_Uninitialized@1@@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_char_ctor_uninitialized, 12) -basic_istream_char* __thiscall basic_istream_char_ctor_uninitialized(basic_istream_char *this, int uninitialized, MSVCP_bool virt_init) +basic_istream_char* __thiscall basic_istream_char_ctor_uninitialized(basic_istream_char *this, int uninitialized, bool virt_init) { basic_ios_char *base; @@ -7796,7 +7796,7 @@ basic_istream_char* __thiscall basic_istream_char_vector_dtor(basic_ios_char *ba /* ?_Ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAE_N_N@Z */ /* ?_Ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAA_N_N@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_char__Ipfx, 8) -MSVCP_bool __thiscall basic_istream_char__Ipfx(basic_istream_char *this, MSVCP_bool noskip) +bool __thiscall basic_istream_char__Ipfx(basic_istream_char *this, bool noskip) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); @@ -7830,7 +7830,7 @@ MSVCP_bool __thiscall basic_istream_char__Ipfx(basic_istream_char *this, MSVCP_b /* ?ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAE_N_N@Z */ /* ?ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAA_N_N@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_char_ipfx, 8) -MSVCP_bool __thiscall basic_istream_char_ipfx(basic_istream_char *this, MSVCP_bool noskip) +bool __thiscall basic_istream_char_ipfx(basic_istream_char *this, bool noskip) { return basic_istream_char__Ipfx(this, noskip); } @@ -7843,7 +7843,7 @@ void __thiscall basic_istream_char_isfx(basic_istream_char *this) TRACE("(%p)\n", this); } -static BOOL basic_istream_char_sentry_create(basic_istream_char *istr, MSVCP_bool noskip) +static BOOL basic_istream_char_sentry_create(basic_istream_char *istr, bool noskip) { basic_ios_char *base = basic_istream_char_get_basic_ios(istr); @@ -8685,7 +8685,7 @@ basic_istream_char* __thiscall basic_istream_char_read_uint64(basic_istream_char /* ??5?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV01@AA_N@Z */ /* ??5?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@AEA_N@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_char_read_bool, 8) -basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char *this, MSVCP_bool *v) +basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char *this, bool *v) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); int state = IOSTATE_goodbit; @@ -9111,7 +9111,7 @@ static inline basic_istream_wchar* basic_istream_wchar_from_basic_ios(basic_ios_ /* ??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, MSVCP_bool isstd, MSVCP_bool noinit, MSVCP_bool virt_init) + basic_streambuf_wchar *strbuf, bool isstd, bool noinit, bool virt_init) { basic_ios_wchar *base; @@ -9136,7 +9136,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ctor_init(basic_istream_wcha /* ??0?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA@PEAV?$basic_streambuf@GU?$char_traits@G@std@@@1@_N1@Z */ 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, MSVCP_bool isstd, MSVCP_bool noinit, MSVCP_bool virt_init) + 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 = &MSVCP_basic_istream_short_vtable; @@ -9147,7 +9147,7 @@ basic_istream_wchar* __thiscall basic_istream_short_ctor_init(basic_istream_wcha /* ??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, MSVCP_bool isstd, MSVCP_bool virt_init) + basic_streambuf_wchar *strbuf, bool isstd, bool virt_init) { return basic_istream_wchar_ctor_init(this, strbuf, isstd, FALSE, virt_init); } @@ -9156,7 +9156,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ctor(basic_istream_wchar *th /* ??0?$basic_istream@GU?$char_traits@G@std@@@std@@QEAA@PEAV?$basic_streambuf@GU?$char_traits@G@std@@@1@_N@Z */ DEFINE_THISCALL_WRAPPER(basic_istream_short_ctor, 16) basic_istream_wchar* __thiscall basic_istream_short_ctor(basic_istream_wchar *this, - basic_streambuf_wchar *strbuf, MSVCP_bool isstd, MSVCP_bool virt_init) + basic_streambuf_wchar *strbuf, bool isstd, bool virt_init) { return basic_istream_short_ctor_init(this, strbuf, isstd, FALSE, virt_init); } @@ -9165,7 +9165,7 @@ basic_istream_wchar* __thiscall basic_istream_short_ctor(basic_istream_wchar *th /* ??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( - basic_istream_wchar *this, int uninitialized, MSVCP_bool virt_init) + basic_istream_wchar *this, int uninitialized, bool virt_init) { basic_ios_wchar *base; @@ -9188,7 +9188,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ctor_uninitialized( /* ??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, MSVCP_bool virt_init) + 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 = &MSVCP_basic_istream_short_vtable; @@ -9248,7 +9248,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_vector_dtor(basic_ios_wchar /* ?_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) -MSVCP_bool __thiscall basic_istream_wchar__Ipfx(basic_istream_wchar *this, MSVCP_bool noskip) +bool __thiscall basic_istream_wchar__Ipfx(basic_istream_wchar *this, bool noskip) { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); @@ -9283,7 +9283,7 @@ MSVCP_bool __thiscall basic_istream_wchar__Ipfx(basic_istream_wchar *this, MSVCP /* ?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) -MSVCP_bool __thiscall basic_istream_wchar_ipfx(basic_istream_wchar *this, MSVCP_bool noskip) +bool __thiscall basic_istream_wchar_ipfx(basic_istream_wchar *this, bool noskip) { return basic_istream_wchar__Ipfx(this, noskip); } @@ -9298,7 +9298,7 @@ void __thiscall basic_istream_wchar_isfx(basic_istream_wchar *this) TRACE("(%p)\n", this); } -static BOOL basic_istream_wchar_sentry_create(basic_istream_wchar *istr, MSVCP_bool noskip) +static BOOL basic_istream_wchar_sentry_create(basic_istream_wchar *istr, bool noskip) { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istr); @@ -10337,7 +10337,7 @@ basic_istream_wchar* __thiscall basic_istream_short_read_uint64(basic_istream_wc IOS_LOCALE(basic_istream_wchar_get_basic_ios(this)->strbuf))); } -static basic_istream_wchar* basic_istream_read_bool(basic_istream_wchar *this, MSVCP_bool *v, const num_get *numget) +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); int state = IOSTATE_goodbit; @@ -10360,7 +10360,7 @@ static basic_istream_wchar* basic_istream_read_bool(basic_istream_wchar *this, M /* ??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, MSVCP_bool *v) +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))); @@ -10369,7 +10369,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_read_bool(basic_istream_wcha /* ??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, MSVCP_bool *v) +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))); @@ -10632,7 +10632,7 @@ static inline basic_iostream_char* basic_iostream_char_from_basic_ios(basic_ios_ /* ??0?$basic_iostream@DU?$char_traits@D@std@@@std@@QAE@PAV?$basic_streambuf@DU?$char_traits@D@std@@@1@@Z */ /* ??0?$basic_iostream@DU?$char_traits@D@std@@@std@@QEAA@PEAV?$basic_streambuf@DU?$char_traits@D@std@@@1@@Z */ DEFINE_THISCALL_WRAPPER(basic_iostream_char_ctor, 12) -basic_iostream_char* __thiscall basic_iostream_char_ctor(basic_iostream_char *this, basic_streambuf_char *strbuf, MSVCP_bool virt_init) +basic_iostream_char* __thiscall basic_iostream_char_ctor(basic_iostream_char *this, basic_streambuf_char *strbuf, bool virt_init) { basic_ios_char *basic_ios; @@ -10727,7 +10727,7 @@ static inline basic_iostream_wchar* basic_iostream_wchar_from_basic_ios(basic_io /* ??0?$basic_iostream@_WU?$char_traits@_W@std@@@std@@QEAA@PEAV?$basic_streambuf@_WU?$char_traits@_W@std@@@1@@Z */ DEFINE_THISCALL_WRAPPER(basic_iostream_wchar_ctor, 12) basic_iostream_wchar* __thiscall basic_iostream_wchar_ctor(basic_iostream_wchar *this, - basic_streambuf_wchar *strbuf, MSVCP_bool virt_init) + basic_streambuf_wchar *strbuf, bool virt_init) { basic_ios_wchar *basic_ios; @@ -10753,7 +10753,7 @@ basic_iostream_wchar* __thiscall basic_iostream_wchar_ctor(basic_iostream_wchar /* ??0?$basic_iostream@GU?$char_traits@G@std@@@std@@QEAA@PEAV?$basic_streambuf@GU?$char_traits@G@std@@@1@@Z */ DEFINE_THISCALL_WRAPPER(basic_iostream_short_ctor, 12) basic_iostream_wchar* __thiscall basic_iostream_short_ctor(basic_iostream_wchar *this, - basic_streambuf_wchar *strbuf, MSVCP_bool virt_init) + basic_streambuf_wchar *strbuf, bool virt_init) { basic_iostream_wchar_ctor(this, strbuf, virt_init); basic_istream_wchar_get_basic_ios(&this->base1)->base.vtable = &MSVCP_basic_iostream_short_vtable; @@ -10838,7 +10838,7 @@ static inline basic_ofstream_char* basic_ofstream_char_from_basic_ios(basic_ios_ /* ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QAE@XZ */ /* ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(basic_ofstream_char_ctor, 8) -basic_ofstream_char* __thiscall basic_ofstream_char_ctor(basic_ofstream_char *this, MSVCP_bool virt_init) +basic_ofstream_char* __thiscall basic_ofstream_char_ctor(basic_ofstream_char *this, bool virt_init) { basic_ios_char *basic_ios; @@ -10862,7 +10862,7 @@ basic_ofstream_char* __thiscall basic_ofstream_char_ctor(basic_ofstream_char *th /* ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QEAA@PEAU_iobuf@@@Z */ DEFINE_THISCALL_WRAPPER(basic_ofstream_char_ctor_file, 12) basic_ofstream_char* __thiscall basic_ofstream_char_ctor_file( - basic_ofstream_char *this, FILE *file, MSVCP_bool virt_init) + basic_ofstream_char *this, FILE *file, bool virt_init) { basic_ios_char *basic_ios; @@ -10886,7 +10886,7 @@ basic_ofstream_char* __thiscall basic_ofstream_char_ctor_file( /* ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QEAA@AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(basic_ofstream_char_copy_ctor, 12) basic_ofstream_char* __thiscall basic_ofstream_char_copy_ctor(basic_ofstream_char *this, - basic_ofstream_char *copy, MSVCP_bool virt_init) + basic_ofstream_char *copy, bool virt_init) { TRACE("(%p %p %d)\n", this, copy, virt_init); return basic_ofstream_char_ctor_file(this, copy->filebuf.file, virt_init); @@ -10896,7 +10896,7 @@ basic_ofstream_char* __thiscall basic_ofstream_char_copy_ctor(basic_ofstream_cha /* ??0?$basic_ofstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z */ DEFINE_THISCALL_WRAPPER(basic_ofstream_char_ctor_name, 16) basic_ofstream_char* __thiscall basic_ofstream_char_ctor_name(basic_ofstream_char *this, - const char *name, int mode, MSVCP_bool virt_init) + const char *name, int mode, bool virt_init) { TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); @@ -10972,7 +10972,7 @@ void __thiscall basic_ofstream_char_close(basic_ofstream_char *this) /* ?is_open@?$basic_ofstream@DU?$char_traits@D@std@@@std@@QBE_NXZ */ /* ?is_open@?$basic_ofstream@DU?$char_traits@D@std@@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(basic_ofstream_char_is_open, 4) -MSVCP_bool __thiscall basic_ofstream_char_is_open(const basic_ofstream_char *this) +bool __thiscall basic_ofstream_char_is_open(const basic_ofstream_char *this) { TRACE("(%p)\n", this); return basic_filebuf_char_is_open(&this->filebuf); @@ -11023,7 +11023,7 @@ static inline basic_ofstream_wchar* basic_ofstream_wchar_from_basic_ios(basic_io /* ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QAE@XZ */ /* ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(basic_ofstream_wchar_ctor, 8) -basic_ofstream_wchar* __thiscall basic_ofstream_wchar_ctor(basic_ofstream_wchar *this, MSVCP_bool virt_init) +basic_ofstream_wchar* __thiscall basic_ofstream_wchar_ctor(basic_ofstream_wchar *this, bool virt_init) { basic_ios_wchar *basic_ios; @@ -11046,7 +11046,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_ctor(basic_ofstream_wchar /* ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAE@XZ */ /* ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(basic_ofstream_short_ctor, 8) -basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor(basic_ofstream_wchar *this, MSVCP_bool virt_init) +basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor(basic_ofstream_wchar *this, bool virt_init) { basic_ofstream_wchar_ctor(this, virt_init); basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ofstream_short_vtable; @@ -11057,7 +11057,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor(basic_ofstream_wchar /* ??0?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEAU_iobuf@@@Z */ DEFINE_THISCALL_WRAPPER(basic_ofstream_wchar_ctor_file, 12) basic_ofstream_wchar* __thiscall basic_ofstream_wchar_ctor_file( - basic_ofstream_wchar *this, FILE *file, MSVCP_bool virt_init) + basic_ofstream_wchar *this, FILE *file, bool virt_init) { basic_ios_wchar *basic_ios; @@ -11081,7 +11081,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_wchar_ctor_file( /* ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QEAA@PEAU_iobuf@@@Z */ DEFINE_THISCALL_WRAPPER(basic_ofstream_short_ctor_file, 12) basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_file( - basic_ofstream_wchar *this, FILE *file, MSVCP_bool virt_init) + basic_ofstream_wchar *this, FILE *file, bool virt_init) { basic_ofstream_wchar_ctor_file(this, file, virt_init); basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ofstream_short_vtable; @@ -11092,7 +11092,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_file( /* ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QEAA@AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(basic_ofstream_short_copy_ctor, 12) basic_ofstream_wchar* __thiscall basic_ofstream_short_copy_ctor(basic_ofstream_wchar *this, - basic_ofstream_wchar *copy, MSVCP_bool virt_init) + basic_ofstream_wchar *copy, bool virt_init) { TRACE("(%p %p %d)\n", this, copy, virt_init); return basic_ofstream_short_ctor_file(this, copy->filebuf.file, virt_init); @@ -11102,7 +11102,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_copy_ctor(basic_ofstream_w /* ??0?$basic_ofstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z */ DEFINE_THISCALL_WRAPPER(basic_ofstream_short_ctor_name, 16) basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_name(basic_ofstream_wchar *this, - const char *name, int mode, MSVCP_bool virt_init) + const char *name, int mode, bool virt_init) { TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); @@ -11186,7 +11186,7 @@ void __thiscall basic_ofstream_wchar_close(basic_ofstream_wchar *this) /* ?is_open@?$basic_ofstream@GU?$char_traits@G@std@@@std@@QBE_NXZ */ /* ?is_open@?$basic_ofstream@GU?$char_traits@G@std@@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(basic_ofstream_wchar_is_open, 4) -MSVCP_bool __thiscall basic_ofstream_wchar_is_open(const basic_ofstream_wchar *this) +bool __thiscall basic_ofstream_wchar_is_open(const basic_ofstream_wchar *this) { TRACE("(%p)\n", this); return basic_filebuf_wchar_is_open(&this->filebuf); @@ -11239,7 +11239,7 @@ static inline basic_ifstream_char* basic_ifstream_char_from_basic_ios(basic_ios_ /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@XZ */ /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor, 8) -basic_ifstream_char* __thiscall basic_ifstream_char_ctor(basic_ifstream_char *this, MSVCP_bool virt_init) +basic_ifstream_char* __thiscall basic_ifstream_char_ctor(basic_ifstream_char *this, bool virt_init) { basic_ios_char *basic_ios; @@ -11263,7 +11263,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor(basic_ifstream_char *th /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEAU_iobuf@@@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor_file, 12) basic_ifstream_char* __thiscall basic_ifstream_char_ctor_file( - basic_ifstream_char *this, FILE *file, MSVCP_bool virt_init) + basic_ifstream_char *this, FILE *file, bool virt_init) { basic_ios_char *basic_ios; @@ -11287,7 +11287,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_file( /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_copy_ctor, 12) basic_ifstream_char* __thiscall basic_ifstream_char_copy_ctor(basic_ifstream_char *this, - const basic_ifstream_char *copy, MSVCP_bool virt_init) + const basic_ifstream_char *copy, bool virt_init) { TRACE("(%p %p %d)\n", this, copy, virt_init); return basic_ifstream_char_ctor_file(this, copy->filebuf.file, virt_init); @@ -11297,7 +11297,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_copy_ctor(basic_ifstream_cha /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor_name, 16) basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_char *this, - const char *name, int mode, MSVCP_bool virt_init) + const char *name, int mode, bool virt_init) { TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); @@ -11373,7 +11373,7 @@ void __thiscall basic_ifstream_char_close(basic_ifstream_char *this) /* ?is_open@?$basic_ifstream@DU?$char_traits@D@std@@@std@@QBE_NXZ */ /* ?is_open@?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_is_open, 4) -MSVCP_bool __thiscall basic_ifstream_char_is_open(const basic_ifstream_char *this) +bool __thiscall basic_ifstream_char_is_open(const basic_ifstream_char *this) { TRACE("(%p)\n", this); return basic_filebuf_char_is_open(&this->filebuf); @@ -11424,7 +11424,7 @@ static inline basic_ifstream_wchar* basic_ifstream_wchar_from_basic_ios(basic_io /* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@XZ */ /* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(basic_ifstream_wchar_ctor, 8) -basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor(basic_ifstream_wchar *this, MSVCP_bool virt_init) +basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor(basic_ifstream_wchar *this, bool virt_init) { basic_ios_wchar *basic_ios; @@ -11447,7 +11447,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor(basic_ifstream_wchar /* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@XZ */ /* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(basic_ifstream_short_ctor, 8) -basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor(basic_ifstream_wchar *this, MSVCP_bool virt_init) +basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor(basic_ifstream_wchar *this, bool virt_init) { basic_ifstream_wchar_ctor(this, virt_init); basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ifstream_short_vtable; @@ -11458,7 +11458,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor(basic_ifstream_wchar /* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEAU_iobuf@@@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_wchar_ctor_file, 12) basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor_file( - basic_ifstream_wchar *this, FILE *file, MSVCP_bool virt_init) + basic_ifstream_wchar *this, FILE *file, bool virt_init) { basic_ios_wchar *basic_ios; @@ -11482,7 +11482,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor_file( /* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@PEAU_iobuf@@@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_short_ctor_file, 12) basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_file( - basic_ifstream_wchar *this, FILE *file, MSVCP_bool virt_init) + basic_ifstream_wchar *this, FILE *file, bool virt_init) { basic_ifstream_wchar_ctor_file(this, file, virt_init); basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ifstream_short_vtable; @@ -11493,7 +11493,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_file( /* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_short_copy_ctor, 12) basic_ifstream_wchar* __thiscall basic_ifstream_short_copy_ctor(basic_ifstream_wchar *this, - basic_ifstream_wchar *copy, MSVCP_bool virt_init) + basic_ifstream_wchar *copy, bool virt_init) { TRACE("(%p %p %d)\n", this, copy, virt_init); return basic_ifstream_short_ctor_file(this, copy->filebuf.file, virt_init); @@ -11503,7 +11503,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_copy_ctor(basic_ifstream_w /* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_short_ctor_name, 16) basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name(basic_ifstream_wchar *this, - const char *name, int mode, MSVCP_bool virt_init) + const char *name, int mode, bool virt_init) { TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); @@ -11587,7 +11587,7 @@ void __thiscall basic_ifstream_wchar_close(basic_ifstream_wchar *this) /* ?is_open@?$basic_ifstream@GU?$char_traits@G@std@@@std@@QBE_NXZ */ /* ?is_open@?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(basic_ifstream_wchar_is_open, 4) -MSVCP_bool __thiscall basic_ifstream_wchar_is_open(const basic_ifstream_wchar *this) +bool __thiscall basic_ifstream_wchar_is_open(const basic_ifstream_wchar *this) { TRACE("(%p)\n", this); return basic_filebuf_wchar_is_open(&this->filebuf); @@ -11640,7 +11640,7 @@ static inline basic_fstream_char* basic_fstream_char_from_basic_ios(basic_ios_ch /* ??0?$basic_fstream@DU?$char_traits@D@std@@@std@@QAE@XZ */ /* ??0?$basic_fstream@DU?$char_traits@D@std@@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(basic_fstream_char_ctor, 8) -basic_fstream_char* __thiscall basic_fstream_char_ctor(basic_fstream_char *this, MSVCP_bool virt_init) +basic_fstream_char* __thiscall basic_fstream_char_ctor(basic_fstream_char *this, bool virt_init) { basic_ios_char *basic_ios; @@ -11665,7 +11665,7 @@ basic_fstream_char* __thiscall basic_fstream_char_ctor(basic_fstream_char *this, /* ??0?$basic_fstream@DU?$char_traits@D@std@@@std@@QEAA@PEAU_iobuf@@@Z */ DEFINE_THISCALL_WRAPPER(basic_fstream_char_ctor_file, 12) basic_fstream_char* __thiscall basic_fstream_char_ctor_file(basic_fstream_char *this, - FILE *file, MSVCP_bool virt_init) + FILE *file, bool virt_init) { basic_ios_char *basic_ios; @@ -11690,7 +11690,7 @@ basic_fstream_char* __thiscall basic_fstream_char_ctor_file(basic_fstream_char * /* ??0?$basic_fstream@DU?$char_traits@D@std@@@std@@QEAA@AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(basic_fstream_char_copy_ctor, 12) basic_fstream_char* __thiscall basic_fstream_char_copy_ctor(basic_fstream_char *this, - basic_fstream_char *copy, MSVCP_bool virt_init) + basic_fstream_char *copy, bool virt_init) { TRACE("(%p %p %d)\n", this, copy, virt_init); return basic_fstream_char_ctor_file(this, copy->filebuf.file, virt_init); @@ -11700,7 +11700,7 @@ basic_fstream_char* __thiscall basic_fstream_char_copy_ctor(basic_fstream_char * /* ??0?$basic_fstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z */ DEFINE_THISCALL_WRAPPER(basic_fstream_char_ctor_name, 16) basic_fstream_char* __thiscall basic_fstream_char_ctor_name(basic_fstream_char *this, - const char *name, int mode, MSVCP_bool virt_init) + const char *name, int mode, bool virt_init) { TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); @@ -11776,7 +11776,7 @@ void __thiscall basic_fstream_char_close(basic_fstream_char *this) /* ?is_open@?$basic_fstream@DU?$char_traits@D@std@@@std@@QBE_NXZ */ /* ?is_open@?$basic_fstream@DU?$char_traits@D@std@@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(basic_fstream_char_is_open, 4) -MSVCP_bool __thiscall basic_fstream_char_is_open(const basic_fstream_char *this) +bool __thiscall basic_fstream_char_is_open(const basic_fstream_char *this) { TRACE("(%p)\n", this); return basic_filebuf_char_is_open(&this->filebuf); @@ -11827,7 +11827,7 @@ static inline basic_fstream_wchar* basic_fstream_wchar_from_basic_ios(basic_ios_ /* ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@XZ */ /* ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(basic_fstream_wchar_ctor, 8) -basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor(basic_fstream_wchar *this, MSVCP_bool virt_init) +basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor(basic_fstream_wchar *this, bool virt_init) { basic_ios_wchar *basic_ios; @@ -11851,7 +11851,7 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor(basic_fstream_wchar *th /* ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QAE@XZ */ /* ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(basic_fstream_short_ctor, 8) -basic_fstream_wchar* __thiscall basic_fstream_short_ctor(basic_fstream_wchar *this, MSVCP_bool virt_init) +basic_fstream_wchar* __thiscall basic_fstream_short_ctor(basic_fstream_wchar *this, bool virt_init) { basic_fstream_wchar_ctor(this, virt_init); basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_fstream_short_vtable; @@ -11862,7 +11862,7 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor(basic_fstream_wchar *th /* ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEAU_iobuf@@@Z */ DEFINE_THISCALL_WRAPPER(basic_fstream_wchar_ctor_file, 12) basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor_file(basic_fstream_wchar *this, - FILE *file, MSVCP_bool virt_init) + FILE *file, bool virt_init) { basic_ios_wchar *basic_ios; @@ -11887,7 +11887,7 @@ basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor_file(basic_fstream_wcha /* ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@PEAU_iobuf@@@Z */ DEFINE_THISCALL_WRAPPER(basic_fstream_short_ctor_file, 12) basic_fstream_wchar* __thiscall basic_fstream_short_ctor_file(basic_fstream_wchar *this, - FILE *file, MSVCP_bool virt_init) + FILE *file, bool virt_init) { basic_fstream_wchar_ctor_file(this, file, virt_init); basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_fstream_short_vtable; @@ -11898,7 +11898,7 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_file(basic_fstream_wcha /* ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(basic_fstream_short_copy_ctor, 12) basic_fstream_wchar* __thiscall basic_fstream_short_copy_ctor(basic_fstream_wchar *this, - basic_fstream_wchar *copy, MSVCP_bool virt_init) + basic_fstream_wchar *copy, bool virt_init) { TRACE("(%p %p %d)\n", this, copy, virt_init); return basic_fstream_short_ctor_file(this, copy->filebuf.file, virt_init); @@ -11908,7 +11908,7 @@ basic_fstream_wchar* __thiscall basic_fstream_short_copy_ctor(basic_fstream_wcha /* ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEB_WHH@Z */ DEFINE_THISCALL_WRAPPER(basic_fstream_short_ctor_name, 16) basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name(basic_fstream_wchar *this, - const char *name, int mode, MSVCP_bool virt_init) + const char *name, int mode, bool virt_init) { TRACE("(%p %s %d %d)\n", this, name, mode, virt_init); @@ -11992,7 +11992,7 @@ void __thiscall basic_fstream_wchar_close(basic_fstream_wchar *this) /* ?is_open@?$basic_fstream@GU?$char_traits@G@std@@@std@@QBE_NXZ */ /* ?is_open@?$basic_fstream@GU?$char_traits@G@std@@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(basic_fstream_wchar_is_open, 4) -MSVCP_bool __thiscall basic_fstream_wchar_is_open(const basic_fstream_wchar *this) +bool __thiscall basic_fstream_wchar_is_open(const basic_fstream_wchar *this) { TRACE("(%p)\n", this); return basic_filebuf_wchar_is_open(&this->filebuf); @@ -12046,7 +12046,7 @@ static inline basic_ostringstream_char* basic_ostringstream_char_from_basic_ios( /* ??0?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@H@Z */ DEFINE_THISCALL_WRAPPER(basic_ostringstream_char_ctor_str, 16) basic_ostringstream_char* __thiscall basic_ostringstream_char_ctor_str(basic_ostringstream_char *this, - const basic_string_char *str, int mode, MSVCP_bool virt_init) + const basic_string_char *str, int mode, bool virt_init) { basic_ios_char *basic_ios; @@ -12070,7 +12070,7 @@ basic_ostringstream_char* __thiscall basic_ostringstream_char_ctor_str(basic_ost /* ??0?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@H@Z */ DEFINE_THISCALL_WRAPPER(basic_ostringstream_char_ctor_mode, 12) basic_ostringstream_char* __thiscall basic_ostringstream_char_ctor_mode( - basic_ostringstream_char *this, int mode, MSVCP_bool virt_init) + basic_ostringstream_char *this, int mode, bool virt_init) { basic_ios_char *basic_ios; @@ -12187,7 +12187,7 @@ static inline basic_ostringstream_wchar* basic_ostringstream_wchar_from_basic_io /* ??0?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@1@H@Z */ DEFINE_THISCALL_WRAPPER(basic_ostringstream_wchar_ctor_str, 16) basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_ctor_str(basic_ostringstream_wchar *this, - const basic_string_wchar *str, int mode, MSVCP_bool virt_init) + const basic_string_wchar *str, int mode, bool virt_init) { basic_ios_wchar *basic_ios; @@ -12211,7 +12211,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_ctor_str(basic_o /* ??0?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@H@Z */ DEFINE_THISCALL_WRAPPER(basic_ostringstream_short_ctor_str, 16) basic_ostringstream_wchar* __thiscall basic_ostringstream_short_ctor_str(basic_ostringstream_wchar *this, - const basic_string_wchar *str, int mode, MSVCP_bool virt_init) + const basic_string_wchar *str, int mode, bool virt_init) { basic_ostringstream_wchar_ctor_str(this, str, mode, virt_init); basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ostringstream_short_vtable; @@ -12222,7 +12222,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_short_ctor_str(basic_o /* ??0?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@H@Z */ DEFINE_THISCALL_WRAPPER(basic_ostringstream_wchar_ctor_mode, 12) basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_ctor_mode( - basic_ostringstream_wchar *this, int mode, MSVCP_bool virt_init) + basic_ostringstream_wchar *this, int mode, bool virt_init) { basic_ios_wchar *basic_ios; @@ -12246,7 +12246,7 @@ basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_ctor_mode( /* ??0?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@H@Z */ DEFINE_THISCALL_WRAPPER(basic_ostringstream_short_ctor_mode, 12) basic_ostringstream_wchar* __thiscall basic_ostringstream_short_ctor_mode( - basic_ostringstream_wchar *this, int mode, MSVCP_bool virt_init) + basic_ostringstream_wchar *this, int mode, bool virt_init) { basic_ostringstream_wchar_ctor_mode(this, mode, virt_init); basic_ostream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_ostringstream_short_vtable; @@ -12369,7 +12369,7 @@ static inline basic_istringstream_char* basic_istringstream_char_from_basic_ios( /* ??0?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@H@Z */ DEFINE_THISCALL_WRAPPER(basic_istringstream_char_ctor_str, 16) basic_istringstream_char* __thiscall basic_istringstream_char_ctor_str(basic_istringstream_char *this, - const basic_string_char *str, int mode, MSVCP_bool virt_init) + const basic_string_char *str, int mode, bool virt_init) { basic_ios_char *basic_ios; @@ -12393,7 +12393,7 @@ basic_istringstream_char* __thiscall basic_istringstream_char_ctor_str(basic_ist /* ??0?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@H@Z */ DEFINE_THISCALL_WRAPPER(basic_istringstream_char_ctor_mode, 12) basic_istringstream_char* __thiscall basic_istringstream_char_ctor_mode( - basic_istringstream_char *this, int mode, MSVCP_bool virt_init) + basic_istringstream_char *this, int mode, bool virt_init) { basic_ios_char *basic_ios; @@ -12510,7 +12510,7 @@ static inline basic_istringstream_wchar* basic_istringstream_wchar_from_basic_io /* ??0?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@1@H@Z */ DEFINE_THISCALL_WRAPPER(basic_istringstream_wchar_ctor_str, 16) basic_istringstream_wchar* __thiscall basic_istringstream_wchar_ctor_str(basic_istringstream_wchar *this, - const basic_string_wchar *str, int mode, MSVCP_bool virt_init) + const basic_string_wchar *str, int mode, bool virt_init) { basic_ios_wchar *basic_ios; @@ -12534,7 +12534,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_ctor_str(basic_i /* ??0?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@H@Z */ DEFINE_THISCALL_WRAPPER(basic_istringstream_short_ctor_str, 16) basic_istringstream_wchar* __thiscall basic_istringstream_short_ctor_str(basic_istringstream_wchar *this, - const basic_string_wchar *str, int mode, MSVCP_bool virt_init) + const basic_string_wchar *str, int mode, bool virt_init) { basic_istringstream_wchar_ctor_str(this, str, mode, virt_init); basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_istringstream_short_vtable; @@ -12545,7 +12545,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_short_ctor_str(basic_i /* ??0?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@H@Z */ DEFINE_THISCALL_WRAPPER(basic_istringstream_wchar_ctor_mode, 12) basic_istringstream_wchar* __thiscall basic_istringstream_wchar_ctor_mode( - basic_istringstream_wchar *this, int mode, MSVCP_bool virt_init) + basic_istringstream_wchar *this, int mode, bool virt_init) { basic_ios_wchar *basic_ios; @@ -12569,7 +12569,7 @@ basic_istringstream_wchar* __thiscall basic_istringstream_wchar_ctor_mode( /* ??0?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@H@Z */ DEFINE_THISCALL_WRAPPER(basic_istringstream_short_ctor_mode, 12) basic_istringstream_wchar* __thiscall basic_istringstream_short_ctor_mode( - basic_istringstream_wchar *this, int mode, MSVCP_bool virt_init) + basic_istringstream_wchar *this, int mode, bool virt_init) { basic_istringstream_wchar_ctor_mode(this, mode, virt_init); basic_istream_wchar_get_basic_ios(&this->base)->base.vtable = &MSVCP_basic_istringstream_short_vtable; @@ -12692,7 +12692,7 @@ static inline basic_stringstream_char* basic_stringstream_char_from_basic_ios(ba /* ??0?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@1@H@Z */ DEFINE_THISCALL_WRAPPER(basic_stringstream_char_ctor_str, 16) basic_stringstream_char* __thiscall basic_stringstream_char_ctor_str(basic_stringstream_char *this, - const basic_string_char *str, int mode, MSVCP_bool virt_init) + const basic_string_char *str, int mode, bool virt_init) { basic_ios_char *basic_ios; @@ -12717,7 +12717,7 @@ basic_stringstream_char* __thiscall basic_stringstream_char_ctor_str(basic_strin /* ??0?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@H@Z */ DEFINE_THISCALL_WRAPPER(basic_stringstream_char_ctor_mode, 12) basic_stringstream_char* __thiscall basic_stringstream_char_ctor_mode( - basic_stringstream_char *this, int mode, MSVCP_bool virt_init) + basic_stringstream_char *this, int mode, bool virt_init) { basic_ios_char *basic_ios; @@ -12836,7 +12836,7 @@ static inline basic_stringstream_wchar* basic_stringstream_wchar_from_basic_ios( /* ??0?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@AEBV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@1@H@Z */ DEFINE_THISCALL_WRAPPER(basic_stringstream_wchar_ctor_str, 16) basic_stringstream_wchar* __thiscall basic_stringstream_wchar_ctor_str(basic_stringstream_wchar *this, - const basic_string_wchar *str, int mode, MSVCP_bool virt_init) + const basic_string_wchar *str, int mode, bool virt_init) { basic_ios_wchar *basic_ios; @@ -12861,7 +12861,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_ctor_str(basic_str /* ??0?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@AEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@1@H@Z */ DEFINE_THISCALL_WRAPPER(basic_stringstream_short_ctor_str, 16) basic_stringstream_wchar* __thiscall basic_stringstream_short_ctor_str(basic_stringstream_wchar *this, - const basic_string_wchar *str, int mode, MSVCP_bool virt_init) + const basic_string_wchar *str, int mode, bool virt_init) { basic_stringstream_wchar_ctor_str(this, str, mode, virt_init); basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_stringstream_short_vtable; @@ -12872,7 +12872,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_short_ctor_str(basic_str /* ??0?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@H@Z */ DEFINE_THISCALL_WRAPPER(basic_stringstream_wchar_ctor_mode, 12) basic_stringstream_wchar* __thiscall basic_stringstream_wchar_ctor_mode( - basic_stringstream_wchar *this, int mode, MSVCP_bool virt_init) + basic_stringstream_wchar *this, int mode, bool virt_init) { basic_ios_wchar *basic_ios; @@ -12897,7 +12897,7 @@ basic_stringstream_wchar* __thiscall basic_stringstream_wchar_ctor_mode( /* ??0?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAA@H@Z */ DEFINE_THISCALL_WRAPPER(basic_stringstream_short_ctor_mode, 12) basic_stringstream_wchar* __thiscall basic_stringstream_short_ctor_mode( - basic_stringstream_wchar *this, int mode, MSVCP_bool virt_init) + basic_stringstream_wchar *this, int mode, bool virt_init) { basic_stringstream_wchar_ctor_mode(this, mode, virt_init); basic_istream_wchar_get_basic_ios(&this->base.base1)->base.vtable = &MSVCP_basic_stringstream_short_vtable; @@ -13174,7 +13174,7 @@ strstreambuf* __thiscall strstreambuf_vector_dtor(strstreambuf *this, unsigned i /* ?freeze@strstreambuf@std@@QAEX_N@Z */ /* ?freeze@strstreambuf@std@@QEAAX_N@Z */ DEFINE_THISCALL_WRAPPER(strstreambuf_freeze, 8) -void __thiscall strstreambuf_freeze(strstreambuf *this, MSVCP_bool freeze) +void __thiscall strstreambuf_freeze(strstreambuf *this, bool freeze) { TRACE("(%p %d)\n", this, freeze); @@ -13418,7 +13418,7 @@ DEFINE_THISCALL_WRAPPER(ostrstream_ctor, 24) #else DEFINE_THISCALL_WRAPPER(ostrstream_ctor, 20) #endif -ostrstream* __thiscall ostrstream_ctor(ostrstream *this, char *buf, streamsize size, int mode, MSVCP_bool virt_init) +ostrstream* __thiscall ostrstream_ctor(ostrstream *this, char *buf, streamsize size, int mode, bool virt_init) { basic_ios_char *basic_ios; @@ -13620,7 +13620,7 @@ DEFINE_THISCALL_WRAPPER(strstream_ctor, 24) #else DEFINE_THISCALL_WRAPPER(strstream_ctor, 20) #endif -strstream* __thiscall strstream_ctor(strstream *this, char *buf, streamsize size, int mode, MSVCP_bool virt_init) +strstream* __thiscall strstream_ctor(strstream *this, char *buf, streamsize size, int mode, bool virt_init) { basic_ios_char *basic_ios; diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index 2240ceda645..2507d9123d9 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -16,13 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "stdbool.h" #include "stdlib.h" #include "windef.h" #include "cxx.h" #define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment)) -typedef unsigned char MSVCP_bool; typedef SSIZE_T streamoff; typedef SSIZE_T streamsize; #define STREAMOFF_BITS 32 @@ -110,7 +110,7 @@ typedef struct { codecvt_base base; } codecvt_char; -MSVCP_bool __thiscall codecvt_base_always_noconv(const codecvt_base*); +bool __thiscall codecvt_base_always_noconv(const codecvt_base*); int __thiscall codecvt_char_unshift(const codecvt_char*, int*, char*, char*, char**); int __thiscall codecvt_char_out(const codecvt_char*, int*, const char*, const char*, const char**, char*, char*, char**); @@ -146,7 +146,7 @@ typedef struct { _Ctypevec ctype; } ctype_char; -MSVCP_bool __thiscall ctype_char_is_ch(const ctype_char*, short, char); +bool __thiscall ctype_char_is_ch(const ctype_char*, short, char); char __thiscall ctype_char_narrow_ch(const ctype_char*, char, char); char __thiscall ctype_char_widen_ch(const ctype_char*, char); @@ -157,7 +157,7 @@ typedef struct { _Cvtvec cvt; } ctype_wchar; -MSVCP_bool __thiscall ctype_wchar_is_ch(const ctype_wchar*, short, wchar_t); +bool __thiscall ctype_wchar_is_ch(const ctype_wchar*, short, wchar_t); char __thiscall ctype_wchar_narrow_ch(const ctype_wchar*, wchar_t, char); wchar_t __thiscall ctype_wchar_widen_ch(const ctype_wchar*, char); @@ -318,12 +318,12 @@ typedef struct { typedef struct { basic_streambuf_char *strbuf; - MSVCP_bool got; + bool got; char val; } istreambuf_iterator_char; typedef struct { - MSVCP_bool failed; + bool failed; basic_streambuf_char *strbuf; } ostreambuf_iterator_char; @@ -351,12 +351,12 @@ typedef struct { typedef struct { basic_streambuf_wchar *strbuf; - MSVCP_bool got; + bool got; wchar_t val; } istreambuf_iterator_wchar; typedef struct { - MSVCP_bool failed; + bool failed; basic_streambuf_wchar *strbuf; } ostreambuf_iterator_wchar; @@ -394,7 +394,7 @@ istreambuf_iterator_char *__thiscall num_get_char_get_int64(const num_get*, istr istreambuf_iterator_char *__thiscall num_get_char_get_uint64(const num_get*, istreambuf_iterator_char*, istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, ULONGLONG*); istreambuf_iterator_char *__thiscall num_get_char_get_bool(const num_get*, istreambuf_iterator_char*, - istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, MSVCP_bool*); + istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, bool*); num_get* num_get_wchar_use_facet(const locale*); num_get* num_get_short_use_facet(const locale*); @@ -419,7 +419,7 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_get_int64(const num_get*, is istreambuf_iterator_wchar *__thiscall num_get_wchar_get_uint64(const num_get*, istreambuf_iterator_wchar*, istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, ULONGLONG*); istreambuf_iterator_wchar *__thiscall num_get_wchar_get_bool(const num_get*, istreambuf_iterator_wchar*, - istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, MSVCP_bool*); + istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, bool*); /* class num_put */ /* class num_put */ @@ -444,7 +444,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_int64(const num_put*, ostr ostreambuf_iterator_char* __thiscall num_put_char_put_uint64(const num_put*, ostreambuf_iterator_char*, ostreambuf_iterator_char, ios_base*, char, unsigned __int64); ostreambuf_iterator_char* __thiscall num_put_char_put_bool(const num_put*, ostreambuf_iterator_char*, - ostreambuf_iterator_char, ios_base*, char, MSVCP_bool); + ostreambuf_iterator_char, ios_base*, char, bool); num_put* num_put_wchar_use_facet(const locale*); num_put* num_put_short_use_facet(const locale*); @@ -463,7 +463,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_int64(const num_put*, os ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_uint64(const num_put*, ostreambuf_iterator_wchar*, ostreambuf_iterator_wchar, ios_base*, wchar_t, unsigned __int64); ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_bool(const num_put*, ostreambuf_iterator_wchar*, - ostreambuf_iterator_wchar, ios_base*, wchar_t, MSVCP_bool); + ostreambuf_iterator_wchar, ios_base*, wchar_t, bool); void init_exception(void*); void init_locale(void*); diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index fa9eaa3611a..8937dd35873 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -230,7 +230,7 @@ wchar_t* CDECL MSVCP_char_traits_wchar_assignn(wchar_t *str, return str; } -static MSVCP_bool basic_string_char_inside( +static bool basic_string_char_inside( basic_string_char *this, const char *ptr) { return ptr>=this->ptr && ptrptr+this->size; @@ -281,7 +281,7 @@ void __thiscall MSVCP_basic_string_char_clear(basic_string_char *this) /* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEX_N@Z */ /* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAX_N@Z */ DEFINE_THISCALL_WRAPPER(basic_string_char__Tidy, 8) -void __thiscall basic_string_char__Tidy(basic_string_char *this, MSVCP_bool built) +void __thiscall basic_string_char__Tidy(basic_string_char *this, bool built) { TRACE("(%p %d)\n", this, built); @@ -297,7 +297,7 @@ void __thiscall basic_string_char__Tidy(basic_string_char *this, MSVCP_bool buil /* ?_Grow@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAE_NI_N@Z */ /* ?_Grow@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAA_N_K_N@Z */ DEFINE_THISCALL_WRAPPER(basic_string_char__Grow, 12) -MSVCP_bool __thiscall basic_string_char__Grow(basic_string_char *this, size_t new_size, MSVCP_bool trim) +bool __thiscall basic_string_char__Grow(basic_string_char *this, size_t new_size, bool trim) { if(!new_size) { if(trim) @@ -739,7 +739,7 @@ int __thiscall MSVCP_basic_string_char_compare_substr_cstr(const basic_string_ch /* ??$?8DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??8std@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??8std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_equal( +bool __cdecl MSVCP_basic_string_char_equal( const basic_string_char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare(left, right) == 0; @@ -749,7 +749,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_equal( /* ??$?8DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ /* ??8std@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PBD@Z */ /* ??8std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_equal_str_cstr( +bool __cdecl MSVCP_basic_string_char_equal_str_cstr( const basic_string_char *left, const char *right) { return MSVCP_basic_string_char_compare_cstr(left, right) == 0; @@ -759,7 +759,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_equal_str_cstr( /* ??$?8DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??8std@@YA_NPBDABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??8std@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_equal_cstr_str( +bool __cdecl MSVCP_basic_string_char_equal_cstr_str( const char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare_cstr(right, left) == 0; @@ -769,7 +769,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_equal_cstr_str( /* ??$?9DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??9std@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??9std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_not_equal( +bool __cdecl MSVCP_basic_string_char_not_equal( const basic_string_char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare(left, right) != 0; @@ -779,7 +779,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_not_equal( /* ??$?9DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ /* ??9std@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PBD@Z */ /* ??9std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_not_equal_str_cstr( +bool __cdecl MSVCP_basic_string_char_not_equal_str_cstr( const basic_string_char *left, const char *right) { return MSVCP_basic_string_char_compare_cstr(left, right) != 0; @@ -789,7 +789,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_not_equal_str_cstr( /* ??$?9DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??9std@@YA_NPBDABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??9std@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_not_equal_cstr_str( +bool __cdecl MSVCP_basic_string_char_not_equal_cstr_str( const char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare_cstr(right, left) != 0; @@ -799,7 +799,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_not_equal_cstr_str( /* ??$?MDU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??Mstd@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??Mstd@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_lower( +bool __cdecl MSVCP_basic_string_char_lower( const basic_string_char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare(left, right) < 0; @@ -809,7 +809,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_lower( /* ??$?MDU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ /* ??Mstd@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PBD@Z */ /* ??Mstd@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_lower_bstr_cstr( +bool __cdecl MSVCP_basic_string_char_lower_bstr_cstr( const basic_string_char *left, const char *right) { return MSVCP_basic_string_char_compare_cstr(left, right) < 0; @@ -819,7 +819,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_lower_bstr_cstr( /* ??$?MDU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??Mstd@@YA_NPBDABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??Mstd@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_lower_cstr_bstr( +bool __cdecl MSVCP_basic_string_char_lower_cstr_bstr( const char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare_cstr(right, left) > 0; @@ -829,7 +829,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_lower_cstr_bstr( /* ??$?NDU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??Nstd@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??Nstd@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_leq( +bool __cdecl MSVCP_basic_string_char_leq( const basic_string_char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare(left, right) <= 0; @@ -839,7 +839,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_leq( /* ??$?NDU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ /* ??Nstd@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PBD@Z */ /* ??Nstd@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_leq_bstr_cstr( +bool __cdecl MSVCP_basic_string_char_leq_bstr_cstr( const basic_string_char *left, const char *right) { return MSVCP_basic_string_char_compare_cstr(left, right) <= 0; @@ -849,7 +849,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_leq_bstr_cstr( /* ??$?NDU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??Nstd@@YA_NPBDABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??Nstd@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_leq_cstr_bstr( +bool __cdecl MSVCP_basic_string_char_leq_cstr_bstr( const char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare_cstr(right, left) >= 0; @@ -859,7 +859,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_leq_cstr_bstr( /* ??$?ODU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??Ostd@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??Ostd@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_greater( +bool __cdecl MSVCP_basic_string_char_greater( const basic_string_char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare(left, right) > 0; @@ -869,7 +869,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_greater( /* ??$?ODU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ /* ??Ostd@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PBD@Z */ /* ??Ostd@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_greater_bstr_cstr( +bool __cdecl MSVCP_basic_string_char_greater_bstr_cstr( const basic_string_char *left, const char *right) { return MSVCP_basic_string_char_compare_cstr(left, right) > 0; @@ -879,7 +879,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_greater_bstr_cstr( /* ??$?ODU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??Ostd@@YA_NPBDABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??Ostd@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_greater_cstr_bstr( +bool __cdecl MSVCP_basic_string_char_greater_cstr_bstr( const char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare_cstr(right, left) < 0; @@ -889,7 +889,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_greater_cstr_bstr( /* ??$?PDU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??Pstd@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ /* ??Pstd@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_geq( +bool __cdecl MSVCP_basic_string_char_geq( const basic_string_char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare(left, right) >= 0; @@ -899,7 +899,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_geq( /* ??$?PDU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ /* ??Pstd@@YA_NABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PBD@Z */ /* ??Pstd@@YA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@PEBD@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_geq_bstr_cstr( +bool __cdecl MSVCP_basic_string_char_geq_bstr_cstr( const basic_string_char *left, const char *right) { return MSVCP_basic_string_char_compare_cstr(left, right) >= 0; @@ -909,7 +909,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_geq_bstr_cstr( /* ??$?PDU?$char_traits@D@std@@V?$allocator@D@1@@std@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??Pstd@@YA_NPBDABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ /* ??Pstd@@YA_NPEBDAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_char_geq_cstr_bstr( +bool __cdecl MSVCP_basic_string_char_geq_cstr_bstr( const char *left, const basic_string_char *right) { return MSVCP_basic_string_char_compare_cstr(right, left) <= 0; @@ -1703,7 +1703,7 @@ void __thiscall MSVCP_basic_string_char_reserve(basic_string_char *this, size_t /* ?empty@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE_NXZ */ /* ?empty@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_empty, 4) -MSVCP_bool __thiscall MSVCP_basic_string_char_empty(basic_string_char *this) +bool __thiscall MSVCP_basic_string_char_empty(basic_string_char *this) { TRACE("%p\n", this); return this->size == 0; @@ -1760,7 +1760,7 @@ allocator* __thiscall basic_string_char_get_allocator(const basic_string_char *t return ret; } -static MSVCP_bool basic_string_wchar_inside( +static bool basic_string_wchar_inside( basic_string_wchar *this, const wchar_t *ptr) { return ptr>=this->ptr && ptrptr+this->size; @@ -1813,7 +1813,7 @@ void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar *this) /* ?_Tidy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEX_N@Z */ /* ?_Tidy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAX_N@Z */ DEFINE_THISCALL_WRAPPER(basic_string_wchar__Tidy, 8) -void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, MSVCP_bool built) +void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, bool built) { TRACE("(%p %d)\n", this, built); @@ -1829,7 +1829,7 @@ void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, MSVCP_bool bu /* ?_Grow@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAE_NI_N@Z */ /* ?_Grow@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAA_N_K_N@Z */ DEFINE_THISCALL_WRAPPER(basic_string_wchar__Grow, 12) -MSVCP_bool __thiscall basic_string_wchar__Grow(basic_string_wchar *this, size_t new_size, MSVCP_bool trim) +bool __thiscall basic_string_wchar__Grow(basic_string_wchar *this, size_t new_size, bool trim) { if(!new_size) { if(trim) @@ -2276,7 +2276,7 @@ int __thiscall MSVCP_basic_string_wchar_compare_substr_cstr(const basic_string_w /* ??$?8GU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??8std@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??8std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_equal( +bool __cdecl MSVCP_basic_string_wchar_equal( const basic_string_wchar *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare(left, right) == 0; @@ -2286,7 +2286,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_equal( /* ??$?8GU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ /* ??8std@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PBG@Z */ /* ??8std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_equal_str_cstr( +bool __cdecl MSVCP_basic_string_wchar_equal_str_cstr( const basic_string_wchar *left, const wchar_t *right) { return MSVCP_basic_string_wchar_compare_cstr(left, right) == 0; @@ -2296,7 +2296,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_equal_str_cstr( /* ??$?8GU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??8std@@YA_NPBGABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??8std@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_equal_cstr_str( +bool __cdecl MSVCP_basic_string_wchar_equal_cstr_str( const wchar_t *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare_cstr(right, left) == 0; @@ -2306,7 +2306,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_equal_cstr_str( /* ??$?9GU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??9std@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??9std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_not_equal( +bool __cdecl MSVCP_basic_string_wchar_not_equal( const basic_string_wchar *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare(left, right) != 0; @@ -2316,7 +2316,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_not_equal( /* ??$?9GU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ /* ??9std@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PBG@Z */ /* ??9std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_not_equal_str_cstr( +bool __cdecl MSVCP_basic_string_wchar_not_equal_str_cstr( const basic_string_wchar *left, const wchar_t *right) { return MSVCP_basic_string_wchar_compare_cstr(left, right) != 0; @@ -2326,7 +2326,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_not_equal_str_cstr( /* ??$?9GU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??9std@@YA_NPBGABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??9std@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_not_equal_cstr_str( +bool __cdecl MSVCP_basic_string_wchar_not_equal_cstr_str( const wchar_t *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare_cstr(right, left) != 0; @@ -2336,7 +2336,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_not_equal_cstr_str( /* ??$?MGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??Mstd@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??Mstd@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_lower( +bool __cdecl MSVCP_basic_string_wchar_lower( const basic_string_wchar *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare(left, right) < 0; @@ -2346,7 +2346,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_lower( /* ??$?MGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ /* ??Mstd@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PBG@Z */ /* ??Mstd@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_lower_bstr_cstr( +bool __cdecl MSVCP_basic_string_wchar_lower_bstr_cstr( const basic_string_wchar *left, const wchar_t *right) { return MSVCP_basic_string_wchar_compare_cstr(left, right) < 0; @@ -2356,7 +2356,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_lower_bstr_cstr( /* ??$?MGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??Mstd@@YA_NPBGABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??Mstd@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_lower_cstr_bstr( +bool __cdecl MSVCP_basic_string_wchar_lower_cstr_bstr( const wchar_t *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare_cstr(right, left) > 0; @@ -2366,7 +2366,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_lower_cstr_bstr( /* ??$?NGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??Nstd@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??Nstd@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_leq( +bool __cdecl MSVCP_basic_string_wchar_leq( const basic_string_wchar *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare(left, right) <= 0; @@ -2376,7 +2376,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_leq( /* ??$?NGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ /* ??Nstd@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PBG@Z */ /* ??Nstd@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_leq_bstr_cstr( +bool __cdecl MSVCP_basic_string_wchar_leq_bstr_cstr( const basic_string_wchar *left, const wchar_t *right) { return MSVCP_basic_string_wchar_compare_cstr(left, right) <= 0; @@ -2386,7 +2386,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_leq_bstr_cstr( /* ??$?NGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??Nstd@@YA_NPBGABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??Nstd@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_leq_cstr_bstr( +bool __cdecl MSVCP_basic_string_wchar_leq_cstr_bstr( const wchar_t *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare_cstr(right, left) >= 0; @@ -2396,7 +2396,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_leq_cstr_bstr( /* ??$?OGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??Ostd@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??Ostd@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_greater( +bool __cdecl MSVCP_basic_string_wchar_greater( const basic_string_wchar *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare(left, right) > 0; @@ -2406,7 +2406,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_greater( /* ??$?OGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ /* ??Ostd@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PBG@Z */ /* ??Ostd@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_greater_bstr_cstr( +bool __cdecl MSVCP_basic_string_wchar_greater_bstr_cstr( const basic_string_wchar *left, const wchar_t *right) { return MSVCP_basic_string_wchar_compare_cstr(left, right) > 0; @@ -2416,7 +2416,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_greater_bstr_cstr( /* ??$?OGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??Ostd@@YA_NPBGABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??Ostd@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_greater_cstr_bstr( +bool __cdecl MSVCP_basic_string_wchar_greater_cstr_bstr( const wchar_t *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare_cstr(right, left) < 0; @@ -2426,7 +2426,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_greater_cstr_bstr( /* ??$?PGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??Pstd@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ /* ??Pstd@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@0@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_geq( +bool __cdecl MSVCP_basic_string_wchar_geq( const basic_string_wchar *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare(left, right) >= 0; @@ -2436,7 +2436,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_geq( /* ??$?PGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ /* ??Pstd@@YA_NABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PBG@Z */ /* ??Pstd@@YA_NAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@PEBG@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_geq_bstr_cstr( +bool __cdecl MSVCP_basic_string_wchar_geq_bstr_cstr( const basic_string_wchar *left, const wchar_t *right) { return MSVCP_basic_string_wchar_compare_cstr(left, right) >= 0; @@ -2446,7 +2446,7 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_geq_bstr_cstr( /* ??$?PGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??Pstd@@YA_NPBGABV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ /* ??Pstd@@YA_NPEBGAEBV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@@Z */ -MSVCP_bool __cdecl MSVCP_basic_string_wchar_geq_cstr_bstr( +bool __cdecl MSVCP_basic_string_wchar_geq_cstr_bstr( const wchar_t *left, const basic_string_wchar *right) { return MSVCP_basic_string_wchar_compare_cstr(right, left) <= 0; @@ -3240,7 +3240,7 @@ void __thiscall MSVCP_basic_string_wchar_reserve(basic_string_wchar *this, size_ /* ?empty@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE_NXZ */ /* ?empty@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_NXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_empty, 4) -MSVCP_bool __thiscall MSVCP_basic_string_wchar_empty(basic_string_wchar *this) +bool __thiscall MSVCP_basic_string_wchar_empty(basic_string_wchar *this) { TRACE("%p\n", this); return this->size == 0;