-Merge license change from AMD64 branch (r42414)

-Adjust the return value of mktime by the chosen timezone after normalizing

svn path=/trunk/; revision=42417

reactos/lib/sdk/crt/time_new/asctime.c

@@ -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()

reactos/lib/sdk/crt/time_new/bitsfixup.h

@@ -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

reactos/lib/sdk/crt/time_new/clock.c

@@ -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()

reactos/lib/sdk/crt/time_new/ctime.c

@@ -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

reactos/lib/sdk/crt/time_new/ctime32.c

@@ -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()

reactos/lib/sdk/crt/time_new/ctime64.c

@@ -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

reactos/lib/sdk/crt/time_new/difftime.c

@@ -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

reactos/lib/sdk/crt/time_new/difftime32.c

@@ -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

reactos/lib/sdk/crt/time_new/difftime64.c

@@ -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

reactos/lib/sdk/crt/time_new/ftime.c

@@ -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

reactos/lib/sdk/crt/time_new/ftime32.c

@@ -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

reactos/lib/sdk/crt/time_new/ftime64.c

@@ -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

reactos/lib/sdk/crt/time_new/futime.c

@@ -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

reactos/lib/sdk/crt/time_new/futime32.c

@@ -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

reactos/lib/sdk/crt/time_new/futime64.c

@@ -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

reactos/lib/sdk/crt/time_new/gmtime.c

@@ -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

reactos/lib/sdk/crt/time_new/localtime.c

@@ -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

reactos/lib/sdk/crt/time_new/localtime32.c

@@ -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

reactos/lib/sdk/crt/time_new/localtime64.c

@@ -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

reactos/lib/sdk/crt/time_new/mktime.c

@@ -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 @@ mktime_worker(struct tm * ptm, int utc)
     }
     *ptm = *ptm2;
 
+    /* Finally adjust by the difference to GMT in seconds */
+    time += _timezone;
+
     return time;
 }
 

reactos/lib/sdk/crt/time_new/strdate.c

@@ -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:

reactos/lib/sdk/crt/time_new/strftime.c

@@ -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>
 

reactos/lib/sdk/crt/time_new/strtime.c

@@ -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:

reactos/lib/sdk/crt/time_new/time.c

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

reactos/lib/sdk/crt/time_new/time32.c

@@ -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"

reactos/lib/sdk/crt/time_new/time64.c

@@ -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"

reactos/lib/sdk/crt/time_new/timezone.c

@@ -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

reactos/lib/sdk/crt/time_new/tzname.c

@@ -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

reactos/lib/sdk/crt/time_new/utime.c

@@ -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

reactos/lib/sdk/crt/time_new/utime32.c

@@ -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

reactos/lib/sdk/crt/time_new/utime64.c

@@ -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

reactos/lib/sdk/crt/time_new/wasctime.c

@@ -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

reactos/lib/sdk/crt/time_new/wcsftime.c

@@ -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

reactos/lib/sdk/crt/time_new/wctime.c

@@ -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

reactos/lib/sdk/crt/time_new/wctime32.c

@@ -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

reactos/lib/sdk/crt/time_new/wctime64.c

@@ -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

reactos/lib/sdk/crt/time_new/wstrdate.c

@@ -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:

reactos/lib/sdk/crt/time_new/wstrtime.c

@@ -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:

reactos/lib/sdk/crt/time_new/wutime.c

@@ -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

reactos/lib/sdk/crt/time_new/wutime32.c

@@ -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

reactos/lib/sdk/crt/time_new/wutime64.c

@@ -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