Skip to content

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

msvcp90: Read last character of bool string in num_get_do_get_bool.

parent 75bcbece
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 8 deletions
dlls/msvcp60/locale.c
View file @ 12cfebb6
......@@ -4828,8 +4828,7 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this,
pfalse = basic_string_wchar_c_str(&false_bstr);
ptrue = basic_string_wchar_c_str(&true_bstr);
for(istreambuf_iterator_wchar_val(&first); first.strbuf;
istreambuf_iterator_wchar_inc(&first)) {
for(istreambuf_iterator_wchar_val(&first); first.strbuf;) {
if(pfalse && *pfalse && first.val!=*pfalse)
pfalse = NULL;
if(ptrue && *ptrue && first.val!=*ptrue)
......@@ -4845,6 +4844,9 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this,
if(ptrue)
ptrue++;
if(pfalse || ptrue)
istreambuf_iterator_wchar_inc(&first);
if((!pfalse || !*pfalse) && (!ptrue || !*ptrue))
break;
}
......@@ -5608,8 +5610,7 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi
pfalse = basic_string_char_c_str(&false_bstr);
ptrue = basic_string_char_c_str(&true_bstr);
for(istreambuf_iterator_char_val(&first); first.strbuf;
istreambuf_iterator_char_inc(&first)) {
for(istreambuf_iterator_char_val(&first); first.strbuf;) {
if(pfalse && *pfalse && first.val!=*pfalse)
pfalse = NULL;
if(ptrue && *ptrue && first.val!=*ptrue)
......@@ -5625,6 +5626,9 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi
if(ptrue)
ptrue++;
if(pfalse || ptrue)
istreambuf_iterator_char_inc(&first);
if((!pfalse || !*pfalse) && (!ptrue || !*ptrue))
break;
}
......
dlls/msvcp90/locale.c
View file @ 12cfebb6
......@@ -5850,8 +5850,7 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this,
pfalse = MSVCP_basic_string_wchar_c_str(&false_bstr);
ptrue = MSVCP_basic_string_wchar_c_str(&true_bstr);
for(istreambuf_iterator_wchar_val(&first); first.strbuf;
istreambuf_iterator_wchar_inc(&first)) {
for(istreambuf_iterator_wchar_val(&first); first.strbuf;) {
if(pfalse && *pfalse && first.val!=*pfalse)
pfalse = NULL;
if(ptrue && *ptrue && first.val!=*ptrue)
......@@ -5867,6 +5866,9 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this,
if(ptrue)
ptrue++;
if(pfalse || ptrue)
istreambuf_iterator_wchar_inc(&first);
if((!pfalse || !*pfalse) && (!ptrue || !*ptrue))
break;
}
......@@ -6823,8 +6825,7 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi
pfalse = MSVCP_basic_string_char_c_str(&false_bstr);
ptrue = MSVCP_basic_string_char_c_str(&true_bstr);
for(istreambuf_iterator_char_val(&first); first.strbuf;
istreambuf_iterator_char_inc(&first)) {
for(istreambuf_iterator_char_val(&first); first.strbuf;) {
if(pfalse && *pfalse && first.val!=*pfalse)
pfalse = NULL;
if(ptrue && *ptrue && first.val!=*ptrue)
......@@ -6840,6 +6841,9 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi
if(ptrue)
ptrue++;
if(pfalse || ptrue)
istreambuf_iterator_char_inc(&first);
if((!pfalse || !*pfalse) && (!ptrue || !*ptrue))
break;
}
......
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