Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[gdalsnes] 13616: forgot to change those two...

by gdalsnes＠svn.reactos.com

forgot to change those two... Modified: trunk/reactos/lib/crtdll/dllmain.c Modified: trunk/reactos/lib/msvcrt/dllmain.c _____ Modified: trunk/reactos/lib/crtdll/dllmain.c --- trunk/reactos/lib/crtdll/dllmain.c 2005-02-17 11:38:16 UTC (rev 13615) +++ trunk/reactos/lib/crtdll/dllmain.c 2005-02-17 12:18:10 UTC (rev 13616) @@ -28,7 +28,7 @@ #include <sys/stat.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* EXTERNAL PROTOTYPES ********************************************************/ _____ Modified: trunk/reactos/lib/msvcrt/dllmain.c --- trunk/reactos/lib/msvcrt/dllmain.c 2005-02-17 11:38:16 UTC (rev 13615) +++ trunk/reactos/lib/msvcrt/dllmain.c 2005-02-17 12:18:10 UTC (rev 13616) @@ -27,7 +27,7 @@ #include <internal/wine/msvcrt.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* EXTERNAL PROTOTYPES ********************************************************/

19 years, 10 months

[gdalsnes] 13615: add workarounds for mingw runtime version differences

by gdalsnes＠svn.reactos.com

add workarounds for mingw runtime version differences gave directory routines a good cleanup (based on wine) more tcharizing of routines Modified: trunk/reactos/lib/crt/direct/chdir.c Modified: trunk/reactos/lib/crt/direct/chdrive.c Modified: trunk/reactos/lib/crt/direct/getcwd.c Modified: trunk/reactos/lib/crt/direct/getdcwd.c Modified: trunk/reactos/lib/crt/direct/getdrive.c Modified: trunk/reactos/lib/crt/direct/mkdir.c Modified: trunk/reactos/lib/crt/direct/rmdir.c Modified: trunk/reactos/lib/crt/direct/wchdir.c Modified: trunk/reactos/lib/crt/direct/wgetcwd.c Modified: trunk/reactos/lib/crt/direct/wgetdcwd.c Modified: trunk/reactos/lib/crt/direct/wmkdir.c Modified: trunk/reactos/lib/crt/direct/wrmdir.c Modified: trunk/reactos/lib/crt/float/fpclass.c Added: trunk/reactos/lib/crt/include/internal/debug.h Modified: trunk/reactos/lib/crt/include/internal/file.h Deleted: trunk/reactos/lib/crt/include/internal/msvcrtdbg.h Modified: trunk/reactos/lib/crt/io/access.c Modified: trunk/reactos/lib/crt/io/chmod.c Modified: trunk/reactos/lib/crt/io/chsize.c Modified: trunk/reactos/lib/crt/io/close.c Modified: trunk/reactos/lib/crt/io/create.c Modified: trunk/reactos/lib/crt/io/find.c Modified: trunk/reactos/lib/crt/io/isatty.c Modified: trunk/reactos/lib/crt/io/mktemp.c Modified: trunk/reactos/lib/crt/io/open.c Modified: trunk/reactos/lib/crt/io/pipe.c Modified: trunk/reactos/lib/crt/io/read.c Modified: trunk/reactos/lib/crt/io/setmode.c Modified: trunk/reactos/lib/crt/io/unlink.c Modified: trunk/reactos/lib/crt/io/wcreate.c Modified: trunk/reactos/lib/crt/io/wmktemp.c Modified: trunk/reactos/lib/crt/io/wopen.c Modified: trunk/reactos/lib/crt/io/write.c Modified: trunk/reactos/lib/crt/io/wunlink.c Modified: trunk/reactos/lib/crt/locale/locale.c Modified: trunk/reactos/lib/crt/misc/crtmain.c Modified: trunk/reactos/lib/crt/misc/environ.c Modified: trunk/reactos/lib/crt/misc/lock.c Modified: trunk/reactos/lib/crt/misc/stubs.c Modified: trunk/reactos/lib/crt/process/process.c Modified: trunk/reactos/lib/crt/signal/signal.c Modified: trunk/reactos/lib/crt/stdio/fwrite.c Modified: trunk/reactos/lib/crt/stdio/popen.c Modified: trunk/reactos/lib/crt/stdio/remove.c Modified: trunk/reactos/lib/crt/stdlib/getenv.c Modified: trunk/reactos/lib/crt/stdlib/putenv.c Modified: trunk/reactos/lib/crt/stdlib/senv.c Modified: trunk/reactos/lib/crt/stdlib/wputenv.c Modified: trunk/reactos/lib/crt/wine/scanf.c _____ Modified: trunk/reactos/lib/crt/direct/chdir.c --- trunk/reactos/lib/crt/direct/chdir.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/chdir.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -2,14 +2,15 @@ #include <ctype.h> #include <direct.h> #include <internal/file.h> +#include <tchar.h> /* * @implemented */ -int _chdir(const char* _path) +int _tchdir(const _TCHAR* _path) { - if (!SetCurrentDirectoryA((char*)_path)) { - _dosmaperr(GetLastError()); + if (!SetCurrentDirectory(_path)) { + _dosmaperr(_path?GetLastError():0); return -1; } return 0; _____ Modified: trunk/reactos/lib/crt/direct/chdrive.c --- trunk/reactos/lib/crt/direct/chdrive.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/chdrive.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -6,29 +6,36 @@ #include <internal/file.h> -int cur_drive = 0; - - /* - * @implemented + * @implemented + * + * _chdrive (MSVCRT.@) + * + * Change the current drive. + * + * PARAMS + * newdrive [I] Drive number to change to (1 = 'A', 2 = 'B', ...) + * + * RETURNS + * Success: 0. The current drive is set to newdrive. + * Failure: -1. errno indicates the error. + * + * NOTES + * See SetCurrentDirectoryA. */ -int _chdrive(int drive) +int _chdrive(int newdrive) { - char d[3]; + WCHAR buffer[] = L"A:"; - if (!( drive >= 1 && drive <= 26)) { - __set_errno(EINVAL); - return -1; - } - if (cur_drive != drive) { - cur_drive = drive; - d[0] = toupper(cur_drive + '@'); - d[1] = ':'; - d[2] = 0; - if (!SetCurrentDirectoryA(d)) { - _dosmaperr(GetLastError()); - return -1; - } + buffer[0] += newdrive - 1; + if (!SetCurrentDirectoryW( buffer )) + { + _dosmaperr(GetLastError()); + if (newdrive <= 0) + { + __set_errno(EACCES); } - return 0; + return -1; + } + return 0; } _____ Modified: trunk/reactos/lib/crt/direct/getcwd.c --- trunk/reactos/lib/crt/direct/getcwd.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/getcwd.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -3,29 +3,33 @@ #include <stdlib.h> #include <errno.h> #include <internal/file.h> +#include <tchar.h> - /* * @implemented */ -char *_getcwd(char* buffer, int maxlen) +_TCHAR* _tgetcwd(_TCHAR* buf, int size) { - char *cwd; - int len; + _TCHAR dir[MAX_PATH]; + DWORD dir_len = GetCurrentDirectory(MAX_PATH,dir); - if (buffer == NULL) { - if ( (cwd = malloc(MAX_PATH)) == NULL ) { - __set_errno(ENOMEM); - return NULL; - } - len = MAX_PATH; - } else { - cwd = buffer; - len = maxlen; - } - if (GetCurrentDirectoryA(len, cwd) == 0) { - _dosmaperr(GetLastError()); - return NULL; - } - return cwd; + if (dir_len == 0) + { + _dosmaperr(GetLastError()); + return NULL; /* FIXME: Real return value untested */ + } + + if (!buf) + { + return _tcsdup(dir); + } + + if (dir_len >= size) + { + __set_errno(ERANGE); + return NULL; /* buf too small */ + } + + _tcscpy(buf,dir); + return buf; } _____ Modified: trunk/reactos/lib/crt/direct/getdcwd.c --- trunk/reactos/lib/crt/direct/getdcwd.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/getdcwd.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -1,27 +1,64 @@ #include "precomp.h" #include <direct.h> #include <internal/file.h> +#include <internal/debug.h> +#include <tchar.h> +#include <errno.h> /* * @implemented + * + * _getdcwd (MSVCRT.@) + * + * Get the current working directory on a given disk. + * + * PARAMS + * drive [I] Drive letter to get the current working directory from. + * buf [O] Destination for the current working directory. + * size [I] Length of drive in characters. + * + * RETURNS + * Success: If drive is NULL, returns an allocated string containing the path. + * Otherwise populates drive with the path and returns it. + * Failure: NULL. errno indicates the error. */ -char* _getdcwd(int nDrive, char* caBuffer, int nBufLen) +_TCHAR* _tgetdcwd(int drive, _TCHAR * buf, int size) { - int i =0; - int dr = _getdrive(); + static _TCHAR* dummy; - if (nDrive < 1 || nDrive > 26) - return NULL; - if (dr != nDrive) { - if ( _chdrive(nDrive) != 0 ) - return NULL; - } - i = GetCurrentDirectoryA(nBufLen, caBuffer); - if (i == nBufLen) - return NULL; - if (dr != nDrive) { - if ( _chdrive(dr) != 0 ) - return NULL; - } - return caBuffer; + TRACE(":drive %d(%c), size %d\n",drive, drive + 'A' - 1, size); + + if (!drive || drive == _getdrive()) + return _tgetcwd(buf,size); /* current */ + else + { + _TCHAR dir[MAX_PATH]; + _TCHAR drivespec[] = _T("A:"); + int dir_len; + + drivespec[0] += drive - 1; + if (GetDriveType(drivespec) < DRIVE_REMOVABLE) + { + __set_errno(EACCES); + return NULL; + } + + /* GetFullPathName for X: means "get working directory on drive X", + * just like passing X: to SetCurrentDirectory means "switch to working + * directory on drive X". -Gunnar */ + dir_len = GetFullPathName(drivespec,MAX_PATH,dir,&dummy); + if (dir_len >= size || dir_len < 1) + { + __set_errno(ERANGE); + return NULL; /* buf too small */ + } + + TRACE(":returning '%s'\n", dir); + if (!buf) + return _tcsdup(dir); /* allocate */ + + _tcscpy(buf,dir); + } + return buf; } + _____ Modified: trunk/reactos/lib/crt/direct/getdrive.c --- trunk/reactos/lib/crt/direct/getdrive.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/getdrive.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -3,28 +3,33 @@ #include <direct.h> -extern int cur_drive; - /* * @implemented + * + * _getdrive (MSVCRT.@) + * + * Get the current drive number. + * + * PARAMS + * None. + * + * RETURNS + * Success: The drive letter number from 1 to 26 ("A:" to "Z:"). + * Failure: 0. */ int _getdrive(void) { - char Buffer[MAX_PATH]; - - if (cur_drive == 0) { - GetCurrentDirectoryA(MAX_PATH, Buffer); - cur_drive = toupper(Buffer[0] - '@'); - } - return cur_drive; + WCHAR buffer[MAX_PATH]; + if (GetCurrentDirectoryW( MAX_PATH, buffer ) && + buffer[0] >= 'A' && buffer[0] <= 'z' && buffer[1] == ':') + return towupper(buffer[0]) - 'A' + 1; + return 0; } /* - * @unimplemented + * @implemented */ unsigned long _getdrives(void) { - //fixme get logical drives - //return GetLogicalDrives(); - return 5; // drive A and C + return GetLogicalDrives(); } _____ Modified: trunk/reactos/lib/crt/direct/mkdir.c --- trunk/reactos/lib/crt/direct/mkdir.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/mkdir.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -1,14 +1,14 @@ #include "precomp.h" #include <direct.h> #include <internal/file.h> +#include <tchar.h> - /* * @implemented */ -int _mkdir(const char* _path) +int _tmkdir(const _TCHAR* _path) { - if (!CreateDirectoryA(_path, NULL)) { + if (!CreateDirectory(_path, NULL)) { _dosmaperr(GetLastError()); return -1; } _____ Modified: trunk/reactos/lib/crt/direct/rmdir.c --- trunk/reactos/lib/crt/direct/rmdir.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/rmdir.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -1,14 +1,14 @@ #include "precomp.h" #include <direct.h> #include <internal/file.h> +#include <tchar.h> - /* * @implemented */ -int _rmdir(const char* _path) +int _trmdir(const _TCHAR* _path) { - if (!RemoveDirectoryA(_path)) { + if (!RemoveDirectory(_path)) { _dosmaperr(GetLastError()); return -1; } _____ Modified: trunk/reactos/lib/crt/direct/wchdir.c --- trunk/reactos/lib/crt/direct/wchdir.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/wchdir.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -1,16 +1,5 @@ -#include "precomp.h" -#include <ctype.h> -#include <direct.h> -#include <internal/file.h> +#define UNICODE +#define _UNICODE -/* - * @implemented - */ -int _wchdir (const wchar_t *_path) -{ - if (!SetCurrentDirectoryW((wchar_t *)_path)) { - _dosmaperr(GetLastError()); - return -1; - } - return 0; -} +#include "chdir.c" + _____ Modified: trunk/reactos/lib/crt/direct/wgetcwd.c --- trunk/reactos/lib/crt/direct/wgetcwd.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/wgetcwd.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -1,28 +1,5 @@ -#include "precomp.h" -#include <direct.h> -#include <stdlib.h> -#include <errno.h> -#include <internal/file.h> +#define UNICODE +#define _UNICODE +#include "getcwd.c" -/* - * @implemented - */ -wchar_t* _wgetcwd(wchar_t* buffer, int maxlen) -{ - wchar_t *cwd; - int len; - if (buffer == NULL) { - if ( (cwd = malloc(MAX_PATH * sizeof(wchar_t))) == NULL ) { - __set_errno(ENOMEM); - return NULL; - } - len = MAX_PATH; - } else { - cwd = buffer; - len = maxlen; - } - if (GetCurrentDirectoryW(len, cwd) == 0) - return NULL; - return cwd; -} _____ Modified: trunk/reactos/lib/crt/direct/wgetdcwd.c --- trunk/reactos/lib/crt/direct/wgetdcwd.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/wgetdcwd.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -1,32 +1,5 @@ -#include "precomp.h" -#include <direct.h> -#include <internal/file.h> +#define UNICODE +#define _UNICODE +#include "getdcwd.c" -/* - * @implemented - */ -wchar_t* _wgetdcwd(int nDrive, wchar_t* caBuffer, int nBufLen) -{ - int i =0; - int dr = _getdrive(); - - if (nDrive < 1 || nDrive > 26) - return NULL; - - if (dr != nDrive) { - if ( _chdrive(nDrive) != 0 ) - return NULL; - } - - i = GetCurrentDirectoryW(nBufLen, caBuffer); - if (i == nBufLen) - return NULL; - - if (dr != nDrive) { - if ( _chdrive(dr) != 0 ) - return NULL; - } - - return caBuffer; -} _____ Modified: trunk/reactos/lib/crt/direct/wmkdir.c --- trunk/reactos/lib/crt/direct/wmkdir.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/wmkdir.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -1,16 +1,4 @@ -#include "precomp.h" -#include <direct.h> -#include <internal/file.h> +#define UNICODE +#define _UNICODE - -/* - * @implemented - */ -int _wmkdir(const wchar_t* _path) -{ - if (!CreateDirectoryW(_path, NULL)) { - _dosmaperr(GetLastError()); - return -1; - } - return 0; -} +#include "mkdir.c" _____ Modified: trunk/reactos/lib/crt/direct/wrmdir.c --- trunk/reactos/lib/crt/direct/wrmdir.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/direct/wrmdir.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -1,16 +1,4 @@ -#include "precomp.h" -#include <direct.h> -#include <internal/file.h> +#define UNICODE +#define _UNICODE - -/* - * @implemented - */ -int _wrmdir(const wchar_t* _path) -{ - if (!RemoveDirectoryW(_path)) { - _dosmaperr(GetLastError()); - return -1; - } - return 0; -} +#include "rmdir.c" _____ Modified: trunk/reactos/lib/crt/float/fpclass.c --- trunk/reactos/lib/crt/float/fpclass.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/float/fpclass.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -14,6 +14,9 @@ #define _FPCLASS_PN 0x0100 /* positive normal */ #define _FPCLASS_PINF 0x0200 /* positive infinity */ + +#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3 + #define FP_SNAN 0x0001 // signaling NaN #define FP_QNAN 0x0002 // quiet NaN #define FP_NINF 0x0004 // negative infinity @@ -25,6 +28,8 @@ #define FP_NNORM 0x0080 // negative normalized non-zero #define FP_PNORM 0x0100 // positive normalized non-zero +#endif + typedef int fpclass_t; /* _____ Copied: trunk/reactos/lib/crt/include/internal/debug.h (from rev 13607, trunk/reactos/lib/crt/include/internal/msvcrtdbg.h) _____ Modified: trunk/reactos/lib/crt/include/internal/file.h --- trunk/reactos/lib/crt/include/internal/file.h 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/include/internal/file.h 2005-02-17 11:38:16 UTC (rev 13615) @@ -185,6 +185,10 @@ wint_t _filwbuf(FILE *f); +#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 2 + int __cdecl _filbuf (FILE*); + int __cdecl _flsbuf (int, FILE*); +#endif #endif /* __dj_include_libc_file_h__ */ _____ Deleted: trunk/reactos/lib/crt/include/internal/msvcrtdbg.h --- trunk/reactos/lib/crt/include/internal/msvcrtdbg.h 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/include/internal/msvcrtdbg.h 2005-02-17 11:38:16 UTC (rev 13615) @@ -1,90 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: include/msvcrt/msvcrtdbg.h - * PURPOSE: Useful debugging macros - * PROGRAMMER: - * UPDATE HISTORY: - * - */ - -/* - * NOTE: Define NDEBUG before including this header to disable debugging - * macros - */ - -#ifndef __MSVCRT_DEBUG -#define __MSVCRT_DEBUG - -#include <roscfg.h> -#include <windows.h> - - -#define MK_STR(s) #s - -#ifdef _UNICODE - #define sT "S" -#else - #define sT "s" -#endif - - - -#define TRACE(...) - - -#ifdef DBG - #define DPRINT1(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); - #define CHECKPOINT1 do { DbgPrint("MSVCRT:%s:%d\n",__FILE__,__LINE__); } while(0); -#else - #ifdef __GNUC__ - #define DPRINT1(args...) - #else - #define DPRINT DbgPrint - #endif - #define CHECKPOINT1 -#endif - -#if !defined(NDEBUG) && defined(DBG) - #define DPRINT(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); - #define CHECKPOINT do { DbgPrint("MSVCRT:%s:%d\n",__FILE__,__LINE__); } while(0); -#else - #ifdef __GNUC__ - #define DPRINT(args...) - #else - #define DPRINT DbgPrint - #endif - #define CHECKPOINT -#endif /* NDEBUG */ - - -#if 0 - - #define TRACE_RETURN(format_str, ret_type) \ - ret_type __return_value__; \ - static char* __return_format_str__ = "%s ret: "format_str"\n" - - #define FUNCTION(func) \ - static char* __func_name__ = #func - - #define TRACE(a,b...) DPRINT1(a"\n", b) - - #define RETURN(a) \ - do{ __return_value__ = (a); DPRINT1(__return_format_str__ ,__func_name__,__return_value__); return __return_value__ ; }while(0) - -#endif - - -/* ULONG CDECL DbgPrint(PCH Format, ...); */ -ULONG DbgPrint(PCH Format,...); -/* unsigned long DbgPrint(const char* Format, ...); */ - - - -/* #define TRACE 0 ? (void)0 : Trace */ - -/* void Trace(TCHAR* lpszFormat, ...); */ - - - -#endif /* __MSVCRT_DEBUG */ _____ Modified: trunk/reactos/lib/crt/io/access.c --- trunk/reactos/lib/crt/io/access.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/access.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -5,7 +5,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> #ifdef _UNICODE #define _TS S _____ Modified: trunk/reactos/lib/crt/io/chmod.c --- trunk/reactos/lib/crt/io/chmod.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/chmod.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -6,7 +6,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> #define mode_t int _____ Modified: trunk/reactos/lib/crt/io/chsize.c --- trunk/reactos/lib/crt/io/chsize.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/chsize.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -2,7 +2,7 @@ #include <io.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/io/close.c --- trunk/reactos/lib/crt/io/close.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/close.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -3,7 +3,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/io/create.c --- trunk/reactos/lib/crt/io/create.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/create.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -2,7 +2,7 @@ #include <fcntl.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* _____ Modified: trunk/reactos/lib/crt/io/find.c --- trunk/reactos/lib/crt/io/find.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/find.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -8,7 +8,7 @@ /* * @implemented */ -#ifdef _UNICODE +#if defined(_UNICODE) || !(__MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3) long #else int @@ -60,7 +60,7 @@ * @implemented */ int _tfindnext( -#ifdef _UNICODE +#if defined(_UNICODE) || !(__MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3) long handle, #else int handle, @@ -176,7 +176,13 @@ /* * @implemented */ -int _findclose(int handle) +int _findclose( +#if __MINGW32_MAJOR_VERSION < 3 || __MINGW32_MINOR_VERSION < 3 + int handle +#else + long handle +#endif + ) { // check no wildcards or invalid handle if (handle == 0 || handle == -1) _____ Modified: trunk/reactos/lib/crt/io/isatty.c --- trunk/reactos/lib/crt/io/isatty.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/isatty.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -2,7 +2,7 @@ #include <sys/stat.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/io/mktemp.c --- trunk/reactos/lib/crt/io/mktemp.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/mktemp.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -18,7 +18,7 @@ #include <io.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* _____ Modified: trunk/reactos/lib/crt/io/open.c --- trunk/reactos/lib/crt/io/open.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/open.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -52,7 +52,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/pipe.c --- trunk/reactos/lib/crt/io/pipe.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/pipe.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -15,7 +15,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* _____ Modified: trunk/reactos/lib/crt/io/read.c --- trunk/reactos/lib/crt/io/read.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/read.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -17,7 +17,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/io/setmode.c --- trunk/reactos/lib/crt/io/setmode.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/setmode.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -14,6 +14,6 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> _____ Modified: trunk/reactos/lib/crt/io/unlink.c --- trunk/reactos/lib/crt/io/unlink.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/unlink.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -13,7 +13,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* _____ Modified: trunk/reactos/lib/crt/io/wcreate.c --- trunk/reactos/lib/crt/io/wcreate.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/wcreate.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -2,7 +2,7 @@ #include <fcntl.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* _____ Modified: trunk/reactos/lib/crt/io/wmktemp.c --- trunk/reactos/lib/crt/io/wmktemp.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/wmktemp.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -18,7 +18,7 @@ #include <io.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* _____ Modified: trunk/reactos/lib/crt/io/wopen.c --- trunk/reactos/lib/crt/io/wopen.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/wopen.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -26,7 +26,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* _____ Modified: trunk/reactos/lib/crt/io/write.c --- trunk/reactos/lib/crt/io/write.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/write.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -16,7 +16,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> #define BUFSIZE 4096 /* _____ Modified: trunk/reactos/lib/crt/io/wunlink.c --- trunk/reactos/lib/crt/io/wunlink.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/io/wunlink.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -13,7 +13,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/locale/locale.c --- trunk/reactos/lib/crt/locale/locale.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/locale/locale.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -13,7 +13,7 @@ #include <stdlib.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> unsigned int __setlc_active; unsigned int __unguarded_readlc_active; _____ Modified: trunk/reactos/lib/crt/misc/crtmain.c --- trunk/reactos/lib/crt/misc/crtmain.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/misc/crtmain.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -6,7 +6,7 @@ #include "precomp.h" #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> #ifndef __GNUC__ _____ Modified: trunk/reactos/lib/crt/misc/environ.c --- trunk/reactos/lib/crt/misc/environ.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/misc/environ.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -12,7 +12,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> unsigned int _osver = 0; _____ Modified: trunk/reactos/lib/crt/misc/lock.c --- trunk/reactos/lib/crt/misc/lock.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/misc/lock.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -19,7 +19,7 @@ #include "precomp.h" #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> #include <internal/mtdll.h> typedef struct _____ Modified: trunk/reactos/lib/crt/misc/stubs.c --- trunk/reactos/lib/crt/misc/stubs.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/misc/stubs.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -1,7 +1,7 @@ #include "precomp.h" #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /********************************************************************* * $I10_OUTPUT (MSVCRT.@) _____ Modified: trunk/reactos/lib/crt/process/process.c --- trunk/reactos/lib/crt/process/process.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/process/process.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -7,7 +7,7 @@ #include <tchar.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> #ifdef _UNICODE #define find_execT find_execW _____ Modified: trunk/reactos/lib/crt/signal/signal.c --- trunk/reactos/lib/crt/signal/signal.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/signal/signal.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -89,7 +89,7 @@ int raise(int sig) { - __p_sig_fn_t temp;// = SIG_DFL; + __p_sig_fn_t temp = 0; int i; switch (sig) _____ Modified: trunk/reactos/lib/crt/stdio/fwrite.c --- trunk/reactos/lib/crt/stdio/fwrite.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/stdio/fwrite.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -6,7 +6,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* _____ Modified: trunk/reactos/lib/crt/stdio/popen.c --- trunk/reactos/lib/crt/stdio/popen.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/stdio/popen.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -8,7 +8,7 @@ #include <internal/file.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* _____ Modified: trunk/reactos/lib/crt/stdio/remove.c --- trunk/reactos/lib/crt/stdio/remove.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/stdio/remove.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -4,7 +4,7 @@ #include <tchar.h> #define NDEBUG -#include <internal/msvcrtdbg.h> +#include <internal/debug.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/stdlib/getenv.c --- trunk/reactos/lib/crt/stdlib/getenv.c 2005-02-17 10:44:57 UTC (rev 13614) +++ trunk/reactos/lib/crt/stdlib/getenv.c 2005-02-17 11:38:16 UTC (rev 13615) @@ -2,7 +2,7 @@ #include <stdlib.h> #define NDEBUG [truncated at 1000 lines; 63 more skipped]

19 years, 10 months

[gdalsnes] 13614: fix typo

by gdalsnes＠svn.reactos.com

fix typo Modified: trunk/reactos/lib/crt/stdio/wtmpnam.c _____ Modified: trunk/reactos/lib/crt/stdio/wtmpnam.c --- trunk/reactos/lib/crt/stdio/wtmpnam.c 2005-02-17 00:01:54 UTC (rev 13613) +++ trunk/reactos/lib/crt/stdio/wtmpnam.c 2005-02-17 10:44:57 UTC (rev 13614) @@ -2,4 +2,4 @@ #define _UNICODE #define UNICODE -#import "tmpnam.c" +#include "tmpnam.c"

19 years, 10 months

[gdalsnes] 13613: remove more cruft

by gdalsnes＠svn.reactos.com

remove more cruft Deleted: trunk/reactos/lib/crtdll/malloc/ Deleted: trunk/reactos/lib/crtdll/quad/ Deleted: trunk/reactos/lib/crtdll/string/ Deleted: trunk/reactos/lib/crtdll/tchar/ Deleted: trunk/reactos/lib/crtdll/wchar/

19 years, 10 months

[chorns] 13612: Interpret numeric values as being hexadecimal values if they contain hex digits a-f

by chorns＠svn.reactos.com

