ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Implement %D format for strftime. 

Signed-off-by: Vijay Kiran Kamuju <infyquest@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Vijay Kiran Kamuju 2019-10-01 11:51:07 +02:00 committed by Alexandre Julliard
parent f359c39b2c
commit 1ed44b3554
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/msvcrt/tests/time.c
View File

@ -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, "%D", 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);

14
dlls/msvcrt/time.c
View File

@ -1157,6 +1157,20 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f
if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31))
return 0;
break;
#if _MSVCR_VER>=140
case 'D':
if(!strftime_int(str, &ret, max, mstm->tm_mon+1, alternate ? 0 : 2, 1, 12))
return 0;
if(ret < max)
str[ret++] = '/';
if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31))
return 0;
if(ret < max)
str[ret++] = '/';
if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99))
return 0;
break;
#endif
case 'H':
if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23))
return 0;

8
dlls/ucrtbase/tests/misc.c
View File

@ -895,6 +895,14 @@ static void test_strftime(void)
char bufA[256];
size_t retA;
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);
retA = p_strftime(bufA, sizeof(bufA), "%#D", &epoch);
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), "%R", &epoch);
ok(retA == 5, "expected 5, got %d\n", (int)retA);
ok(!strcmp(bufA, "00:00"), "got %s\n", bufA);