asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2042 from est31/fix-win

Browse source 
Fix windows compilability
This commit is contained in:
Juan Linietsky 2015-06-07 10:40:04 -03:00
commit a30b2bf5df
4 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
platform/windows/os_windows.cpp
View file

@ -1829,22 +1829,7 @@ String OS_Windows::get_name() {
return "Windows";
}
OS::Date OS_Windows::get_date() const {
SYSTEMTIME systemtime;
if (local)
GetSystemTime(&systemtime);
else
GetLocalTime(&systemtime);
Date date;
date.day=systemtime.wDay;
date.month=Month(systemtime.wMonth);
date.weekday=Weekday(systemtime.wDayOfWeek);
date.year=systemtime.wYear;
date.dst=false;
return date;
}
OS::Time OS_Windows::get_time(bool utc) const {
OS::Date OS_Windows::get_date(bool utc) const {
SYSTEMTIME systemtime;
if (utc)
@ -1852,11 +1837,13 @@ OS::Time OS_Windows::get_time(bool utc) const {
else
GetLocalTime(&systemtime);
Time time;
time.hour=systemtime.wHour;
time.min=systemtime.wMinute;
time.sec=systemtime.wSecond;
return time;
Date date;
date.day=systemtime.wDay;
date.month=Month(systemtime.wMonth);
date.weekday=Weekday(systemtime.wDayOfWeek);
date.year=systemtime.wYear;
date.dst=false;
return date;
}
OS::Time OS_Windows::get_time(bool utc) const {
@ -1889,7 +1876,7 @@ OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
return ret;
}
uint64_t OS_Windows::get_unix_time(bool local) const {
uint64_t OS_Windows::get_unix_time() const {
FILETIME ft;
SYSTEMTIME st;

1
platform/windows/os_windows.h
View file

@ -261,6 +261,7 @@ public:
virtual Date get_date(bool utc) const;
virtual Time get_time(bool utc) const;
virtual TimeZoneInfo get_time_zone_info() const;
virtual uint64_t get_unix_time() const;
virtual bool can_draw() const;

15
platform/winrt/os_winrt.cpp
View file

@ -442,10 +442,14 @@ String OSWinrt::get_name() {
return "WinRT";
}
OS::Date OSWinrt::get_date() const {
OS::Date OSWinrt::get_date(bool utc) const {
SYSTEMTIME systemtime;
GetLocalTime(&systemtime);
if (utc)
GetSystemTime(&systemtime);
else
GetLocalTime(&systemtime);
Date date;
date.day=systemtime.wDay;
date.month=Month(systemtime.wMonth);
@ -485,14 +489,11 @@ OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
return ret;
}
uint64_t OSWinrt::get_unix_time(bool utc) const {
uint64_t OSWinrt::get_unix_time() const {
FILETIME ft;
SYSTEMTIME st;
if (utc)
GetSystemTime(&systemtime);
else
GetLocalTime(&systemtime);
GetSystemTime(&systemtime);
SystemTimeToFileTime(&st, &ft);
SYSTEMTIME ep;

1
platform/winrt/os_winrt.h
View file

@ -200,6 +200,7 @@ public:
virtual Date get_date(bool utc) const;
virtual Time get_time(bool utc) const;
virtual TimeZoneInfo get_time_zone_info() const;
virtual uint64_t get_unix_time() const;
virtual bool can_draw() const;