Module: wine Branch: master Commit: 0280c5fb5f8a7a69725d7b5294906c31f9de7387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0280c5fb5f8a7a69725d7b5294...
Author: Piotr Caban piotr@codeweavers.com Date: Fri Nov 2 20:05:51 2012 +0100
msvcp90: Fixed incorrect sentry object usage.
---
dlls/msvcp100/ios.c | 3 --- dlls/msvcp60/ios.c | 3 --- dlls/msvcp71/ios.c | 3 --- dlls/msvcp90/ios.c | 3 --- 4 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 026ee99..608e9f5 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -6039,7 +6039,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret;
basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -7160,7 +7159,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret;
basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -7189,7 +7187,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret;
basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 3a5fa52..bd3eb7d 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7432,7 +7432,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret;
basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -8678,7 +8677,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret;
basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -8707,7 +8705,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret;
basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 043ac64..fff2abc 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -7773,7 +7773,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret;
basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -9041,7 +9040,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret;
basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -9070,7 +9068,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret;
basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7759b72..d03f3a9 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7797,7 +7797,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret;
basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -9052,7 +9051,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret;
basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -9081,7 +9079,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret;
basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this);
if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit);