Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gschneider] 42430: [Temp] add some checkpoints to narrow the mysterious buildserver msvcrt test crash position #2
by gschneider＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: gschneider Date: Thu Aug 6 18:08:49 2009 New Revision: 42430 URL: http://svn.reactos.org/svn/reactos?rev=42430&view=rev Log: [Temp] add some checkpoints to narrow the mysterious buildserver msvcrt test crash position #2 Modified: trunk/rostests/winetests/msvcrt/time.c Modified: trunk/rostests/winetests/msvcrt/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/time.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/time.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/time.c [iso-8859-1] Thu Aug 6 18:08:49 2009 @@ -91,6 +91,7 @@ WideCharToMultiByte( CP_ACP, 0, tzinfo.StandardName, -1, buffer, sizeof(buffer), NULL, NULL ); trace( "bias %d std %d dst %d zone %s\n", tzinfo.Bias, tzinfo.StandardBias, tzinfo.DaylightBias, buffer ); +DPRINT1("Finshed 1st\n"); /* Bias may be positive or negative, to use offset of one day */ my_tm = *localtime(&ref); /* retrieve current dst flag */ secs = SECSPERDAY - tzinfo.Bias * SECSPERMIN; @@ -111,6 +112,7 @@ local_time = mktime(&my_tm); ok(local_time == ref, "mktime returned %u, expected %u\n", (DWORD)local_time, (DWORD)ref); +DPRINT1("Finshed 2nd\n"); /* now test some unnormalized struct tm's */ my_tm = sav_tm; my_tm.tm_sec += 60; @@ -126,6 +128,7 @@ my_tm.tm_hour,my_tm.tm_sec, sav_tm.tm_year,sav_tm.tm_mon,sav_tm.tm_mday, sav_tm.tm_hour,sav_tm.tm_sec); +DPRINT1("Finshed 3rd\n"); my_tm = sav_tm; my_tm.tm_min -= 60; my_tm.tm_hour += 1; @@ -140,6 +143,7 @@ my_tm.tm_hour,my_tm.tm_sec, sav_tm.tm_year,sav_tm.tm_mon,sav_tm.tm_mday, sav_tm.tm_hour,sav_tm.tm_sec); +DPRINT1("Finshed 4th\n"); my_tm = sav_tm; my_tm.tm_mon -= 12; my_tm.tm_year += 1; @@ -154,6 +158,7 @@ my_tm.tm_hour,my_tm.tm_sec, sav_tm.tm_year,sav_tm.tm_mon,sav_tm.tm_mday, sav_tm.tm_hour,sav_tm.tm_sec); +DPRINT1("Finshed 5th\n"); my_tm = sav_tm; my_tm.tm_mon += 12; my_tm.tm_year -= 1; @@ -168,12 +173,13 @@ my_tm.tm_hour,my_tm.tm_sec, sav_tm.tm_year,sav_tm.tm_mon,sav_tm.tm_mday, sav_tm.tm_hour,sav_tm.tm_sec); +DPRINT1("Finshed 6th\n"); /* now a bad time example */ my_tm = sav_tm; my_tm.tm_year = 69; local_time = mktime(&my_tm); ok((local_time == -1), "(bad time) mktime returned %d, expected -1\n", (int)local_time); - +DPRINT1("Finshed 7th\n"); my_tm = sav_tm; /* TEST that we are independent from the TZ variable */ /*Argh, msvcrt doesn't have setenv() */ @@ -181,6 +187,7 @@ putenv("TZ=GMT"); nulltime = mktime(&my_tm); ok(nulltime == ref,"mktime returned 0x%08x\n",(DWORD)nulltime); +DPRINT1("Finshed 8th\n"); putenv(TZ_env); }

1 0

[sginsberg] 42429: - Don't rely on the default calling convention being cdecl for function pointers
by sginsberg＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: sginsberg Date: Thu Aug 6 17:27:23 2009 New Revision: 42429 URL: http://svn.reactos.org/svn/reactos?rev=42429&view=rev Log: - Don't rely on the default calling convention being cdecl for function pointers Modified: trunk/reactos/lib/sdk/crt/search/bsearch.c trunk/reactos/lib/sdk/crt/search/lfind.c trunk/reactos/lib/sdk/crt/search/lsearch.c trunk/reactos/lib/sdk/crt/stdlib/qsort.c Modified: trunk/reactos/lib/sdk/crt/search/bsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/bsearch… ============================================================================== --- trunk/reactos/lib/sdk/crt/search/bsearch.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/search/bsearch.c [iso-8859-1] Thu Aug 6 17:27:23 2009 @@ -6,7 +6,7 @@ */ void * bsearch(const void *key, const void *base0, size_t nelem, - size_t size, int (*cmp)(const void *ck, const void *ce)) + size_t size, int (__cdecl *cmp)(const void *ck, const void *ce)) { char *base = (char *)base0; int lim, cmpval; Modified: trunk/reactos/lib/sdk/crt/search/lfind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/lfind.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/search/lfind.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/search/lfind.c [iso-8859-1] Thu Aug 6 17:27:23 2009 @@ -5,7 +5,7 @@ * @implemented */ void *_lfind(const void *key, const void *base, unsigned int *nelp, - unsigned int width, int (*compar)(const void *, const void *)) + unsigned int width, int (__cdecl *compar)(const void *, const void *)) { char* char_base = (char*)base; unsigned int i; Modified: trunk/reactos/lib/sdk/crt/search/lsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/lsearch… ============================================================================== --- trunk/reactos/lib/sdk/crt/search/lsearch.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/search/lsearch.c [iso-8859-1] Thu Aug 6 17:27:23 2009 @@ -6,7 +6,7 @@ * @implemented */ void *_lsearch(const void *key, void *base, unsigned int *nelp, unsigned int width, - int (*compar)(const void *, const void *)) + int (__cdecl *compar)(const void *, const void *)) { void *ret_find = _lfind(key,base,nelp,width,compar); Modified: trunk/reactos/lib/sdk/crt/stdlib/qsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/qsort.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/qsort.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/qsort.c [iso-8859-1] Thu Aug 6 17:27:23 2009 @@ -50,7 +50,7 @@ */ static void -qst(size_t size, int (*compar)(const void*, const void*), char *base, char *max) +qst(size_t size, int (__cdecl *compar)(const void*, const void*), char *base, char *max) { char c, *i, *j, *jj; int ii; @@ -176,7 +176,7 @@ * @implemented */ void -qsort(void *base0, size_t n, size_t size, int (*compar)(const void*, const void*)) +qsort(void *base0, size_t n, size_t size, int (__cdecl *compar)(const void*, const void*)) { char *base = (char *)base0; char c, *i, *j, *lo, *hi;

1 0

[gschneider] 42428: Retrieve the timezone bias in mktime via GetTimeZoneInformation
by gschneider＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: gschneider Date: Thu Aug 6 17:18:24 2009 New Revision: 42428 URL: http://svn.reactos.org/svn/reactos?rev=42428&view=rev Log: Retrieve the timezone bias in mktime via GetTimeZoneInformation Modified: trunk/reactos/lib/sdk/crt/time/mktime.c Modified: trunk/reactos/lib/sdk/crt/time/mktime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/mktime.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/mktime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/mktime.c [iso-8859-1] Thu Aug 6 17:18:24 2009 @@ -18,6 +18,8 @@ struct tm *ptm2; __time64_t time; int mons, years, leapyears; + TIME_ZONE_INFORMATION tzi; + DWORD ret; /* Normalize year and month */ if (ptm->tm_mon < 0) @@ -84,7 +86,11 @@ *ptm = *ptm2; /* Finally adjust by the difference to GMT in seconds */ - time += _timezone; + ret = GetTimeZoneInformation(&tzi); + if (ret != TIME_ZONE_ID_INVALID) + { + time += tzi.Bias * 60; + } return time; }

1 0

[gschneider] 42427: [Temp] add some checkpoints to narrow the mysterious buildserver msvcrt test crash position
by gschneider＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: gschneider Date: Thu Aug 6 16:23:40 2009 New Revision: 42427 URL: http://svn.reactos.org/svn/reactos?rev=42427&view=rev Log: [Temp] add some checkpoints to narrow the mysterious buildserver msvcrt test crash position Modified: trunk/rostests/winetests/msvcrt/time.c Modified: trunk/rostests/winetests/msvcrt/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/time.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/time.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/time.c [iso-8859-1] Thu Aug 6 16:23:40 2009 @@ -32,6 +32,9 @@ #define MINSPERHOUR 60 #define HOURSPERDAY 24 +#define NDEBUG +#include <debug.h> + static int get_test_year(time_t *start) { time_t now = time(NULL); @@ -285,11 +288,19 @@ START_TEST(time) { test_ctime(); +DPRINT1("test_ctime finished\n"); test_gmtime(); +DPRINT1("test_gmtime finished\n"); test_mktime(); +DPRINT1("test_mktime finished\n"); test_localtime(); +DPRINT1("test_localtime finished\n"); test_strdate(); +DPRINT1("test_strdate finished\n"); test_strtime(); +DPRINT1("test_strtime finished\n"); test_wstrdate(); +DPRINT1("test_wstrdate finished\n"); test_wstrtime(); -} +DPRINT1("test_wstrtime finished\n"); +}

1 0

[gschneider] 42426: -Increase array size to allow proper string termination (MSVC warning #C4045) -The code correctly copies only the first TCHAR4 value being the string itself
by gschneider＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: gschneider Date: Thu Aug 6 14:45:11 2009 New Revision: 42426 URL: http://svn.reactos.org/svn/reactos?rev=42426&view=rev Log: -Increase array size to allow proper string termination (MSVC warning #C4045) -The code correctly copies only the first TCHAR4 value being the string itself Modified: trunk/reactos/lib/sdk/crt/time/asctime.c Modified: trunk/reactos/lib/sdk/crt/time/asctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/asctime.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/asctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/asctime.c [iso-8859-1] Thu Aug 6 14:45:11 2009 @@ -14,13 +14,13 @@ #define MONSPERYEAR 12 #define HUNDREDYEAROFFSET 19 -static const _TCHAR wday_name[DAYSPERWEEK][4] = +static const _TCHAR wday_name[DAYSPERWEEK][5] = { _T("Sun "), _T("Mon "), _T("Tue "), _T("Wed "), _T("Thu "), _T("Fri "), _T("Sat ") }; -static const _TCHAR mon_name[MONSPERYEAR][4] = +static const _TCHAR mon_name[MONSPERYEAR][5] = { _T("Jan "), _T("Feb "), _T("Mar "), _T("Apr "), _T("May "), _T("Jun "), _T("Jul "), _T("Aug "), _T("Sep "), _T("Oct "), _T("Nov "), _T("Dec ")

1 0

[sginsberg] 42425: - MSVC fix: static __inline__ -> FORCEINLINE
by sginsberg＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: sginsberg Date: Thu Aug 6 13:59:20 2009 New Revision: 42425 URL: http://svn.reactos.org/svn/reactos?rev=42425&view=rev Log: - MSVC fix: static __inline__ -> FORCEINLINE Modified: trunk/reactos/lib/sdk/crt/time/asctime.c Modified: trunk/reactos/lib/sdk/crt/time/asctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/asctime.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/asctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/asctime.c [iso-8859-1] Thu Aug 6 13:59:20 2009 @@ -57,8 +57,8 @@ } timebuf_t; #pragma pack(pop) +FORCEINLINE _TCHAR2 -static __inline__ IntToChar2(int x) { union @@ -73,8 +73,8 @@ return u.char2; } +FORCEINLINE void -static __inline__ FillBuf(timebuf_t *buf, const struct tm *ptm) { /* Format looks like this:

1 0

[fireball] 42424: - Implement RosGdiGetDcRects. - Wrap usermode pointers access in RosGdiSetDcRects/GetDcRects to SEH.
by fireball＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: fireball Date: Thu Aug 6 13:48:07 2009 New Revision: 42424 URL: http://svn.reactos.org/svn/reactos?rev=42424&view=rev Log: - Implement RosGdiGetDcRects. - Wrap usermode pointers access in RosGdiSetDcRects/GetDcRects to SEH. Modified: branches/arwinss/reactos/include/psdk/ntrosgdi.h branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/include/psdk/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/nt… ============================================================================== --- branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] Thu Aug 6 13:48:07 2009 @@ -117,6 +117,7 @@ const PIXELFORMATDESCRIPTOR *ppfd); COLORREF APIENTRY RosGdiSetTextColor( HDC physDev, COLORREF color ); VOID APIENTRY RosGdiSetDcRects( HDC physDev, RECT *rcDcRect, RECT *rcVport ); +VOID APIENTRY RosGdiGetDcRects( HDC physDev, RECT *rcDcRect, RECT *rcVport ); /* enum.c */ int APIENTRY RosGdiChoosePixelFormat(HDC physDev, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Thu Aug 6 13:48:07 2009 @@ -522,13 +522,46 @@ /* Get a pointer to the DC */ pDC = DC_Lock(physDev); - /* Set DC rectangle */ - if (rcDcRect) - pDC->rcDcRect = *rcDcRect; - - /* Set viewport rectangle */ - if (rcVport) - pDC->rcVport = *rcVport; + _SEH2_TRY + { + /* Set DC rectangle */ + if (rcDcRect) + pDC->rcDcRect = *rcDcRect; + + /* Set viewport rectangle */ + if (rcVport) + pDC->rcVport = *rcVport; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + /* Release the object */ + DC_Unlock(pDC); +} + +VOID APIENTRY RosGdiGetDcRects( HDC physDev, RECT *rcDcRect, RECT *rcVport ) +{ + PDC pDC; + + /* Get a pointer to the DC */ + pDC = DC_Lock(physDev); + + _SEH2_TRY + { + /* Set DC rectangle */ + if (rcDcRect) + *rcDcRect = pDC->rcDcRect; + + /* Set viewport rectangle */ + if (rcVport) + *rcVport = pDC->rcVport; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; /* Release the object */ DC_Unlock(pDC); Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Thu Aug 6 13:48:07 2009 @@ -31,6 +31,7 @@ RosGdiSetPixelFormat 3 RosGdiSetTextColor 2 RosGdiSetDcRects 3 +RosGdiGetDcRects 3 RosGdiChoosePixelFormat 2 RosGdiDescribePixelFormat 4 RosGdiEnumDeviceFonts 4

1 0

[gschneider] 42423: Switch from time to time_new 2/2: -Rename time_new to time
by gschneider＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: gschneider Date: Thu Aug 6 13:38:09 2009 New Revision: 42423 URL: http://svn.reactos.org/svn/reactos?rev=42423&view=rev Log: Switch from time to time_new 2/2: -Rename time_new to time Added: trunk/reactos/lib/sdk/crt/time/ (props changed) - copied from r42422, trunk/reactos/lib/sdk/crt/time_new/ Removed: trunk/reactos/lib/sdk/crt/time_new/ Propchange: trunk/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Aug 6 13:38:09 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Aug 6 13:38:09 2009 @@ -1,0 +1,2 @@ +/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 +/trunk/reactos/lib/sdk/crt/time_new:39350-42241 Propchange: trunk/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[gschneider] 42422: Switch from time to time_new 1/2: -Get updated headers into place, prepare rbuild file, delete old dir
by gschneider＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: gschneider Date: Thu Aug 6 13:37:09 2009 New Revision: 42422 URL: http://svn.reactos.org/svn/reactos?rev=42422&view=rev Log: Switch from time to time_new 1/2: -Get updated headers into place, prepare rbuild file, delete old dir Added: trunk/reactos/lib/sdk/crt/include/internal/time.h (with props) Removed: trunk/reactos/lib/sdk/crt/time/ Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/include/internal/file.h trunk/reactos/lib/sdk/crt/include/internal/tls.h trunk/reactos/lib/sdk/crt/precomp.h Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Thu Aug 6 13:37:09 2009 @@ -429,18 +429,46 @@ <file>systime.c</file> </directory> <directory name="time"> + <file>asctime.c</file> <file>clock.c</file> + <file>ctime32.c</file> + <file>ctime64.c</file> <file>ctime.c</file> + <file>difftime32.c</file> + <file>difftime64.c</file> <file>difftime.c</file> + <file>ftime32.c</file> + <file>ftime64.c</file> <file>ftime.c</file> + <file>futime32.c</file> + <file>futime64.c</file> + <file>futime.c</file> + <file>gmtime.c</file> + <file>localtime32.c</file> + <file>localtime64.c</file> + <file>localtime.c</file> + <file>mktime.c</file> <file>strdate.c</file> <file>strftime.c</file> <file>strtime.c</file> + <file>time32.c</file> + <file>time64.c</file> <file>time.c</file> - <file>tz_vars.c</file> + <file>timezone.c</file> + <file>tzname.c</file> + <file>utime32.c</file> + <file>utime64.c</file> + <file>utime.c</file> + <file>wasctime.c</file> + <file>wcsftime.c</file> + <file>wctime32.c</file> + <file>wctime64.c</file> <file>wctime.c</file> <file>wstrdate.c</file> <file>wstrtime.c</file> + <file>wutime32.c</file> + <file>wutime64.c</file> + <file>wutime.c</file> </directory> <directory name="wstring"> <file>wcscoll.c</file> Modified: trunk/reactos/lib/sdk/crt/include/internal/file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/file.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/file.h [iso-8859-1] Thu Aug 6 13:37:09 2009 @@ -49,8 +49,6 @@ void sigabort_handler(int sig); void UnixTimeToFileTime(time_t unix_time, FILETIME* filetime, DWORD remainder); -time_t FileTimeToUnixTime(const FILETIME* filetime, DWORD *remainder); - #define __FILE_REC_MAX 20 typedef struct __file_rec Added: trunk/reactos/lib/sdk/crt/include/internal/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/time.h (added) +++ trunk/reactos/lib/sdk/crt/include/internal/time.h [iso-8859-1] Thu Aug 6 13:37:09 2009 @@ -1,0 +1,55 @@ +#define DIFFTIME 0x19db1ded53e8000ULL +#define DIFFDAYS (3 * DAYSPER100YEARS + 17 * DAYSPER4YEARS + 1 * DAYSPERYEAR) + +#define DAYSPERYEAR 365 +#define DAYSPER4YEARS (4*DAYSPERYEAR+1) +#define DAYSPER100YEARS (25*DAYSPER4YEARS-1) +#define DAYSPER400YEARS (4*DAYSPER100YEARS+1) +#define SECONDSPERDAY (24*60*60) +#define SECONDSPERHOUR (60*60) +#define LEAPDAY 59 + +static __inline +__time64_t +FileTimeToUnixTime(const FILETIME *FileTime, USHORT *millitm) +{ + ULARGE_INTEGER ULargeInt; + __time64_t time; + + ULargeInt.LowPart = FileTime->dwLowDateTime; + ULargeInt.HighPart = FileTime->dwHighDateTime; + ULargeInt.QuadPart -= DIFFTIME; + + time = ULargeInt.QuadPart / 10000; + if (millitm) + *millitm = (ULargeInt.QuadPart % 10000) / 10; + + return time; +} + +static __inline +long leapyears_passed(long days) +{ + long quadcenturies, centuries, quadyears; + quadcenturies = days / DAYSPER400YEARS; + days -= quadcenturies; + centuries = days / DAYSPER100YEARS; + days += centuries; + quadyears = days / DAYSPER4YEARS; + return quadyears - centuries + quadcenturies; +} + +static __inline +long leapdays_passed(long days) +{ + return leapyears_passed(days + DAYSPERYEAR - LEAPDAY + 1); +} + +static __inline +long years_passed(long days) +{ + return (days - leapdays_passed(days)) / 365; +} + +extern long dst_begin; +extern long dst_end; Propchange: trunk/reactos/lib/sdk/crt/include/internal/time.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/include/internal/tls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tls.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tls.h [iso-8859-1] Thu Aug 6 13:37:09 2009 @@ -12,6 +12,7 @@ #include <windef.h> #include <winbase.h> #include <winnt.h> +#include <time.h> #include <stddef.h> @@ -29,6 +30,10 @@ EXCEPTION_RECORD *exc_record; /* Head of exception record list */ + struct tm tmbuf; /* Used by gmtime, mktime, mkgmtime, localtime */ + char asctimebuf[26]; /* Buffer for asctime and ctime */ + wchar_t wasctimebuf[26]; /* Buffer for wasctime and wctime */ + } THREADDATA, *PTHREADDATA; @@ -41,4 +46,3 @@ #endif /* __MSVCRT_INTERNAL_TLS_H */ /* EOF */ - Modified: trunk/reactos/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/precomp.h?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] Thu Aug 6 13:37:09 2009 @@ -58,6 +58,7 @@ #include <internal/mbstring.h> #include <internal/mtdll.h> #include <internal/rterror.h> +#include <internal/time.h> #include <internal/tls.h> #include <internal/printf.h>

1 0

[fireball] 42420: Merge 42419: - Add PsGetThreadId declaration.
by fireball＠svn.reactos.org 06 Aug '09

06 Aug '09

Author: fireball Date: Thu Aug 6 13:19:05 2009 New Revision: 42420 URL: http://svn.reactos.org/svn/reactos?rev=42420&view=rev Log: Merge 42419: - Add PsGetThreadId declaration. Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/include/ndk/psfuncs.h Propchange: branches/arwinss/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 6 13:19:05 2009 @@ -1,1 +1,1 @@ -/trunk/reactos:42202,42376 +/trunk/reactos:42202,42376,42419 Modified: branches/arwinss/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/psf… ============================================================================== --- branches/arwinss/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/ndk/psfuncs.h [iso-8859-1] Thu Aug 6 13:19:05 2009 @@ -82,6 +82,13 @@ PTEB NTAPI PsGetThreadTeb( + IN PETHREAD Thread +); + +NTKERNELAPI +HANDLE +NTAPI +PsGetThreadId( IN PETHREAD Thread );

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs