Not sure quite how these changed seeing as they're to go shortly I just want to clear my CVS for now.

svn path=/trunk/; revision=3776

reactos/include/crtdll/alloc.h

@@ -25,9 +25,9 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/04/14 07:10:15 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 

reactos/include/crtdll/assert.h

@@ -18,9 +18,9 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/04/02 21:42:06 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 

reactos/include/crtdll/conio.h

@@ -19,9 +19,9 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/04/27 06:16:04 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 

reactos/include/crtdll/dir.h

@@ -18,9 +18,9 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/04/02 21:42:06 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 
@@ -72,9 +72,9 @@ struct _finddata_t
  * _findclose calls. _findnext also returns -1 if no match could be found,
  * and 0 if a match was found. Call _findclose when you are finished.
  */
+int	_findclose (int nHandle);
 int	_findfirst (const char* szFilespec, struct _finddata_t* find);
 int	_findnext (int nHandle, struct _finddata_t* find);
-int	_findclose (int nHandle);
 
 int	_chdir (const char* szPath);
 char*	_getcwd (char* caBuffer, int nBufferSize);

reactos/include/crtdll/locale.h

@@ -19,9 +19,9 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/05/22 07:28:28 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 

reactos/include/crtdll/malloc.h

@@ -21,9 +21,9 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/04/02 21:42:06 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 

reactos/include/crtdll/math.h

@@ -18,9 +18,9 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/04/23 18:43:00 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 // added modfl 

reactos/include/crtdll/mbctype.h

@@ -37,6 +37,8 @@ extern "C" {
 
 extern char _jctype[257];
 
+
+int _ismbbkalnum( unsigned int c );
 int _ismbbkana( unsigned char c );
 
 

reactos/include/crtdll/signal.h

@@ -18,9 +18,9 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
- * $Author: rex $
+ * $Author: robd $
- * $Date: 1999/03/19 05:55:09 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 /* added some extra signal constants */

reactos/include/crtdll/stdio.h

@@ -22,9 +22,9 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
- * $Author: jean $
+ * $Author: robd $
- * $Date: 2001/01/25 18:51:26 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 /* Appropriated for Reactos Crtdll by Ariadne */
@@ -50,10 +50,14 @@ extern "C" {
 #define _IOREAD   0x000010
 #define _IOWRT    0x000020
 #define _IOMYBUF  0x000040
+
 #define _IOEOF    0x000100
 #define _IOERR    0x000200
 #define _IOSTRG   0x000400
 
+#define _IOBINARY 0x000800
+#define _IOTEXT   0x000000
+
 #define _IOAPPEND 0x002000
 #define _IORMONCL 0x004000  /* remove on close, for temp files */
 /* if _flag & _IORMONCL, ._name_to_remove needs freeing */

reactos/include/crtdll/sys/locking.h

@@ -18,9 +18,9 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/04/02 21:42:07 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 

reactos/include/crtdll/sys/stat.h

@@ -19,9 +19,9 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
- * $Author: ekohl $
+ * $Author: robd $
- * $Date: 2001/07/03 13:14:18 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 
@@ -32,9 +32,6 @@
 
 #include <crtdll/sys/types.h>
 
-#ifdef	__cplusplus
-extern "C" {
-#endif
 
 /*
  * Constants for the stat st_mode member.
@@ -89,6 +86,10 @@ struct stat
 	time_t	st_ctime;	/* Creation time */
 };
 
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
 
 int	_fstat (int nFileNo, struct stat* pstat);
 int	_chmod (const char* szPath, int nMode);

reactos/include/crtdll/sys/timeb.h

@@ -15,12 +15,12 @@
  *
  *  This code is distributed in the hope that it will be useful but
  *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warranties of
+ *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/04/02 21:42:07 $
+ * $Date: 2002/11/24 18:09:57 $
  *
  */
 
@@ -29,9 +29,6 @@
 #ifndef	_TIMEB_H_
 #define	_TIMEB_H_
 
-#ifdef	__cplusplus
-extern "C" {
-#endif
 
 /*
  * TODO: Structure not tested.
@@ -44,6 +41,10 @@ struct timeb
 	short	dstflag;
 };
 
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
 /* TODO: Not tested. */
 void	_ftime (struct timeb* timebBuffer);
 

reactos/include/crtdll/sys/types.h

@@ -15,12 +15,12 @@
  *
  *  This code is distributed in the hope that it will be useful but
  *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
+ *  DISCLAIMED. This includes but is not limited to warrenties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/04/02 21:42:07 $
+ * $Date: 2002/11/24 18:09:57 $
  *
  */
 

reactos/include/crtdll/sys/utime.h

@@ -15,12 +15,12 @@
  *
  *  This code is distributed in the hope that it will be useful but
  *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warranties of
+ *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
- * $Author: ekohl $
+ * $Author: robd $
- * $Date: 2001/07/03 13:14:18 $
+ * $Date: 2002/11/24 18:09:57 $
  *
  */
 
@@ -34,9 +34,6 @@
 #include <crtdll/stddef.h>
 #include <crtdll/sys/types.h>
 
-#ifdef	__cplusplus
-extern "C" {
-#endif
 
 /*
  * Structure used by _utime function.
@@ -47,11 +44,6 @@ struct _utimbuf
 	time_t	modtime;	/* Modification time */
 };
 
-int	_utime (const char* szFileName, struct _utimbuf* pTimes);
-int     _futime (int nHandle, struct _utimbuf *pTimes);
-
-/* Wide character version */
-int     _wutime (const wchar_t *szFileName, struct _utimbuf *times);
 
 #ifndef	_NO_OLDNAMES
 
@@ -61,9 +53,22 @@ struct utimbuf
 	time_t	actime;
 	time_t	modtime;
 };
+#endif	/* Not _NO_OLDNAMES */
 
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+int	_utime (const char* szFileName, struct _utimbuf* pTimes);
+int _futime (int nHandle, struct _utimbuf *pTimes);
+
+/* The wide character version, only available for MSVCRT versions of the
+ * C runtime library. */
+int     _wutime (const wchar_t *szFileName, struct _utimbuf *times);
+
+
+#ifndef	_NO_OLDNAMES
 int	utime (const char* szFileName, struct utimbuf* pTimes);
-
 #endif	/* Not _NO_OLDNAMES */
 
 

reactos/include/crtdll/time.h

@@ -15,12 +15,12 @@
  *
  *  This code is distributed in the hope that it will be useful but
  *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warranties of
+ *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/04/02 21:42:06 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 /* Appropriated for Reactos Crtdll by Ariadne */
@@ -31,9 +31,6 @@
 #define __need_size_t
 #include <crtdll/stddef.h>
 
-#ifdef	__cplusplus
-extern "C" {
-#endif
 
 /*
  * Number of clock ticks per second. A clock tick is the unit by which
@@ -42,13 +39,6 @@ extern "C" {
 #define	CLOCKS_PER_SEC	1000.0
 #define	CLK_TICK	CLOCKS_PER_SEC
 
-/*
- * A type for measuring processor time (in clock ticks).
- */
-#ifndef _CLOCK_T_
-#define _CLOCK_T_
-typedef	long	clock_t;
-#endif
 
 /*
  * Need a definition of time_t.
@@ -61,34 +51,46 @@ typedef	long	clock_t;
  * NOTE: Normally this is defined by the above include of sys/types.h
  */
 #ifndef _TIME_T_
-#define _TIME_T_
 typedef	long	time_t;
+#define _TIME_T_
+#endif
+
+/*
+ * A type for measuring processor time (in clock ticks).
+ */
+#ifndef _CLOCK_T_
+typedef	long	clock_t;
+#define _CLOCK_T_
 #endif
 
 /*
  * A structure for storing all kinds of useful information about the
  * current (or another) time.
  */
-struct tm {
+struct tm
-  int tm_sec;
+{
-  int tm_min;
+	int	tm_sec;		/* Seconds: 0-59 (K&R says 0-61?) */
-  int tm_hour;
+	int	tm_min;		/* Minutes: 0-59 */
-  int tm_mday;
+	int	tm_hour;	/* Hours since midnight: 0-23 */
-  int tm_mon;
+	int	tm_mday;	/* Day of the month: 1-31 */
-  int tm_year;
+	int	tm_mon;		/* Months *since* january: 0-11 */
-  int tm_wday;
+	int	tm_year;	/* Years since 1900 */
-  int tm_yday;
+	int	tm_wday;	/* Days since Sunday (0-6) */
-  int tm_isdst;
+	int	tm_yday;	/* Days since Jan. 1: 0-365 */
-  char *tm_zone;
+	int	tm_isdst;	/* +1 Daylight Savings Time, 0 No DST,
-  int tm_gmtoff;
+				 * -1 don't know */
+    char *tm_zone;
+    int tm_gmtoff;
 };
 
-
+#ifdef	__cplusplus
+extern "C" {
+#endif
 
 clock_t	clock (void);
-time_t	time (time_t* tp);
+time_t	time (time_t*);
-double	difftime (time_t t2, time_t t1);
+double	difftime (time_t, time_t);
-time_t	mktime (struct tm* tmsp);
+time_t	mktime (struct tm*);
 
 /*
  * These functions write to and return pointers to static buffers that may
@@ -100,20 +102,19 @@ time_t	mktime (struct tm* tmsp);
  * Fault and crap out your program. Guess how I know. Hint: stat called on
  * a directory gives 'invalid' times in st_atime etc...
  */
-char*		asctime (const struct tm* tmsp);
+char*		asctime (const struct tm*);
-char*		ctime (const time_t* tp);
+char*		ctime (const time_t*);
-struct tm*	gmtime (const time_t* tm);
+struct tm*	gmtime (const time_t*);
-struct tm*	localtime (const time_t* tm);
+struct tm*	localtime (const time_t*);
 
 
-size_t	strftime (char* caBuffer, size_t sizeMax, const char* szFormat,
+size_t	strftime (char*, size_t, const char*, const struct tm*);
-		  const struct tm* tpPrint);
 
-size_t	wcsftime (wchar_t* wcaBuffer, size_t sizeMax,
+size_t	wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*);
-		  const wchar_t* wsFormat, const struct tm* tpPrint);
 
 #ifdef	__cplusplus
 }
 #endif
 
-#endif
+#endif	/* Not _TIME_H_ */
+

reactos/include/crtdll/wchar.h

@@ -15,18 +15,26 @@
  *
  *  This code is distributed in the hope that it will be useful but
  *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warranties of
+ *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
- * $Author: ariadne $
+ * $Author: robd $
- * $Date: 1999/04/02 21:42:06 $
+ * $Date: 2002/11/24 18:09:56 $
  *
  */
 
+#ifndef	_WCHAR_H_
+#define	_WCHAR_H_
+
+
 #include <crtdll/ctype.h>
 #include <crtdll/stdio.h>
 #include <crtdll/stdlib.h>
 #include <crtdll/string.h>
 #include <crtdll/time.h>
 
+#endif /* not _WCHAR_H_ */
+
+
+