From 3be6ac0d338f6908ca5cbd2e10fc0fb87238e618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Matellanes?= Date: Thu, 23 Jun 2016 10:46:59 +0100 Subject: [PATCH] msvcirt: Set the error flag in writepad without locking. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit writepad() is always called between opfx() and osfx(), so the ios object is already locked. Signed-off-by: Iván Matellanes Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/msvcirt/msvcirt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 666c44c5c7b..5f44854d71d 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2572,22 +2572,22 @@ ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char /* left of the padding */ if (base->flags & (FLAGS_left|FLAGS_internal)) { if (streambuf_sputn(base->sb, str1, len1) != len1) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; if (!(base->flags & FLAGS_internal)) if (streambuf_sputn(base->sb, str2, len2) != len2) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; } /* add padding to fill the width */ for (i = len1 + len2; i < base->width; i++) if (streambuf_sputc(base->sb, base->fill) == EOF) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; /* right of the padding */ if ((base->flags & (FLAGS_left|FLAGS_internal)) != FLAGS_left) { if (!(base->flags & (FLAGS_left|FLAGS_internal))) if (streambuf_sputn(base->sb, str1, len1) != len1) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; if (streambuf_sputn(base->sb, str2, len2) != len2) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; } return this; }