msvcrt: Update consumed in all scanf variants on end of input.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Update consumed in all scanf variants on end of input.
1366dd69 · Piotr Caban · Alexandre Julliard · 1d91c196 · 1366dd69
Commit 1366dd69 authored Jan 03, 2020 by Piotr Caban Committed by Alexandre Julliard Jan 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

scanf.h dlls/msvcrt/scanf.h +2 -2

No files found.
--- a/dlls/msvcrt/scanf.h
+++ b/dlls/msvcrt/scanf.h
@@ -79,9 +79,9 @@
 #endif
 #ifdef STRING_LEN
 #ifdef WIDE_SCANF
-#define _GETC_(file) (consumed==length ? '\0' : (consumed++, *file++))
+#define _GETC_(file) (consumed++, consumed>length ? '\0' : *file++)
 #else /* WIDE_SCANF */
-#define _GETC_(file) (consumed==length ? '\0' : (consumed++, (unsigned char)*file++))
+#define _GETC_(file) (consumed++, consumed>length ? '\0' : (unsigned char)*file++)
 #endif /* WIDE_SCANF */
 #define _UNGETC_(nch, file) do { file--; consumed--; } while(0)
 #define _LOCK_FILE_(file) do {} while(0)