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

[Alexandre Julliard]

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

Author: Vijay Kiran Kamuju <infyquest at gmail.com>
Date:   Mon Sep 30 16:52:14 2019 +0200

msvcrt: Implement %R format for strftime.

Signed-off-by: Vijay Kiran Kamuju <infyquest at gmail.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcrt/tests/time.c   |  5 +++++
 dlls/msvcrt/time.c         | 10 ++++++++++
 dlls/ucrtbase/tests/misc.c |  8 ++++++++
 3 files changed, 23 insertions(+)

diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c
index fea7ca19db..faf1a6dcb4 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, "%R", 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, "%T", gmt_tm);
     ok(retA == 0, "expected 0, got %ld\n", retA);
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index 4aaa89ac0e..c72b3ed21e 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -1189,6 +1189,16 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f
                         time_data->str.names.am : time_data->str.names.pm))
                 return 0;
             break;
+#if _MSVCR_VER>=140
+        case 'R':
+            if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23))
+                return 0;
+            if(ret < max)
+                str[ret++] = ':';
+            if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59))
+                return 0;
+            break;
+#endif
         case 'S':
             if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59))
                 return 0;
diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c
index bb0c2e3a0a..02ea1297bb 100644
--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -895,6 +895,14 @@ static void test_strftime(void)
     char bufA[256];
     size_t retA;
 
+    retA = p_strftime(bufA, sizeof(bufA), "%R", &epoch);
+    ok(retA == 5, "expected 5, got %d\n", (int)retA);
+    ok(!strcmp(bufA, "00:00"), "got %s\n", bufA);
+
+    retA = p_strftime(bufA, sizeof(bufA), "%#R", &epoch);
+    ok(retA == 3, "expected 3, got %d\n", (int)retA);
+    ok(!strcmp(bufA, "0:0"), "got %s\n", bufA);
+
     retA = p_strftime(bufA, sizeof(bufA), "%T", &epoch);
     ok(retA == 8, "expected 8, got %d\n", (int)retA);
     ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA);