ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ucrtbase: Fix precision handling in %#g when printing 0. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-08-06 13:17:25 +02:00 committed by Alexandre Julliard
parent 120b220979
commit e475d04591
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/msvcrt/printf.h
View File

@ -691,10 +691,7 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu
if(flags->Format=='g' || flags->Format=='G') { if(flags->Format=='g' || flags->Format=='G') {
trim_tail = TRUE; trim_tail = TRUE;
if(!v) { if(radix_pos>=-3 && radix_pos<=flags->Precision) {
flags->Format -= 1;
if(!flags->Precision) flags->Precision++;
} else if(radix_pos>=-3 && radix_pos<=flags->Precision) {
flags->Format -= 1; flags->Format -= 1;
if(!flags->Precision) flags->Precision++; if(!flags->Precision) flags->Precision++;
flags->Precision -= radix_pos; flags->Precision -= radix_pos;

15
dlls/ucrtbase/tests/printf.c
View File

@ -661,6 +661,7 @@ static void test_printf_fp(void)
const char *fmt; const char *fmt;
double d; double d;
const char *res[ARRAY_SIZE(flags)]; const char *res[ARRAY_SIZE(flags)];
const char *broken[ARRAY_SIZE(flags)];
} tests[] = { } tests[] = {
{ "%a", NAN, { "nan", "0x1.#QNAN00000000p+0", "nan", "0x1.#QNAN00000000p+0" }}, { "%a", NAN, { "nan", "0x1.#QNAN00000000p+0", "nan", "0x1.#QNAN00000000p+0" }},
{ "%A", NAN, { "NAN", "0X1.#QNAN00000000P+0", "NAN", "0X1.#QNAN00000000P+0" }}, { "%A", NAN, { "NAN", "0X1.#QNAN00000000P+0", "NAN", "0X1.#QNAN00000000P+0" }},
@ -773,7 +774,7 @@ static void test_printf_fp(void)
{ "%.020g", 0, { "0" }}, { "%.020g", 0, { "0" }},
{ "%#.21f", 0, { "0.000000000000000000000" }}, { "%#.21f", 0, { "0.000000000000000000000" }},
{ "%#.20e", 0, { "0.00000000000000000000e+00", NULL, "0.00000000000000000000e+000" }}, { "%#.20e", 0, { "0.00000000000000000000e+00", NULL, "0.00000000000000000000e+000" }},
{ "%#.20g", 0, { "0.00000000000000000000" }}, { "%#.20g", 0, { "0.0000000000000000000" }, { "0.00000000000000000000" }},
{ "%f", 123, { "123.000000" }}, { "%f", 123, { "123.000000" }},
{ "%e", 123, { "1.230000e+02", NULL, "1.230000e+002" }}, { "%e", 123, { "1.230000e+02", NULL, "1.230000e+002" }},
@ -812,20 +813,24 @@ static void test_printf_fp(void)
}; };
const char *res = NULL; const char *res = NULL;
const char *broken_res;
char buf[100]; char buf[100];
int i, j, r; int i, j, r;
for (i = 0; i < ARRAY_SIZE(tests); i++) for (i = 0; i < ARRAY_SIZE(tests); i++)
{ {
broken_res = NULL;
for (j = 0; j < ARRAY_SIZE(flags); j++) for (j = 0; j < ARRAY_SIZE(flags); j++)
{ {
if (tests[i].res[j]) res = tests[i].res[j]; if (tests[i].res[j]) res = tests[i].res[j];
if (tests[i].broken[j]) broken_res = tests[i].broken[j];
r = vsprintf_wrapper(flags[j], buf, sizeof(buf), tests[i].fmt, tests[i].d); r = vsprintf_wrapper(flags[j], buf, sizeof(buf), tests[i].fmt, tests[i].d);
ok(r == strlen(res), "%d,%d) r = %d, expected %d\n", ok(r == strlen(res) || broken(broken_res && r == strlen(broken_res)),
i, j, r, strlen(res)); "%d,%d) r = %d, expected %d\n", i, j, r, strlen(res));
ok(!strcmp(buf, res), "%d,%d) buf = %s, expected %s\n", ok(!strcmp(buf, res) || broken(broken_res && !strcmp(buf, broken_res)),
i, j, buf, res); "%d,%d) buf = %s, expected %s\n", i, j, buf, res);
} }
} }
} }