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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e475d04591d7429f83d567e5e821913a95fa6df7
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e475d04591d7429f83d567e5e821913a95fa6df7

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu Aug  6 13:17:25 2020 +0200

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

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

---

 dlls/msvcrt/printf.h         |  5 +----
 dlls/ucrtbase/tests/printf.c | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h
index 4fe9f6106a..b9b379f91e 100644
--- a/dlls/msvcrt/printf.h
+++ b/dlls/msvcrt/printf.h
@@ -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') {
         trim_tail = TRUE;
 
-        if(!v) {
-            flags->Format -= 1;
-            if(!flags->Precision) flags->Precision++;
-        } else if(radix_pos>=-3 && radix_pos<=flags->Precision) {
+        if(radix_pos>=-3 && radix_pos<=flags->Precision) {
             flags->Format -= 1;
             if(!flags->Precision) flags->Precision++;
             flags->Precision -= radix_pos;
diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c
index 7b754e13fd..f8446b8ac9 100644
--- a/dlls/ucrtbase/tests/printf.c
+++ b/dlls/ucrtbase/tests/printf.c
@@ -661,6 +661,7 @@ static void test_printf_fp(void)
         const char *fmt;
         double d;
         const char *res[ARRAY_SIZE(flags)];
+        const char *broken[ARRAY_SIZE(flags)];
     } tests[] = {
         { "%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" }},
         { "%#.21f", 0, { "0.000000000000000000000" }},
         { "%#.20e", 0, { "0.00000000000000000000e+00", NULL, "0.00000000000000000000e+000" }},
-        { "%#.20g", 0, { "0.00000000000000000000" }},
+        { "%#.20g", 0, { "0.0000000000000000000" }, { "0.00000000000000000000" }},
 
         { "%f", 123, { "123.000000" }},
         { "%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 *broken_res;
     char buf[100];
     int i, j, r;
 
     for (i = 0; i < ARRAY_SIZE(tests); i++)
     {
+        broken_res = NULL;
+
         for (j = 0; j < ARRAY_SIZE(flags); 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);
-            ok(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",
-                    i, j, buf, res);
+            ok(r == strlen(res) || broken(broken_res && r == strlen(broken_res)),
+                    "%d,%d) r = %d, expected %d\n", i, j, r, strlen(res));
+            ok(!strcmp(buf, res) || broken(broken_res && !strcmp(buf, broken_res)),
+                    "%d,%d) buf = %s, expected %s\n", i, j, buf, res);
         }
     }
 }