Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

by gdalsnes＠svn.reactos.com

crt: -use native mingw headers and not private copies of them tchar.h: -added lotsa missin stuff Deleted: trunk/reactos/include/msvcrt/alloc.h Deleted: trunk/reactos/include/msvcrt/assert.h Deleted: trunk/reactos/include/msvcrt/conio.h Deleted: trunk/reactos/include/msvcrt/ctype.h Deleted: trunk/reactos/include/msvcrt/dir.h Deleted: trunk/reactos/include/msvcrt/direct.h Deleted: trunk/reactos/include/msvcrt/errno.h Deleted: trunk/reactos/include/msvcrt/fcntl.h Deleted: trunk/reactos/include/msvcrt/float.h Deleted: trunk/reactos/include/msvcrt/internal/ Deleted: trunk/reactos/include/msvcrt/io.h Deleted: trunk/reactos/include/msvcrt/locale.h Deleted: trunk/reactos/include/msvcrt/malloc.h Deleted: trunk/reactos/include/msvcrt/math.h Deleted: trunk/reactos/include/msvcrt/mbctype.h Deleted: trunk/reactos/include/msvcrt/mbstring.h Deleted: trunk/reactos/include/msvcrt/msvcrtdbg.h Deleted: trunk/reactos/include/msvcrt/process.h Deleted: trunk/reactos/include/msvcrt/search.h Deleted: trunk/reactos/include/msvcrt/share.h Deleted: trunk/reactos/include/msvcrt/signal.h Deleted: trunk/reactos/include/msvcrt/stdarg.h Deleted: trunk/reactos/include/msvcrt/stddef.h Deleted: trunk/reactos/include/msvcrt/stdio.h Deleted: trunk/reactos/include/msvcrt/stdlib.h Deleted: trunk/reactos/include/msvcrt/string.h Deleted: trunk/reactos/include/msvcrt/sys/ Deleted: trunk/reactos/include/msvcrt/time.h Deleted: trunk/reactos/include/msvcrt/wchar.h Deleted: trunk/reactos/include/msvcrt/wine/ Modified: trunk/reactos/include/tchar.h _____ Deleted: trunk/reactos/include/msvcrt/alloc.h --- trunk/reactos/include/msvcrt/alloc.h 2005-02-16 21:59:00 UTC (rev 13605) +++ trunk/reactos/include/msvcrt/alloc.h 2005-02-16 22:22:42 UTC (rev 13606) @@ -1,86 +0,0 @@ -/* - * alloc.h - * - * Memory management functions. Because most of these functions are - * actually declared in stdlib.h I have decided to simply include that - * header file. This file is included by malloc.h. My head hurts... - * - * NOTE: In the version of the Standard C++ Library from Cygnus there - * is also an alloc.h which needs to be on your include path. Most of - * the time I think the most sensible option would be to get rid of - * this file. - * - * This file is part of the Mingw32 package. - * - * Contributors: - * Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision: 1.5 $ - * $Author$ - * $Date$ - * - */ - -#ifndef __STRICT_ANSI__ - -#ifndef _ALLOC_H_ -#define _ALLOC_H_ - -#include <msvcrt/stdlib.h> - -#ifndef RC_INVOKED - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * The structure used to walk through the heap with _heapwalk. - * TODO: This is a guess at the internals of this structure. - */ -typedef struct _heapinfo -{ - void* ptr; - unsigned int size; - int in_use; -} _HEAPINFO; - -int _heapwalk(_HEAPINFO* pHeapinfo); - -#ifdef __GNUC__ -#ifdef USE_C_ALLOCA -void* C_alloca(size_t size); -#define _alloca(x) C_alloca(x) -#else /* USE_C_ALLOCA */ -#define _alloca(x) __builtin_alloca(x) -#endif /* USE_C_ALLOCA */ -#else /* __GNUC__ */ -void* _alloca(size_t size); -#endif /* __GNUC__ */ - - -#ifndef _NO_OLDNAMES -#define heapwalk(x) _heapwalk(x) -#define alloca(s) _alloca(s) -#endif /* Not _NO_OLDNAMES */ - -#ifdef __cplusplus -} -#endif - -#endif /* Not RC_INVOKED */ - -#endif /* Not _ALLOC_H_ */ - -#endif /* Not __STRICT_ANSI__ */ - _____ Deleted: trunk/reactos/include/msvcrt/assert.h --- trunk/reactos/include/msvcrt/assert.h 2005-02-16 21:59:00 UTC (rev 13605) +++ trunk/reactos/include/msvcrt/assert.h 2005-02-16 22:22:42 UTC (rev 13606) @@ -1,69 +0,0 @@ -/* - * assert.h - * - * Define the assert macro for debug output. - * - * This file is part of the Mingw32 package. - * - * Contributors: - * Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision: 1.4 $ - * $Author$ - * $Date$ - * - */ - -#ifndef _ASSERT_H_ -#define _ASSERT_H_ - - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef NDEBUG - -/* - * If not debugging, assert does nothing. - */ -#define assert(x) ((void)0) - -#else /* debugging enabled */ - -/* - * CRTDLL nicely supplies a function which does the actual output and - * call to abort. - */ -#ifndef __ATTRIB_NORETURN -#ifdef __GNUC__ -#define _ATTRIB_NORETURN __attribute__ ((noreturn)) -#else /* Not __GNUC__ */ -#define _ATTRIB_NORETURN -#endif /* __GNUC__ */ -#endif - -void _assert(const char* szExpression, const char* szFileName, int nLine) _ATTRIB_NORETURN; - -/* - * Definition of the assert macro. - */ -#define assert(x) if(!(x)) _assert( #x , __FILE__, __LINE__); -#endif /* NDEBUG */ - -#ifdef __cplusplus -} -#endif - -#endif /* Not _ASSERT_H_ */ - _____ Deleted: trunk/reactos/include/msvcrt/conio.h --- trunk/reactos/include/msvcrt/conio.h 2005-02-16 21:59:00 UTC (rev 13605) +++ trunk/reactos/include/msvcrt/conio.h 2005-02-16 22:22:42 UTC (rev 13606) @@ -1,63 +0,0 @@ -/* - * conio.h - * - * Low level console I/O functions. Pretty please try to use the ANSI - * standard ones if you are writing new code. - * - * This file is part of the Mingw32 package. - * - * Contributors: - * Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision: 1.4 $ - * $Author$ - * $Date$ - * - */ - -#ifndef __STRICT_ANSI__ - -#ifndef _CONIO_H_ -#define _CONIO_H_ - -#ifdef __cplusplus -extern "C" { -#endif - - -char* _cgets(char*); -int _cprintf(const char*, ...); -int _cputs(const char*); -int _cscanf(char*, ...); -int _getch(void); -int _getche(void); -int _kbhit(void); -int _putch(int); -int _ungetch(int); - -#ifndef _NO_OLDNAMES -#define getch _getch -#define getche _getche -#define kbhit _kbhit -#define putch(cPut) _putch(cPut) -#define ungetch(cUnget) _ungetch(cUnget) -#endif /* Not _NO_OLDNAMES */ - - -#ifdef __cplusplus -} -#endif - -#endif /* Not _CONIO_H_ */ - -#endif /* Not __STRICT_ANSI__ */ _____ Deleted: trunk/reactos/include/msvcrt/ctype.h --- trunk/reactos/include/msvcrt/ctype.h 2005-02-16 21:59:00 UTC (rev 13605) +++ trunk/reactos/include/msvcrt/ctype.h 2005-02-16 22:22:42 UTC (rev 13606) @@ -1,146 +0,0 @@ -/* - * ctype.h - * - * Functions for testing character types and converting characters. - * - * This file is part of the Mingw32 package. - * - * Contributors: - * Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision: 1.10 $ - * $Author$ - * $Date$ - * - */ - -#ifndef _CTYPE_H_ -#define _CTYPE_H_ - -#define __need_wchar_t -#define __need_wint_t -#include <msvcrt/stddef.h> - - -/* - * The following flags are used to tell iswctype and _isctype what character - * types you are looking for. - */ -#define _UPPER 0x0001 -#define _LOWER 0x0002 -#define _DIGIT 0x0004 -#define _SPACE 0x0008 /* HT LF VT FF CR SP */ -#define _PUNCT 0x0010 -#define _CONTROL 0x0020 -#define _BLANK 0x0040 /* this is SP only, not SP and HT as in C99 */ -#define _HEX 0x0080 -#define _LEADBYTE 0x8000 - -#define _ALPHA 0x0103 - - -#ifdef __cplusplus -extern "C" { -#endif - -int isalnum(int); -int isalpha(int); -int iscntrl(int); -int isdigit(int); -int isgraph(int); -int islower(int); -int isprint(int); -int ispunct(int); -int isspace(int); -int isupper(int); -int isxdigit(int); - -#ifndef __STRICT_ANSI__ -int _isctype (unsigned int, int); -#endif - -/* These are the ANSI versions, with correct checking of argument */ -int tolower(int); -int toupper(int); - -/* - * NOTE: The above are not old name type wrappers, but functions exported - * explicitly by MSVCRT/CRTDLL. However, underscored versions are also - * exported. - */ -#ifndef __STRICT_ANSI__ -/* - * These are the cheap non-std versions: The return values are undefined - * if the argument is not ASCII char or is not of appropriate case - */ -int _tolower(int); -int _toupper(int); -#endif - -/* - * TODO: MB_CUR_MAX should be defined here (if not already defined, since - * it should also be defined in stdlib.h). It is supposed to be the - * maximum number of bytes in a multi-byte character in the current - * locale. Perhaps accessible through the __mb_curr_max_dll entry point, - * but I think (again) that that is a variable pointer, which leads to - * problems under the current Cygwin compiler distribution. - */ - -typedef int wctype_t; - - -/* Wide character equivalents */ -#ifndef WEOF -#define WEOF (wchar_t)(0xFFFF) -#endif - -int iswalnum(wint_t); -int iswalpha(wint_t); -int iswascii(wint_t); -int iswcntrl(wint_t); -int iswctype(wint_t, wctype_t); -int is_wctype(wint_t, wctype_t); /* Obsolete! */ -int iswdigit(wint_t); -int iswgraph(wint_t); -int iswlower(wint_t); -int iswprint(wint_t); -int iswpunct(wint_t); -int iswspace(wint_t); -int iswupper(wint_t); -int iswxdigit(wint_t); - -wchar_t towlower(wchar_t); -wchar_t towupper(wchar_t); - -int isleadbyte(int); - -#ifndef __STRICT_ANSI__ -int __isascii(int); -int __toascii(int); -int __iscsymf(int); /* Valid first character in C symbol */ -int __iscsym(int); /* Valid character in C symbol (after first) */ - -#ifndef _NO_OLDNAMES -#define isascii(c) __isascii(c) -#define toascii(c) _toascii(c) -#define iscsymf(c) __iscsymf(c) -#define iscsym(c) __iscsym(c) -#endif /* Not _NO_OLDNAMES */ - -#endif /* Not __STRICT_ANSI__ */ - -#ifdef __cplusplus -} -#endif - -#endif /* Not _CTYPE_H_ */ _____ Deleted: trunk/reactos/include/msvcrt/dir.h --- trunk/reactos/include/msvcrt/dir.h 2005-02-16 21:59:00 UTC (rev 13605) +++ trunk/reactos/include/msvcrt/dir.h 2005-02-16 22:22:42 UTC (rev 13606) @@ -1,149 +0,0 @@ -/* - * dir.h - * - * Functions for working with directories and path names. - * This file OBSOLESCENT and only provided for backward compatibility. - * Please use io.h instead. - * - * This file is part of the Mingw32 package. - * - * Contributors: - * Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision: 1.6 $ - * $Author$ - * $Date$ - * - */ - -#ifndef __STRICT_ANSI__ - -#ifndef _DIR_H_ -#define _DIR_H_ - -#include <msvcrt/stdio.h> /* To get FILENAME_MAX... ugly. */ -#include <msvcrt/sys/types.h> /* To get time_t. */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * Attributes of files as returned by _findfirst et al. - */ -#define _A_NORMAL 0x00000000 -#define _A_RDONLY 0x00000001 -#define _A_HIDDEN 0x00000002 -#define _A_SYSTEM 0x00000004 -#define _A_VOLID 0x00000008 -#define _A_SUBDIR 0x00000010 -#define _A_ARCH 0x00000020 - -#ifndef _FSIZE_T_DEFINED -typedef unsigned long _fsize_t; -#define _FSIZE_T_DEFINED -#endif - -/* - * The following structures are filled in by _findfirst or _findnext when - * they succeed in finding a match. - */ -struct _finddata_t -{ - unsigned attrib; /* Attributes, see constants above. */ - time_t time_create; - time_t time_access; /* always midnight local time */ - time_t time_write; - _fsize_t size; - char name[FILENAME_MAX]; /* may include spaces. */ -}; - -struct _finddatai64_t -{ - unsigned attrib; /* Attributes, see constants above. */ - time_t time_create; - time_t time_access; /* always midnight local time */ - time_t time_write; - __int64 size; - char name[FILENAME_MAX]; /* may include spaces. */ -}; - -struct _wfinddata_t -{ - unsigned attrib; /* Attributes, see constants above. */ - time_t time_create; - time_t time_access; /* always midnight local time */ - time_t time_write; - _fsize_t size; - wchar_t name[FILENAME_MAX]; /* may include spaces. */ -}; - -struct _wfinddatai64_t -{ - unsigned attrib; /* Attributes, see constants above. */ - time_t time_create; - time_t time_access; /* always midnight local time */ - time_t time_write; - __int64 size; - wchar_t name[FILENAME_MAX]; /* may include spaces. */ -}; - -/* - * Functions for searching for files. _findfirst returns -1 if no match - * is found. Otherwise it returns a handle to be used in _findnext and - * _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 _findfirsti64(const char* szFilespec, struct _finddatai64_t* find); -int _findnexti64(int nHandle, struct _finddatai64_t* find); -/* Wide character versions */ -int _wfindfirst(const wchar_t *_name, struct _wfinddata_t *result); -int _wfindfirsti64(const wchar_t *_name, struct _wfinddatai64_t *result); -int _wfindnext(int handle, struct _wfinddata_t *result); -int _wfindnexti64(int handle, struct _wfinddatai64_t *result); - -int _chdir(const char* szPath); -char* _getcwd(char* caBuffer, int nBufferSize); -int _mkdir(const char* szPath); -char* _mktemp(char* szTemplate); -int _rmdir(const char* szPath); - -/* Wide character versions */ -int _wchdir(const wchar_t *szPath); -wchar_t* _wgetcwd(wchar_t *buffer, int maxlen); -int _wmkdir(const wchar_t *_path); -wchar_t* _wmktemp(wchar_t *_template); -int _wrmdir(const wchar_t *_path); - - -#ifndef _NO_OLDNAMES - -int chdir(const char* szPath); -char* getcwd(char* caBuffer, int nBufferSize); -int mkdir(const char* szPath); -char* mktemp(char* szTemplate); -int rmdir(const char* szPath); - -#endif /* Not _NO_OLDNAMES */ - - -#ifdef __cplusplus -} -#endif - -#endif /* Not _DIR_H_ */ - -#endif /* Not __STRICT_ANSI__ */ _____ Deleted: trunk/reactos/include/msvcrt/direct.h --- trunk/reactos/include/msvcrt/direct.h 2005-02-16 21:59:00 UTC (rev 13605) +++ trunk/reactos/include/msvcrt/direct.h 2005-02-16 22:22:42 UTC (rev 13606) @@ -1,81 +0,0 @@ -/* - * direct.h - * - * Functions for manipulating paths and directories (included from io.h) - * plus functions for setting the current drive. - * - * This file is part of the Mingw32 package. - * - * Contributors: - * Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision: 1.4 $ - * $Author$ - * $Date$ - * - */ - -#ifndef _DIRECT_H_ -#define _DIRECT_H_ - -#ifndef _WCHAR_T_ -typedef unsigned short wchar_t; -#define _WCHAR_T_ -#endif - -#ifndef _SIZE_T_ -typedef unsigned int size_t; -#define _SIZE_T_ -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -struct _diskfree_t { - unsigned short total_clusters; - unsigned short avail_clusters; - unsigned short sectors_per_cluster; - unsigned short bytes_per_sector; -}; - -int _getdrive(void); -int _chdrive(int); -char* _getcwd(char*, int); - -unsigned int _getdiskfree(unsigned int, struct _diskfree_t*); - -int _chdir(const char*); -int _mkdir(const char*); -int _rmdir(const char*); - -#define chdir _chdir -#define getcwd _getcwd -#define mkdir _mkdir -#define rmdir _rmdir - -char* _getdcwd(int nDrive, char* caBuffer, int nBufLen); - -wchar_t* _wgetcwd(wchar_t *buffer, int maxlen); -wchar_t* _wgetdcwd(int nDrive, wchar_t* caBuffer, int nBufLen); - -int _wchdir(const wchar_t* _path); -int _wmkdir(const wchar_t* _path); -int _wrmdir(const wchar_t* _path); - -#ifdef __cplusplus -} -#endif - -#endif /* Not _DIRECT_H_ */ - _____ Deleted: trunk/reactos/include/msvcrt/errno.h --- trunk/reactos/include/msvcrt/errno.h 2005-02-16 21:59:00 UTC (rev 13605) +++ trunk/reactos/include/msvcrt/errno.h 2005-02-16 22:22:42 UTC (rev 13606) @@ -1,120 +0,0 @@ -/* - * errno.h - * - * Error numbers and access to error reporting. - * - * This file is part of the Mingw32 package. - * - * Contributors: - * Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision: 1.7 $ - * $Author$ - * $Date$ - * - */ - -#ifndef _ERRNO_H_ -#define _ERRNO_H_ - -/* - * Error numbers. - * TODO: Can't be sure of some of these assignments, I guessed from the - * names given by strerror and the defines in the Cygnus errno.h. A lot - * of the names from the Cygnus errno.h are not represented, and a few - * of the descriptions returned by strerror do not obviously match - * their error naming. - */ -#define EPERM 1 /* Operation not permitted */ -#define ENOFILE 2 /* No such file or directory */ -#define ENOENT 2 -#define ESRCH 3 /* No such process */ -#define EINTR 4 /* Interrupted function call */ -#define EIO 5 /* Input/output error */ -#define ENXIO 6 /* No such device or address */ -#define E2BIG 7 /* Arg list too long */ -#define ENOEXEC 8 /* Exec format error */ -#define EBADF 9 /* Bad file descriptor */ -#define ECHILD 10 /* No child processes */ -#define EAGAIN 11 /* Resource temporarily unavailable */ -#define ENOMEM 12 /* Not enough space */ -#define EACCES 13 /* Permission denied */ -#define EFAULT 14 /* Bad address */ -/* 15 - Unknown Error */ -#define EBUSY 16 /* strerror reports "Resource device" */ -#define EEXIST 17 /* File exists */ -#define EXDEV 18 /* Improper link (cross-device link?) */ -#define ENODEV 19 /* No such device */ -#define ENOTDIR 20 /* Not a directory */ -#define EISDIR 21 /* Is a directory */ -#define EINVAL 22 /* Invalid argument */ -#define ENFILE 23 /* Too many open files in system */ -#define EMFILE 24 /* Too many open files */ -#define ENOTTY 25 /* Inappropriate I/O control operation */ -/* 26 - Unknown Error */ -#define EFBIG 27 /* File too large */ -#define ENOSPC 28 /* No space left on device */ -#define ESPIPE 29 /* Invalid seek (seek on a pipe?) */ -#define EROFS 30 /* Read-only file system */ -#define EMLINK 31 /* Too many links */ -#define EPIPE 32 /* Broken pipe */ -#define EDOM 33 /* Domain error (math functions) */ -#define ERANGE 34 /* Result too large (possibly too small) */ -/* 35 - Unknown Error */ -#define EDEADLOCK 36 /* Resource deadlock avoided (non-Cyg) */ -#define EDEADLK 36 -/* 37 - Unknown Error */ -#define ENAMETOOLONG 38 /* Filename too long (91 in Cyg?) */ -#define ENOLCK 39 /* No locks available (46 in Cyg?) */ -#define ENOSYS 40 /* Function not implemented (88 in Cyg?) */ -#define ENOTEMPTY 41 /* Directory not empty (90 in Cyg?) */ -#define EILSEQ 42 /* Illegal byte sequence */ - -/* - * NOTE: ENAMETOOLONG and ENOTEMPTY conflict with definitions in the - * sockets.h header provided with windows32api-0.1.2. - * You should go and put an #if 0 ... #endif around the whole block - * of errors (look at the comment above them). - */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * Definitions of macros for the 'variables' errno, _doserrno, sys_nerr and - * sys_errlist. - */ -int* _errno(void); -#define errno (*_errno()) - -int* __doserrno(void); -#define _doserrno (*__doserrno()) - -/* One of the MSVCRTxx libraries */ - -extern int* __imp__sys_nerr; -#ifndef sys_nerr -#define sys_nerr (*__imp__sys_nerr) -#endif - -extern char** __imp__sys_errlist; -#ifndef sys_errlist -#define sys_errlist (__imp__sys_errlist) -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* Not _ERRNO_H_ */ _____ Deleted: trunk/reactos/include/msvcrt/fcntl.h --- trunk/reactos/include/msvcrt/fcntl.h 2005-02-16 21:59:00 UTC (rev 13605) +++ trunk/reactos/include/msvcrt/fcntl.h 2005-02-16 22:22:42 UTC (rev 13606) @@ -1,130 +0,0 @@ -/* - * fcntl.h - * - * Access constants for _open. Note that the permissions constants are - * in sys/stat.h (ick). - * - * This code is part of the Mingw32 package. - * - * Contributors: - * Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision: 1.6 $ - * $Author$ - * $Date$ - * - */ -/* Appropriated for Reactos Crtdll by Ariadne */ -/* added _O_RANDOM_O_SEQUENTIAL _O_SHORT_LIVED*/ -/* changed fmode_dll */ - -#ifndef _FCNTL_H_ -#define _FCNTL_H_ - -/* - * It appears that fcntl.h should include io.h for compatibility... - */ -#include <msvcrt/io.h> - -/* - * This variable determines the default file mode. - * TODO: Which flags work? - */ -#if 0 -#ifdef __MSVCRT__ // || _MSVCRT_LIB_ -extern unsigned int* __imp__fmode; -#define _fmode (*__imp__fmode) -#else -/* CRTDLL */ -extern unsigned int* _fmode_dll; -#define _fmode (*_fmode_dll) -#endif -#endif /* 0 */ - -/* - * NOTE: This is the correct definition to build crtdll. - * It is NOT valid outside of crtdll. - */ -extern unsigned int* _fmode_dll; -#ifndef __USE_W32API -extern unsigned int _fmode; -#endif - -/* Specifiy one of these flags to define the access mode. */ -#define _O_RDONLY 0 -#define _O_WRONLY 1 -#define _O_RDWR 2 - -/* Mask for access mode bits in the _open flags. */ -#define _O_ACCMODE (O_RDONLY|O_WRONLY|O_RDWR) - -#define _O_APPEND 0x0008 /* Writes will add to the end of the file. */ -#define _O_RANDOM 0x0010 -#define _O_SEQUENTIAL _O_RANDOM -#define _O_TEMPORARY 0x0040 /* Make the file dissappear after closing. - * WARNING: Even if not created by _open! */ -#define _O_NOINHERIT 0x0080 - -#define _O_CREAT 0x0100 /* Create the file if it does not exist. */ -#define _O_TRUNC 0x0200 /* Truncate the file if it does exist. */ -#define _O_EXCL 0x0400 /* Open only if the file does not exist. */ - -#define _O_SHORT_LIVED 0x1000 - -/* NOTE: Text is the default even if the given _O_TEXT bit is not on. */ -#define _O_TEXT 0x4000 /* CR-LF in file becomes LF in memory. */ -#define _O_BINARY 0x8000 /* Input and output is not translated. */ -#define _O_RAW _O_BINARY - - -#ifndef __STRICT_ANSI__ -#ifndef _NO_OLDNAMES - -/* POSIX/Non-ANSI names for increased portability */ -#define O_RDONLY _O_RDONLY -#define O_WRONLY _O_WRONLY -#define O_RDWR _O_RDWR -#define O_ACCMODE _O_ACCMODE -#define O_APPEND _O_APPEND -#define O_CREAT _O_CREAT -#define O_TRUNC _O_TRUNC -#define O_EXCL _O_EXCL -#define O_TEXT _O_TEXT -#define O_BINARY _O_BINARY -#define O_TEMPORARY _O_TEMPORARY -#define O_NOINHERIT _O_NOINHERIT - -#define O_RANDOM _O_RANDOM -#define O_SEQUENTIAL _O_RANDOM -#define O_SHORT_LIVED _O_SHORT_LIVED - -#endif /* Not _NO_OLDNAMES */ - -#ifdef __cplusplus -extern "C" { -#endif - -int _setmode (int, int); - -#ifndef _NO_OLDNAMES -int setmode (int, int); -#endif /* Not _NO_OLDNAMES */ - -#ifdef __cplusplus -} -#endif - -#endif /* Not __STRICT_ANSI__ */ - -#endif /* Not _FCNTL_H_ */ - _____ Deleted: trunk/reactos/include/msvcrt/float.h --- trunk/reactos/include/msvcrt/float.h 2005-02-16 21:59:00 UTC (rev 13605) +++ trunk/reactos/include/msvcrt/float.h 2005-02-16 22:22:42 UTC (rev 13606) @@ -1,214 +0,0 @@ -/* - * float.h - * - * Constants related to floating point arithmetic. - * - * Also included here are some non-ANSI bits for accessing the floating - * point controller. - * - * NOTE: GCC provides float.h, and it is probably more accurate than this, - * but it doesn't include the non-standard stuff for accessing the - * fp controller. (TODO: Move those bits elsewhere?) Thus it is - * probably not a good idea to use the GCC supplied version instead - * of this header. - * - * This file is part of the Mingw32 package. - * - * Contributors: - * Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * $Revision: 1.5 $ - * $Author$ - * $Date$ - * - */ - -#ifndef _FLOAT_H_ -#define _FLOAT_H_ - - -#define FLT_ROUNDS 1 -#define FLT_GUARD 1 -#define FLT_NORMALIZE 1 - -/* - * The characteristics of float. - */ - -/* The radix for floating point representation. */ -#define FLT_RADIX 2 - -/* Decimal digits of precision. */ -#define FLT_DIG 6 - -/* Smallest number such that 1+x != 1 */ -#define FLT_EPSILON 1.19209290e-07F - -/* The number of base FLT_RADIX digits in the mantissa. */ -#define FLT_MANT_DIG 24 - -/* The maximum floating point number. */ -#define FLT_MAX 3.40282347e+38F - -/* Maximum n such that FLT_RADIX^n - 1 is representable. */ -#define FLT_MAX_EXP 128 - -/* Maximum n such that 10^n is representable. */ -#define FLT_MAX_10_EXP 38 - -/* Minimum normalized floating-point number. */ -#define FLT_MIN 1.17549435e-38F - -/* Minimum n such that FLT_RADIX^n is a normalized number. */ -#define FLT_MIN_EXP (-125) - -/* Minimum n such that 10^n is a normalized number. */ -#define FLT_MIN_10_EXP (-37) - - -/* - * The characteristics of double. - */ -#define DBL_DIG 15 -#define DBL_EPSILON 1.1102230246251568e-16 -#define DBL_MANT_DIG 53 -#define DBL_MAX 1.7976931348623157e+308 -#define DBL_MAX_EXP 1024 -#define DBL_MAX_10_EXP 308 -#define DBL_MIN 2.2250738585072014e-308 -#define DBL_MIN_EXP (-1021) -#define DBL_MIN_10_EXP (-307) - - -/* - * The characteristics of long double. - * NOTE: long double is the same as double. - */ -#define LDBL_DIG 15 -#define LDBL_EPSILON 1.1102230246251568e-16L -#define LDBL_MANT_DIG 53 -#define LDBL_MAX 1.7976931348623157e+308L -#define LDBL_MAX_EXP 1024 -#define LDBL_MAX_10_EXP 308 -#define LDBL_MIN 2.2250738585072014e-308L -#define LDBL_MIN_EXP (-1021) -#define LDBL_MIN_10_EXP (-307) - - -/* - * Functions and definitions for controlling the FPU. - */ -#ifndef __STRICT_ANSI__ [truncated at 1000 lines; 3240 more skipped]

19 years, 10 months

[ekohl] 13605: Add lsasrv.dll stub.

by ekohl＠svn.reactos.com

Add lsasrv.dll stub. Modified: trunk/reactos/Makefile Added: trunk/reactos/include/lsass/lsasrv.h Added: trunk/reactos/lib/lsasrv/ Added: trunk/reactos/lib/lsasrv/lsaport.c Added: trunk/reactos/lib/lsasrv/lsasrv.c Added: trunk/reactos/lib/lsasrv/lsasrv.def Added: trunk/reactos/lib/lsasrv/lsasrv.rc Added: trunk/reactos/lib/lsasrv/makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-02-16 21:07:55 UTC (rev 13604) +++ trunk/reactos/Makefile 2005-02-16 21:59:00 UTC (rev 13605) @@ -63,7 +63,7 @@ msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi smdll snmpapi syssetup \ twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ - urlmon shdocvw dinput dinput8 dxdiagn devenum dsound $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) + urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) SUBSYS = smss win32k csrss ntvdm _____ Added: trunk/reactos/include/lsass/lsasrv.h --- trunk/reactos/include/lsass/lsasrv.h 2005-02-16 21:07:55 UTC (rev 13604) +++ trunk/reactos/include/lsass/lsasrv.h 2005-02-16 21:59:00 UTC (rev 13605) @@ -0,0 +1,8 @@ + +#ifndef __LSASRV_H +#define __LSASRV_H + +NTSTATUS STDCALL +LsapInitLsa(VOID); + +#endif /* __LSASRV_H */ _____ Added: trunk/reactos/lib/lsasrv/lsaport.c --- trunk/reactos/lib/lsasrv/lsaport.c 2005-02-16 21:07:55 UTC (rev 13604) +++ trunk/reactos/lib/lsasrv/lsaport.c 2005-02-16 21:59:00 UTC (rev 13605) @@ -0,0 +1,178 @@ +/* + */ + +#define NTOS_MODE_USER +#include <ntos.h> +#include <windows.h> + +//#define NDEBUG +#include <debug.h> + + +HANDLE PortThreadHandle = NULL; +HANDLE ConnectPortHandle = NULL; +HANDLE MessagePortHandle = NULL; + + +static NTSTATUS +InitializeLsaPort(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING PortName; + LPC_MAX_MESSAGE Request; + NTSTATUS Status; + + ConnectPortHandle = NULL; + MessagePortHandle = NULL; + + RtlInitUnicodeString(&PortName, + L"\\SeLsaCommandPort"); + + InitializeObjectAttributes(&ObjectAttributes, + &PortName, + 0, + NULL, + NULL); + + Status = NtCreatePort(&ConnectPortHandle, + &ObjectAttributes, + 0, + 0x100, + 0x2000); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreatePort() failed (Status %lx)\n", Status); + goto ByeBye; + } + + Status = NtListenPort(ConnectPortHandle, + &Request.Header); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtListenPort() failed (Status %lx)\n", Status); + goto ByeBye; + } + + Status = NtAcceptConnectPort(&MessagePortHandle, + ConnectPortHandle, + NULL, + TRUE, + NULL, + NULL); + if (!NT_SUCCESS (Status)) + { + DPRINT1("NtAcceptConnectPort() failed (Status %lx)\n", Status); + goto ByeBye; + } + + Status = NtCompleteConnectPort (MessagePortHandle); + if (!NT_SUCCESS (Status)) + { + DPRINT1("NtCompleteConnectPort() failed (Status %lx)\n", Status); + goto ByeBye; + } + +ByeBye: + if (!NT_SUCCESS (Status)) + { + if (ConnectPortHandle != NULL) + NtClose (ConnectPortHandle); + + if (MessagePortHandle != NULL) + NtClose (MessagePortHandle); + } + + return Status; +} + + +static NTSTATUS +ProcessPortMessage(VOID) +{ + LPC_MAX_MESSAGE Request; +// LPC_MAX_MESSAGE Reply; + NTSTATUS Status; + + + DPRINT1("ProcessPortMessage() called\n"); + + Status = STATUS_SUCCESS; + + for (;;) + { + Status = NtReplyWaitReceivePort(MessagePortHandle, + 0, + NULL, + &Request.Header); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtReplyWaitReceivePort() failed (Status %lx)\n", Status); + break; + } + + DPRINT("Received message\n"); + + if (Request.Header.MessageType == LPC_PORT_CLOSED) + { + DPRINT("Port closed\n"); + +// return STATUS_UNSUCCESSFUL; + } + if (Request.Header.MessageType == LPC_REQUEST) + { + DPRINT("Received request\n"); + + } + else if (Request.Header.MessageType == LPC_DATAGRAM) + { + DPRINT("Received datagram\n"); + +// Message = (PIO_ERROR_LOG_MESSAGE)&Request.Data; + + } + } + + return Status; +} + + +static NTSTATUS STDCALL +PortThreadRoutine(PVOID Param) +{ + NTSTATUS Status = STATUS_SUCCESS; + + Status = InitializeLsaPort(); + if (!NT_SUCCESS(Status)) + return Status; + + while (NT_SUCCESS(Status)) + { + Status = ProcessPortMessage(); + } + + if (ConnectPortHandle != NULL) + NtClose (ConnectPortHandle); + + if (MessagePortHandle != NULL) + NtClose (MessagePortHandle); + + return Status; +} + + +BOOLEAN +StartLsaPortThread(VOID) +{ + DWORD ThreadId; + + PortThreadHandle = CreateThread(NULL, + 0x1000, + (LPTHREAD_START_ROUTINE)PortThreadRoutine, + NULL, + 0, + &ThreadId); + + return (PortThreadHandle != NULL); +} + +/* EOF */ _____ Added: trunk/reactos/lib/lsasrv/lsasrv.c --- trunk/reactos/lib/lsasrv/lsasrv.c 2005-02-16 21:07:55 UTC (rev 13604) +++ trunk/reactos/lib/lsasrv/lsasrv.c 2005-02-16 21:59:00 UTC (rev 13605) @@ -0,0 +1,24 @@ + +#define NTOS_MODE_USER +#include <ntos.h> +#include <windows.h> + +#include <lsass/lsasrv.h> + +#define NDEBUG +#include <debug.h> + +VOID StartLsaPortThread(VOID); + + +NTSTATUS STDCALL +LsapInitLsa(VOID) +{ + DPRINT1("LsapInitLsa() called\n"); + + StartLsaPortThread(); + + return STATUS_SUCCESS; +} + +/* EOF */ _____ Added: trunk/reactos/lib/lsasrv/lsasrv.def --- trunk/reactos/lib/lsasrv/lsasrv.def 2005-02-16 21:07:55 UTC (rev 13604) +++ trunk/reactos/lib/lsasrv/lsasrv.def 2005-02-16 21:59:00 UTC (rev 13605) @@ -0,0 +1,68 @@ +; $Id: lsasrv.def 12852 2005-01-06 13:58:04Z mf $ +LIBRARY lsasrv +EXPORTS +;LsaIAuditNotifyPackageLoad +;LsaIAuditSamEvent +;LsaIEnumerateSecrets +;LsaIFree_LSAI_PRIVATE_DATA +;LsaIFree_LSAI_SECRET_ENUM_BUFFER +;LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER +;LsaIFree_LSAPR_CR_CIPHER_VALUE +;LsaIFree_LSAPR_POLICY_INFORMATION +;LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER +;LsaIFree_LSAPR_PRIVILEGE_SET +;LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST +;LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR +;LsaIFree_LSAPR_TRANSLATED_NAMES +;LsaIFree_LSAPR_TRANSLATED_SIDS +;LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO +;LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER +;LsaIFree_LSAPR_TRUST_INFORMATION +;LsaIFree_LSAPR_UNICODE_STRING +;LsaIGetPrivateData +;LsaIGetSerialNumberPolicy +;LsaIGetSerialNumberPolicy2 +;LsaIHealthCheck +;LsaIInitializeWellKnownSids +;LsaIOpenPolicyTrusted +;LsaIQueryInformationPolicyTrusted +;LsaISetPrivateData +;LsaISetSerialNumberPolicy +;LsaISetTimesSecret +;LsaISetupWasRun +;LsapAuOpenSam +LsapInitLsa@0 +;LsarAddPrivilegesToAccount +;LsarClose +;LsarCreateAccount +;LsarCreateSecret +;LsarCreateTrustedDomain +;LsarDelete +;LsarEnumerateAccounts +;LsarEnumeratePrivileges +;LsarEnumeratePrivilegesAccount +;LsarEnumerateTrustedDomains +;LsarGetQuotasForAccount +;LsarGetSystemAccessAccount +;LsarLookupNames +;LsarLookupPrivilegeDisplayName +;LsarLookupPrivilegeName +;LsarLookupPrivilegeValue +;LsarLookupSids +;LsarOpenAccount +;LsarOpenPolicy +;LsarOpenSecret +;LsarOpenTrustedDomain +;LsarQueryInfoTrustedDomain +;LsarQueryInformationPolicy +;LsarQuerySecret +;LsarQuerySecurityObject +;LsarRemovePrivilegesFromAccount +;LsarSetInformationPolicy +;LsarSetInformationTrustedDomain +;LsarSetQuotasForAccount +;LsarSetSecret +;LsarSetSecurityObject +;LsarSetSystemAccessAccount +;ServiceInit +; EOF \ No newline at end of file _____ Added: trunk/reactos/lib/lsasrv/lsasrv.rc --- trunk/reactos/lib/lsasrv/lsasrv.rc 2005-02-16 21:07:55 UTC (rev 13604) +++ trunk/reactos/lib/lsasrv/lsasrv.rc 2005-02-16 21:59:00 UTC (rev 13605) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "LSA server DLL\0" +#define REACTOS_STR_INTERNAL_NAME "lsasrv\0" +#define REACTOS_STR_ORIGINAL_FILENAME "lsasrv.dll\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/lib/lsasrv/makefile --- trunk/reactos/lib/lsasrv/makefile 2005-02-16 21:07:55 UTC (rev 13604) +++ trunk/reactos/lib/lsasrv/makefile 2005-02-16 21:59:00 UTC (rev 13605) @@ -0,0 +1,28 @@ +# $Id$ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = dynlink + +TARGET_NAME = lsasrv + +TARGET_BASE = $(TARGET_BASE_LIB_LSASRV) + +TARGET_ENTRY = 0x0 + +TARGET_CFLAGS += -Wall -Werror + +TARGET_LFLAGS = -nostartfiles -nostdlib + +TARGET_SDKLIBS = ntdll.a kernel32.a + +TARGET_OBJECTS = lsasrv.o lsaport.o + +DEP_OBJECTS = $(TARGET_OBJECTS) + + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk

19 years, 10 months

[chorns] 13604: Support multiple channels

by chorns＠svn.reactos.com

Support multiple channels Modified: trunk/irc/TechBot/TechBot/App.config Modified: trunk/irc/TechBot/TechBot/ServiceThread.cs Modified: trunk/irc/TechBot/TechBot.Console/App.config Modified: trunk/irc/TechBot/TechBot.Console/Main.cs Modified: trunk/irc/TechBot/TechBot.Library/ApiCommand.cs Modified: trunk/irc/TechBot/TechBot.Library/HelpCommand.cs Modified: trunk/irc/TechBot/TechBot.Library/HresultCommand.cs Modified: trunk/irc/TechBot/TechBot.Library/ICommand.cs Modified: trunk/irc/TechBot/TechBot.Library/IrcService.cs Added: trunk/irc/TechBot/TechBot.Library/MessageContext.cs Modified: trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs Modified: trunk/irc/TechBot/TechBot.Library/ServiceOutput.cs Modified: trunk/irc/TechBot/TechBot.Library/SvnCommand.cs Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs Modified: trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs _____ Modified: trunk/irc/TechBot/TechBot/App.config --- trunk/irc/TechBot/TechBot/App.config 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot/App.config 2005-02-16 21:07:55 UTC (rev 13604) @@ -3,7 +3,7 @@ <appSettings> <add key="IRCServerHostName" value="irc.eu.freenode.net" /> <add key="IRCServerHostPort" value="6667" /> - <add key="IRCChannelName" value="channel" /> + <add key="IRCChannelNames" value="channel1;channel2" /> <add key="IRCBotName" value="MyBot" /> <add key="ChmPath" value="C:\IRC\TechBot\CHM" /> <add key="MainChm" value="kmarch.chm" /> _____ Modified: trunk/irc/TechBot/TechBot/ServiceThread.cs --- trunk/irc/TechBot/TechBot/ServiceThread.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot/ServiceThread.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -9,7 +9,7 @@ { private string IRCServerHostName; private int IRCServerHostPort; - private string IRCChannelName; + private string IRCChannelNames; private string IRCBotName; private string ChmPath; private string MainChm; @@ -28,7 +28,7 @@ { IRCServerHostName = ConfigurationSettings.AppSettings["IRCServerHostName"]; IRCServerHostPort = Int32.Parse(ConfigurationSettings.AppSettings["IRCServerHostPort"]); - IRCChannelName = ConfigurationSettings.AppSettings["IRCChannelName"]; + IRCChannelNames = ConfigurationSettings.AppSettings["IRCChannelNames"]; IRCBotName = ConfigurationSettings.AppSettings["IRCBotName"]; ChmPath = ConfigurationSettings.AppSettings["ChmPath"]; MainChm = ConfigurationSettings.AppSettings["MainChm"]; @@ -45,7 +45,7 @@ IrcService ircService = new IrcService(IRCServerHostName, IRCServerHostPort, - IRCChannelName, + IRCChannelNames, IRCBotName, ChmPath, MainChm, _____ Modified: trunk/irc/TechBot/TechBot.Console/App.config --- trunk/irc/TechBot/TechBot.Console/App.config 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Console/App.config 2005-02-16 21:07:55 UTC (rev 13604) @@ -3,7 +3,7 @@ <appSettings> <add key="IRCServerHostName" value="irc.eu.freenode.net" /> <add key="IRCServerHostPort" value="6667" /> - <add key="IRCChannelName" value="channel" /> + <add key="IRCChannelNames" value="channel1;channel2" /> <add key="IRCBotName" value="MyBot" /> <add key="ChmPath" value="C:\IRC\TechBot\CHM" /> <add key="MainChm" value="kmarch.chm" /> _____ Modified: trunk/irc/TechBot/TechBot.Console/Main.cs --- trunk/irc/TechBot/TechBot.Console/Main.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Console/Main.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -6,7 +6,8 @@ { public class ConsoleServiceOutput : IServiceOutput { - public void WriteLine(string message) + public void WriteLine(MessageContext context, + string message) { System.Console.WriteLine(message); } @@ -49,11 +50,11 @@ } } - private static string IRCChannelName + private static string IRCChannelNames { get { - string optionName = "IRCChannelName"; + string optionName = "IRCChannelNames"; string s = ConfigurationSettings.AppSettings[optionName]; VerifyRequiredOption(optionName, s); @@ -149,7 +150,7 @@ { IrcService ircService = new IrcService(IRCServerHostName, IRCServerHostPort, - IRCChannelName, + IRCChannelNames, IRCBotName, ChmPath, MainChm, @@ -180,7 +181,8 @@ while (true) { string s = System.Console.ReadLine(); - service.InjectMessage(s); + service.InjectMessage(null, + s); } } } _____ Modified: trunk/irc/TechBot/TechBot.Library/ApiCommand.cs --- trunk/irc/TechBot/TechBot.Library/ApiCommand.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Library/ApiCommand.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -26,10 +26,12 @@ Run(); } - private void WriteIfVerbose(string message) + private void WriteIfVerbose(MessageContext context, + string message) { if (IsVerbose) - serviceOutput.WriteLine(message); + serviceOutput.WriteLine(context, + message); } private void Run() @@ -70,13 +72,15 @@ new string[] { "api" }); } - public void Handle(string commandName, + public void Handle(MessageContext context, + string commandName, string parameters) { if (parameters.Trim().Equals(String.Empty)) - DisplayNoKeyword(); + DisplayNoKeyword(context); else - Search(parameters); + Search(context, + parameters); } public string Help() @@ -84,7 +88,8 @@ return "!api <apiname>"; } - private bool SearchIndex(string keyword) + private bool SearchIndex(MessageContext context, + string keyword) { if (chm.HasIndex) { @@ -92,14 +97,18 @@ IndexType.KeywordLinks); if (item != null && item.Topics.Count > 0) { - WriteIfVerbose(String.Format("Keyword {0} found in index", + WriteIfVerbose(context, + String.Format("Keyword {0} found in index", item.KeyWord)); IndexTopic indexTopic = item.Topics[0] as IndexTopic; - return DisplayResult(keyword, indexTopic); + return DisplayResult(context, + keyword, + indexTopic); } else { - WriteIfVerbose(String.Format("Keyword {0} not found in index", + WriteIfVerbose(context, + String.Format("Keyword {0} not found in index", keyword)); return false; } @@ -108,14 +117,12 @@ return false; } - private void SearchFullText(string keyword) + private void SearchFullText(MessageContext context, + string keyword) { string sort = "Rating ASC"; -/* - sort = "Location ASC"); - sort = "Title ASC"); -*/ - WriteIfVerbose(String.Format("Searching fulltext database for {0}", + WriteIfVerbose(context, + String.Format("Searching fulltext database for {0}", keyword)); bool partialMatches = false; @@ -125,47 +132,58 @@ maxResults, partialMatches, titlesOnly); - WriteIfVerbose(String.Format("results.Rows.Count = {0}", + WriteIfVerbose(context, + String.Format("results.Rows.Count = {0}", results != null ? results.Rows.Count.ToString() : "(none)")); if (results != null && results.Rows.Count > 0) { results.DefaultView.Sort = sort; - if (!DisplayResult(keyword, results)) + if (!DisplayResult(context, + keyword, + results)) { - DisplayNoResult(keyword); + DisplayNoResult(context, + keyword); } } else { - DisplayNoResult(keyword); + DisplayNoResult(context, + keyword); } } - private void Search(string keyword) + private void Search(MessageContext context, + string keyword) { - if (!SearchIndex(keyword)) - { - SearchFullText(keyword); - } + if (!SearchIndex(context, + keyword)) + SearchFullText(context, + keyword); } - private bool DisplayResult(string keyword, + private bool DisplayResult(MessageContext context, + string keyword, IndexTopic indexTopic) { keyword = keyword.Trim().ToLower(); string url = indexTopic.URL; - WriteIfVerbose(String.Format("URL from index search {0}", + WriteIfVerbose(context, + String.Format("URL from index search {0}", url)); - string prototype = ExtractPrototype(url); + string prototype = ExtractPrototype(context, + url); if (prototype == null || prototype.Trim().Equals(String.Empty)) return false; string formattedPrototype = FormatPrototype(prototype); - serviceOutput.WriteLine(formattedPrototype); + serviceOutput.WriteLine(context, + formattedPrototype); return true; } - private bool DisplayResult(string keyword, + private bool DisplayResult(MessageContext context, + string keyword, DataTable results) { keyword = keyword.Trim().ToLower(); @@ -173,31 +191,38 @@ { DataRowView row = results.DefaultView[i]; string title = row["Title"].ToString(); - WriteIfVerbose(String.Format("Examining {0}", title)); + WriteIfVerbose(context, + String.Format("Examining {0}", title)); if (title.Trim().ToLower().Equals(keyword)) { string location = row["Location"].ToString(); string rating = row["Rating"].ToString(); string url = row["Url"].ToString(); - string prototype = ExtractPrototype(url); + string prototype = ExtractPrototype(context, + url); if (prototype == null || prototype.Trim().Equals(String.Empty)) continue; string formattedPrototype = FormatPrototype(prototype); - serviceOutput.WriteLine(formattedPrototype); + serviceOutput.WriteLine(context, + formattedPrototype); return true; } } return false; } - private void DisplayNoResult(string keyword) + private void DisplayNoResult(MessageContext context, + string keyword) { - serviceOutput.WriteLine(String.Format("I don't know about keyword {0}", keyword)); + serviceOutput.WriteLine(context, + String.Format("I don't know about keyword {0}", + keyword)); } - private void DisplayNoKeyword() + private void DisplayNoKeyword(MessageContext context) { - serviceOutput.WriteLine("Please give me a keyword."); + serviceOutput.WriteLine(context, + "Please give me a keyword."); } private string ReplaceComments(string s) @@ -241,9 +266,11 @@ return s; } - private string ExtractPrototype(string url) + private string ExtractPrototype(MessageContext context, + string url) { - string page = GetPage(url); + string page = GetPage(context, + url); Match match = Regex.Match(page, "<PRE class=\"?syntax\"?>(.+)</PRE>", RegexOptions.Multiline | @@ -273,7 +300,8 @@ return Regex.Replace(html, @"<(.|\n)*?>", String.Empty); } - private string GetPage(string url) + private string GetPage(MessageContext context, + string url) { string CHMFileName = ""; string topicName = ""; @@ -288,7 +316,8 @@ } else { - baseStream = GetBaseStreamFromCHMFileName(CHMFileName); + baseStream = GetBaseStreamFromCHMFileName(context, + CHMFileName); } if ((topicName == "") || (CHMFileName == "") || (baseStream == null)) @@ -299,11 +328,13 @@ return baseStream.ExtractTextFile(topicName); } - private CHMStream.CHMStream GetBaseStreamFromCHMFileName(string CHMFileName) + private CHMStream.CHMStream GetBaseStreamFromCHMFileName(MessageContext context, + string CHMFileName) { foreach (CHMFile file in chm.FileList) { - WriteIfVerbose(String.Format("Compare: {0} <> {1}", + WriteIfVerbose(context, + String.Format("Compare: {0} <> {1}", file.ChmFilePath, CHMFileName)); if (file.ChmFilePath.ToLower().Equals(CHMFileName.ToLower())) @@ -311,7 +342,8 @@ return file.BaseStream; } } - WriteIfVerbose(String.Format("Could not find loaded CHM file in list: {0}", + WriteIfVerbose(context, + String.Format("Could not find loaded CHM file in list: {0}", CHMFileName)); return null; } _____ Modified: trunk/irc/TechBot/TechBot.Library/HelpCommand.cs --- trunk/irc/TechBot/TechBot.Library/HelpCommand.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Library/HelpCommand.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -21,12 +21,17 @@ new string[] { "help" }); } - public void Handle(string commandName, + public void Handle(MessageContext context, + string commandName, string parameters) { - serviceOutput.WriteLine("I support the following commands:"); + serviceOutput.WriteLine(context, + "I support the following commands:"); foreach (ICommand command in commands) - serviceOutput.WriteLine(command.Help()); + { + serviceOutput.WriteLine(context, + command.Help()); + } } public string Help() _____ Modified: trunk/irc/TechBot/TechBot.Library/HresultCommand.cs --- trunk/irc/TechBot/TechBot.Library/HresultCommand.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Library/HresultCommand.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -24,13 +24,15 @@ new string[] { "hresult" }); } - public void Handle(string commandName, + public void Handle(MessageContext context, + string commandName, string parameters) { string hresultText = parameters; if (hresultText.Equals(String.Empty)) { - serviceOutput.WriteLine("Please provide a valid HRESULT value."); + serviceOutput.WriteLine(context, + "Please provide a valid HRESULT value."); return; } @@ -38,7 +40,8 @@ long hresult = np.Parse(hresultText); if (np.Error) { - serviceOutput.WriteLine(String.Format("{0} is not a valid HRESULT value.", + serviceOutput.WriteLine(context, + String.Format("{0} is not a valid HRESULT value.", hresultText)); return; } @@ -46,13 +49,15 @@ string description = GetHresultDescription(hresult); if (description != null) { - serviceOutput.WriteLine(String.Format("{0} is {1}.", + serviceOutput.WriteLine(context, + String.Format("{0} is {1}.", hresultText, description)); } else { - serviceOutput.WriteLine(String.Format("I don't know about HRESULT {0}.", + serviceOutput.WriteLine(context, + String.Format("I don't know about HRESULT {0}.", hresultText)); } } _____ Modified: trunk/irc/TechBot/TechBot.Library/ICommand.cs --- trunk/irc/TechBot/TechBot.Library/ICommand.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Library/ICommand.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -5,7 +5,8 @@ public interface ICommand { bool CanHandle(string commandName); - void Handle(string commandName, + void Handle(MessageContext context, + string commandName, string parameters); string Help(); } _____ Modified: trunk/irc/TechBot/TechBot.Library/IrcService.cs --- trunk/irc/TechBot/TechBot.Library/IrcService.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Library/IrcService.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Threading; using TechBot.IRCLibrary; @@ -8,7 +9,7 @@ { private string hostname; private int port; - private string channelname; + private string channelnames; private string botname; private string chmPath; private string mainChm; @@ -17,13 +18,13 @@ private string hresultXml; private string svnCommand; private IrcClient client; - private IrcChannel channel1; + private ArrayList channels = new ArrayList(); /* IrcChannel */ private TechBotService service; private bool isStopped = false; public IrcService(string hostname, int port, - string channelname, + string channelnames, string botname, string chmPath, string mainChm, @@ -34,7 +35,7 @@ { this.hostname = hostname; this.port = port; - this.channelname = channelname; + this.channelnames = channelnames; this.botname = botname; this.chmPath = chmPath; this.mainChm = mainChm; @@ -65,30 +66,53 @@ System.Console.WriteLine("Connected..."); client.Register(botname, null); System.Console.WriteLine(String.Format("Registered as {0}...", botname)); - channel1 = client.JoinChannel(channelname); - System.Console.WriteLine(String.Format("Joined channel {0}...", channelname)); + JoinChannels(); while (!isStopped) { Thread.Sleep(1000); } - client.PartChannel(channel1, "Caught in the bitstream..."); + PartChannels(); client.Diconnect(); System.Console.WriteLine("Disconnected..."); } - + public void Stop() { isStopped = true; } - - public void WriteLine(string message) + + private void JoinChannels() { - Console.WriteLine(String.Format("Sending: {0}", message)); - channel1.Talk(message); + foreach (string channelname in channelnames.Split(new char[] { ';' })) + { + IrcChannel channel = client.JoinChannel(channelname); + channels.Add(channel); + System.Console.WriteLine(String.Format("Joined channel #{0}...", + channel.Name)); + } } + private void PartChannels() + { + foreach (IrcChannel channel in channels) + { + client.PartChannel(channel, "Caught in the bitstream..."); + System.Console.WriteLine(String.Format("Parted channel #{0}...", + channel.Name)); + } + } + + public void WriteLine(MessageContext context, + string message) + { + Console.WriteLine(String.Format("Sending: {0} to #{1}", + message, + context.Channel != null ? context.Channel.Name : "(null)")); + context.Channel.Talk(message); + } + private void ExtractMessage(string parameters, out string message) { @@ -102,22 +126,65 @@ message = parameters; } } - + + private bool GetChannelName(IrcMessage message, + out string channelName) + { + if (message.Parameters == null || !message.Parameters.StartsWith("#")) + { + channelName = null; + return false; + } + + int index = message.Parameters.IndexOf(' '); + if (index == -1) + index = message.Parameters.Length; + channelName = message.Parameters.Substring(1, index - 1); + return true; + } + + private bool ShouldAcceptMessage(IrcMessage message, + out MessageContext context) + { + if (message.Command.ToUpper().Equals("PRIVMSG")) + { + string channelName; + if (GetChannelName(message, + out channelName)) + { + foreach (IrcChannel channel in channels) + { + if (String.Compare(channel.Name, channelName, true) == 0) + { + context = new MessageContext(channel); + return true; + } + } + } + } + context = null; + return false; + } + private void client_MessageReceived(IrcMessage message) { try { - if (channel1 != null && - channel1.Name != null && + if (message.Command != null && message.Parameters != null) { string injectMessage; - ExtractMessage(message.Parameters, out injectMessage); - if ((message.Command.ToUpper().Equals("PRIVMSG")) && - (message.Parameters.ToLower().StartsWith("#" + channel1.Name.ToLower() + " "))) + ExtractMessage(message.Parameters, + out injectMessage); + MessageContext context; + if (ShouldAcceptMessage(message, + out context)) { - Console.WriteLine("Injecting: " + injectMessage); - service.InjectMessage(injectMessage); + Console.WriteLine(String.Format("Injecting: {0} from #{1}", + injectMessage, + context.Channel.Name)); + service.InjectMessage(context, + injectMessage); } else { _____ Added: trunk/irc/TechBot/TechBot.Library/MessageContext.cs --- trunk/irc/TechBot/TechBot.Library/MessageContext.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Library/MessageContext.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -0,0 +1,23 @@ +using System; +using TechBot.IRCLibrary; + +namespace TechBot.Library +{ + public class MessageContext + { + private IrcChannel channel; + + public IrcChannel Channel + { + get + { + return channel; + } + } + + public MessageContext(IrcChannel channel) + { + this.channel = channel; + } + } +} _____ Modified: trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs --- trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Library/NtStatusCommand.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -24,13 +24,15 @@ new string[] { "ntstatus" }); } - public void Handle(string commandName, + public void Handle(MessageContext context, + string commandName, string parameters) { string ntstatusText = parameters; if (ntstatusText.Equals(String.Empty)) { - serviceOutput.WriteLine("Please provide a valid NTSTATUS value."); + serviceOutput.WriteLine(context, + "Please provide a valid NTSTATUS value."); return; } @@ -38,7 +40,8 @@ long ntstatus = np.Parse(ntstatusText); if (np.Error) { - serviceOutput.WriteLine(String.Format("{0} is not a valid NTSTATUS value.", + serviceOutput.WriteLine(context, + String.Format("{0} is not a valid NTSTATUS value.", ntstatusText)); return; } @@ -46,13 +49,15 @@ string description = GetNtstatusDescription(ntstatus); if (description != null) { - serviceOutput.WriteLine(String.Format("{0} is {1}.", + serviceOutput.WriteLine(context, + String.Format("{0} is {1}.", ntstatusText, description)); } else { - serviceOutput.WriteLine(String.Format("I don't know about NTSTATUS {0}.", + serviceOutput.WriteLine(context, + String.Format("I don't know about NTSTATUS {0}.", ntstatusText)); } } _____ Modified: trunk/irc/TechBot/TechBot.Library/ServiceOutput.cs --- trunk/irc/TechBot/TechBot.Library/ServiceOutput.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Library/ServiceOutput.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -4,6 +4,7 @@ { public interface IServiceOutput { - void WriteLine(string message); + void WriteLine(MessageContext context, + string message); } } _____ Modified: trunk/irc/TechBot/TechBot.Library/SvnCommand.cs --- trunk/irc/TechBot/TechBot.Library/SvnCommand.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Library/SvnCommand.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -20,10 +20,12 @@ new string[] { "svn" }); } - public void Handle(string commandName, + public void Handle(MessageContext context, + string commandName, string parameters) { - serviceOutput.WriteLine(svnCommand); + serviceOutput.WriteLine(context, + svnCommand); } public string Help() _____ Modified: trunk/irc/TechBot/TechBot.Library/TechBotService.cs --- trunk/irc/TechBot/TechBot.Library/TechBotService.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Library/TechBotService.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -9,8 +9,6 @@ { public class TechBotService { - private const bool IsVerbose = false; - private IServiceOutput serviceOutput; private string chmPath; private string mainChm; @@ -37,12 +35,6 @@ this.svnCommand = svnCommand; } - private void WriteIfVerbose(string message) - { - if (IsVerbose) - serviceOutput.WriteLine(message); - } - public void Run() { commands.Add(new HelpCommand(serviceOutput, @@ -60,12 +52,12 @@ svnCommand)); } - public void InjectMessage(string message) + public void InjectMessage(MessageContext context, + string message) { if (message.StartsWith("!")) - { - ParseCommandMessage(message); - } + ParseCommandMessage(context, + message); } private bool IsCommandMessage(string message) @@ -73,7 +65,8 @@ return message.StartsWith("!"); } - public void ParseCommandMessage(string message) + public void ParseCommandMessage(MessageContext context, + string message) { if (!IsCommandMessage(message)) return; @@ -94,7 +87,8 @@ { if (command.CanHandle(commandName)) { - command.Handle(commandName, parameters); + command.Handle(context, + commandName, parameters); return; } } _____ Modified: trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs --- trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs 2005-02-16 18:21:21 UTC (rev 13603) +++ trunk/irc/TechBot/TechBot.Library/WinerrorCommand.cs 2005-02-16 21:07:55 UTC (rev 13604) @@ -24,13 +24,15 @@ new string[] { "winerror" }); } - public void Handle(string commandName, + public void Handle(MessageContext context, + string commandName, string parameters) { string winerrorText = parameters; if (winerrorText.Equals(String.Empty)) { - serviceOutput.WriteLine("Please provide a valid System Error Code value."); + serviceOutput.WriteLine(context, + "Please provide a valid System Error Code value."); return; } @@ -38,7 +40,8 @@ long winerror = np.Parse(winerrorText); if (np.Error) { - serviceOutput.WriteLine(String.Format("{0} is not a valid System Error Code value.", + serviceOutput.WriteLine(context, + String.Format("{0} is not a valid System Error Code value.", winerrorText)); return; } @@ -46,13 +49,15 @@ string description = GetWinerrorDescription(winerror); if (description != null) { - serviceOutput.WriteLine(String.Format("{0} is {1}.", + serviceOutput.WriteLine(context, + String.Format("{0} is {1}.", winerrorText, description)); } else { - serviceOutput.WriteLine(String.Format("I don't know about System Error Code {0}.", + serviceOutput.WriteLine(context, + String.Format("I don't know about System Error Code {0}.", winerrorText)); } }

19 years, 10 months

[navaraf] 13603: Cast pointers to ULONG_PTR instead of ULONG.

by navaraf＠svn.reactos.com

Cast pointers to ULONG_PTR instead of ULONG. Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c _____ Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c --- trunk/reactos/ntoskrnl/mm/i386/pfault.c 2005-02-16 18:19:54 UTC (rev 13602) +++ trunk/reactos/ntoskrnl/mm/i386/pfault.c 2005-02-16 18:21:21 UTC (rev 13603) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -75,18 +75,18 @@ KeLowerIrql(oldIrql); } if (!NT_SUCCESS(Status) && (Mode == KernelMode) && - ((*Eip) >= (ULONG)MmSafeCopyFromUserUnsafeStart) && - ((*Eip) <= (ULONG)MmSafeCopyFromUserRestart)) + ((*Eip) >= (ULONG_PTR)MmSafeCopyFromUserUnsafeStart) && + ((*Eip) <= (ULONG_PTR)MmSafeCopyFromUserRestart)) { - (*Eip) = (ULONG)MmSafeCopyFromUserRestart; + (*Eip) = (ULONG_PTR)MmSafeCopyFromUserRestart; (*Eax) = STATUS_ACCESS_VIOLATION; return(STATUS_SUCCESS); } if (!NT_SUCCESS(Status) && (Mode == KernelMode) && - ((*Eip) >= (ULONG)MmSafeCopyToUserUnsafeStart) && - ((*Eip) <= (ULONG)MmSafeCopyToUserRestart)) + ((*Eip) >= (ULONG_PTR)MmSafeCopyToUserUnsafeStart) && + ((*Eip) <= (ULONG_PTR)MmSafeCopyToUserRestart)) { - (*Eip) = (ULONG)MmSafeCopyToUserRestart; + (*Eip) = (ULONG_PTR)MmSafeCopyToUserRestart; (*Eax) = STATUS_ACCESS_VIOLATION; return(STATUS_SUCCESS); }

19 years, 10 months

[navaraf] 13602: Fix email address.

by navaraf＠svn.reactos.com

Fix email address. Modified: trunk/reactos/ntoskrnl/se/access.c Modified: trunk/reactos/ntoskrnl/se/audit.c _____ Modified: trunk/reactos/ntoskrnl/se/access.c --- trunk/reactos/ntoskrnl/se/access.c 2005-02-16 18:12:15 UTC (rev 13601) +++ trunk/reactos/ntoskrnl/se/access.c 2005-02-16 18:19:54 UTC (rev 13602) @@ -5,7 +5,7 @@ * FILE: ntoskrnl/se/access.c * PURPOSE: Access rights handling functions * - * PROGRAMMERS: Eric Kohl <ekohl(a)rz-online.de> + * PROGRAMMERS: Eric Kohl <eric.kohl(a)t-online.de> */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/se/audit.c --- trunk/reactos/ntoskrnl/se/audit.c 2005-02-16 18:12:15 UTC (rev 13601) +++ trunk/reactos/ntoskrnl/se/audit.c 2005-02-16 18:19:54 UTC (rev 13602) @@ -5,7 +5,7 @@ * FILE: ntoskrnl/se/audit.c * PURPOSE: Audit functions * - * PROGRAMMERS: Eric Kohl (ekohl(a)rz-online.de) + * PROGRAMMERS: Eric Kohl <eric.kohl(a)t-online.de> */ /* INCLUDES *****************************************************************/

19 years, 10 months

[navaraf] 13601: Fix a typo.

by navaraf＠svn.reactos.com

Fix a typo. Modified: trunk/reactos/doc/README.WINE _____ Modified: trunk/reactos/doc/README.WINE --- trunk/reactos/doc/README.WINE 2005-02-16 18:10:12 UTC (rev 13600) +++ trunk/reactos/doc/README.WINE 2005-02-16 18:12:15 UTC (rev 13601) @@ -80,7 +80,7 @@ reactos/lib/uuid # advapi32 - - reactos/lib/advapi32/crypyto/*.c # Synced to Wine-20041201 + reactos/lib/advapi32/crypto/*.c # Synced to Wine-20041201 gdi32 - reactos/lib/gdi32/objects/linedda.c # Out of sync

19 years, 10 months

[navaraf] 13600: Fix definition of MIDL_SERVER_INFO structure.

by navaraf＠svn.reactos.com

Fix definition of MIDL_SERVER_INFO structure. Modified: trunk/reactos/w32api/include/rpcndr.h _____ Modified: trunk/reactos/w32api/include/rpcndr.h --- trunk/reactos/w32api/include/rpcndr.h 2005-02-16 18:02:50 UTC (rev 13599) +++ trunk/reactos/w32api/include/rpcndr.h 2005-02-16 18:10:12 UTC (rev 13600) @@ -316,6 +316,17 @@ short Pad; unsigned char Format[1]; } MIDL_FORMAT_STRING; +typedef struct _MIDL_SYNTAX_INFO +{ + RPC_SYNTAX_IDENTIFIER TransferSyntax; + RPC_DISPATCH_TABLE *DispatchTable; + PFORMAT_STRING ProcString; + const unsigned short *FmtStringOffset; + PFORMAT_STRING TypeString; + const void *aUserMarshalQuadruple; + ULONG_PTR pReserved1; + ULONG_PTR pReserved2; +} MIDL_SYNTAX_INFO, *PMIDL_SYNTAX_INFO; typedef void(__RPC_API *STUB_THUNK)(PMIDL_STUB_MESSAGE); typedef long(__RPC_API *SERVER_ROUTINE)(void); typedef struct _MIDL_SERVER_INFO_ { @@ -324,6 +335,9 @@ PFORMAT_STRING ProcString; const unsigned short *FmtStringOffset; const STUB_THUNK *ThunkTable; + PRPC_SYNTAX_IDENTIFIER pTransferSyntax; + ULONG_PTR nCount; + PMIDL_SYNTAX_INFO pSyntaxInfo; } MIDL_SERVER_INFO,*PMIDL_SERVER_INFO; typedef struct _MIDL_STUBLESS_PROXY_INFO { PMIDL_STUB_DESC pStubDesc;

19 years, 10 months

[navaraf] 13599: Minor formatting change.

by navaraf＠svn.reactos.com

Minor formatting change. Modified: trunk/reactos/include/ddk/csq.h _____ Modified: trunk/reactos/include/ddk/csq.h --- trunk/reactos/include/ddk/csq.h 2005-02-16 16:52:51 UTC (rev 13598) +++ trunk/reactos/include/ddk/csq.h 2005-02-16 18:02:50 UTC (rev 13599) @@ -34,8 +34,8 @@ * * USAGE * - * This library follows exactly the same interface as the Microsoft Cancel-Safe Queue - * routines (IoCsqXxx()). As such, the authoritative reference is the + * This library follows exactly the same interface as the Microsoft Cancel-Safe + * Queue routines (IoCsqXxx()). As such, the authoritative reference is the * current DDK. There is also a DDK sample called "cancel" that has an * example of how to use this code. I have also provided a sample driver * that makes use of this queue. Finally, please do read the header and the

19 years, 10 months

[arty] 13598: Fix compilation with -O3 and fix bugs 484 and 505. win32k patches by Tinus.

by arty＠svn.reactos.com

Fix compilation with -O3 and fix bugs 484 and 505. win32k patches by Tinus. Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/halx86/generic/timer.c Modified: trunk/reactos/ntoskrnl/cc/cacheman.c Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/subsys/win32k/eng/mouse.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2005-02-16 16:45:51 UTC (rev 13597) +++ trunk/reactos/hal/hal/hal.c 2005-02-16 16:52:51 UTC (rev 13598) @@ -384,6 +384,8 @@ PADAPTER_OBJECT AdapterObject) { UNIMPLEMENTED; + + return 0; } @@ -682,6 +684,8 @@ KdPortDisableInterrupts() { UNIMPLEMENTED; + + return FALSE; } @@ -690,6 +694,8 @@ KdPortEnableInterrupts() { UNIMPLEMENTED; + + return FALSE; } @@ -709,6 +715,8 @@ PKSPIN_LOCK SpinLock) { UNIMPLEMENTED; + + return 0; } _____ Modified: trunk/reactos/hal/halx86/generic/timer.c --- trunk/reactos/hal/halx86/generic/timer.c 2005-02-16 16:45:51 UTC (rev 13597) +++ trunk/reactos/hal/halx86/generic/timer.c 2005-02-16 16:52:51 UTC (rev 13598) @@ -99,7 +99,7 @@ * For supported compilers we use inline assembler. For the others, * portable plain C. */ -VOID STDCALL +VOID STDCALL __attribute__((noinline)) __KeStallExecutionProcessor(ULONG Loops) { if (!Loops) _____ Modified: trunk/reactos/ntoskrnl/cc/cacheman.c --- trunk/reactos/ntoskrnl/cc/cacheman.c 2005-02-16 16:45:51 UTC (rev 13597) +++ trunk/reactos/ntoskrnl/cc/cacheman.c 2005-02-16 16:52:51 UTC (rev 13598) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -49,6 +49,8 @@ ) { UNIMPLEMENTED; + + return 0; } /* _____ Modified: trunk/reactos/ntoskrnl/ex/time.c --- trunk/reactos/ntoskrnl/ex/time.c 2005-02-16 16:45:51 UTC (rev 13597) +++ trunk/reactos/ntoskrnl/ex/time.c 2005-02-16 16:52:51 UTC (rev 13598) @@ -290,6 +290,8 @@ ) { UNIMPLEMENTED; + + return 0; } _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2005-02-16 16:45:51 UTC (rev 13597) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2005-02-16 16:52:51 UTC (rev 13598) @@ -243,7 +243,7 @@ RECTL DestRect; POINTL SrcPoint; SURFOBJ *ColorSurf; - SURFOBJ *MaskSurf; + SURFOBJ *MaskSurf = NULL; DestRect.left = max(pt.x, 0); DestRect.top = max(pt.y, 0); @@ -257,7 +257,9 @@ SrcPoint.x = max(-pt.x, 0); SrcPoint.y = max(-pt.y, 0); - MaskSurf = EngLockSurface(pgp->MaskSurface); + if (pgp->MaskSurface) + MaskSurf = EngLockSurface(pgp->MaskSurface); + if (MaskSurf != NULL) { if (pgp->ColorSurface != NULL) _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-02-16 16:45:51 UTC (rev 13597) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-02-16 16:52:51 UTC (rev 13598) @@ -199,6 +199,9 @@ NtUserAcquireOrReleaseInputOwnership(FALSE); + /* Setup the cursor */ + IntLoadDefaultCursors(); + return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-02-16 16:45:51 UTC (rev 13597) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-02-16 16:52:51 UTC (rev 13598) @@ -664,6 +664,11 @@ SurfaceRect.bottom = SurfObj->sizlBitmap.cy; /* FIXME - why does EngEraseSurface() sometimes crash? EngEraseSurface(SurfObj, &SurfaceRect, 0); */ + + /* Put the pointer in the center of the screen */ + GDIDEV(SurfObj)->Pointer.Pos.x = (SurfaceRect.right - SurfaceRect.left) / 2; + GDIDEV(SurfObj)->Pointer.Pos.y = (SurfaceRect.bottom - SurfaceRect.top) / 2; + EngUnlockSurface(SurfObj); IntShowDesktop(IntGetActiveDesktop(), SurfSize.cx, SurfSize.cy); break;

19 years, 10 months

[weiden] 13597: get rid of libunicode

by weiden＠svn.reactos.com

get rid of libunicode Deleted: trunk/reactos/lib/unicode/

19 years, 10 months

← Newer
1
...
16
17
18
19
20
21
22
...
42
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 February 2005