[PATCH 1/2] ucrtbase: Correct behavior of strftime format %c.

[Jeff Smith]

Signed-off-by: Jeff Smith <whydoubt at gmail.com>
---
 dlls/msvcrt/time.c         | 28 +++++++++++++++++++++-------
 dlls/ucrtbase/tests/misc.c |  4 ++--
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index 4283566102..d8043f459d 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -1234,13 +1234,27 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
 
         switch(*format) {
         case 'c':
-            if(!strftime_format(str, &ret, max, mstm, time_data,
-                    alternate ? STRFTIME_TD(time_data, date) : STRFTIME_TD(time_data, short_date)))
-                return 0;
-            if(ret < max)
-                str[ret++] = ' ';
-            if(!strftime_format(str, &ret, max, mstm, time_data, STRFTIME_TD(time_data, time)))
-                return 0;
+#if _MSVCR_VER>=140
+            if(time_data == MSVCRT_locale->locinfo->lc_time_curr && !alternate)
+            {
+                static const WCHAR datetime_format[] =
+                        { '%','a',' ','%','b',' ','%','e',' ','%','T',' ','%','Y',0 };
+                tmp = strftime_impl(str+ret, max-ret, datetime_format, mstm, time_data, loc);
+                if(!tmp)
+                    return 0;
+                ret += tmp;
+            }
+            else
+#endif
+            {
+                if(!strftime_format(str, &ret, max, mstm, time_data,
+                        alternate ? STRFTIME_TD(time_data, date) : STRFTIME_TD(time_data, short_date)))
+                    return 0;
+                if(ret < max)
+                    str[ret++] = ' ';
+                if(!strftime_format(str, &ret, max, mstm, time_data, STRFTIME_TD(time_data, time)))
+                    return 0;
+            }
             break;
         case 'x':
             if(!strftime_format(str, &ret, max, mstm, time_data,
diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c
index c1ab7f216a..5ff1d1e44e 100644
--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -999,8 +999,8 @@ static void test_strftime(void)
         {"%y", "00", { 0, 0, 0, 0, 0, -1900, 0, 0, 0 }},
         {"%y", "99", { 0, 0, 0, 0, 0, 8099, 0, 0, 0 }},
         {"%y", "", { 0, 0, 0, 0, 0, 8100, 0, 0, 0 }},
-        {"%c", "Thu Jan  1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE, TRUE},
-        {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE, TRUE},
+        {"%c", "Thu Jan  1 00:00:00 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
+        {"%c", "Thu Feb 30 00:00:00 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }},
         {"%#c", "Thursday, January 01, 1970 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
         {"%#c", "Thursday, February 30, 1970 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }},
         {"%x", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
-- 
2.23.0