system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-03 00:28:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

msvcp90: Don't overwrite pointers to class members in basic_streambuf:swap.

Browse source 
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2017-05-03 17:44:03 +02:00 committed by Alexandre Julliard
parent 29a55bc4d1
commit 5bb77b4e45
1 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
dlls/msvcp90/ios.c
View file

@ -2002,18 +2002,33 @@ streamsize __thiscall basic_streambuf_char_sputn(basic_streambuf_char *this, con
DEFINE_THISCALL_WRAPPER(basic_streambuf_char_swap, 8)
void __thiscall basic_streambuf_char_swap(basic_streambuf_char *this, basic_streambuf_char *r)
{
basic_streambuf_char tmp;
char *wfirst, *wnext, *wlast, *rfirst, *rnext, *rlast;
#if _MSVCP_VER < 70
locale loc;
#else
locale *loc;
#endif
TRACE("(%p %p)\n", this, r);
if(this == r)
return;
tmp = *this;
*this = *r;
this->vtable = tmp.vtable;
tmp.vtable = r->vtable;
*r = tmp;
wfirst = *this->pwbuf;
wnext = *this->pwpos;
wlast = *this->pwpos + *this->pwsize;
rfirst = *this->prbuf;
rnext = *this->prpos;
rlast = *this->prpos + *this->prsize;
loc = this->loc;
basic_streambuf_char_setp_next(this, *r->pwbuf, *r->pwpos, *r->pwpos + *r->pwsize);
basic_streambuf_char_setg(this, *r->prbuf, *r->prpos, *r->prpos + *r->prsize);
this->loc = r->loc;
basic_streambuf_char_setp_next(r, wfirst, wnext, wlast);
basic_streambuf_char_setg(r, rfirst, rnext, rlast);
r->loc = loc;
}
/* ?setp@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IAEXPA_W00@Z */
@ -2959,18 +2974,33 @@ streamsize __thiscall basic_streambuf_wchar_sputn(basic_streambuf_wchar *this, c
DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_swap, 8)
void __thiscall basic_streambuf_wchar_swap(basic_streambuf_wchar *this, basic_streambuf_wchar *r)
{
basic_streambuf_wchar tmp;
wchar_t *wfirst, *wnext, *wlast, *rfirst, *rnext, *rlast;
#if _MSVCP_VER < 70
locale loc;
#else
locale *loc;
#endif
TRACE("(%p %p)\n", this, r);
if(this == r)
return;
tmp = *this;
*this = *r;
this->vtable = tmp.vtable;
tmp.vtable = r->vtable;
*r = tmp;
wfirst = *this->pwbuf;
wnext = *this->pwpos;
wlast = *this->pwpos + *this->pwsize;
rfirst = *this->prbuf;
rnext = *this->prpos;
rlast = *this->prpos + *this->prsize;
loc = this->loc;
basic_streambuf_wchar_setp_next(this, *r->pwbuf, *r->pwpos, *r->pwpos + *r->pwsize);
basic_streambuf_wchar_setg(this, *r->prbuf, *r->prpos, *r->prpos + *r->prsize);
this->loc = r->loc;
basic_streambuf_wchar_setp_next(r, wfirst, wnext, wlast);
basic_streambuf_wchar_setg(r, rfirst, rnext, rlast);
r->loc = loc;
}
/* ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA */