Skip to content

W
wine-winehq
Commit 257c57bd authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcp90: Fixed EOF detection in basic_streambuf_char__Xsgetn_s function.

parent b9bc582f
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
dlls/msvcp90/ios.c
View file @ 257c57bd
...@@ -786,6 +786,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Xsgetn_s, 16) ...@@ -786,6 +786,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Xsgetn_s, 16)
streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, char *ptr, MSVCP_size_t size, streamsize count) streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, char *ptr, MSVCP_size_t size, streamsize count)
{ {
streamsize copied, chunk; streamsize copied, chunk;
int c;
TRACE("(%p %p %lu %ld)\n", this, ptr, size, count); TRACE("(%p %p %lu %ld)\n", this, ptr, size, count);
...@@ -800,7 +801,8 @@ streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, ...@@ -800,7 +801,8 @@ streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this,
*this->prsize -= chunk; *this->prsize -= chunk;
copied += chunk; copied += chunk;
size -= chunk; size -= chunk;
}else if((ptr[copied] = call_basic_streambuf_char_uflow(this)) != EOF) { }else if((c = call_basic_streambuf_char_uflow(this)) != EOF) {
ptr[copied] = c;
copied++; copied++;
size--; size--;
}else { }else {
...@@ -1529,6 +1531,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar__Xsgetn_s, 16) ...@@ -1529,6 +1531,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar__Xsgetn_s, 16)
streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *this, wchar_t *ptr, MSVCP_size_t size, streamsize count) streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *this, wchar_t *ptr, MSVCP_size_t size, streamsize count)
{ {
streamsize copied, chunk; streamsize copied, chunk;
unsigned short c;
TRACE("(%p %p %lu %ld)\n", this, ptr, size, count); TRACE("(%p %p %lu %ld)\n", this, ptr, size, count);
...@@ -1543,7 +1546,8 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi ...@@ -1543,7 +1546,8 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi
*this->prsize -= chunk; *this->prsize -= chunk;
copied += chunk; copied += chunk;
size -= chunk; size -= chunk;
}else if((ptr[copied] = call_basic_streambuf_wchar_uflow(this)) != WEOF) { }else if((c = call_basic_streambuf_wchar_uflow(this)) != WEOF) {
ptr[copied] = c;
copied++; copied++;
size--; size--;
}else { }else {
......
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