Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[sginsberg] 42425: - MSVC fix: static __inline__ -> FORCEINLINE

by sginsberg＠svn.reactos.org

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:

15 years, 1 month

[fireball] 42424: - Implement RosGdiGetDcRects. - Wrap usermode pointers access in RosGdiSetDcRects/GetDcRects to SEH.

by fireball＠svn.reactos.org

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

15 years, 1 month

[gschneider] 42423: Switch from time to time_new 2/2: -Rename time_new to time

by gschneider＠svn.reactos.org

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

15 years, 1 month

[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

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>

15 years, 1 month

[fireball] 42420: Merge 42419: - Add PsGetThreadId declaration.

by fireball＠svn.reactos.org

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 );

15 years, 1 month

[fireball] 42419: - Add PsGetThreadId declaration.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 6 13:16:42 2009 New Revision: 42419 URL: http://svn.reactos.org/svn/reactos?rev=42419&view=rev Log: - Add PsGetThreadId declaration. Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Thu Aug 6 13:16:42 2009 @@ -82,6 +82,13 @@ PTEB NTAPI PsGetThreadTeb( + IN PETHREAD Thread +); + +NTKERNELAPI +HANDLE +NTAPI +PsGetThreadId( IN PETHREAD Thread );

15 years, 1 month

[sginsberg] 42418: - crt: Use ANSI C types - math.h: Move nonstandard inline using nonstandard function into nonstandard group - crtdefs.h: Don't disable non-ANSI C definitions for MSVC only -- the behaviour should be the same for all compilers, so always disable them -- fixes various msvc build errors introduced by 42369.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Aug 6 13:03:08 2009 New Revision: 42418 URL: http://svn.reactos.org/svn/reactos?rev=42418&view=rev Log: - crt: Use ANSI C types - math.h: Move nonstandard inline using nonstandard function into nonstandard group - crtdefs.h: Don't disable non-ANSI C definitions for MSVC only -- the behaviour should be the same for all compilers, so always disable them -- fixes various msvc build errors introduced by 42369. Modified: trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/math.h trunk/reactos/lib/sdk/crt/process/process.c trunk/reactos/lib/sdk/crt/stdio/fmode.c trunk/reactos/lib/sdk/crt/stdlib/_exit.c trunk/reactos/lib/sdk/crt/time/ctime.c Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Thu Aug 6 13:03:08 2009 @@ -19,10 +19,11 @@ #endif #endif -/* Compatability definition */ -#if _MSC_VER > 0 && __STDC__ -#define NO_OLDNAMES -#endif +/* Disable non-ANSI C definitions if compiling with __STDC__ */ +//HACK: Disabled +//#if __STDC__ +//#define NO_OLDNAMES +//#endif /** Properties ***************************************************************/ Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=424… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Thu Aug 6 13:03:08 2009 @@ -225,6 +225,8 @@ #define HUGE _HUGE /* double __cdecl cabs(struct _complex _X); */ double __cdecl hypot(double _X,double _Y); + __CRT_INLINE float __cdecl hypotf (float x, float y) + { return (float) hypot (x, y);} _CRTIMP double __cdecl j0(double _X); _CRTIMP double __cdecl j1(double _X); _CRTIMP double __cdecl jn(int _X,double _Y); @@ -448,8 +450,6 @@ extern float __cdecl cbrtf (float); extern long double __cdecl cbrtl (long double); - __CRT_INLINE float __cdecl hypotf (float x, float y) - { return (float) hypot (x, y);} extern long double __cdecl hypotl (long double, long double); extern long double __cdecl powl (long double, long double); Modified: trunk/reactos/lib/sdk/crt/process/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/proces… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] Thu Aug 6 13:03:08 2009 @@ -521,7 +521,7 @@ if (args) { - ret = do_spawnT(P_OVERLAY, cmdname, args, NULL); + ret = do_spawnT(_P_OVERLAY, cmdname, args, NULL); free(args); } return ret; @@ -533,7 +533,7 @@ intptr_t _texecv(const _TCHAR* cmdname, const _TCHAR* const* argv) { TRACE(MK_STR(_texecv)"('%"sT"')\n", cmdname); - return _tspawnv(P_OVERLAY, cmdname, argv); + return _tspawnv(_P_OVERLAY, cmdname, argv); } /* @@ -560,7 +560,7 @@ envs = argvtosT(ptr, 0); if (args) { - ret = do_spawnT(P_OVERLAY, cmdname, args, envs); + ret = do_spawnT(_P_OVERLAY, cmdname, args, envs); free(args); } if (envs) @@ -576,7 +576,7 @@ intptr_t _texecve(const _TCHAR* cmdname, const _TCHAR* const* argv, const _TCHAR* const* envp) { TRACE(MK_STR(_texecve)"('%"sT"')\n", cmdname); - return _tspawnve(P_OVERLAY, cmdname, argv, envp); + return _tspawnve(_P_OVERLAY, cmdname, argv, envp); } /* @@ -596,7 +596,7 @@ if (args) { - ret = do_spawnT(P_OVERLAY, find_execT(cmdname, pathname), args, NULL); + ret = do_spawnT(_P_OVERLAY, find_execT(cmdname, pathname), args, NULL); free(args); } return ret; @@ -608,7 +608,7 @@ intptr_t _texecvp(const _TCHAR* cmdname, const _TCHAR* const* argv) { TRACE(MK_STR(_texecvp)"('%"sT"')\n", cmdname); - return _tspawnvp(P_OVERLAY, cmdname, argv); + return _tspawnvp(_P_OVERLAY, cmdname, argv); } /* @@ -636,7 +636,7 @@ envs = argvtosT(ptr, 0); if (args) { - ret = do_spawnT(P_OVERLAY, find_execT(cmdname, pathname), args, envs); + ret = do_spawnT(_P_OVERLAY, find_execT(cmdname, pathname), args, envs); free(args); } if (envs) @@ -652,7 +652,7 @@ intptr_t _texecvpe(const _TCHAR* cmdname, const _TCHAR* const* argv, const _TCHAR* const* envp) { TRACE(MK_STR(_texecvpe)"('%"sT"')\n", cmdname); - return _tspawnvpe(P_OVERLAY, cmdname, argv, envp); -} - - + return _tspawnvpe(_P_OVERLAY, cmdname, argv, envp); +} + + Modified: trunk/reactos/lib/sdk/crt/stdio/fmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/fmode.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/fmode.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/fmode.c [iso-8859-1] Thu Aug 6 13:03:08 2009 @@ -1,7 +1,7 @@ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #include <precomp.h> -int _fmode = O_TEXT; +int _fmode = _O_TEXT; /* * @implemented Modified: trunk/reactos/lib/sdk/crt/stdlib/_exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/_exit.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/_exit.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/_exit.c [iso-8859-1] Thu Aug 6 13:03:08 2009 @@ -19,7 +19,7 @@ djgpp_first_dtor[i](); */ /* in case the program set it this way */ - _setmode(0, O_TEXT); + _setmode(0, _O_TEXT); _atexit_cleanup(); _exit(status); for(;;); Modified: trunk/reactos/lib/sdk/crt/time/ctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/ctime.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] Thu Aug 6 13:03:08 2009 @@ -53,8 +53,8 @@ #define fread_size_t size_t #define fwrite_size_t size_t -#define ACCESS_MODE O_RDONLY|O_BINARY -#define OPEN_MODE O_RDONLY|O_BINARY +#define ACCESS_MODE _O_RDONLY|_O_BINARY +#define OPEN_MODE _O_RDONLY|_O_BINARY /* ** Someone might make incorrect use of a time zone abbreviation:

