Vijay Kiran Kamuju : msvcrt: Implement %C format for strftime.

[Alexandre Julliard]

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

Author: Vijay Kiran Kamuju 
Date:   Wed Oct  2 22:11:38 2019 +0200

msvcrt: Implement %C format for strftime.

Signed-off-by: Vijay Kiran Kamuju 
Signed-off-by: Piotr Caban 
Signed-off-by: Alexandre Julliard

---

dlls/msvcrt/tests/time.c   | 5 +++++
 dlls/msvcrt/time.c         | 7 +++++++
 dlls/ucrtbase/tests/misc.c | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c
index 016c9775de..86799c900f 100644
--- a/dlls/msvcrt/tests/time.c
+++ b/dlls/msvcrt/tests/time.c
@@ -608,6 +608,11 @@ static void test_strftime(void)
     gmt_tm = p_gmtime(&gmt);
     ok(gmt_tm != NULL, "gmtime failed\n");

+    errno = 0xdeadbeef;
+    retA = p_strftime(bufA, 256, "%C", gmt_tm);
+    ok(retA == 0, "expected 0, got %ld\n", retA);
+    ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
+
     errno = 0xdeadbeef;
     retA = p_strftime(bufA, 256, "%D", gmt_tm);
     ok(retA == 0, "expected 0, got %ld\n", retA);
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index 450663fd1f..b9fcde7978 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -1153,6 +1153,13 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f
             if(!strftime_str(str, &ret, max, time_data->str.names.mon[mstm->tm_mon]))
                 return 0;
             break;
+#if _MSVCR_VER>=140
+        case 'C':
+            tmp = (1900+mstm->tm_year)/100;
+            if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99))
+                return 0;
+            break;
+#endif
         case 'd':
             if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31))
                 return 0;
diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c
index c58b631565..1ba4280a54 100644
--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -895,6 +895,10 @@ static void test_strftime(void)
     char bufA[256];
     size_t retA;

+    retA = p_strftime(bufA, sizeof(bufA), "%C", &epoch);
+    ok(retA == 2, "expected 2, got %d\n", (int)retA);
+    ok(!strcmp(bufA, "19"), "got %s\n", bufA);
+
     retA = p_strftime(bufA, sizeof(bufA), "%D", &epoch);
     ok(retA == 8, "expected 8, got %d\n", (int)retA);
     ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA);