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

[Alexandre Julliard]

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

Author: Vijay Kiran Kamuju <infyquest at gmail.com>
Date:   Fri Oct  4 19:53:20 2019 +0200

msvcrt: Implement %h 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         | 3 +++
 dlls/ucrtbase/tests/misc.c | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c
index 9795c92baf..7eea78367d 100644
--- a/dlls/msvcrt/tests/time.c
+++ b/dlls/msvcrt/tests/time.c
@@ -628,6 +628,11 @@ static void test_strftime(void)
     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, "%h", 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, "%R", gmt_tm);
     ok(retA == 0, "expected 0, got %ld\n", retA);
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index cbffd77f32..6108ad17cc 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -1142,6 +1142,9 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f
                 return 0;
             break;
         case 'b':
+#if _MSVCR_VER>=140
+        case 'h':
+#endif
             if(mstm->tm_mon<0 || mstm->tm_mon>11)
                 goto einval_error;
             if(!strftime_str(str, &ret, max, time_data->str.names.short_mon[mstm->tm_mon]))
diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c
index aecbc9dca5..d056bf7de1 100644
--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -938,6 +938,10 @@ static void test_strftime(void)
     retA = p_strftime(bufA, sizeof(bufA), "%#T", &epoch);
     ok(retA == 5, "expected 5, got %d\n", (int)retA);
     ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA);
+
+    retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch);
+    ok(retA == 3, "expected 3, got %d\n", (int)retA);
+    ok(!strcmp(bufA, "Jan"), "got %s\n", bufA);
 }
 
 static LONG* get_failures_counter(HANDLE *map)