mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 05:21:08 +00:00
msvcrt: Fix scanf file locking when returning EOF.
Fixes regression introduced in 0a89a69913
.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48087
Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
da238dc1d1
commit
925a88d1f7
|
@ -489,6 +489,7 @@ _FUNCTION_ {
|
||||||
}
|
}
|
||||||
/* if we have reached the EOF and output nothing then report EOF */
|
/* if we have reached the EOF and output nothing then report EOF */
|
||||||
if (nch==_EOF_ && rd==0 && st==0) {
|
if (nch==_EOF_ && rd==0 && st==0) {
|
||||||
|
_UNLOCK_FILE_(file);
|
||||||
return _EOF_RET;
|
return _EOF_RET;
|
||||||
}
|
}
|
||||||
/* terminate */
|
/* terminate */
|
||||||
|
@ -524,6 +525,7 @@ _FUNCTION_ {
|
||||||
#if _MSVCR_VER >= 80
|
#if _MSVCR_VER >= 80
|
||||||
/* if we have reached the EOF and output nothing then report EOF */
|
/* if we have reached the EOF and output nothing then report EOF */
|
||||||
if (nch==_EOF_ && rd==0 && st==0) {
|
if (nch==_EOF_ && rd==0 && st==0) {
|
||||||
|
_UNLOCK_FILE_(file);
|
||||||
return _EOF_RET;
|
return _EOF_RET;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue