diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index fea2adee164..8a5813e0464 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -8347,9 +8347,6 @@ fpos_int* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpos_int basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - if(ret->off==-1 && ret->pos==0 && ret->state==0) - basic_ios_char_setstate(base, IOSTATE_failbit); - return ret; } @@ -9846,8 +9843,6 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - if(ret->off==-1 && ret->pos==0 && ret->state==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); return ret; } diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index 1938a51df1e..dc4700d518b 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1428,6 +1428,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_char_vbase_dtor, &ss); call_func1(p_basic_string_char_dtor, &str); @@ -1453,6 +1457,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); call_func1(p_basic_string_wchar_dtor, &wstr);