15 years, 1 month

[gschneider] 42417: -Merge license change from AMD64 branch (r42414) -Adjust the return value of mktime by the chosen timezone after normalizing

by gschneider＠svn.reactos.org

Author: gschneider Date: Thu Aug 6 13:01:44 2009 New Revision: 42417 URL: http://svn.reactos.org/svn/reactos?rev=42417&view=rev Log: -Merge license change from AMD64 branch (r42414) -Adjust the return value of mktime by the chosen timezone after normalizing Modified: trunk/reactos/lib/sdk/crt/time_new/ (props changed) trunk/reactos/lib/sdk/crt/time_new/asctime.c trunk/reactos/lib/sdk/crt/time_new/bitsfixup.h trunk/reactos/lib/sdk/crt/time_new/clock.c trunk/reactos/lib/sdk/crt/time_new/ctime.c trunk/reactos/lib/sdk/crt/time_new/ctime32.c trunk/reactos/lib/sdk/crt/time_new/ctime64.c trunk/reactos/lib/sdk/crt/time_new/difftime.c trunk/reactos/lib/sdk/crt/time_new/difftime32.c trunk/reactos/lib/sdk/crt/time_new/difftime64.c trunk/reactos/lib/sdk/crt/time_new/ftime.c trunk/reactos/lib/sdk/crt/time_new/ftime32.c trunk/reactos/lib/sdk/crt/time_new/ftime64.c trunk/reactos/lib/sdk/crt/time_new/futime.c trunk/reactos/lib/sdk/crt/time_new/futime32.c trunk/reactos/lib/sdk/crt/time_new/futime64.c trunk/reactos/lib/sdk/crt/time_new/gmtime.c trunk/reactos/lib/sdk/crt/time_new/localtime.c trunk/reactos/lib/sdk/crt/time_new/localtime32.c trunk/reactos/lib/sdk/crt/time_new/localtime64.c trunk/reactos/lib/sdk/crt/time_new/mktime.c trunk/reactos/lib/sdk/crt/time_new/strdate.c trunk/reactos/lib/sdk/crt/time_new/strftime.c trunk/reactos/lib/sdk/crt/time_new/strtime.c trunk/reactos/lib/sdk/crt/time_new/time.c trunk/reactos/lib/sdk/crt/time_new/time32.c trunk/reactos/lib/sdk/crt/time_new/time64.c trunk/reactos/lib/sdk/crt/time_new/timezone.c trunk/reactos/lib/sdk/crt/time_new/tzname.c trunk/reactos/lib/sdk/crt/time_new/utime.c trunk/reactos/lib/sdk/crt/time_new/utime32.c trunk/reactos/lib/sdk/crt/time_new/utime64.c trunk/reactos/lib/sdk/crt/time_new/wasctime.c trunk/reactos/lib/sdk/crt/time_new/wcsftime.c trunk/reactos/lib/sdk/crt/time_new/wctime.c trunk/reactos/lib/sdk/crt/time_new/wctime32.c trunk/reactos/lib/sdk/crt/time_new/wctime64.c trunk/reactos/lib/sdk/crt/time_new/wstrdate.c trunk/reactos/lib/sdk/crt/time_new/wstrtime.c trunk/reactos/lib/sdk/crt/time_new/wutime.c trunk/reactos/lib/sdk/crt/time_new/wutime32.c trunk/reactos/lib/sdk/crt/time_new/wutime64.c Propchange: trunk/reactos/lib/sdk/crt/time_new/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 6 13:01:44 2009 @@ -1,1 +1,2 @@ +/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 /trunk/reactos/lib/sdk/crt/time_new:39350-42241 Modified: trunk/reactos/lib/sdk/crt/time_new/asctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/ascti… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/asctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/asctime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/ftime.c * PURPOSE: Implementation of asctime(), _asctime_s() Modified: trunk/reactos/lib/sdk/crt/time_new/bitsfixup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/bitsf… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/bitsfixup.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/bitsfixup.h [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/bitsfixup.h + * PURPOSE: definitions for different time_t versions + * PROGRAMERS: Timo Kreuzer + */ #if defined(_USE_EXPLITIT_32BIT_TIME) || defined(_USE_EXPLITIT_64BIT_TIME) #undef _timeb Modified: trunk/reactos/lib/sdk/crt/time_new/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/clock… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/clock.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/clock.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/clock.c * PURPOSE: Implementation of clock() Modified: trunk/reactos/lib/sdk/crt/time_new/ctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/ctime… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/ctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/ctime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/ctime.c * PURPOSE: Implementation of ctime, _ctime_s Modified: trunk/reactos/lib/sdk/crt/time_new/ctime32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/ctime… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/ctime32.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/ctime32.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/ctime32.c * PURPOSE: Implementation of _ctime32() Modified: trunk/reactos/lib/sdk/crt/time_new/ctime64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/ctime… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/ctime64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/ctime64.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/ctime64.c * PURPOSE: Implementation of _ctime64 Modified: trunk/reactos/lib/sdk/crt/time_new/difftime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/difft… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/difftime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/difftime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/difftime.c * PURPOSE: Implementation of difftime Modified: trunk/reactos/lib/sdk/crt/time_new/difftime32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/difft… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/difftime32.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/difftime32.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/difftime32.c * PURPOSE: Implementation of _difftime32 Modified: trunk/reactos/lib/sdk/crt/time_new/difftime64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/difft… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/difftime64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/difftime64.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/difftime64.c * PURPOSE: Implementation of _difftime64 Modified: trunk/reactos/lib/sdk/crt/time_new/ftime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/ftime… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/ftime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/ftime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/ftime.c * PURPOSE: Deprecated BSD library call Modified: trunk/reactos/lib/sdk/crt/time_new/ftime32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/ftime… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/ftime32.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/ftime32.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/ftime32.c * PURPOSE: Implementation of _ftime32 Modified: trunk/reactos/lib/sdk/crt/time_new/ftime64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/ftime… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/ftime64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/ftime64.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/ftime64.c * PURPOSE: Implementation of _ftime64 Modified: trunk/reactos/lib/sdk/crt/time_new/futime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/futim… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/futime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/futime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/futime.c * PURPOSE: Implementation of _futime Modified: trunk/reactos/lib/sdk/crt/time_new/futime32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/futim… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/futime32.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/futime32.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/futime32.c * PURPOSE: Implementation of _futime32 Modified: trunk/reactos/lib/sdk/crt/time_new/futime64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/futim… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/futime64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/futime64.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/futime64.c * PURPOSE: Implementation of _futime64 Modified: trunk/reactos/lib/sdk/crt/time_new/gmtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/gmtim… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/gmtime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/gmtime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/gmtime.c * PURPOSE: Implementation of gmtime, _gmtime32, _gmtime64 Modified: trunk/reactos/lib/sdk/crt/time_new/localtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/local… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/localtime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/localtime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/localtime.c * PURPOSE: Implementation of localtime, localtime_s Modified: trunk/reactos/lib/sdk/crt/time_new/localtime32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/local… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/localtime32.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/localtime32.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/localtime32.c * PURPOSE: Implementation of _localtime32 Modified: trunk/reactos/lib/sdk/crt/time_new/localtime64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/local… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/localtime64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/localtime64.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/localtime64.c * PURPOSE: Implementation of _localtime64 Modified: trunk/reactos/lib/sdk/crt/time_new/mktime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/mktim… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/mktime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/mktime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/mktime.c * PURPOSE: Implementation of mktime, _mkgmtime @@ -83,6 +83,9 @@ } *ptm = *ptm2; + /* Finally adjust by the difference to GMT in seconds */ + time += _timezone; + return time; } Modified: trunk/reactos/lib/sdk/crt/time_new/strdate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/strda… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/strdate.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/strdate.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CRT library - * FILE: lib/msvcrt/time/strtime.c + * FILE: lib/sdk/crt/time/strtime.c * PURPOSE: Fills a buffer with a formatted date representation * PROGRAMER: Ariadne * UPDATE HISTORY: Modified: trunk/reactos/lib/sdk/crt/time_new/strftime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/strft… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/strftime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/strftime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/strftime.c + * PURPOSE: + * PROGRAMER: + */ #include <precomp.h> #include <tchar.h> Modified: trunk/reactos/lib/sdk/crt/time_new/strtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/strti… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/strtime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/strtime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/msvcrt/time/strtime.c + * FILE: lib/sdk/crt/time/strtime.c * PURPOSE: Fills a buffer with a formatted time representation * PROGRAMER: Ariadne * UPDATE HISTORY: Modified: trunk/reactos/lib/sdk/crt/time_new/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/time.… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/time.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/time.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/sdk/crt/time/time.c * PURPOSE: Implementation of _time (_tim32, _tim64) Modified: trunk/reactos/lib/sdk/crt/time_new/time32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/time3… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/time32.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/time32.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/time32.c + * PURPOSE: + * PROGRAMER: + */ #define _USE_EXPLITIT_32BIT_TIME #include "time.c" Modified: trunk/reactos/lib/sdk/crt/time_new/time64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/time6… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/time64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/time64.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory + * PROJECT: ReactOS CRT library + * FILE: lib/sdk/crt/time/time64.c + * PURPOSE: + * PROGRAMER: + */ #define _USE_EXPLITIT_64BIT_TIME #include "time.c" Modified: trunk/reactos/lib/sdk/crt/time_new/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/timez… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/timezone.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/timezone.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/timezone.c * PURPOSE: Implementation of time zone functions Modified: trunk/reactos/lib/sdk/crt/time_new/tzname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/tznam… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/tzname.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/tzname.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/ctime.c * PURPOSE: Implementation of ctime Modified: trunk/reactos/lib/sdk/crt/time_new/utime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/utime… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/utime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/utime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/utime.c * PURPOSE: Implementation of utime, _wutime Modified: trunk/reactos/lib/sdk/crt/time_new/utime32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/utime… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/utime32.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/utime32.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/utime32.c * PURPOSE: Implementation of _utime32 Modified: trunk/reactos/lib/sdk/crt/time_new/utime64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/utime… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/utime64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/utime64.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/utime64.c * PURPOSE: Implementation of _utime64 Modified: trunk/reactos/lib/sdk/crt/time_new/wasctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/wasct… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/wasctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/wasctime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/wasctime.c * PURPOSE: Implementation of _wasctime Modified: trunk/reactos/lib/sdk/crt/time_new/wcsftime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/wcsft… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/wcsftime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/wcsftime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/wcsftime.c * PURPOSE: Implementation of _wcsftime Modified: trunk/reactos/lib/sdk/crt/time_new/wctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/wctim… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/wctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/wctime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/wctime.c * PURPOSE: Implementation of _wctime Modified: trunk/reactos/lib/sdk/crt/time_new/wctime32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/wctim… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/wctime32.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/wctime32.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/wctime32.c * PURPOSE: Implementation of _wctime32 Modified: trunk/reactos/lib/sdk/crt/time_new/wctime64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/wctim… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/wctime64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/wctime64.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/wctime64.c * PURPOSE: Implementation of _Wctime64 Modified: trunk/reactos/lib/sdk/crt/time_new/wstrdate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/wstrd… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/wstrdate.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/wstrdate.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CRT library - * FILE: lib/msvcrt/time/strtime.c + * FILE: lib/sdk/crt/time/strtime.c * PURPOSE: Fills a buffer with a formatted date representation * PROGRAMER: Ariadne * UPDATE HISTORY: Modified: trunk/reactos/lib/sdk/crt/time_new/wstrtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/wstrt… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/wstrtime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/wstrtime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CRT library - * FILE: lib/msvcrt/time/strtime.c + * FILE: lib/sdk/crt/time/strtime.c * PURPOSE: Fills a buffer with a formatted time representation * PROGRAMER: Ariadne * UPDATE HISTORY: Modified: trunk/reactos/lib/sdk/crt/time_new/wutime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/wutim… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/wutime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/wutime.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/wutime.c * PURPOSE: Implementation of _wutime Modified: trunk/reactos/lib/sdk/crt/time_new/wutime32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/wutim… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/wutime32.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/wutime32.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/wutime32.c * PURPOSE: Implementation of _wutime32 Modified: trunk/reactos/lib/sdk/crt/time_new/wutime64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time_new/wutim… ============================================================================== --- trunk/reactos/lib/sdk/crt/time_new/wutime64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time_new/wutime64.c [iso-8859-1] Thu Aug 6 13:01:44 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/wutime64.c * PURPOSE: Implementation of _wutime64

15 years, 1 month

[fireball] 42416: - A leftover from a previous commit to winent.h (fixes incorrect structure names). - More work towards movable windows support: create private window data in SetWindowStyle too, make move_window_bits and WindowPosChanged more or less what they should be. New windows appear perfectly now, however moving still doesn't work.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 6 11:42:34 2009 New Revision: 42416 URL: http://svn.reactos.org/svn/reactos?rev=42416&view=rev Log: - A leftover from a previous commit to winent.h (fixes incorrect structure names). - More work towards movable windows support: create private window data in SetWindowStyle too, make move_window_bits and WindowPosChanged more or less what they should be. New windows appear perfectly now, however moving still doesn't work. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Thu Aug 6 11:42:34 2009 @@ -33,7 +33,7 @@ * * Move the window bits when a window is moved. */ -void move_window_bits( HWND hwnd, const RECT *old_rect, const RECT *new_rect, +void move_window_bits( struct ntdrv_win_data *data, const RECT *old_rect, const RECT *new_rect, const RECT *old_client_rect ) { RECT src_rect = *old_rect; @@ -42,27 +42,27 @@ HRGN rgn = 0; HWND parent = 0; - if (FALSE) - { - //OffsetRect( &dst_rect, -data->window_rect.left, -data->window_rect.top ); - parent = GetAncestor( hwnd, GA_PARENT ); + if (TRUE) + { + OffsetRect( &dst_rect, -data->window_rect.left, -data->window_rect.top ); + parent = GetAncestor( data->hwnd, GA_PARENT ); hdc_src = GetDCEx( parent, 0, DCX_CACHE ); - hdc_dst = GetDCEx( hwnd, 0, DCX_CACHE | DCX_WINDOW ); + hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE | DCX_WINDOW ); } else { - //OffsetRect( &dst_rect, -data->client_rect.left, -data->client_rect.top ); - /* make src rect relative to the old position of the window */ - OffsetRect( &src_rect, -old_client_rect->left, -old_client_rect->top ); - //if (dst_rect.left == src_rect.left && dst_rect.top == src_rect.top) return; - hdc_src = hdc_dst = GetDCEx( hwnd, 0, DCX_CACHE ); + OffsetRect( &dst_rect, -data->client_rect.left, -data->client_rect.top ); + /* make src rect relative to the old position of the window */ + OffsetRect( &src_rect, -old_client_rect->left, -old_client_rect->top ); + if (dst_rect.left == src_rect.left && dst_rect.top == src_rect.top) return; + hdc_src = hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE ); } //code = X11DRV_START_EXPOSURES; //ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); ERR( "copying bits for win %p (parent %p)/ %s -> %s\n", - hwnd, parent, + data->hwnd, parent, wine_dbgstr_rect(&src_rect), wine_dbgstr_rect(&dst_rect) ); BitBlt( hdc_dst, dst_rect.left, dst_rect.top, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, @@ -71,12 +71,20 @@ //code = X11DRV_END_EXPOSURES; //ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, sizeof(rgn), (LPSTR)&rgn ); - ReleaseDC( hwnd, hdc_dst ); + ReleaseDC( data->hwnd, hdc_dst ); if (hdc_src != hdc_dst) ReleaseDC( parent, hdc_src ); if (rgn) { - RedrawWindow( hwnd, NULL, rgn, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); + if (/*!data->whole_window*/TRUE) + { + /* map region to client rect since we are using DCX_WINDOW */ + OffsetRgn( rgn, data->window_rect.left - data->client_rect.left, + data->window_rect.top - data->client_rect.top ); + RedrawWindow( data->hwnd, NULL, rgn, + RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ALLCHILDREN ); + } + else RedrawWindow( data->hwnd, NULL, rgn, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); DeleteObject( rgn ); } } @@ -592,12 +600,17 @@ void CDECL RosDrv_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { DWORD changed; + struct ntdrv_win_data *data; if (hwnd == GetDesktopWindow()) return; changed = style->styleNew ^ style->styleOld; if (offset == GWL_STYLE && (changed & WS_VISIBLE) && (style->styleNew & WS_VISIBLE)) { + /* Create private win data if it's missing */ + if (!(data = NTDRV_get_win_data( hwnd )) && + !(data = NTDRV_create_win_data( hwnd ))) return; + /* Do some magic... */ TRACE("Window %x is being made visible\n", hwnd); } @@ -683,53 +696,42 @@ const RECT *window_rect, const RECT *rectClient, const RECT *visible_rect, const RECT *valid_rects ) { -#if 0 RECT old_whole_rect, old_client_rect; - RECT whole_rect = *visible_rect; - RECT client_rect = *rectClient; - - old_whole_rect = whole_rect; - old_client_rect = client_rect; -#endif - RECT old_whole_rect; + //RECT whole_rect = *visible_rect; + //RECT client_rect = *rectClient; struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd); - if (valid_rects) - { - TRACE("valid_rects[0] (%d, %d)-(%d,%d)\n", - valid_rects[0].top, valid_rects[0].left, valid_rects[0].bottom, valid_rects[0].right); - } - if (!data) return; - ERR("old rect %s, new rect %s\n", - wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_rect(window_rect)); - -#if 0 + old_whole_rect = data->whole_rect; + old_client_rect = data->client_rect; + data->window_rect = *window_rect; + data->whole_rect = *visible_rect; + data->client_rect = *rectClient; + if (!IsRectEmpty( &valid_rects[0] )) { - int x_offset = old_whole_rect.left - whole_rect.left; - int y_offset = old_whole_rect.top - whole_rect.top; + int x_offset = old_whole_rect.left - data->whole_rect.left; + int y_offset = old_whole_rect.top - data->whole_rect.top; /* if all that happened is that the whole window moved, copy everything */ if (!(swp_flags & SWP_FRAMECHANGED) && - old_whole_rect.right - whole_rect.right == x_offset && - old_whole_rect.bottom - whole_rect.bottom == y_offset && - old_client_rect.left - client_rect.left == x_offset && - old_client_rect.right - client_rect.right == x_offset && - old_client_rect.top - client_rect.top == y_offset && - old_client_rect.bottom - client_rect.bottom == y_offset && - !memcmp( &valid_rects[0], &client_rect, sizeof(RECT) )) + old_whole_rect.right - data->whole_rect.right == x_offset && + old_whole_rect.bottom - data->whole_rect.bottom == y_offset && + old_client_rect.left - data->client_rect.left == x_offset && + old_client_rect.right - data->client_rect.right == x_offset && + old_client_rect.top - data->client_rect.top == y_offset && + old_client_rect.bottom - data->client_rect.bottom == y_offset && + !memcmp( &valid_rects[0], &data->client_rect, sizeof(RECT) )) { - /* if we have an X window the bits will be moved by the X server */ - //if (!data->whole_window) - move_window_bits( hwnd, &old_whole_rect, &whole_rect, &old_client_rect ); + move_window_bits( data, &old_whole_rect, &data->whole_rect, &old_client_rect ); } else - move_window_bits( hwnd, &valid_rects[1], &valid_rects[0], &old_client_rect ); - } -#endif + { + move_window_bits( data, &valid_rects[1], &valid_rects[0], &old_client_rect ); + } + } } /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Thu Aug 6 11:42:34 2009 @@ -60,6 +60,6 @@ BOOL CDECL RosDrv_GetCursorPos( LPPOINT pt ); /* wnd.c */ -struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ); -struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ); +struct ntdrv_win_data *NTDRV_get_win_data( HWND hwnd ); +struct ntdrv_win_data *NTDRV_create_win_data( HWND hwnd ); void NTDRV_destroy_win_data( HWND hwnd );

15 years, 1 month

[fireball] 42415: - Add a private window data storage support associated with each window via window properties. Could be improved in the future if using SetProp/GetProp proves to be very slow (it is in wine, but not in arwinss).

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 6 10:51:18 2009 New Revision: 42415 URL: http://svn.reactos.org/svn/reactos?rev=42415&view=rev Log: - Add a private window data storage support associated with each window via window properties. Could be improved in the future if using SetProp/GetProp proves to be very slow (it is in wine, but not in arwinss). Added: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c (with props) Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Thu Aug 6 10:51:18 2009 @@ -467,7 +467,8 @@ void CDECL RosDrv_DestroyWindow( HWND hwnd ) { - UNIMPLEMENTED; + /* Destroy its window data */ + NTDRV_destroy_win_data( hwnd ); } void CDECL RosDrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *win_rect, @@ -665,7 +666,16 @@ const RECT *window_rect, const RECT *client_rect, RECT *visible_rect ) { - //UNIMPLEMENTED; + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd); + + if (!data) + { + /* create the win data if the window is being made visible */ + if (!(style & WS_VISIBLE) && !(swp_flags & SWP_SHOWWINDOW)) return; + if (!(data = NTDRV_create_win_data( hwnd ))) return; + } + *visible_rect = *window_rect; } @@ -681,12 +691,21 @@ old_whole_rect = whole_rect; old_client_rect = client_rect; #endif + RECT old_whole_rect; + + struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd); if (valid_rects) { TRACE("valid_rects[0] (%d, %d)-(%d,%d)\n", valid_rects[0].top, valid_rects[0].left, valid_rects[0].bottom, valid_rects[0].right); } + + if (!data) return; + + ERR("old rect %s, new rect %s\n", + wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_rect(window_rect)); + #if 0 if (!IsRectEmpty( &valid_rects[0] )) { Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Thu Aug 6 10:51:18 2009 @@ -29,6 +29,15 @@ int gl_copy; /* whether the GL contents need explicit copying */ }; +/* ntdrv private window data */ +struct ntdrv_win_data +{ + HWND hwnd; /* hwnd that this private data belongs to */ + RECT window_rect; /* USER window rectangle relative to parent */ + RECT whole_rect; /* X window rectangle for the whole window relative to parent */ + RECT client_rect; /* client area relative to parent */ +}; + /* font.c */ VOID FeSelectFont(NTDRV_PDEVICE *physDev, HFONT hFont); @@ -49,3 +58,8 @@ LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ); BOOL CDECL RosDrv_GetCursorPos( LPPOINT pt ); + +/* wnd.c */ +struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ); +struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ); +void NTDRV_destroy_win_data( HWND hwnd ); Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] Thu Aug 6 10:51:18 2009 @@ -10,6 +10,7 @@ <file>main.c</file> <file>userdrv.c</file> <file>mouse.c</file> + <file>wnd.c</file> <file>winent.rc</file> Added: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c (added) +++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] Thu Aug 6 10:51:18 2009 @@ -1,0 +1,119 @@ +/* + * PROJECT: ReactOS + * LICENSE: LGPL + * FILE: dll/win32/winent.drv/wnd.c + * PURPOSE: Windows related functions + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include <stdarg.h> +#include <stdio.h> +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#define NTOS_USER_MODE +#include <ndk/ntndk.h> +#include "ntrosgdi.h" +#include "winent.h" +#include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rosuserdrv); + +static const char window_data_prop[] = "__ros_nt_window_data"; + +/* FUNCTIONS **************************************************************/ + +VOID CDECL RosDrv_UpdateZOrder(HWND hwnd, RECT *rect) +{ + FIXME("hwnd %x rect (%d, %d)-(%d,%d)\n", hwnd, + rect->top, rect->left, rect->bottom, rect->right); + + SERVER_START_REQ( update_window_zorder ) + { + req->window = wine_server_user_handle( hwnd ); + req->rect.left = rect->left; + req->rect.top = rect->top; + req->rect.right = rect->right; + req->rect.bottom = rect->bottom; + wine_server_call( req ); + } + SERVER_END_REQ; +} + +/*********************************************************************** + * NTDRV_get_win_data + * + * Return the private data structure associated with a window. + */ +struct ntdrv_win_data *NTDRV_get_win_data( HWND hwnd ) +{ + struct ntdrv_win_data *data; + + if (!hwnd) return NULL; + + data = (struct ntdrv_win_data *)GetPropA( hwnd, window_data_prop ); + + return data; +} + + +/*********************************************************************** + * NTDRV_create_win_data + * + * Create a private data window structure for an existing window. + */ +struct ntdrv_win_data *NTDRV_create_win_data( HWND hwnd ) +{ + struct ntdrv_win_data *data; + HWND parent; + + if (!(parent = GetAncestor( hwnd, GA_PARENT ))) return NULL; /* desktop */ + + /* don't create win data for HWND_MESSAGE windows */ + if (parent != GetDesktopWindow() && !GetAncestor( parent, GA_PARENT )) return NULL; + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(struct ntdrv_win_data)); + if (!data) return NULL; + + /* Add it as a property to the window */ + SetPropA( hwnd, window_data_prop, (HANDLE)data ); + + GetWindowRect( hwnd, &data->window_rect ); + MapWindowPoints( 0, parent, (POINT *)&data->window_rect, 2 ); + data->whole_rect = data->window_rect; + GetClientRect( hwnd, &data->client_rect ); + MapWindowPoints( hwnd, parent, (POINT *)&data->client_rect, 2 ); + + if (parent == GetDesktopWindow()) + { + TRACE( "win %p window %s whole %s client %s\n", + hwnd, wine_dbgstr_rect( &data->window_rect ), + wine_dbgstr_rect( &data->whole_rect ), wine_dbgstr_rect( &data->client_rect )); + } + return data; +} + +/*********************************************************************** + * NTDRV_destroy_win_data + * + * Deletes a private data window structure for an existing window. + */ +void NTDRV_destroy_win_data( HWND hwnd ) +{ + struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd); + if (!data) return; + + /* Remove property */ + RemovePropA( hwnd, window_data_prop ); + + /* Free window data */ + HeapFree( GetProcessHeap(), 0, data ); +} + + +/* EOF */ Propchange: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 1 month

← Newer
1
...
53
54
55
56
57
58
59
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009