Skip to content

W
wine-cw
Commit 22c254c3 authored by Daniel Lehman's avatar Daniel Lehman Committed by Alexandre Julliard
Browse files
Options

msvcp: Sync std::getline(istream<> &) implementations.

parent 89cde281
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
dlls/msvcp60/ios.c
View file @ 22c254c3
...@@ -7767,27 +7767,27 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char * ...@@ -7767,27 +7767,27 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char *
basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim(
basic_istream_char *istream, basic_string_char *str, char delim) basic_istream_char *istream, basic_string_char *str, char delim)
{ {
IOSB_iostate state = IOSTATE_failbit; basic_ios_char *base = basic_istream_char_get_basic_ios(istream);
IOSB_iostate state = IOSTATE_goodbit;
int c = (unsigned char)delim; int c = (unsigned char)delim;
TRACE("(%p %p %c)\n", istream, str, delim); TRACE("(%p %p %c)\n", istream, str, delim);
if(basic_istream_char_sentry_create(istream, TRUE)) { if(basic_istream_char_sentry_create(istream, TRUE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
basic_string_char_clear(str); basic_string_char_clear(str);
c = basic_istream_char_get(istream); c = basic_streambuf_char_sgetc(strbuf);
if(c != EOF) for(; c!=(unsigned char)delim && c!=EOF; c = basic_streambuf_char_snextc(strbuf))
state = IOSTATE_goodbit;
for(; c!=(unsigned char)delim && c!=EOF; c = basic_istream_char_get(istream)) {
state = IOSTATE_goodbit;
basic_string_char_append_ch(str, c); basic_string_char_append_ch(str, c);
} if(c==EOF) state |= IOSTATE_eofbit;
else if(c==(unsigned char)delim) basic_streambuf_char_sbumpc(strbuf);
if(!basic_string_char_length(str) && c!=(unsigned char)delim) state |= IOSTATE_failbit;
} }
basic_istream_char_sentry_destroy(istream); basic_istream_char_sentry_destroy(istream);
basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), state);
state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit));
return istream; return istream;
} }
...@@ -9078,27 +9078,27 @@ basic_istream_wchar* __thiscall basic_istream_short_read_bool(basic_istream_wcha ...@@ -9078,27 +9078,27 @@ basic_istream_wchar* __thiscall basic_istream_short_read_bool(basic_istream_wcha
basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim(
basic_istream_wchar *istream, basic_string_wchar *str, wchar_t delim) basic_istream_wchar *istream, basic_string_wchar *str, wchar_t delim)
{ {
IOSB_iostate state = IOSTATE_failbit; basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream);
IOSB_iostate state = IOSTATE_goodbit;
int c = delim; int c = delim;
TRACE("(%p %p %c)\n", istream, str, delim); TRACE("(%p %p %c)\n", istream, str, delim);
if(basic_istream_wchar_sentry_create(istream, TRUE)) { if(basic_istream_wchar_sentry_create(istream, TRUE)) {
basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base);
basic_string_wchar_clear(str); basic_string_wchar_clear(str);
c = basic_istream_wchar_get(istream); c = basic_streambuf_wchar_sgetc(strbuf);
if(c != WEOF) for(; c!=delim && c!=WEOF; c = basic_streambuf_wchar_snextc(strbuf))
state = IOSTATE_goodbit;
for(; c!=delim && c!=WEOF; c = basic_istream_wchar_get(istream)) {
state = IOSTATE_goodbit;
basic_string_wchar_append_ch(str, c); basic_string_wchar_append_ch(str, c);
} if(c==delim) basic_streambuf_wchar_sbumpc(strbuf);
else if(c==WEOF) state |= IOSTATE_eofbit;
if(!basic_string_wchar_length(str) && c!=delim) state |= IOSTATE_failbit;
} }
basic_istream_wchar_sentry_destroy(istream); basic_istream_wchar_sentry_destroy(istream);
basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), state);
state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit));
return istream; return istream;
} }
......
dlls/msvcp71/ios.c
View file @ 22c254c3
...@@ -8108,27 +8108,27 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char * ...@@ -8108,27 +8108,27 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char *
basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim(
basic_istream_char *istream, basic_string_char *str, char delim) basic_istream_char *istream, basic_string_char *str, char delim)
{ {
IOSB_iostate state = IOSTATE_failbit; basic_ios_char *base = basic_istream_char_get_basic_ios(istream);
IOSB_iostate state = IOSTATE_goodbit;
int c = (unsigned char)delim; int c = (unsigned char)delim;
TRACE("(%p %p %c)\n", istream, str, delim); TRACE("(%p %p %c)\n", istream, str, delim);
if(basic_istream_char_sentry_create(istream, TRUE)) { if(basic_istream_char_sentry_create(istream, TRUE)) {
basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base);
MSVCP_basic_string_char_clear(str); MSVCP_basic_string_char_clear(str);
c = basic_istream_char_get(istream); c = basic_streambuf_char_sgetc(strbuf);
if(c != EOF) for(; c!=(unsigned char)delim && c!=EOF; c = basic_streambuf_char_snextc(strbuf))
state = IOSTATE_goodbit;
for(; c!=(unsigned char)delim && c!=EOF; c = basic_istream_char_get(istream)) {
state = IOSTATE_goodbit;
MSVCP_basic_string_char_append_ch(str, c); MSVCP_basic_string_char_append_ch(str, c);
} if(c==EOF) state |= IOSTATE_eofbit;
else if(c==(unsigned char)delim) basic_streambuf_char_sbumpc(strbuf);
if(!MSVCP_basic_string_char_length(str) && c!=(unsigned char)delim) state |= IOSTATE_failbit;
} }
basic_istream_char_sentry_destroy(istream); basic_istream_char_sentry_destroy(istream);
basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), state);
state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit));
return istream; return istream;
} }
...@@ -9573,27 +9573,27 @@ basic_istream_wchar* __thiscall basic_istream_short_read_bool(basic_istream_wcha ...@@ -9573,27 +9573,27 @@ basic_istream_wchar* __thiscall basic_istream_short_read_bool(basic_istream_wcha
basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim(
basic_istream_wchar *istream, basic_string_wchar *str, wchar_t delim) basic_istream_wchar *istream, basic_string_wchar *str, wchar_t delim)
{ {
IOSB_iostate state = IOSTATE_failbit; basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream);
IOSB_iostate state = IOSTATE_goodbit;
int c = delim; int c = delim;
TRACE("(%p %p %c)\n", istream, str, delim); TRACE("(%p %p %c)\n", istream, str, delim);
if(basic_istream_wchar_sentry_create(istream, TRUE)) { if(basic_istream_wchar_sentry_create(istream, TRUE)) {
basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base);
MSVCP_basic_string_wchar_clear(str); MSVCP_basic_string_wchar_clear(str);
c = basic_istream_wchar_get(istream); c = basic_streambuf_wchar_sgetc(strbuf);
if(c != WEOF) for(; c!=delim && c!=WEOF; c = basic_streambuf_wchar_snextc(strbuf))
state = IOSTATE_goodbit;
for(; c!=delim && c!=WEOF; c = basic_istream_wchar_get(istream)) {
state = IOSTATE_goodbit;
MSVCP_basic_string_wchar_append_ch(str, c); MSVCP_basic_string_wchar_append_ch(str, c);
} if(c==delim) basic_streambuf_wchar_sbumpc(strbuf);
else if(c==WEOF) state |= IOSTATE_eofbit;
if(!MSVCP_basic_string_wchar_length(str) && c!=delim) state |= IOSTATE_failbit;
} }
basic_istream_wchar_sentry_destroy(istream); basic_istream_wchar_sentry_destroy(istream);
basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), state);
state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit));
return istream; return istream;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment