Skip to content

Bug# 5552 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Feb 12, 2011
Merged

Bug# 5552 #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions std/datetime.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31818,7 +31818,7 @@ SysTime DosFileTimeToSysTime(DosFileTime dft, immutable TimeZone tz = LocalTime(
throw new DateTimeException("Invalid DosFileTime.");

int year = ((dt >> 25) & 0x7F) + 1980;
int month = ((dt >> 21) & 0x0F) - 1; // 1..12
int month = ((dt >> 21) & 0x0F); // 1..12
int dayOfMonth = ((dt >> 16) & 0x1F); // 1..31
int hour = (dt >> 11) & 0x1F; // 0..23
int minute = (dt >> 5) & 0x3F; // 0..59
Expand All @@ -31832,6 +31832,21 @@ SysTime DosFileTimeToSysTime(DosFileTime dft, immutable TimeZone tz = LocalTime(
throw new DateTimeException("Invalid DosFileTime", __FILE__, __LINE__, dte);
}

unittest
{
version(testStdDateTime)
{
assertPred!"=="(DosFileTimeToSysTime(0b00000000001000010000000000000000),
SysTime(DateTime(1980, 1, 1, 0, 0, 0)));

assertPred!"=="(DosFileTimeToSysTime(0b11111111100111111011111101111101),
SysTime(DateTime(2107, 12, 31, 23, 59, 58)));

assertPred!"=="(DosFileTimeToSysTime(0x3E3F8456),
SysTime(DateTime(2011, 1, 31, 16, 34, 44)));
}
}


/++
Converts from SysTime to DOS file date/time.
Expand All @@ -31855,7 +31870,7 @@ DosFileTime SysTimeToDosFileTime(SysTime sysTime)

uint retval = 0;
retval = (dateTime.year - 1980) << 25;
retval |= ((dateTime.month + 1) & 0x0F) << 21;
retval |= (dateTime.month & 0x0F) << 21;
retval |= (dateTime.day & 0x1F) << 16;
retval |= (dateTime.hour & 0x1F) << 11;
retval |= (dateTime.minute & 0x3F) << 5;
Expand All @@ -31864,6 +31879,21 @@ DosFileTime SysTimeToDosFileTime(SysTime sysTime)
return cast(DosFileTime)retval;
}

unittest
{
version(testStdDateTime)
{
assertPred!"=="(SysTimeToDosFileTime(SysTime(DateTime(1980, 1, 1, 0, 0, 0))),
0b00000000001000010000000000000000);

assertPred!"=="(SysTimeToDosFileTime(SysTime(DateTime(2107, 12, 31, 23, 59, 58))),
0b11111111100111111011111101111101);

assertPred!"=="(SysTimeToDosFileTime(SysTime(DateTime(2011, 1, 31, 16, 34, 44))),
0x3E3F8456);
}
}



/++
Expand Down