[v3 PATCH 1/2] msvcrt: Implement %C format for strftime
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- 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 016c9775de7..86799c900f7 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 450663fd1f5..b9fcde79789 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 c58b6315656..1ba4280a546 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); -- 2.21.0
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- 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 86799c900f7..9795c92baf8 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 b9fcde79789..ea06e23b806 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(mstm->tm_mday > 0 && mstm->tm_mday < 10) + 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 1ba4280a546..aecbc9dca52 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); -- 2.21.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=57294 Your paranoid android. === w8 (32 bit report) === msvcrt: time.c:920: Test failed: clock() = 765, expected 906
Hi Vijay, On 10/2/19 10:11 PM, Vijay Kiran Kamuju wrote:
+ if(mstm->tm_mday > 0 && mstm->tm_mday < 10) + str[ret-2] = ' '; It's not working if alternate is set. I thought about something like: if (!alternate && str[ret-2] = '0')
Thanks, Piotr
Hi Piotr, I have sent in with the changes. Also can you send me the example, so I can use it for further tests. Thanks, Vijay On Thu, Oct 3, 2019 at 11:44 AM Piotr Caban <piotr.caban(a)gmail.com> wrote:
Hi Vijay,
On 10/2/19 10:11 PM, Vijay Kiran Kamuju wrote:
+ if(mstm->tm_mday > 0 && mstm->tm_mday < 10) + str[ret-2] = ' '; It's not working if alternate is set. I thought about something like: if (!alternate && str[ret-2] = '0')
Thanks, Piotr
Hi Piotr, The alternative is set when the format has '#', eg: '%#e'. I have sent the test for it too, and it passes in testbot too. Please check the V2 patch. Thanks, Vijay On Thu, Oct 3, 2019 at 3:20 PM Piotr Caban <piotr.caban(a)gmail.com> wrote:
Hi,
On 10/3/19 3:05 PM, Vijay Kiran Kamuju wrote:
Also can you send me the example, so I can use it for further tests. Sorry but I don't know what you are asking for.
Thanks, Piotr
Hi, It doesn't make sense to include that test in wine but something like this should catch the bug: strftime(..., "0%#e", ....); Thanks, Piotr
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=57293 Your paranoid android. === wvistau64_zh_CN (32 bit report) === msvcrt: time.c:915: Test failed: clock() = 46, expected 234 === wvistau64_fr (32 bit report) === msvcrt: time.c:915: Test failed: clock() = 140, expected 468 === wvistau64_he (32 bit report) === msvcrt: time.c:915: Test failed: clock() = 93, expected 343 === w7u (32 bit report) === msvcrt: time.c:915: Test failed: clock() = 78, expected 218
participants (4)
-
Marvin -
Piotr Caban -
Piotr Caban -
Vijay Kiran Kamuju