Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
bb264a0a
Commit
bb264a0a
authored
Jul 19, 2018
by
Piotr Caban
Committed by
Alexandre Julliard
Jul 19, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp60: Don't set failbit in basic_istream::tellg.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
98bc9fda
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
ios.c
dlls/msvcp60/ios.c
+0
-5
ios.c
dlls/msvcp60/tests/ios.c
+8
-0
No files found.
dlls/msvcp60/ios.c
View file @
bb264a0a
...
...
@@ -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
;
}
...
...
dlls/msvcp60/tests/ios.c
View file @
bb264a0a
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment