Piotr Caban : msvcp60: Fixed basic_istream::ipfx implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9796cf388c967fdf8c21a264cc186636177951be
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9796cf388c967fdf8c21a264cc186636177951be

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Wed Nov 14 15:39:19 2012 +0100

msvcp60: Fixed basic_istream::ipfx implementation.

---

 dlls/msvcp60/ios.c |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c
index d243b1d..99493c4 100644
--- a/dlls/msvcp60/ios.c
+++ b/dlls/msvcp60/ios.c
@@ -6756,12 +6756,7 @@ static MSVCP_bool basic_istream_char__Ipfx(basic_istream_char *this, MSVCP_bool
 
             for(ch = basic_streambuf_char_sgetc(strbuf); ;
                     ch = basic_streambuf_char_snextc(strbuf)) {
-                if(ch == EOF) {
-                    basic_ios_char_setstate(base, IOSTATE_eofbit);
-                    break;
-                }
-
-                if(!ctype_char_is_ch(ctype, _SPACE|_BLANK, ch))
+                if(ch==EOF || !ctype_char_is_ch(ctype, _SPACE|_BLANK, ch))
                     break;
             }
         }
@@ -7985,12 +7980,7 @@ static MSVCP_bool basic_istream_wchar__Ipfx(basic_istream_wchar *this, MSVCP_boo
 
             for(ch = basic_streambuf_wchar_sgetc(strbuf); ;
                     ch = basic_streambuf_wchar_snextc(strbuf)) {
-                if(ch == WEOF) {
-                    basic_ios_wchar_setstate(base, IOSTATE_eofbit);
-                    break;
-                }
-
-                if(!ctype_wchar_is_ch(ctype, _SPACE|_BLANK, ch))
+                if(ch==WEOF || !ctype_wchar_is_ch(ctype, _SPACE|_BLANK, ch))
                     break;
             }
         }