diff --git a/programs/emulator/kwine/bin/lib/msvcrt.dll b/programs/emulator/kwine/bin/lib/msvcrt.dll index 45f1a69455..3d296d7f5a 100644 Binary files a/programs/emulator/kwine/bin/lib/msvcrt.dll and b/programs/emulator/kwine/bin/lib/msvcrt.dll differ diff --git a/programs/emulator/kwine/bin/samples.zip b/programs/emulator/kwine/bin/samples.zip index 94a17ff362..5fab40f550 100644 Binary files a/programs/emulator/kwine/bin/samples.zip and b/programs/emulator/kwine/bin/samples.zip differ diff --git a/programs/emulator/kwine/lib/kolibrisys.h b/programs/emulator/kwine/lib/kolibrisys.h new file mode 100644 index 0000000000..ad5ac1e2a7 --- /dev/null +++ b/programs/emulator/kwine/lib/kolibrisys.h @@ -0,0 +1,20 @@ +#ifndef __KOS_32_SYS_H__ +#define __KOS_32_SYS_H__ + +#include "stddef.h" + +static inline uint32_t _ksys_get_date(void) +{ + uint32_t val; + asm volatile ("int $0x40":"=a"(val):"a"(29)); + return val; +} + +static inline uint32_t _ksys_get_system_clock(void) +{ + uint32_t val; + asm volatile ("int $0x40":"=a"(val):"a"(3)); + return val; +} + +#endif \ No newline at end of file diff --git a/programs/emulator/kwine/lib/msvcrt.dll.c b/programs/emulator/kwine/lib/msvcrt.dll.c index 8cdf7a038e..55d6405c50 100644 --- a/programs/emulator/kwine/lib/msvcrt.dll.c +++ b/programs/emulator/kwine/lib/msvcrt.dll.c @@ -12,6 +12,9 @@ #include "stdio.c" #include "stdlib.c" +#include "time.h" +#include "time.c" + typedef struct { @@ -39,6 +42,9 @@ const char sz_free[] = "free"; const char sz_realloc[] = "realloc"; //const char sz_[] = ""; +// time +const char sz_time[] = "time"; + //uint32_t EXPORTS[] __asm__("EXPORTS") = export_t EXPORTS[] = @@ -57,6 +63,9 @@ export_t EXPORTS[] = {sz_malloc, (void*)malloc}, {sz_free, (void*)free}, {sz_realloc, (void*)realloc}, + + {sz_time, (void*)time}, + {NULL, NULL}, }; diff --git a/programs/emulator/kwine/lib/time.c b/programs/emulator/kwine/lib/time.c new file mode 100644 index 0000000000..eda6634933 --- /dev/null +++ b/programs/emulator/kwine/lib/time.c @@ -0,0 +1,86 @@ +#include "time.h" +#include "kolibrisys.h" + +struct tm __buffertime; + +struct tm * localtime (const time_t * timer) +/* non-standard! ignore parameter and return just time now */ +{ + int kos_date, kos_time; + kos_date = _ksys_get_date(); + kos_time = _ksys_get_system_clock(); + + int bcd_day = (kos_date >> 16); + int bcd_mon = ((kos_date & 0xFF00) >> 8); + int bcd_year = (kos_date & 0xFF); + __buffertime.tm_mday = ((bcd_day & 0xF0)>>4)*10 + (bcd_day & 0x0F); + __buffertime.tm_mon = ((bcd_mon & 0xF0)>>4)*10 + (bcd_mon & 0x0F) - 1; + __buffertime.tm_year = ((bcd_year & 0xF0)>>4)*10 + (bcd_year & 0x0F) + 100; + //printf("%d %d %d\n", __buffertime.tm_mday, __buffertime.tm_mon, __buffertime.tm_year); + + __buffertime.tm_wday = __buffertime.tm_yday = __buffertime.tm_isdst = -1; /* temporary */ + + int bcd_sec = (kos_time >> 16); + int bcd_min = ((kos_time & 0xFF00) >> 8); + int bcd_hour = (kos_time & 0xFF); + + __buffertime.tm_sec = ((bcd_sec & 0xF0)>>4)*10 + (bcd_sec & 0x0F); + __buffertime.tm_min = ((bcd_min & 0xF0)>>4)*10 + (bcd_min & 0x0F); + __buffertime.tm_hour = ((bcd_hour & 0xF0)>>4)*10 + (bcd_hour & 0x0F); + //printf("%d %d %d\n", __buffertime.tm_sec, __buffertime.tm_min, __buffertime.tm_hour); + + return &__buffertime; +} + +time_t time (time_t* timer) +{ + time_t t = mktime(localtime(0)); + if (timer) *timer = t; + return t; +} + +time_t mktime (struct tm * timeptr) +{ + /*int y, m, d; + time_t t; + y = timeptr->tm_year + 1900; + m = timeptr->tm_mon + 1; + d = timeptr->tm_mday; // to -1 or not to -1? + + if (m < 3) { m += 12; y -= 1; } + + t = y * 365 + y / 4 + y /400 - y / 100; // years - > days + t += 30 * m + 3 * (m + 1) / 5 + d; // add month days + + t -= 719561; // 01 jan 1970 + t *= 86400; + + t += 3600 * timeptr->tm_hour + 60 * timeptr->tm_min + timeptr->tm_sec; + + return t;*/ + + int utcdiff = -3; + const int mon_days [] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + unsigned long int tyears, tdays, leaps, utc_hrs; + int i; + + tyears = timeptr->tm_year - 70 ;// tm->tm_year is from 1900. + leaps = (tyears + 2) / 4; // no of next two lines until year 2100. + i = (timeptr->tm_year - 100) / 100; + leaps -= ( (i/4)*3 + i%4 ); + tdays = 0; + for (i=0; i < timeptr->tm_mon; i++) tdays += mon_days[i]; + + tdays += timeptr->tm_mday-1; // days of month passed. + tdays = tdays + (tyears * 365) + leaps; + + utc_hrs = timeptr->tm_hour + utcdiff; // for your time zone. + return (tdays * 86400) + (utc_hrs * 3600) + (timeptr->tm_min * 60) + timeptr->tm_sec; +} + +double difftime (time_t end, time_t beginning) +{ + return end - beginning; +} + + diff --git a/programs/emulator/kwine/lib/time.h b/programs/emulator/kwine/lib/time.h new file mode 100644 index 0000000000..584cd587eb --- /dev/null +++ b/programs/emulator/kwine/lib/time.h @@ -0,0 +1,29 @@ +#ifndef _TIME_H +#define _TIME_H + +typedef unsigned long int clock_t; +typedef unsigned long int time_t; +//#define clock() get_tick_count() +#define CLOCKS_PER_SEC 100 + +struct tm { + int tm_sec; /* seconds after the minute 0-61*/ + int tm_min; /* minutes after the hour 0-59 */ + int tm_hour; /* hours since midnight 0-23 */ + int tm_mday; /* day of the month 1-31 */ + int tm_mon; /* months since January 0-11 */ + int tm_year; /* years since 1900 */ + int tm_wday; /* days since Sunday 0-6 */ + int tm_yday; /* days since January 1 0-365 */ + int tm_isdst; /* Daylight Saving Time flag */ +}; + +time_t mktime(struct tm * timeptr); +time_t time(time_t* timer); +struct tm * localtime(const time_t * timer); /* non-standard! ignore parameter and return just time now, not generate tm_isdst, tm_yday, tm_wday == -1 */ +double difftime(time_t end, time_t beginning); + +extern struct tm __buffertime; + +#endif + diff --git a/programs/emulator/kwine/readme.txt b/programs/emulator/kwine/readme.txt index c8cc192220..594c7f3748 100644 --- a/programs/emulator/kwine/readme.txt +++ b/programs/emulator/kwine/readme.txt @@ -1,4 +1,4 @@ -KWINE v0.0.2 +KWINE Developers: - 0CodErr founder of project PEload @@ -9,7 +9,3 @@ How to use: kwine, lib/kernel32.dll, lib/msvcrt.dll - usage: kwine mysuperexefile.exe - -Changelog: - - msvcrt.dll rewritten in c - - added malloc, free, realloc, strcmp, strcat, strlen, printf to msvcrt.dll \ No newline at end of file