Module: wine Branch: master Commit: a43840bcdf69050a7ae0f4ee3d1f0df883a60be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a43840bcdf69050a7ae0f4ee3d...
Author: Piotr Caban piotr@codeweavers.com Date: Wed Nov 14 15:39:31 2012 +0100
msvcp60: Fixed basic_istream::seekg implementation.
---
dlls/msvcp60/ios.c | 36 ++++-------------------------------- 1 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 99493c4..08a3848 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7264,14 +7264,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg(basic_istream_char *this fpos_int ret;
basic_streambuf_char_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_char_setstate(base, IOSTATE_failbit); - else - basic_ios_char_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_char_clear(base, IOSTATE_goodbit); + }
return this; } @@ -7290,14 +7283,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret;
basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_char_setstate(base, IOSTATE_failbit); - else - basic_ios_char_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_char_clear(base, IOSTATE_goodbit); + }
return this; } @@ -8530,14 +8516,7 @@ 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); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); - else - basic_ios_wchar_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_wchar_clear(base, IOSTATE_goodbit); + }
return this; } @@ -8558,14 +8537,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret;
basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); - else - basic_ios_wchar_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_wchar_clear(base, IOSTATE_goodbit); + }
return this; }