ucrtbase: Write the %hh prefix as a single char.

This fixes a crash in Planet Coaster on startup. Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ucrtbase: Write the %hh prefix as a single char.
9445bed2 · Zebediah Figura · Alexandre Julliard · 353ea070 · 9445bed2 · 9445bed2
Commit 9445bed2 authored Jun 10, 2019 by Zebediah Figura Committed by Alexandre Julliard Jun 11, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

scanf.h dlls/msvcrt/scanf.h +3 -0

scanf.c dlls/ucrtbase/tests/scanf.c +1 -1

No files found.
--- a/dlls/msvcrt/scanf.h
+++ b/dlls/msvcrt/scanf.h
@@ -309,6 +309,9 @@ _FUNCTION_ {
 			if (I64_prefix) _SET_NUMBER_(LONGLONG);
 			else if (l_prefix) _SET_NUMBER_(LONG);
 			else if (h_prefix == 1) _SET_NUMBER_(short int);
+#if _MSVCR_VER >= 140
+                        else if (h_prefix == 2) _SET_NUMBER_(char);
+#endif
 			else _SET_NUMBER_(int);
 		    }
                }

--- a/dlls/ucrtbase/tests/scanf.c
+++ b/dlls/ucrtbase/tests/scanf.c
@@ -188,7 +188,7 @@ static void test_sscanf(void)
        result = 0xdeadbeef;
        ret = vsscanf_wrapper(tests[i], "12345678", "%hhd", &result);
        ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]);
-        todo_wine ok(result == 0xdeadbe4e, "got wrong number %#x for flags %#x\n", result, tests[i]);
+        ok(result == 0xdeadbe4e, "got wrong number %#x for flags %#x\n", result, tests[i]);

        ret = vsscanf_wrapper(tests[i], "12345678901234", "%lld", &result64);
        ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]);