Skip to content

W
wine-cw
Commit f6542bbb authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcp60: Fixed basic_streambuf class structure.

parent 605ea649
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 75 deletions
dlls/msvcp60/ios.c
View file @ f6542bbb
......@@ -946,8 +946,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char
TRACE("(%p)\n", this);
this->vtable = &MSVCP_basic_streambuf_char_vtable;
this->loc = MSVCRT_operator_new(sizeof(locale));
locale_ctor(this->loc);
locale_ctor(&this->loc);
basic_streambuf_char__Init_empty(this);
return this;
......@@ -960,8 +959,7 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this)
{
TRACE("(%p)\n", this);
locale_dtor(this->loc);
MSVCRT_operator_delete(this->loc);
locale_dtor(&this->loc);
}
DEFINE_THISCALL_WRAPPER(basic_streambuf_char_vector_dtor, 8)
......@@ -1253,9 +1251,9 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_pubimbue, 12)
locale* __thiscall basic_streambuf_char_pubimbue(basic_streambuf_char *this, locale *ret, const locale *loc)
{
TRACE("(%p %p)\n", this, loc);
memcpy(ret, this->loc, sizeof(locale));
memcpy(ret, &this->loc, sizeof(locale));
call_basic_streambuf_char_imbue(this, loc);
locale_copy_ctor(this->loc, loc);
locale_copy_ctor(&this->loc, loc);
return ret;
}
......@@ -1605,8 +1603,7 @@ static basic_streambuf_wchar* basic_streambuf_wchar_ctor(basic_streambuf_wchar *
this->vtable = &MSVCP_basic_streambuf_wchar_vtable;
mutex_ctor(&this->lock);
this->loc = MSVCRT_operator_new(sizeof(locale));
locale_ctor(this->loc);
locale_ctor(&this->loc);
basic_streambuf_wchar__Init_empty(this);
return this;
......@@ -1633,8 +1630,7 @@ void __thiscall basic_streambuf_wchar_dtor(basic_streambuf_wchar *this)
TRACE("(%p)\n", this);
mutex_dtor(&this->lock);
locale_dtor(this->loc);
MSVCRT_operator_delete(this->loc);
locale_dtor(&this->loc);
}
DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_vector_dtor, 8)
......@@ -1978,9 +1974,9 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_pubimbue, 12)
locale* __thiscall basic_streambuf_wchar_pubimbue(basic_streambuf_wchar *this, locale *ret, const locale *loc)
{
TRACE("(%p %p)\n", this, loc);
memcpy(ret, this->loc, sizeof(locale));
memcpy(ret, &this->loc, sizeof(locale));
call_basic_streambuf_wchar_imbue(this, loc);
locale_copy_ctor(this->loc, loc);
locale_copy_ctor(&this->loc, loc);
return ret;
}
......@@ -2554,7 +2550,7 @@ static basic_filebuf_char* basic_filebuf_char_open_wchar(basic_filebuf_char *thi
return NULL;
basic_filebuf_char__Init(this, f, INITFL_open);
basic_filebuf_char__Initcvt(this, codecvt_char_use_facet(this->base.loc));
basic_filebuf_char__Initcvt(this, codecvt_char_use_facet(&this->base.loc));
return this;
}
......@@ -3070,7 +3066,7 @@ static basic_filebuf_wchar* basic_filebuf_wchar_open_wchar(basic_filebuf_wchar *
return NULL;
basic_filebuf_wchar__Init(this, f, INITFL_open);
basic_filebuf_wchar__Initcvt(this, codecvt_wchar_use_facet(this->base.loc));
basic_filebuf_wchar__Initcvt(this, codecvt_wchar_use_facet(&this->base.loc));
return this;
}
......@@ -4853,7 +4849,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_char_narrow, 12)
char __thiscall basic_ios_char_narrow(basic_ios_char *this, char ch, char def)
{
TRACE("(%p %c %c)\n", this, ch, def);
return ctype_char_narrow_ch(ctype_char_use_facet(this->strbuf->loc), ch, def);
return ctype_char_narrow_ch(ctype_char_use_facet(&this->strbuf->loc), ch, def);
}
/* ?rdbuf@?$basic_ios@DU?$char_traits@D@std@@@std@@QAEPAV?$basic_streambuf@DU?$char_traits@D@std@@@2@PAV32@@Z */
......@@ -4925,7 +4921,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_char_widen, 8)
char __thiscall basic_ios_char_widen(basic_ios_char *this, char ch)
{
TRACE("(%p %c)\n", this, ch);
return ctype_char_widen_ch(ctype_char_use_facet(this->strbuf->loc), ch);
return ctype_char_widen_ch(ctype_char_use_facet(&this->strbuf->loc), ch);
}
......@@ -5110,7 +5106,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_narrow, 12)
char __thiscall basic_ios_wchar_narrow(basic_ios_wchar *this, wchar_t ch, char def)
{
TRACE("(%p %c %c)\n", this, ch, def);
return ctype_wchar_narrow_ch(ctype_wchar_use_facet(this->strbuf->loc), ch, def);
return ctype_wchar_narrow_ch(ctype_wchar_use_facet(&this->strbuf->loc), ch, def);
}
/* ?rdbuf@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QAEPAV?$basic_streambuf@_WU?$char_traits@_W@std@@@2@PAV32@@Z */
......@@ -5196,7 +5192,7 @@ DEFINE_THISCALL_WRAPPER(basic_ios_wchar_widen, 8)
wchar_t __thiscall basic_ios_wchar_widen(basic_ios_wchar *this, char ch)
{
TRACE("(%p %c)\n", this, ch);
return ctype_wchar_widen_ch(ctype_wchar_use_facet(this->strbuf->loc), ch);
return ctype_wchar_widen_ch(ctype_wchar_use_facet(&this->strbuf->loc), ch);
}
/* Caution: basic_ostream uses virtual inheritance.
......@@ -5481,7 +5477,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_short(basic_ostream_char
if(basic_ostream_char_sentry_create(this)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_put *numput = num_put_char_use_facet(strbuf->loc);
const num_put *numput = num_put_char_use_facet(&strbuf->loc);
ostreambuf_iterator_char dest = {0, strbuf};
num_put_char_put_long(numput, &dest, dest, &base->base, basic_ios_char_fill_get(base),
......@@ -5506,7 +5502,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_ushort(basic_ostream_cha
if(basic_ostream_char_sentry_create(this)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_put *numput = num_put_char_use_facet(strbuf->loc);
const num_put *numput = num_put_char_use_facet(&strbuf->loc);
ostreambuf_iterator_char dest = {0, strbuf};
num_put_char_put_ulong(numput, &dest, dest, &base->base, basic_ios_char_fill_get(base), val);
......@@ -5531,7 +5527,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_int(basic_ostream_char *
if(basic_ostream_char_sentry_create(this)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_put *numput = num_put_char_use_facet(strbuf->loc);
const num_put *numput = num_put_char_use_facet(&strbuf->loc);
ostreambuf_iterator_char dest = {0, strbuf};
num_put_char_put_long(numput, &dest, dest, &base->base, basic_ios_char_fill_get(base), val);
......@@ -5556,7 +5552,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_uint(basic_ostream_char
if(basic_ostream_char_sentry_create(this)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_put *numput = num_put_char_use_facet(strbuf->loc);
const num_put *numput = num_put_char_use_facet(&strbuf->loc);
ostreambuf_iterator_char dest = {0, strbuf};
num_put_char_put_ulong(numput, &dest, dest, &base->base, basic_ios_char_fill_get(base), val);
......@@ -5579,7 +5575,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_float(basic_ostream_char
if(basic_ostream_char_sentry_create(this)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_put *numput = num_put_char_use_facet(strbuf->loc);
const num_put *numput = num_put_char_use_facet(&strbuf->loc);
ostreambuf_iterator_char dest = {0, strbuf};
num_put_char_put_double(numput, &dest, dest, &base->base, basic_ios_char_fill_get(base), val);
......@@ -5602,7 +5598,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_double(basic_ostream_cha
if(basic_ostream_char_sentry_create(this)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_put *numput = num_put_char_use_facet(strbuf->loc);
const num_put *numput = num_put_char_use_facet(&strbuf->loc);
ostreambuf_iterator_char dest = {0, strbuf};
num_put_char_put_double(numput, &dest, dest, &base->base, basic_ios_char_fill_get(base), val);
......@@ -5625,7 +5621,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_ldouble(basic_ostream_ch
if(basic_ostream_char_sentry_create(this)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_put *numput = num_put_char_use_facet(strbuf->loc);
const num_put *numput = num_put_char_use_facet(&strbuf->loc);
ostreambuf_iterator_char dest = {0, strbuf};
num_put_char_put_ldouble(numput, &dest, dest, &base->base, basic_ios_char_fill_get(base), val);
......@@ -5679,7 +5675,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_ptr(basic_ostream_char *
if(basic_ostream_char_sentry_create(this)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_put *numput = num_put_char_use_facet(strbuf->loc);
const num_put *numput = num_put_char_use_facet(&strbuf->loc);
ostreambuf_iterator_char dest = {0, strbuf};
num_put_char_put_ptr(numput, &dest, dest, &base->base, basic_ios_char_fill_get(base), val);
......@@ -5702,7 +5698,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_int64(basic_ostream_char
if(basic_ostream_char_sentry_create(this)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_put *numput = num_put_char_use_facet(strbuf->loc);
const num_put *numput = num_put_char_use_facet(&strbuf->loc);
ostreambuf_iterator_char dest = {0, strbuf};
num_put_char_put_int64(numput, &dest, dest, &base->base, basic_ios_char_fill_get(base), val);
......@@ -5725,7 +5721,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_uint64(basic_ostream_cha
if(basic_ostream_char_sentry_create(this)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_put *numput = num_put_char_use_facet(strbuf->loc);
const num_put *numput = num_put_char_use_facet(&strbuf->loc);
ostreambuf_iterator_char dest = {0, strbuf};
num_put_char_put_uint64(numput, &dest, dest, &base->base, basic_ios_char_fill_get(base), val);
......@@ -5748,7 +5744,7 @@ basic_ostream_char* __thiscall basic_ostream_char_print_bool(basic_ostream_char
if(basic_ostream_char_sentry_create(this)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_put *numput = num_put_char_use_facet(strbuf->loc);
const num_put *numput = num_put_char_use_facet(&strbuf->loc);
ostreambuf_iterator_char dest = {0, strbuf};
num_put_char_put_bool(numput, &dest, dest, &base->base, basic_ios_char_fill_get(base), val);
......@@ -6274,7 +6270,7 @@ DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_short, 8)
basic_ostream_wchar* __thiscall basic_ostream_short_print_short(basic_ostream_wchar *this, short val)
{
return basic_ostream_print_short(this, val, num_put_short_use_facet(
basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
&basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
}
static basic_ostream_wchar* basic_ostream_print_int(basic_ostream_wchar *this, int val, const num_put *numput)
......@@ -6304,7 +6300,7 @@ DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_int, 8)
basic_ostream_wchar* __thiscall basic_ostream_short_print_int(basic_ostream_wchar *this, int val)
{
return basic_ostream_print_int(this, val, num_put_short_use_facet(
basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
&basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
}
static basic_ostream_wchar* basic_ostream_print_uint(basic_ostream_wchar *this, unsigned int val, const num_put *numput)
......@@ -6334,7 +6330,7 @@ DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_uint, 8)
basic_ostream_wchar* __thiscall basic_ostream_short_print_uint(basic_ostream_wchar *this, unsigned int val)
{
return basic_ostream_print_uint(this, val, num_put_short_use_facet(
basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
&basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
}
static basic_ostream_wchar* basic_ostream_print_float(basic_ostream_wchar *this, float val, const num_put *numput)
......@@ -6362,7 +6358,7 @@ DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_float, 8)
basic_ostream_wchar* __thiscall basic_ostream_short_print_float(basic_ostream_wchar *this, float val)
{
return basic_ostream_print_float(this, val, num_put_short_use_facet(
basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
&basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
}
static basic_ostream_wchar* basic_ostream_print_double(basic_ostream_wchar *this, double val, const num_put *numput)
......@@ -6390,7 +6386,7 @@ DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_double, 12)
basic_ostream_wchar* __thiscall basic_ostream_short_print_double(basic_ostream_wchar *this, double val)
{
return basic_ostream_print_double(this, val, num_put_short_use_facet(
basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
&basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
}
static basic_ostream_wchar* basic_ostream_print_ldouble(basic_ostream_wchar *this, double val, const num_put *numput)
......@@ -6418,7 +6414,7 @@ DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_ldouble, 12)
basic_ostream_wchar* __thiscall basic_ostream_short_print_ldouble(basic_ostream_wchar *this, double val)
{
return basic_ostream_print_ldouble(this, val, num_put_short_use_facet(
basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
&basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
}
/* ??6?$basic_ostream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@PAV?$basic_streambuf@_WU?$char_traits@_W@std@@@1@@Z */
......@@ -6479,7 +6475,7 @@ DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_ptr, 8)
basic_ostream_wchar* __thiscall basic_ostream_short_print_ptr(basic_ostream_wchar *this, const void *val)
{
return basic_ostream_print_ptr(this, val, num_put_short_use_facet(
basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
&basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
}
static basic_ostream_wchar* basic_ostream_print_int64(basic_ostream_wchar *this, __int64 val, const num_put *numput)
......@@ -6507,7 +6503,7 @@ DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_int64, 12)
basic_ostream_wchar* __thiscall basic_ostream_short_print_int64(basic_ostream_wchar *this, __int64 val)
{
return basic_ostream_print_int64(this, val, num_put_short_use_facet(
basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
&basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
}
static basic_ostream_wchar* basic_ostream_print_uint64(basic_ostream_wchar *this, unsigned __int64 val, const num_put *numput)
......@@ -6535,7 +6531,7 @@ DEFINE_THISCALL_WRAPPER(basic_ostream_short_print_uint64, 12)
basic_ostream_wchar* __thiscall basic_ostream_short_print_uint64(basic_ostream_wchar *this, unsigned __int64 val)
{
return basic_ostream_print_uint64(this, val, num_put_short_use_facet(
basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
&basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
}
static basic_ostream_wchar* basic_ostream_print_bool(basic_ostream_wchar *this, MSVCP_bool val, const num_put *numput)
......@@ -6563,7 +6559,7 @@ 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)
{
return basic_ostream_print_bool(this, val, num_put_short_use_facet(
basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
&basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc));
}
/* ?endl@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AAV21@@Z */
......@@ -6888,7 +6884,7 @@ static MSVCP_bool basic_istream_char__Ipfx(basic_istream_char *this, MSVCP_bool
if(!noskip && (ios_base_flags_get(&base->base) & FMTFLAG_skipws)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const ctype_char *ctype = ctype_char_use_facet(base->strbuf->loc);
const ctype_char *ctype = ctype_char_use_facet(&base->strbuf->loc);
int ch;
for(ch = basic_streambuf_char_sgetc(strbuf); ;
......@@ -7184,7 +7180,7 @@ basic_istream_char* __cdecl ws_basic_istream_char(basic_istream_char *istream)
if(basic_istream_char_sentry_create(istream, TRUE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const ctype_char *ctype = ctype_char_use_facet(strbuf->loc);
const ctype_char *ctype = ctype_char_use_facet(&strbuf->loc);
for(ch = basic_streambuf_char_sgetc(strbuf); ctype_char_is_ch(ctype, _SPACE, ch);
ch = basic_streambuf_char_snextc(strbuf)) {
......@@ -7456,7 +7452,7 @@ basic_istream_char* __thiscall basic_istream_char_read_short(basic_istream_char
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
LONG tmp;
......@@ -7486,7 +7482,7 @@ basic_istream_char* __thiscall basic_istream_char_read_ushort(basic_istream_char
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7510,7 +7506,7 @@ basic_istream_char* __thiscall basic_istream_char_read_int(basic_istream_char *t
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7534,7 +7530,7 @@ basic_istream_char* __thiscall basic_istream_char_read_uint(basic_istream_char *
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7558,7 +7554,7 @@ basic_istream_char* __thiscall basic_istream_char_read_long(basic_istream_char *
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7582,7 +7578,7 @@ basic_istream_char* __thiscall basic_istream_char_read_ulong(basic_istream_char
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7606,7 +7602,7 @@ basic_istream_char* __thiscall basic_istream_char_read_float(basic_istream_char
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7630,7 +7626,7 @@ basic_istream_char* __thiscall basic_istream_char_read_double(basic_istream_char
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7654,7 +7650,7 @@ basic_istream_char* __thiscall basic_istream_char_read_ldouble(basic_istream_cha
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7678,7 +7674,7 @@ basic_istream_char* __thiscall basic_istream_char_read_ptr(basic_istream_char *t
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7702,7 +7698,7 @@ basic_istream_char* __thiscall basic_istream_char_read_int64(basic_istream_char
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7726,7 +7722,7 @@ basic_istream_char* __thiscall basic_istream_char_read_uint64(basic_istream_char
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7750,7 +7746,7 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char *
if(basic_istream_char_sentry_create(this, FALSE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
const num_get *numget = num_get_char_use_facet(strbuf->loc);
const num_get *numget = num_get_char_use_facet(&strbuf->loc);
istreambuf_iterator_char first={0}, last={0};
first.strbuf = strbuf;
......@@ -7811,7 +7807,7 @@ basic_istream_char* __cdecl basic_istream_char_read_bstr(
TRACE("(%p %p)\n", istream, str);
if(basic_istream_char_sentry_create(istream, FALSE)) {
const ctype_char *ctype = ctype_char_use_facet(base->strbuf->loc);
const ctype_char *ctype = ctype_char_use_facet(&base->strbuf->loc);
MSVCP_size_t count = ios_base_width_get(&base->base);
if(!count)
......@@ -7848,7 +7844,7 @@ basic_istream_char* __cdecl basic_istream_char_read_str(basic_istream_char *istr
TRACE("(%p %p)\n", istream, str);
if(basic_istream_char_sentry_create(istream, FALSE)) {
const ctype_char *ctype = ctype_char_use_facet(base->strbuf->loc);
const ctype_char *ctype = ctype_char_use_facet(&base->strbuf->loc);
MSVCP_size_t count = ios_base_width_get(&base->base)-1;
for(c = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base));
......@@ -8117,7 +8113,7 @@ static MSVCP_bool basic_istream_wchar__Ipfx(basic_istream_wchar *this, MSVCP_boo
if(!noskip && (ios_base_flags_get(&base->base) & FMTFLAG_skipws)) {
basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base);
const ctype_wchar *ctype = ctype_wchar_use_facet(base->strbuf->loc);
const ctype_wchar *ctype = ctype_wchar_use_facet(&base->strbuf->loc);
int ch;
for(ch = basic_streambuf_wchar_sgetc(strbuf); ;
......@@ -8438,7 +8434,7 @@ basic_istream_wchar* __cdecl ws_basic_istream_wchar(basic_istream_wchar *istream
if(basic_istream_wchar_sentry_create(istream, TRUE)) {
basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base);
const ctype_wchar *ctype = ctype_wchar_use_facet(strbuf->loc);
const ctype_wchar *ctype = ctype_wchar_use_facet(&strbuf->loc);
for(ch = basic_streambuf_wchar_sgetc(strbuf); ctype_wchar_is_ch(ctype, _SPACE, ch);
ch = basic_streambuf_wchar_snextc(strbuf)) {
......@@ -8749,7 +8745,7 @@ 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(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_int(basic_istream_wchar *this, int *v, const num_get *numget)
......@@ -8778,7 +8774,7 @@ 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(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_uint(basic_istream_wchar *this, unsigned int *v, const num_get *numget)
......@@ -8807,7 +8803,7 @@ 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(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_long(basic_istream_wchar *this, LONG *v, const num_get *numget)
......@@ -8836,7 +8832,7 @@ 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(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_ulong(basic_istream_wchar *this, ULONG *v, const num_get *numget)
......@@ -8865,7 +8861,7 @@ 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(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_float(basic_istream_wchar *this, float *v, const num_get *numget)
......@@ -8894,7 +8890,7 @@ 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(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_double(basic_istream_wchar *this, double *v, const num_get *numget)
......@@ -8923,7 +8919,7 @@ 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(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_ldouble(basic_istream_wchar *this, double *v, const num_get *numget)
......@@ -8952,7 +8948,7 @@ 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(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_ptr(basic_istream_wchar *this, void **v, const num_get *numget)
......@@ -8981,7 +8977,7 @@ 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(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_int64(basic_istream_wchar *this, __int64 *v, const num_get *numget)
......@@ -9010,7 +9006,7 @@ 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(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_uint64(basic_istream_wchar *this, unsigned __int64 *v, const num_get *numget)
......@@ -9039,7 +9035,7 @@ 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(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_bool(basic_istream_wchar *this, MSVCP_bool *v, const num_get *numget)
......@@ -9068,7 +9064,7 @@ 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)
{
return basic_istream_read_bool(this, v, num_get_short_use_facet(
basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(this)->strbuf->loc));
}
/* ??$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 */
......@@ -9149,7 +9145,7 @@ basic_istream_wchar* __cdecl basic_istream_wchar_read_bstr(
basic_istream_wchar *istream, basic_string_wchar *str)
{
return basic_istream_read_bstr(istream, str, ctype_wchar_use_facet(
basic_istream_wchar_get_basic_ios(istream)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(istream)->strbuf->loc));
}
/* ??$?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 */
......@@ -9158,7 +9154,7 @@ 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(
basic_istream_wchar_get_basic_ios(istream)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(istream)->strbuf->loc));
}
static basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream, wchar_t *str, const ctype_wchar *ctype)
......@@ -9192,7 +9188,7 @@ static basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream,
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(
basic_istream_wchar_get_basic_ios(istream)->strbuf->loc));
&basic_istream_wchar_get_basic_ios(istream)->strbuf->loc));
}
/* ??$?5_WU?$char_traits@_W@std@@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AA_W@Z */
......
dlls/msvcp60/msvcp.h
View file @ f6542bbb
......@@ -302,7 +302,7 @@ typedef struct {
int wsize;
int *prsize;
int *pwsize;
locale *loc;
locale loc;
} basic_streambuf_char;
typedef struct {
......@@ -336,7 +336,7 @@ typedef struct {
int wsize;
int *prsize;
int *pwsize;
locale *loc;
locale loc;
} basic_streambuf_wchar;
typedef struct {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment