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

[Alexandre Julliard]

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

Author: Vijay Kiran Kamuju 
Date:   Thu Oct  3 16:27:33 2019 +0200

msvcrt: Implement %e 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         | 6 ++++++
 dlls/ucrtbase/tests/misc.c | 8 ++++++++
 3 files changed, 19 insertions(+)

diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c
index 86799c900f..9795c92baf 100644
--- a/dlls/msvcrt/tests/time.c
+++ b/dlls/msvcrt/tests/time.c
@@ -618,6 +618,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, "%e", 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, "%F", gmt_tm);
     ok(retA == 0, "expected 0, got %ld\n", retA);
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index b9fcde7978..cbffd77f32 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -1177,6 +1177,12 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f
             if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99))
                 return 0;
             break;
+        case 'e':
+            if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31))
+                return 0;
+            if(!alternate && str[ret-2] == '0')
+                str[ret-2] = ' ';
+            break;
         case 'F':
             tmp = 1900+mstm->tm_year;
             if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999))
diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c
index 1ba4280a54..aecbc9dca5 100644
--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -907,6 +907,14 @@ static void test_strftime(void)
     ok(retA == 6, "expected 6, got %d\n", (int)retA);
     ok(!strcmp(bufA, "1/1/70"), "got %s\n", bufA);

+    retA = p_strftime(bufA, sizeof(bufA), "%e", &epoch);
+    ok(retA == 2, "expected 2, got %d\n", (int)retA);
+    ok(!strcmp(bufA, " 1"), "got %s\n", bufA);
+
+    retA = p_strftime(bufA, sizeof(bufA), "%#e", &epoch);
+    ok(retA == 1, "expected 1, got %d\n", (int)retA);
+    ok(!strcmp(bufA, "1"), "got %s\n", bufA);
+
     retA = p_strftime(bufA, sizeof(bufA), "%F", &epoch);
     ok(retA == 10, "expected 10, got %d\n", (int)retA);
     ok(!strcmp(bufA, "1970-01-01"), "got %s\n", bufA);