Interpret numeric values as being hexadecimal values if they contain hex digits a-f Modified: trunk/irc/TechBot/TechBot.Library/NumberParser.cs _____ Modified: trunk/irc/TechBot/TechBot.Library/NumberParser.cs --- trunk/irc/TechBot/TechBot.Library/NumberParser.cs 2005-02-16 23:08:04 UTC (rev 13611) +++ trunk/irc/TechBot/TechBot.Library/NumberParser.cs 2005-02-16 23:17:17 UTC (rev 13612) @@ -7,13 +7,43 @@ { public bool Error = false; + private const string SpecialHexCharacters = "ABCDEF"; + + private bool IsSpecialHexCharacter(char ch) + { + foreach (char specialChar in SpecialHexCharacters) + { + if (ch.ToString().ToUpper() == specialChar.ToString()) + return true; + } + return false; + } + + private bool HasSpecialHexCharacters(string s) + { + foreach (char ch in s) + { + if (IsSpecialHexCharacter(ch)) + return true; + } + return false; + } + public long Parse(string s) { try { Error = false; + bool useHex = false; if (s.StartsWith("0x")) - return Int64.Parse(s.Substring(2), + { + s = s.Substring(2); + useHex = true; + } + if (HasSpecialHexCharacters(s)) + useHex = true; + if (useHex) + return Int64.Parse(s, NumberStyles.HexNumber); else return Int64.Parse(s);

19 years, 10 months

[gdalsnes] 13611: hack into private crt headers

by gdalsnes＠svn.reactos.com

hack into private crt headers Modified: trunk/reactos/lib/crtdll/dllmain.c Modified: trunk/reactos/lib/crtdll/makefile Modified: trunk/reactos/lib/msvcrt/Makefile Modified: trunk/reactos/lib/msvcrt/dllmain.c _____ Modified: trunk/reactos/lib/crtdll/dllmain.c --- trunk/reactos/lib/crtdll/dllmain.c 2005-02-16 22:38:49 UTC (rev 13610) +++ trunk/reactos/lib/crtdll/dllmain.c 2005-02-16 23:08:04 UTC (rev 13611) @@ -21,13 +21,14 @@ */ #include "precomp.h" -#include <msvcrt/internal/tls.h> +#include <stdio.h> +#include <internal/tls.h> #include <stdlib.h> -#include <msvcrt/wine/msvcrt.h> +#include <internal/wine/msvcrt.h> #include <sys/stat.h> #define NDEBUG -#include <msvcrt/msvcrtdbg.h> +#include <internal/msvcrtdbg.h> /* EXTERNAL PROTOTYPES ********************************************************/ _____ Modified: trunk/reactos/lib/crtdll/makefile --- trunk/reactos/lib/crtdll/makefile 2005-02-16 22:38:49 UTC (rev 13610) +++ trunk/reactos/lib/crtdll/makefile 2005-02-16 23:08:04 UTC (rev 13611) @@ -21,7 +21,7 @@ TARGET_GCCLIBS = gcc -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -I../crt/include # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += \ _____ Modified: trunk/reactos/lib/msvcrt/Makefile --- trunk/reactos/lib/msvcrt/Makefile 2005-02-16 22:38:49 UTC (rev 13610) +++ trunk/reactos/lib/msvcrt/Makefile 2005-02-16 23:08:04 UTC (rev 13611) @@ -21,7 +21,7 @@ TARGET_GCCLIBS = gcc -TARGET_CFLAGS = -D__USE_W32API -D_MSVCRT_LIB_ -Wall -Werror +TARGET_CFLAGS = -D__USE_W32API -D_MSVCRT_LIB_ -Wall -Werror -I../crt/include # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += \ _____ Modified: trunk/reactos/lib/msvcrt/dllmain.c --- trunk/reactos/lib/msvcrt/dllmain.c 2005-02-16 22:38:49 UTC (rev 13610) +++ trunk/reactos/lib/msvcrt/dllmain.c 2005-02-16 23:08:04 UTC (rev 13611) @@ -21,12 +21,13 @@ */ #include "precomp.h" -#include <msvcrt/internal/tls.h> +#include <stdio.h> +#include <internal/tls.h> #include <stdlib.h> -#include <msvcrt/wine/msvcrt.h> +#include <internal/wine/msvcrt.h> #define NDEBUG -#include <msvcrt/msvcrtdbg.h> +#include <internal/msvcrtdbg.h> /* EXTERNAL PROTOTYPES ********************************************************/

19 years, 10 months

[chorns] 13610: Support private messages

by chorns＠svn.reactos.com

Support private messages Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IrcChannel.cs Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IrcMessage.cs Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IrcUser.cs Modified: trunk/irc/TechBot/TechBot.Library/IrcService.cs Modified: trunk/irc/TechBot/TechBot.Library/MessageContext.cs _____ Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IrcChannel.cs --- trunk/irc/TechBot/TechBot.IRCLibrary/IrcChannel.cs 2005-02-16 22:30:50 UTC (rev 13609) +++ trunk/irc/TechBot/TechBot.IRCLibrary/IrcChannel.cs 2005-02-16 22:38:49 UTC (rev 13610) @@ -128,7 +128,10 @@ /// <param name="text">Text to send to the channel.</param> public void Talk(string text) { - owner.SendMessage(new IrcMessage(IRC.PRIVMSG, String.Format("#{0} :{1}", name, text))); + owner.SendMessage(new IrcMessage(IRC.PRIVMSG, + String.Format("#{0} :{1}", + name, + text))); } } } _____ Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs --- trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs 2005-02-16 22:30:50 UTC (rev 13609) +++ trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs 2005-02-16 22:38:49 UTC (rev 13610) @@ -391,7 +391,8 @@ IrcUser user = channel.LocateUser(nickname.Substring(1)); if (user == null) { - user = new IrcUser(nickname.Substring(1)); + user = new IrcUser(this, + nickname.Substring(1)); channel.Users.Add(user); } for (int i = 4; i < parameters.Length; i++) @@ -400,7 +401,8 @@ user = channel.LocateUser(nickname); if (user == null) { - user = new IrcUser(nickname); + user = new IrcUser(this, + nickname); channel.Users.Add(user); } } @@ -509,7 +511,7 @@ { throw new NotConnectedException(); } - + /* Serialize sending messages */ lock (typeof(IrcClient)) { @@ -545,16 +547,6 @@ /// <param name="text">Text to send to the channel.</param> public void TalkTo(string nickname, string text) { - if (nickname == null) - { - throw new ArgumentNullException("nickname", "Nickname cannot be null."); - } - if (text == null) - { - throw new ArgumentNullException("text", "Text cannot be null."); - } - - SendMessage(new IrcMessage(IRC.PRIVMSG, String.Format("{0} :{1}", nickname, text))); } /// <summary> _____ Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IrcMessage.cs --- trunk/irc/TechBot/TechBot.IRCLibrary/IrcMessage.cs 2005-02-16 22:30:50 UTC (rev 13609) +++ trunk/irc/TechBot/TechBot.IRCLibrary/IrcMessage.cs 2005-02-16 22:38:49 UTC (rev 13610) @@ -428,7 +428,7 @@ } private const string IrcSpecial = @"-[]\`^{}"; - private const string IrcSpecialNonSpecs = @"_"; + private const string IrcSpecialNonSpecs = @"_|"; /// <summary> /// Returns wether a character is an IRC special character. _____ Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IrcUser.cs --- trunk/irc/TechBot/TechBot.IRCLibrary/IrcUser.cs 2005-02-16 22:30:50 UTC (rev 13609) +++ trunk/irc/TechBot/TechBot.IRCLibrary/IrcUser.cs 2005-02-16 22:38:49 UTC (rev 13610) @@ -9,6 +9,7 @@ { #region Private fields + private IrcClient owner; private string nickname; private string decoratedNickname; @@ -17,6 +18,17 @@ #region Public properties /// <summary> + /// Owner of this channel. + /// </summary> + public IrcClient Owner + { + get + { + return owner; + } + } + + /// <summary> /// Nickname of user. /// </summary> public string Nickname @@ -65,14 +77,38 @@ /// <summary> /// Constructor. /// </summary> + /// <param name="owner">Owner of this channel.</param> /// <param name="nickname">Nickname (possibly decorated) of user.</param> - public IrcUser(string nickname) + public IrcUser(IrcClient owner, + string nickname) { + if (owner == null) + { + throw new ArgumentNullException("owner", "Owner cannot be null."); + } + this.owner = owner; this.decoratedNickname = nickname.Trim(); this.nickname = StripDecoration(decoratedNickname); } /// <summary> + /// Talk to the user. + /// </summary> + /// <param name="text">Text to send to the user.</param> + public void Talk(string text) + { + if (text == null) + { + throw new ArgumentNullException("text", "Text cannot be null."); + } + + owner.SendMessage(new IrcMessage(IRC.PRIVMSG, + String.Format("{0} :{1}", + nickname, + text))); + } + + /// <summary> /// Strip docoration of nickname. /// </summary> /// <param name="nickname">Possible decorated nickname.</param> _____ Modified: trunk/irc/TechBot/TechBot.Library/IrcService.cs --- trunk/irc/TechBot/TechBot.Library/IrcService.cs 2005-02-16 22:30:50 UTC (rev 13609) +++ trunk/irc/TechBot/TechBot.Library/IrcService.cs 2005-02-16 22:38:49 UTC (rev 13610) @@ -104,13 +104,44 @@ } } + private string GetMessageSource(MessageContext context) + { + if (context is ChannelMessageContext) + { + ChannelMessageContext channelContext = context as ChannelMessageContext; + return String.Format("#{0}", + channelContext.Channel.Name); + } + else if (context is UserMessageContext) + { + UserMessageContext userContext = context as UserMessageContext; + return userContext.User.Nickname; + } + else + { + throw new InvalidOperationException(String.Format("Unhandled message context '{0}'", + context.GetType())); + } + } + 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); + if (context is ChannelMessageContext) + { + ChannelMessageContext channelContext = context as ChannelMessageContext; + channelContext.Channel.Talk(message); + } + else if (context is UserMessageContext) + { + UserMessageContext userContext = context as UserMessageContext; + userContext.User.Talk(message); + } + else + { + throw new InvalidOperationException(String.Format("Unhandled message context '{0}'", + context.GetType())); + } } private void ExtractMessage(string parameters, @@ -139,16 +170,36 @@ int index = message.Parameters.IndexOf(' '); if (index == -1) index = message.Parameters.Length; - channelName = message.Parameters.Substring(1, index - 1); + else + index = index - 1; + channelName = message.Parameters.Substring(1, index); return true; } + private bool GetTargetNickname(IrcMessage message, + out string nickname) + { + if (message.Parameters == null) + { + nickname = null; + return false; + } + + int index = message.Parameters.IndexOf(' '); + if (index == -1) + index = message.Parameters.Length; + nickname = message.Parameters.Substring(0, index); + Console.WriteLine("nickname: " + nickname); + return true; + } + private bool ShouldAcceptMessage(IrcMessage message, out MessageContext context) { if (message.Command.ToUpper().Equals("PRIVMSG")) { string channelName; + string nickname; if (GetChannelName(message, out channelName)) { @@ -156,11 +207,24 @@ { if (String.Compare(channel.Name, channelName, true) == 0) { - context = new MessageContext(channel); + context = new ChannelMessageContext(channel); return true; } } } + else if (GetTargetNickname(message, + out nickname)) + { + IrcUser targetUser = new IrcUser(client, + nickname); + if (String.Compare(targetUser.Nickname, botname, true) == 0) + { + IrcUser sourceUser = new IrcUser(client, + message.PrefixNickname); + context = new UserMessageContext(sourceUser); + return true; + } + } } context = null; return false; @@ -180,9 +244,9 @@ if (ShouldAcceptMessage(message, out context)) { - Console.WriteLine(String.Format("Injecting: {0} from #{1}", + Console.WriteLine(String.Format("Injecting: {0} from {1}", injectMessage, - context.Channel.Name)); + GetMessageSource(context))); service.InjectMessage(context, injectMessage); } _____ Modified: trunk/irc/TechBot/TechBot.Library/MessageContext.cs --- trunk/irc/TechBot/TechBot.Library/MessageContext.cs 2005-02-16 22:30:50 UTC (rev 13609) +++ trunk/irc/TechBot/TechBot.Library/MessageContext.cs 2005-02-16 22:38:49 UTC (rev 13610) @@ -3,8 +3,14 @@ namespace TechBot.Library { - public class MessageContext + public abstract class MessageContext { + } + + + + public class ChannelMessageContext : MessageContext + { private IrcChannel channel; public IrcChannel Channel @@ -15,9 +21,29 @@ } } - public MessageContext(IrcChannel channel) + public ChannelMessageContext(IrcChannel channel) { this.channel = channel; } } + + + + public class UserMessageContext : MessageContext + { + private IrcUser user; + + public IrcUser User + { + get + { + return user; + } + } + + public UserMessageContext(IrcUser user) + { + this.user = user; + } + } }

19 years, 10 months

[gdalsnes] 13609: ntdll:

by gdalsnes＠svn.reactos.com

19 years, 10 months

[gdalsnes] 13608: ntdll:

by gdalsnes＠svn.reactos.com

ntdll: -critical.c: catch (more) invalid use -impl. sscanf (stolen from wine) crt: -use native mingw headers and not private copies of them -converted some routines to using tchar == impl. many missing unicode routines -impl. sscanf and friends correctly (stolen from wine) tchar.h: -added lotsa missin stuff Modified: trunk/reactos/lib/crt/conio/cgets.c Modified: trunk/reactos/lib/crt/conio/cprintf.c Modified: trunk/reactos/lib/crt/conio/cputs.c Deleted: trunk/reactos/lib/crt/conio/cscanf.c Modified: trunk/reactos/lib/crt/conio/getch.c Modified: trunk/reactos/lib/crt/conio/getche.c Modified: trunk/reactos/lib/crt/conio/kbhit.c Modified: trunk/reactos/lib/crt/conio/putch.c Modified: trunk/reactos/lib/crt/conio/ungetch.c Modified: trunk/reactos/lib/crt/ctype/ctype.c Modified: trunk/reactos/lib/crt/ctype/isalnum.c Modified: trunk/reactos/lib/crt/ctype/isalpha.c Modified: trunk/reactos/lib/crt/ctype/isascii.c Modified: trunk/reactos/lib/crt/ctype/iscntrl.c Modified: trunk/reactos/lib/crt/ctype/iscsym.c Modified: trunk/reactos/lib/crt/ctype/isctype.c Modified: trunk/reactos/lib/crt/ctype/isdigit.c Modified: trunk/reactos/lib/crt/ctype/isgraph.c Modified: trunk/reactos/lib/crt/ctype/islower.c Modified: trunk/reactos/lib/crt/ctype/isprint.c Modified: trunk/reactos/lib/crt/ctype/ispunct.c Modified: trunk/reactos/lib/crt/ctype/isspace.c Modified: trunk/reactos/lib/crt/ctype/isupper.c Modified: trunk/reactos/lib/crt/ctype/isxdigit.c Modified: trunk/reactos/lib/crt/ctype/toascii.c Modified: trunk/reactos/lib/crt/ctype/tolower.c Modified: trunk/reactos/lib/crt/ctype/toupper.c Modified: trunk/reactos/lib/crt/direct/chdir.c Modified: trunk/reactos/lib/crt/direct/chdrive.c Modified: trunk/reactos/lib/crt/direct/getcwd.c Modified: trunk/reactos/lib/crt/direct/getdcwd.c Modified: trunk/reactos/lib/crt/direct/getdfree.c Modified: trunk/reactos/lib/crt/direct/getdrive.c Modified: trunk/reactos/lib/crt/direct/mkdir.c Modified: trunk/reactos/lib/crt/direct/rmdir.c Modified: trunk/reactos/lib/crt/direct/wchdir.c Modified: trunk/reactos/lib/crt/direct/wgetcwd.c Modified: trunk/reactos/lib/crt/direct/wgetdcwd.c Modified: trunk/reactos/lib/crt/direct/wmkdir.c Modified: trunk/reactos/lib/crt/direct/wrmdir.c Modified: trunk/reactos/lib/crt/float/chgsign.c Modified: trunk/reactos/lib/crt/float/clearfp.c Modified: trunk/reactos/lib/crt/float/cntrlfp.c Modified: trunk/reactos/lib/crt/float/copysign.c Modified: trunk/reactos/lib/crt/float/fpclass.c Modified: trunk/reactos/lib/crt/float/fpecode.c Modified: trunk/reactos/lib/crt/float/fpreset.c Modified: trunk/reactos/lib/crt/float/isnan.c Modified: trunk/reactos/lib/crt/float/logb.c Modified: trunk/reactos/lib/crt/float/nafter.c Modified: trunk/reactos/lib/crt/float/scalb.c Modified: trunk/reactos/lib/crt/float/statfp.c Modified: trunk/reactos/lib/crt/io/access.c Modified: trunk/reactos/lib/crt/io/chmod.c Modified: trunk/reactos/lib/crt/io/chsize.c Modified: trunk/reactos/lib/crt/io/close.c Modified: trunk/reactos/lib/crt/io/commit.c Modified: trunk/reactos/lib/crt/io/create.c Modified: trunk/reactos/lib/crt/io/dup.c Modified: trunk/reactos/lib/crt/io/dup2.c Modified: trunk/reactos/lib/crt/io/eof.c Modified: trunk/reactos/lib/crt/io/filelen.c Modified: trunk/reactos/lib/crt/io/fileleni.c Modified: trunk/reactos/lib/crt/io/find.c Modified: trunk/reactos/lib/crt/io/fmode.c Modified: trunk/reactos/lib/crt/io/isatty.c Modified: trunk/reactos/lib/crt/io/locking.c Modified: trunk/reactos/lib/crt/io/lseek.c Modified: trunk/reactos/lib/crt/io/lseeki64.c Modified: trunk/reactos/lib/crt/io/mktemp.c Modified: trunk/reactos/lib/crt/io/open.c Modified: trunk/reactos/lib/crt/io/pipe.c Modified: trunk/reactos/lib/crt/io/read.c Modified: trunk/reactos/lib/crt/io/setmode.c Modified: trunk/reactos/lib/crt/io/sopen.c Modified: trunk/reactos/lib/crt/io/tell.c Modified: trunk/reactos/lib/crt/io/telli64.c Modified: trunk/reactos/lib/crt/io/umask.c Modified: trunk/reactos/lib/crt/io/unlink.c Modified: trunk/reactos/lib/crt/io/utime.c Modified: trunk/reactos/lib/crt/io/waccess.c Modified: trunk/reactos/lib/crt/io/wchmod.c Modified: trunk/reactos/lib/crt/io/wcreate.c Modified: trunk/reactos/lib/crt/io/wfind.c Modified: trunk/reactos/lib/crt/io/wmktemp.c Modified: trunk/reactos/lib/crt/io/wopen.c Modified: trunk/reactos/lib/crt/io/write.c Modified: trunk/reactos/lib/crt/io/wunlink.c Modified: trunk/reactos/lib/crt/io/wutime.c Modified: trunk/reactos/lib/crt/locale/locale.c Modified: trunk/reactos/lib/crt/makefile Modified: trunk/reactos/lib/crt/math/acos.c Modified: trunk/reactos/lib/crt/math/asin.c Modified: trunk/reactos/lib/crt/math/atan.c Modified: trunk/reactos/lib/crt/math/atan2.c Modified: trunk/reactos/lib/crt/math/cabs.c Modified: trunk/reactos/lib/crt/math/ceil.c Modified: trunk/reactos/lib/crt/math/cos.c Modified: trunk/reactos/lib/crt/math/cosh.c Modified: trunk/reactos/lib/crt/math/exp.c [truncated at 100 lines; 288 more skipped] _____ Modified: trunk/reactos/lib/crt/conio/cgets.c --- trunk/reactos/lib/crt/conio/cgets.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/conio/cgets.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,8 +6,8 @@ * PROGRAMMER: Eric Kohl (Imported from DJGPP) */ -#include <msvcrt/conio.h> -#include <msvcrt/stdlib.h> +#include <conio.h> +#include <stdlib.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/conio/cprintf.c --- trunk/reactos/lib/crt/conio/cprintf.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/conio/cprintf.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,8 +6,9 @@ * PROGRAMMER: Eric Kohl (Imported from DJGPP) */ -#include <msvcrt/stdio.h> -#include <msvcrt/conio.h> +#include <stdio.h> +#include <stdarg.h> +#include <conio.h> /* * @unimplemented _____ Modified: trunk/reactos/lib/crt/conio/cputs.c --- trunk/reactos/lib/crt/conio/cputs.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/conio/cputs.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -9,10 +9,10 @@ */ #include "precomp.h" -#include <msvcrt/conio.h> -#include <msvcrt/string.h> -#include <msvcrt/stdio.h> -#include <msvcrt/internal/file.h> +#include <conio.h> +#include <string.h> +#include <stdio.h> +#include <internal/file.h> /* @@ -22,7 +22,7 @@ { int len = strlen(_str); DWORD written = 0; - if (!WriteFile(filehnd(stdout->_file),_str,len,&written,NULL)) + if (!WriteFile( fdinfo(stdout->_file)->hFile ,_str,len,&written,NULL)) return -1; return 0; } _____ Deleted: trunk/reactos/lib/crt/conio/cscanf.c --- trunk/reactos/lib/crt/conio/cscanf.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/conio/cscanf.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,29 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: msvcrt/conio/cscanf.c - * PURPOSE: C Runtime - * PROGRAMMER: Eric Kohl (Imported from DJGPP) - */ - -#include <msvcrt/conio.h> -#include <msvcrt/stdarg.h> -#include <msvcrt/stdio.h> -#include <msvcrt/internal/stdio.h> - -/* - * @unimplemented - */ -int _cscanf(char *fmt, ...) -{ - int cnt; - - va_list ap; - - //fixme cscanf should scan the console's keyboard - va_start(ap, fmt); - cnt = __vscanf(fmt, ap); - va_end(ap); - - return cnt; -} _____ Modified: trunk/reactos/lib/crt/conio/getch.c --- trunk/reactos/lib/crt/conio/getch.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/conio/getch.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -9,10 +9,10 @@ */ #include "precomp.h" -#include <msvcrt/conio.h> -#include <msvcrt/stdio.h> -#include <msvcrt/io.h> -#include <msvcrt/internal/console.h> +#include <conio.h> +#include <stdio.h> +#include <io.h> +#include <internal/console.h> /* @@ -26,7 +26,7 @@ c = ungot_char; char_avail = 0; } else { - ReadConsoleA(_get_osfhandle(stdin->_file), + ReadConsoleA((HANDLE)_get_osfhandle(stdin->_file), &c, 1, &NumberOfCharsRead, _____ Modified: trunk/reactos/lib/crt/conio/getche.c --- trunk/reactos/lib/crt/conio/getche.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/conio/getche.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -10,11 +10,11 @@ * 28/12/98: Created */ -#include <msvcrt/conio.h> -#include <msvcrt/internal/console.h> +#include <conio.h> +#include <internal/console.h> -int getche(void) +int _getche(void) { if (char_avail) /* @@ -26,6 +26,6 @@ * hasn't been got by a conio function. * We don't echo again. */ - return(getch()); - return (_putch(getch())); + return(_getch()); + return (_putch(_getch())); } _____ Modified: trunk/reactos/lib/crt/conio/kbhit.c --- trunk/reactos/lib/crt/conio/kbhit.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/conio/kbhit.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -9,8 +9,8 @@ */ #include "precomp.h" -#include <msvcrt/conio.h> -#include <msvcrt/internal/console.h> +#include <conio.h> +#include <internal/console.h> /* _____ Modified: trunk/reactos/lib/crt/conio/putch.c --- trunk/reactos/lib/crt/conio/putch.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/conio/putch.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -9,7 +9,7 @@ */ #include "precomp.h" -#include <msvcrt/conio.h> +#include <conio.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/conio/ungetch.c --- trunk/reactos/lib/crt/conio/ungetch.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/conio/ungetch.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -10,8 +10,8 @@ * 28/12/98: Created */ -#include <msvcrt/conio.h> -#include <msvcrt/internal/console.h> +#include <conio.h> +#include <internal/console.h> #define EOF -1 _____ Modified: trunk/reactos/lib/crt/ctype/ctype.c --- trunk/reactos/lib/crt/ctype/ctype.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/ctype.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> unsigned short _ctype[] = { 0, /* <EOF>, 0xFFFF */ _____ Modified: trunk/reactos/lib/crt/ctype/isalnum.c --- trunk/reactos/lib/crt/ctype/isalnum.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/isalnum.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -7,7 +7,7 @@ * UPDATE HISTORY: * 28/12/98: Created */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef isalnum _____ Modified: trunk/reactos/lib/crt/ctype/isalpha.c --- trunk/reactos/lib/crt/ctype/isalpha.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/isalpha.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -8,7 +8,7 @@ * 28/12/98: Created */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef isalpha _____ Modified: trunk/reactos/lib/crt/ctype/isascii.c --- trunk/reactos/lib/crt/ctype/isascii.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/isascii.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -8,7 +8,7 @@ * 28/12/98: Created */ -#include <msvcrt/ctype.h> +#include <ctype.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/ctype/iscntrl.c --- trunk/reactos/lib/crt/ctype/iscntrl.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/iscntrl.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef iscntrl /* _____ Modified: trunk/reactos/lib/crt/ctype/iscsym.c --- trunk/reactos/lib/crt/ctype/iscsym.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/iscsym.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -7,7 +7,7 @@ * UPDATE HISTORY: * 28/12/98: Created */ -#include <msvcrt/ctype.h> +#include <ctype.h> /* _____ Modified: trunk/reactos/lib/crt/ctype/isctype.c --- trunk/reactos/lib/crt/ctype/isctype.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/isctype.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> extern unsigned short _ctype[]; @@ -34,7 +34,7 @@ /* * @implemented */ -int _isctype(unsigned int c, int ctypeFlags) +int _isctype(int c, int ctypeFlags) { return (_pctype[(unsigned char)(c & 0xFF)] & ctypeFlags); } _____ Modified: trunk/reactos/lib/crt/ctype/isdigit.c --- trunk/reactos/lib/crt/ctype/isdigit.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/isdigit.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef isdigit _____ Modified: trunk/reactos/lib/crt/ctype/isgraph.c --- trunk/reactos/lib/crt/ctype/isgraph.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/isgraph.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef isgraph /* _____ Modified: trunk/reactos/lib/crt/ctype/islower.c --- trunk/reactos/lib/crt/ctype/islower.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/islower.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef islower _____ Modified: trunk/reactos/lib/crt/ctype/isprint.c --- trunk/reactos/lib/crt/ctype/isprint.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/isprint.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef isprint /* _____ Modified: trunk/reactos/lib/crt/ctype/ispunct.c --- trunk/reactos/lib/crt/ctype/ispunct.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/ispunct.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef ispunct /* _____ Modified: trunk/reactos/lib/crt/ctype/isspace.c --- trunk/reactos/lib/crt/ctype/isspace.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/isspace.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -8,7 +8,7 @@ * 28/12/98: Created */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef isspace _____ Modified: trunk/reactos/lib/crt/ctype/isupper.c --- trunk/reactos/lib/crt/ctype/isupper.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/isupper.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef isupper /* _____ Modified: trunk/reactos/lib/crt/ctype/isxdigit.c --- trunk/reactos/lib/crt/ctype/isxdigit.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/isxdigit.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef isxdigit /* _____ Modified: trunk/reactos/lib/crt/ctype/toascii.c --- trunk/reactos/lib/crt/ctype/toascii.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/toascii.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/ctype/tolower.c --- trunk/reactos/lib/crt/ctype/tolower.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/tolower.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef tolower /* _____ Modified: trunk/reactos/lib/crt/ctype/toupper.c --- trunk/reactos/lib/crt/ctype/toupper.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/ctype/toupper.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -6,7 +6,7 @@ * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ -#include <msvcrt/ctype.h> +#include <ctype.h> #undef toupper /* _____ Modified: trunk/reactos/lib/crt/direct/chdir.c --- trunk/reactos/lib/crt/direct/chdir.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/chdir.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,7 +1,7 @@ #include "precomp.h" -#include <msvcrt/ctype.h> -#include <msvcrt/direct.h> -#include <msvcrt/internal/file.h> +#include <ctype.h> +#include <direct.h> +#include <internal/file.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/direct/chdrive.c --- trunk/reactos/lib/crt/direct/chdrive.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/chdrive.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,9 +1,9 @@ #include "precomp.h" -#include <msvcrt/ctype.h> -#include <msvcrt/direct.h> -#include <msvcrt/stdlib.h> -#include <msvcrt/errno.h> -#include <msvcrt/internal/file.h> +#include <ctype.h> +#include <direct.h> +#include <stdlib.h> +#include <errno.h> +#include <internal/file.h> int cur_drive = 0; _____ Modified: trunk/reactos/lib/crt/direct/getcwd.c --- trunk/reactos/lib/crt/direct/getcwd.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/getcwd.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,8 +1,8 @@ #include "precomp.h" -#include <msvcrt/direct.h> -#include <msvcrt/stdlib.h> -#include <msvcrt/errno.h> -#include <msvcrt/internal/file.h> +#include <direct.h> +#include <stdlib.h> +#include <errno.h> +#include <internal/file.h> /* _____ Modified: trunk/reactos/lib/crt/direct/getdcwd.c --- trunk/reactos/lib/crt/direct/getdcwd.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/getdcwd.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,6 +1,6 @@ #include "precomp.h" -#include <msvcrt/direct.h> -#include <msvcrt/internal/file.h> +#include <direct.h> +#include <internal/file.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/direct/getdfree.c --- trunk/reactos/lib/crt/direct/getdfree.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/getdfree.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,6 +1,6 @@ #include "precomp.h" -#include <msvcrt/ctype.h> -#include <msvcrt/direct.h> +#include <ctype.h> +#include <direct.h> /* _____ Modified: trunk/reactos/lib/crt/direct/getdrive.c --- trunk/reactos/lib/crt/direct/getdrive.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/getdrive.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,6 +1,6 @@ #include "precomp.h" -#include <msvcrt/ctype.h> -#include <msvcrt/direct.h> +#include <ctype.h> +#include <direct.h> extern int cur_drive; _____ Modified: trunk/reactos/lib/crt/direct/mkdir.c --- trunk/reactos/lib/crt/direct/mkdir.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/mkdir.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,6 +1,6 @@ #include "precomp.h" -#include <msvcrt/direct.h> -#include <msvcrt/internal/file.h> +#include <direct.h> +#include <internal/file.h> /* _____ Modified: trunk/reactos/lib/crt/direct/rmdir.c --- trunk/reactos/lib/crt/direct/rmdir.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/rmdir.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,6 +1,6 @@ #include "precomp.h" -#include <msvcrt/direct.h> -#include <msvcrt/internal/file.h> +#include <direct.h> +#include <internal/file.h> /* _____ Modified: trunk/reactos/lib/crt/direct/wchdir.c --- trunk/reactos/lib/crt/direct/wchdir.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/wchdir.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,8 +1,7 @@ #include "precomp.h" -#include <msvcrt/ctype.h> -#include <msvcrt/direct.h> -#include <msvcrt/internal/file.h> -#include <msvcrt/internal/file.h> +#include <ctype.h> +#include <direct.h> +#include <internal/file.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/direct/wgetcwd.c --- trunk/reactos/lib/crt/direct/wgetcwd.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/wgetcwd.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,8 +1,8 @@ #include "precomp.h" -#include <msvcrt/direct.h> -#include <msvcrt/stdlib.h> -#include <msvcrt/errno.h> -#include <msvcrt/internal/file.h> +#include <direct.h> +#include <stdlib.h> +#include <errno.h> +#include <internal/file.h> /* _____ Modified: trunk/reactos/lib/crt/direct/wgetdcwd.c --- trunk/reactos/lib/crt/direct/wgetdcwd.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/wgetdcwd.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,6 +1,6 @@ #include "precomp.h" -#include <msvcrt/direct.h> -#include <msvcrt/internal/file.h> +#include <direct.h> +#include <internal/file.h> /* _____ Modified: trunk/reactos/lib/crt/direct/wmkdir.c --- trunk/reactos/lib/crt/direct/wmkdir.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/wmkdir.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,6 +1,6 @@ #include "precomp.h" -#include <msvcrt/direct.h> -#include <msvcrt/internal/file.h> +#include <direct.h> +#include <internal/file.h> /* _____ Modified: trunk/reactos/lib/crt/direct/wrmdir.c --- trunk/reactos/lib/crt/direct/wrmdir.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/direct/wrmdir.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,6 +1,6 @@ #include "precomp.h" -#include <msvcrt/direct.h> -#include <msvcrt/internal/file.h> +#include <direct.h> +#include <internal/file.h> /* _____ Modified: trunk/reactos/lib/crt/float/chgsign.c --- trunk/reactos/lib/crt/float/chgsign.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/chgsign.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,5 +1,5 @@ -#include <msvcrt/float.h> -#include <msvcrt/internal/ieee.h> +#include <float.h> +#include <internal/ieee.h> /* _____ Modified: trunk/reactos/lib/crt/float/clearfp.c --- trunk/reactos/lib/crt/float/clearfp.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/clearfp.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,4 +1,4 @@ -#include <msvcrt/float.h> +#include <float.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/float/cntrlfp.c --- trunk/reactos/lib/crt/float/cntrlfp.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/cntrlfp.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,6 +1,6 @@ /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ -#include <msvcrt/float.h> +#include <float.h> #define X87_CW_IM (1<<0) /* Invalid operation mask */ #define X87_CW_DM (1<<1) /* Denormal operand mask */ _____ Modified: trunk/reactos/lib/crt/float/copysign.c --- trunk/reactos/lib/crt/float/copysign.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/copysign.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,5 +1,5 @@ -#include <msvcrt/float.h> -#include <msvcrt/internal/ieee.h> +#include <float.h> +#include <internal/ieee.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/float/fpclass.c --- trunk/reactos/lib/crt/float/fpclass.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/fpclass.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,6 +1,6 @@ -#include <msvcrt/float.h> -#include <msvcrt/math.h> -#include <msvcrt/internal/ieee.h> +#include <float.h> +#include <math.h> +#include <internal/ieee.h> #define _FPCLASS_SNAN 0x0001 /* signaling NaN */ _____ Modified: trunk/reactos/lib/crt/float/fpecode.c --- trunk/reactos/lib/crt/float/fpecode.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/fpecode.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -2,8 +2,8 @@ #undef __USE_W32API #endif -#include <msvcrt/float.h> -#include <msvcrt/internal/tls.h> +#include <float.h> +#include <internal/tls.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/float/fpreset.c --- trunk/reactos/lib/crt/float/fpreset.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/fpreset.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,4 +1,4 @@ -#include <msvcrt/float.h> +#include <float.h> /* _____ Modified: trunk/reactos/lib/crt/float/isnan.c --- trunk/reactos/lib/crt/float/isnan.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/isnan.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -16,9 +16,9 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <msvcrt/math.h> -#include <msvcrt/float.h> -#include <msvcrt/internal/ieee.h> +#include <math.h> +#include <float.h> +#include <internal/ieee.h> /* _____ Modified: trunk/reactos/lib/crt/float/logb.c --- trunk/reactos/lib/crt/float/logb.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/logb.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -18,7 +18,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <msvcrt/float.h> +#include <float.h> double _logb (double __x) { _____ Modified: trunk/reactos/lib/crt/float/nafter.c --- trunk/reactos/lib/crt/float/nafter.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/nafter.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,4 +1,4 @@ -#include <msvcrt/float.h> +#include <float.h> /* @@ -9,7 +9,7 @@ if ( x == y) return x; - if ( isnan(x) || isnan(y) ) + if ( _isnan(x) || _isnan(y) ) return x; return x; _____ Modified: trunk/reactos/lib/crt/float/scalb.c --- trunk/reactos/lib/crt/float/scalb.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/scalb.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,5 +1,5 @@ -#include <msvcrt/float.h> -#include <msvcrt/internal/ieee.h> +#include <float.h> +#include <internal/ieee.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/float/statfp.c --- trunk/reactos/lib/crt/float/statfp.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/float/statfp.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,4 +1,4 @@ -#include <msvcrt/float.h> +#include <float.h> /* * @implemented _____ Modified: trunk/reactos/lib/crt/io/access.c --- trunk/reactos/lib/crt/io/access.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/io/access.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,17 +1,26 @@ #include "precomp.h" -#include <msvcrt/io.h> -#include <msvcrt/errno.h> +#include <io.h> +#include <errno.h> +#include <tchar.h> +#include <internal/file.h> + #define NDEBUG -#include <msvcrt/msvcrtdbg.h> +#include <internal/msvcrtdbg.h> +#ifdef _UNICODE + #define _TS S +#else + #define _TS s +#endif + /* * @implemented */ -int _access( const char *_path, int _amode ) +int _taccess( const _TCHAR *_path, int _amode ) { - DWORD Attributes = GetFileAttributesA(_path); - DPRINT("_access('%s', %x)\n", _path, _amode); + DWORD Attributes = GetFileAttributes(_path); + DPRINT(MK_STR(_taccess)"('%"_TS"', %x)\n", _path, _amode); if (Attributes == -1) { _dosmaperr(GetLastError()); @@ -23,11 +32,31 @@ return -1; } } - if ((_amode & D_OK) == D_OK) { - if ((Attributes & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) { - __set_errno(EACCES); - return -1; - } - } + return 0; } + + + +/* + * INTERNAL + */ +int access_dirT(const _TCHAR *_path) +{ + DWORD Attributes = GetFileAttributes(_path); + DPRINT(MK_STR(is_dirT)"('%"_TS"')\n", _path); + + if (Attributes == -1) { + _dosmaperr(GetLastError()); + return -1; + } + + if ((Attributes & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) + { + __set_errno(EACCES); + return -1; + } + + return 0; +} + _____ Modified: trunk/reactos/lib/crt/io/chmod.c --- trunk/reactos/lib/crt/io/chmod.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/io/chmod.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,24 +1,28 @@ + #include "precomp.h" -#include <msvcrt/io.h> -#include <msvcrt/internal/file.h> +#include <io.h> +#include <sys/stat.h> +#include <tchar.h> +#include <internal/file.h> #define NDEBUG -#include <msvcrt/msvcrtdbg.h> +#include <internal/msvcrtdbg.h> + #define mode_t int /* * @implemented */ -int _chmod(const char* filename, mode_t mode) +int _tchmod(const _TCHAR* filename, mode_t mode) { DWORD FileAttributes = 0; BOOLEAN Set = FALSE; - DPRINT("_chmod('%s', %x)\n", filename, mode); + DPRINT(#_tchmod"('%"sT"', %x)\n", filename, mode); - FileAttributes = GetFileAttributesA(filename); + FileAttributes = GetFileAttributes(filename); if ( FileAttributes == -1 ) { _dosmaperr(GetLastError()); return -1; @@ -38,7 +42,7 @@ Set = TRUE; } } - if (Set && SetFileAttributesA(filename, FileAttributes) == FALSE) { + if (Set && SetFileAttributes(filename, FileAttributes) == FALSE) { _dosmaperr(GetLastError()); return -1; } _____ Modified: trunk/reactos/lib/crt/io/chsize.c --- trunk/reactos/lib/crt/io/chsize.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/io/chsize.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,8 +1,8 @@ /* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ -#include <msvcrt/io.h> +#include <io.h> #define NDEBUG -#include <msvcrt/msvcrtdbg.h> +#include <internal/msvcrtdbg.h> /* * @implemented @@ -10,7 +10,7 @@ int _chsize(int _fd, long size) { DPRINT("_chsize(fd %d, size %d)\n", _fd, size); - if (lseek(_fd, size, 0) == -1) + if (_lseek(_fd, size, 0) == -1) return -1; if (_write(_fd, 0, 0) < 0) return -1; _____ Modified: trunk/reactos/lib/crt/io/close.c --- trunk/reactos/lib/crt/io/close.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/io/close.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,19 +1,22 @@ #include "precomp.h" -#include <msvcrt/io.h> -#include <msvcrt/internal/file.h> +#include <io.h> +#include <internal/file.h> #define NDEBUG -#include <msvcrt/msvcrtdbg.h> +#include <internal/msvcrtdbg.h> /* * @implemented */ int _close(int _fd) { - DPRINT("_close(fd %d)\n", _fd); - if (_fd == -1) - return -1; - if (CloseHandle(_get_osfhandle(_fd)) == FALSE) - return -1; - return __fileno_close(_fd); + TRACE("_close(%i)", _fd); + + if (_fd == -1) + return(-1); + if (CloseHandle((HANDLE)_get_osfhandle(_fd)) == FALSE) + return(-1); + //return + free_fd(_fd); + return(0); } _____ Modified: trunk/reactos/lib/crt/io/commit.c --- trunk/reactos/lib/crt/io/commit.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/io/commit.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,7 +1,7 @@ #include "precomp.h" -#include <msvcrt/io.h> -#include <msvcrt/errno.h> -#include <msvcrt/internal/file.h> +#include <io.h> +#include <errno.h> +#include <internal/file.h> /* @@ -9,7 +9,7 @@ */ int _commit(int _fd) { - if (! FlushFileBuffers(_get_osfhandle(_fd)) ) { + if (! FlushFileBuffers((HANDLE)_get_osfhandle(_fd)) ) { __set_errno(EBADF); return -1; } _____ Modified: trunk/reactos/lib/crt/io/create.c --- trunk/reactos/lib/crt/io/create.c 2005-02-16 22:29:16 UTC (rev 13607) +++ trunk/reactos/lib/crt/io/create.c 2005-02-16 22:29:48 UTC (rev 13608) @@ -1,8 +1,8 @@ -#include <msvcrt/io.h> -#include <msvcrt/fcntl.h> +#include <io.h> +#include <fcntl.h> #define NDEBUG -#include <msvcrt/msvcrtdbg.h> +#include <internal/msvcrtdbg.h> [truncated at 1000 lines; 12226 more skipped]

19 years, 10 months

[gdalsnes] 13607: ntdll:

by gdalsnes＠svn.reactos.com

19 years, 10 months

← Newer
1
...
15
16
17
18
19
20
21
...
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