Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 35890: - FlsAlloc (and Co.) should first be implemented, and then exported, because some apps/DLLs depend on that (they use FlsAlloc if it's available, and workaround if it's not).
by fireball＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: fireball Date: Tue Sep 2 20:44:10 2008 New Revision: 35890 URL: http://svn.reactos.org/svn/reactos?rev=35890&view=rev Log: - FlsAlloc (and Co.) should first be implemented, and then exported, because some apps/DLLs depend on that (they use FlsAlloc if it's available, and workaround if it's not). Modified: trunk/reactos/dll/win32/kernel32/kernel32.def Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] Tue Sep 2 20:44:10 2008 @@ -274,10 +274,10 @@ FindResourceW@12 FindVolumeClose@4 FindVolumeMountPointClose@4 -FlsAlloc@4 -FlsFree@4 -FlsGetValue@4 -FlsSetValue@8 +;FlsAlloc@4 +;FlsFree@4 +;FlsGetValue@4 +;FlsSetValue@8 FlushConsoleInputBuffer@4 FlushFileBuffers@4 FlushInstructionCache@12

1 0

[cgutman] 35889: - Initially set NdisProtocolHandle to NULL
by cgutman＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cgutman Date: Tue Sep 2 20:38:42 2008 New Revision: 35889 URL: http://svn.reactos.org/svn/reactos?rev=35889&view=rev Log: - Initially set NdisProtocolHandle to NULL Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Tue Sep 2 20:38:42 2008 @@ -674,6 +674,8 @@ NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + *NdisProtocolHandle = NULL; + /* first validate the PROTOCOL_CHARACTERISTICS */ switch (ProtocolCharacteristics->MajorNdisVersion) {

1 0

[sserapion] 35888: Fix up winnt.h a bit
by sserapion＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: sserapion Date: Tue Sep 2 17:20:23 2008 New Revision: 35888 URL: http://svn.reactos.org/svn/reactos?rev=35888&view=rev Log: Fix up winnt.h a bit Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Tue Sep 2 17:20:23 2008 @@ -140,41 +140,39 @@ typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR; typedef CHAR *PCHAR,*LPCH,*PCH,*NPSTR,*LPSTR,*PSTR; typedef CONST CHAR *LPCCH,*PCCH,*PCSTR,*LPCSTR; +typedef PWSTR *PZPWSTR; +typedef CONST PWSTR *PCZPWSTR; +typedef WCHAR UNALIGNED *LPUWSTR,*PUWSTR; +typedef PCWSTR *PZPCWSTR; +typedef CONST WCHAR UNALIGNED *LPCUWSTR,*PCUWSTR; +typedef PSTR *PZPSTR; +typedef CONST PSTR *PCZPSTR; +typedef PCSTR *PZPCSTR; + +#ifdef UNICODE #ifndef _TCHAR_DEFINED #define _TCHAR_DEFINED -#ifdef UNICODE -/* - * NOTE: This tests UNICODE, which is different from the _UNICODE define - * used to differentiate standard C runtime calls. - */ -typedef WCHAR TCHAR; -typedef WCHAR _TCHAR; + typedef WCHAR TCHAR,*PTCHAR; + typedef WCHAR TBYTE ,*PTBYTE; +#endif + typedef LPWSTR LPTCH,PTCH,PTSTR,LPTSTR,LP,PTCHAR; + typedef LPCWSTR PCTSTR,LPCTSTR; + typedef LPUWSTR PUTSTR,LPUTSTR; + typedef LPCUWSTR PCUTSTR,LPCUTSTR; +#define __TEXT(quote) L##quote #else -typedef CHAR TCHAR; -typedef CHAR _TCHAR; -#endif -#endif -typedef TCHAR TBYTE,*PTCH,*PTBYTE; -typedef TCHAR *LPTCH,*PTSTR,*LPTSTR,*LP,*PTCHAR; -typedef const TCHAR *LPCTSTR; -#ifdef UNICODE -/* - * __TEXT is a private macro whose specific use is to force the expansion of a - * macro passed as an argument to the macro TEXT. DO NOT use this - * macro within your programs. It's name and function could change without - * notice. - */ -#define __TEXT(q) L##q -#else -#define __TEXT(q) q -#endif -/* - * UNICODE a constant string when UNICODE is defined, else returns the string - * unmodified. - * The corresponding macros _TEXT() and _T() for mapping _UNICODE strings - * passed to C runtime functions are defined in mingw/tchar.h - */ -#define TEXT(q) __TEXT(q) +#ifndef _TCHAR_DEFINED +#define _TCHAR_DEFINED + typedef char TCHAR,*PTCHAR; + typedef unsigned char TBYTE ,*PTBYTE; +#endif + typedef LPSTR LPTCH,PTCH,PTSTR,LPTSTR,PUTSTR,LPUTSTR,PTCHAR; + typedef LPCSTR PCTSTR,LPCTSTR,PCUTSTR,LPCUTSTR; +#define __TEXT(quote) quote +#endif + +#define TEXT(quote) __TEXT(quote) + typedef SHORT *PSHORT; typedef LONG *PLONG; #ifdef STRICT

1 0

[sserapion] 35887: Moved tchar.h out of psdk/ Update tchar.h to mingw-w64 version. Protect WCHAR_MAX from redefine warning
by sserapion＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: sserapion Date: Tue Sep 2 17:09:01 2008 New Revision: 35887 URL: http://svn.reactos.org/svn/reactos?rev=35887&view=rev Log: Moved tchar.h out of psdk/ Update tchar.h to mingw-w64 version. Protect WCHAR_MAX from redefine warning Removed: branches/ros-amd64-bringup/reactos/include/psdk/tchar.h Modified: branches/ros-amd64-bringup/reactos/include/crt/tchar.h branches/ros-amd64-bringup/reactos/include/crt/wchar.h Modified: branches/ros-amd64-bringup/reactos/include/crt/tchar.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/tchar.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/tchar.h [iso-8859-1] Tue Sep 2 17:09:01 2008 @@ -1,410 +1,1102 @@ - -#ifndef _TCHAR_H_ -#define _TCHAR_H_ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ +#include <_mingw.h> + +#ifndef _INC_TCHAR +#define _INC_TCHAR + +#ifdef _STRSAFE_H_INCLUDED_ +#error Need to include strsafe.h after tchar.h +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define _ftcscat _tcscat +#define _ftcschr _tcschr +#define _ftcscpy _tcscpy +#define _ftcscspn _tcscspn +#define _ftcslen _tcslen +#define _ftcsncat _tcsncat +#define _ftcsncpy _tcsncpy +#define _ftcspbrk _tcspbrk +#define _ftcsrchr _tcsrchr +#define _ftcsspn _tcsspn +#define _ftcsstr _tcsstr +#define _ftcstok _tcstok + +#define _ftcsdup _tcsdup +#define _ftcsnset _tcsnset +#define _ftcsrev _tcsrev +#define _ftcsset _tcsset + +#define _ftcscmp _tcscmp +#define _ftcsicmp _tcsicmp +#define _ftcsnccmp _tcsnccmp +#define _ftcsncmp _tcsncmp +#define _ftcsncicmp _tcsncicmp +#define _ftcsnicmp _tcsnicmp + +#define _ftcscoll _tcscoll +#define _ftcsicoll _tcsicoll +#define _ftcsnccoll _tcsnccoll +#define _ftcsncoll _tcsncoll +#define _ftcsncicoll _tcsncicoll +#define _ftcsnicoll _tcsnicoll + +#define _ftcsclen _tcsclen +#define _ftcsnccat _tcsnccat +#define _ftcsnccpy _tcsnccpy +#define _ftcsncset _tcsncset + +#define _ftcsdec _tcsdec +#define _ftcsinc _tcsinc +#define _ftcsnbcnt _tcsnbcnt +#define _ftcsnccnt _tcsnccnt +#define _ftcsnextc _tcsnextc +#define _ftcsninc _tcsninc +#define _ftcsspnp _tcsspnp + +#define _ftcslwr _tcslwr +#define _ftcsupr _tcsupr + +#define _ftclen _tclen +#define _ftccpy _tccpy +#define _ftccmp _tccmp + +#ifndef _CONST_RETURN +#ifdef __cplusplus +#define _CONST_RETURN const +#define _CRT_CONST_CORRECT_OVERLOADS +#else +#define _CONST_RETURN +#endif +#endif + +#define _WConst_return _CONST_RETURN + +#ifdef _UNICODE + +#ifdef __cplusplus +} +#endif + +#include <wchar.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _WCTYPE_T_DEFINED +#define _WCTYPE_T_DEFINED + typedef unsigned short wint_t; + typedef unsigned short wctype_t; +#endif + +#ifndef __TCHAR_DEFINED +#define __TCHAR_DEFINED + typedef wchar_t _TCHAR; + typedef wchar_t _TSCHAR; + typedef wchar_t _TUCHAR; + typedef wchar_t _TXCHAR; + typedef wint_t _TINT; +#endif + +#ifndef _TCHAR_DEFINED +#define _TCHAR_DEFINED +#ifndef NO_OLDNAMES + typedef wchar_t TCHAR; +#endif +#endif + +#define _TEOF WEOF + +#define __T(x) L##x + +#define _tmain wmain +#define _tWinMain wWinMain +#define _tenviron _wenviron +#define __targv __wargv + +#define _tprintf wprintf +#define _tprintf_l _wprintf_l +#define _tprintf_p _wprintf_p +#define _tprintf_p_l _wprintf_p_l +#define _tcprintf _cwprintf +#define _tcprintf_l _cwprintf_l +#define _tcprintf_p _cwprintf_p +#define _tcprintf_p_l _cwprintf_p_l +#define _vtcprintf _vcwprintf +#define _vtcprintf_l _vcwprintf_l +#define _vtcprintf_p _vcwprintf_p +#define _vtcprintf_p_l _vcwprintf_p_l +#define _ftprintf fwprintf +#define _ftprintf_l _fwprintf_l +#define _ftprintf_p _fwprintf_p +#define _ftprintf_p_l _fwprintf_p_l +#define _stprintf swprintf +#define _stprintf_l __swprintf_l +#define _stprintf_p _swprintf_p +#define _stprintf_p_l _swprintf_p_l +#define _sctprintf _scwprintf +#define _sctprintf_l _scwprintf_l +#define _sctprintf_p _scwprintf_p +#define _sctprintf_p_l _scwprintf_p_l +#define _sntprintf _snwprintf +#define _sntprintf_l _snwprintf_l +#define _vtprintf vwprintf +#define _vtprintf_l _vwprintf_l +#define _vtprintf_p _vwprintf_p +#define _vtprintf_p_l _vwprintf_p_l +#define _vftprintf vfwprintf +#define _vftprintf_l _vfwprintf_l +#define _vftprintf_p _vfwprintf_p +#define _vftprintf_p_l _vfwprintf_p_l +#define _vstprintf vswprintf +#define _vstprintf_l _vswprintf_l +#define _vstprintf_p _vswprintf_p +#define _vstprintf_p_l _vswprintf_p_l +#define _vsctprintf _vscwprintf +#define _vsctprintf_l _vscwprintf_l +#define _vsctprintf_p _vscwprintf_p +#define _vsctprintf_p_l _vscwprintf_p_l +#define _vsntprintf _vsnwprintf +#define _vsntprintf_l _vsnwprintf_l + +#define _tscanf wscanf +#define _tscanf_l _wscanf_l +#define _tcscanf _cwscanf +#define _tcscanf_l _cwscanf_l +#define _ftscanf fwscanf +#define _ftscanf_l _fwscanf_l +#define _stscanf swscanf +#define _stscanf_l _swscanf_l +#define _sntscanf _snwscanf +#define _sntscanf_l _snwscanf_l + +#define _fgettc fgetwc +#define _fgettc_nolock _fgetwc_nolock +#define _fgettchar _fgetwchar +#define _fgetts fgetws +#define _fputtc fputwc +#define _fputtc_nolock _fputwc_nolock +#define _fputtchar _fputwchar +#define _fputts fputws +#define _cputts _cputws +#define _cgetts _cgetws +#define _gettc getwc +#define _gettc_nolock _getwc_nolock +#define _gettch _getwch +#define _gettch_nolock _getwch_nolock +#define _gettche _getwche +#define _gettche_nolock _getwche_nolock +#define _gettchar getwchar +#define _gettchar_nolock _getwchar_nolock +#define _getts _getws +#define _puttc putwc +#define _puttc_nolock _putwc_nolock +#define _puttchar putwchar +#define _puttchar_nolock _putwchar_nolock +#define _puttch _putwch +#define _puttch_nolock _putwch_nolock +#define _putts _putws +#define _ungettc ungetwc +#define _ungettc_nolock _ungetwc_nolock +#define _ungettch _ungetwch +#define _ungettch_nolock _ungetwch_nolock + +#define _tcstod wcstod +#define _tcstol wcstol +#define _tcstoul wcstoul +#define _tcstoi64 _wcstoi64 +#define _tcstoui64 _wcstoui64 +#define _tstof _wtof +#define _tstol _wtol +#define _tstoi _wtoi +#define _tstoi64 _wtoi64 +#define _tcstod_l _wcstod_l +#define _tcstol_l _wcstol_l +#define _tcstoul_l _wcstoul_l +#define _tcstoi64_l _wcstoi64_l +#define _tcstoui64_l _wcstoui64_l +#define _tstof_l _wtof_l +#define _tstol_l _wtol_l +#define _tstoi_l _wtoi_l +#define _tstoi64_l _wtoi64_l + +#define _itot _itow +#define _ltot _ltow +#define _ultot _ultow +#define _ttoi _wtoi +#define _ttol _wtol + +#define _ttoi64 _wtoi64 +#define _i64tot _i64tow +#define _ui64tot _ui64tow + +#define _tcscat wcscat +#define _tcschr wcschr +#define _tcscpy wcscpy +#define _tcscspn wcscspn +#define _tcslen wcslen +#define _tcsnlen wcsnlen +#define _tcsncat wcsncat +#define _tcsncat_l _wcsncat_l +#define _tcsncpy wcsncpy +#define _tcsncpy_l _wcsncpy_l +#define _tcspbrk wcspbrk +#define _tcsrchr wcsrchr +#define _tcsspn wcsspn +#define _tcsstr wcsstr +#define _tcstok wcstok +#define _tcstok_l _wcstok_l +#define _tcserror _wcserror +#define __tcserror __wcserror + +#define _tcsdup _wcsdup +#define _tcsnset _wcsnset +#define _tcsnset_l _wcsnset_l +#define _tcsrev _wcsrev +#define _tcsset _wcsset +#define _tcsset_l _wcsset_l + +#define _tcscmp wcscmp +#define _tcsicmp _wcsicmp +#define _tcsicmp_l _wcsicmp_l +#define _tcsnccmp wcsncmp +#define _tcsncmp wcsncmp +#define _tcsncicmp _wcsnicmp +#define _tcsncicmp_l _wcsnicmp_l +#define _tcsnicmp _wcsnicmp +#define _tcsnicmp_l _wcsnicmp_l + +#define _tcscoll wcscoll +#define _tcscoll_l _wcscoll_l +#define _tcsicoll _wcsicoll +#define _tcsicoll_l _wcsicoll_l +#define _tcsnccoll _wcsncoll +#define _tcsnccoll_l _wcsncoll_l +#define _tcsncoll _wcsncoll +#define _tcsncoll_l _wcsncoll_l +#define _tcsncicoll _wcsnicoll +#define _tcsncicoll_l _wcsnicoll_l +#define _tcsnicoll _wcsnicoll +#define _tcsnicoll_l _wcsnicoll_l + +#define _texecl _wexecl +#define _texecle _wexecle +#define _texeclp _wexeclp +#define _texeclpe _wexeclpe +#define _texecv _wexecv +#define _texecve _wexecve +#define _texecvp _wexecvp +#define _texecvpe _wexecvpe + +#define _tspawnl _wspawnl +#define _tspawnle _wspawnle +#define _tspawnlp _wspawnlp +#define _tspawnlpe _wspawnlpe +#define _tspawnv _wspawnv +#define _tspawnve _wspawnve +#define _tspawnvp _wspawnvp +#define _tspawnvp _wspawnvp +#define _tspawnvpe _wspawnvpe + +#define _tsystem _wsystem + +#define _tasctime _wasctime +#define _tctime _wctime +#define _tctime32 _wctime32 +#define _tctime64 _wctime64 +#define _tstrdate _wstrdate +#define _tstrtime _wstrtime +#define _tutime _wutime +#define _tutime32 _wutime32 +#define _tutime64 _wutime64 +#define _tcsftime wcsftime +#define _tcsftime_l _wcsftime_l + +#define _tchdir _wchdir +#define _tgetcwd _wgetcwd +#define _tgetdcwd _wgetdcwd +#define _tgetdcwd_nolock _wgetdcwd_nolock +#define _tmkdir _wmkdir +#define _trmdir _wrmdir + +#define _tfullpath _wfullpath +#define _tgetenv _wgetenv +#define _tmakepath _wmakepath +#define _tpgmptr _wpgmptr +#define _get_tpgmptr _get_wpgmptr +#define _tputenv _wputenv +#define _tsearchenv _wsearchenv +#define _tsplitpath _wsplitpath + +#define _tfdopen _wfdopen +#define _tfsopen _wfsopen +#define _tfopen _wfopen +#define _tfreopen _wfreopen +#define _tperror _wperror +#define _tpopen _wpopen +#define _ttempnam _wtempnam +#define _ttmpnam _wtmpnam + +#define _taccess _waccess +#define _tchmod _wchmod +#define _tcreat _wcreat +#define _tfindfirst _wfindfirst +#define _tfindfirst32 _wfindfirst32 +#define _tfindfirst64 _wfindfirst64 +#define _tfindfirsti64 _wfindfirsti64 +#define _tfindfirst32i64 _wfindfirst32i64 +#define _tfindfirst64i32 _wfindfirst64i32 +#define _tfindnext _wfindnext +#define _tfindnext32 _wfindnext32 +#define _tfindnext64 _wfindnext64 +#define _tfindnexti64 _wfindnexti64 +#define _tfindnext32i64 _wfindnext32i64 +#define _tfindnext64i32 _wfindnext64i32 +#define _tmktemp _wmktemp +#define _topen _wopen +#define _tremove _wremove +#define _trename _wrename +#define _tsopen _wsopen +#define _tunlink _wunlink + +#define _tfinddata_t _wfinddata_t +#define _tfinddata32_t _wfinddata32_t +#define _tfinddata64_t _wfinddata64_t +#define _tfinddatai64_t _wfinddatai64_t +#define _tfinddata32i64_t _wfinddata32i64_t +#define _tfinddata64i32_t _wfinddata64i32_t + +#define _tstat _wstat +#define _tstat32 _wstat32 +#define _tstat32i64 _wstat32i64 +#define _tstat64 _wstat64 +#define _tstat64i32 _wstat64i32 +#define _tstati64 _wstati64 + +#define _tsetlocale _wsetlocale + +#define _tcsclen wcslen +#define _tcscnlen wcsnlen +#define _tcsclen_l(_String,_Locale) wcslen(_String) +#define _tcscnlen_l(_String,_Max_count,_Locale) wcsnlen_l((_String),(_Max_count)) +#define _tcsnccat wcsncat +#define _tcsnccat_l _wcsncat_l +#define _tcsnccpy wcsncpy +#define _tcsnccpy_l _wcsncpy_l +#define _tcsncset _wcsnset + +#define _tcsdec _wcsdec +#define _tcsinc _wcsinc +#define _tcsnbcnt _wcsncnt +#define _tcsnccnt _wcsncnt +#define _tcsnextc _wcsnextc +#define _tcsninc _wcsninc +#define _tcsspnp _wcsspnp + +#define _tcslwr _wcslwr +#define _tcslwr_l _wcslwr_l +#define _tcsupr _wcsupr +#define _tcsupr_l _wcsupr_l +#define _tcsxfrm wcsxfrm +#define _tcsxfrm_l _wcsxfrm_l + +#define _tclen(_pc) (1) +#define _tccpy(_pc1,_cpc2) ((*(_pc1) = *(_cpc2))) +#define _tccmp(_cpc1,_cpc2) ((*(_cpc1))-(*(_cpc2))) + +#define _istalnum iswalnum +#define _istalnum_l _iswalnum_l +#define _istalpha iswalpha +#define _istalpha_l _iswalpha_l +#define _istascii iswascii +#define _istcntrl iswcntrl +#define _istcntrl_l _iswcntrl_l +#define _istdigit iswdigit +#define _istdigit_l _iswdigit_l +#define _istgraph iswgraph +#define _istgraph_l _iswgraph_l +#define _istlower iswlower +#define _istlower_l _iswlower_l +#define _istprint iswprint +#define _istprint_l _iswprint_l +#define _istpunct iswpunct +#define _istpunct_l _iswpunct_l +#define _istspace iswspace +#define _istspace_l _iswspace_l +#define _istupper iswupper +#define _istupper_l _iswupper_l +#define _istxdigit iswxdigit +#define _istxdigit_l _iswxdigit_l + +#define _totupper towupper +#define _totupper_l _towupper_l +#define _totlower towlower +#define _totlower_l _towlower_l + +#define _istlegal(_Char) (1) +#define _istlead(_Char) (0) +#define _istleadbyte(_Char) (0) +#define _istleadbyte_l(_Char,_Locale) (0) + +#define _wcsdec(_cpc1,_cpc2) ((_cpc1)>=(_cpc2) ? NULL : (_cpc2)-1) +#define _wcsinc(_pc) ((_pc)+1) +#define _wcsnextc(_cpc) ((unsigned int) *(_cpc)) +#define _wcsninc(_pc,_sz) (((_pc)+(_sz))) + _CRTIMP size_t __cdecl __wcsncnt(const wchar_t *_Str,size_t _MaxCount); +#define _wcsncnt(_cpc,_sz) (__wcsncnt(_cpc,_sz)) +#define _wcsspnp(_cpc1,_cpc2) (!_cpc1 ? NULL : ((*((_cpc1)+wcsspn(_cpc1,_cpc2))) ? ((_cpc1)+wcsspn(_cpc1,_cpc2)) : NULL)) +#define _wcsncpy_l(_Destination,_Source,_Count,_Locale) (wcsncpy(_Destination,_Source,_Count)) +#define _wcsncat_l(_Destination,_Source,_Count,_Locale) (wcsncat(_Destination,_Source,_Count)) +#define _wcstok_l(_String,_Delimiters,_Locale) (wcstok(_String,_Delimiters)) +#define _wcsnset_l(_Destination,_Value,_Count,_Locale) (_wcsnset(_Destination,_Value,_Count)) +#define _wcsset_l(_Destination,_Value,_Locale) (_wcsset(_Destination,_Value)) + + /* dirent structures and functions */ +#define _tdirent _wdirent +#define _TDIR _WDIR +#define _topendir _wopendir +#define _tclosedir _wclosedir +#define _treaddir _wreaddir +#define _trewinddir _wrewinddir +#define _ttelldir _wtelldir +#define _tseekdir _wseekdir + +#else + +#ifdef __cplusplus +} +#endif #include <string.h> -#ifdef _UNICODE - - #define __T(q) L##q - - #ifndef _TCHAR_DEFINED - #ifndef RC_INVOKED - typedef wchar_t TCHAR; - typedef wchar_t _TCHAR; - #endif /* Not RC_INVOKED */ - #define _TCHAR_DEFINED - #endif - - #define _TINT wint_t - #define _TSCHAR wchar_t - #define _TUCHAR wchar_t - #define _TXCHAR wchar_t - #define _TEOF WEOF - #define _tenviron _wenviron - #define _tfinddata_t _wfinddata_t - - /* dirent structures and functions */ - #define _tdirent _wdirent - #define _TDIR _WDIR - #define _topendir _wopendir - #define _tclosedir _wclosedir - #define _treaddir _wreaddir - #define _trewinddir _wrewinddir - #define _ttelldir _wtelldir - #define _tseekdir _wseekdir - - #define _ttoi64 _wtoi64 - #define _i64tot _i64tow - #define _ui64tot _ui64tow - #define _tcsnccoll _wstrncoll - #define _tcsncoll _wstrncoll - #define _tcsncicoll _wstrnicoll - #define _tfindfirsti64 _wfindfirsti64 - #define _tfindnexti64 _wfindnexti64 - #define _tfinddatai64_t _wfinddatai64_t - - #define _tunlink _wunlink - #define _tgetdcwd _wgetdcwd - - #define _fgettc fgetwc - #define _fgettchar _fgetwchar - #define _fgetts fgetws - #define _fputtc fputwc - #define _fputtchar _fputwchar - #define _fputts fputws - #define _ftprintf fwprintf - #define _ftscanf fwscanf - #define _gettc getwc - #define _gettchar getwchar - #define _getts getws - #define _istalnum iswalnum - #define _istalpha iswalpha - #define _istascii iswascii - #define _istcntrl iswcntrl - #define _istdigit iswdigit - #define _istgraph iswgraph - #define _istlead(c) 0 - #define _istleadbyte(c) 0 - #define _istlegal(c) 1 - #define _istlower iswlower - #define _istprint iswprint - #define _istpunct iswpunct - #define _istspace iswspace - #define _istupper iswupper - #define _istxdigit iswxdigit - #define _itot _itow - #define _ltot _ltow - #define _puttc putwc - #define _puttchar putwchar - #define _putts putws - #define _tmain wmain - #define _sntprintf _snwprintf - #define _stprintf swprintf - #define _stscanf swscanf - #define _taccess _waccess - #define _tasctime _wasctime - #define _tccpy(d,s) (*(d)=*(s)) - #define _tchdir _wchdir - #define _tclen(c) 2 - #define _tchmod _wchmod - #define _tcreat _wcreat - #define _tcscat wcscat - #define _tcschr wcschr - #define _tcsclen wcslen - #define _tcscmp wcscmp - #define _tcscoll wcscoll - #define _tcscpy wcscpy - #define _tcscspn wcscspn - #define _tcsdec _wcsdec - #define _tcsdup _wcsdup - #define _tcsftime wcsftime - #define _tcsicmp _wcsicmp - #define _tcsicoll _wcsicoll - #define _tcsinc _wcsinc - #define _tcslen wcslen - #define _tcslwr _wcslwr - #define _tcsnbcnt _wcnscnt - #define _tcsncat wcsncat - #define _tcsnccat wcsncat - #define _tcsncmp wcsncmp - #define _tcsnccmp wcsncmp - #define _tcsnccnt _wcsncnt - #define _tcsnccpy wcsncpy - #define _tcsncicmp _wcsnicmp - #define _tcsncpy wcsncpy - #define _tcsncset _wcsnset - #define _tcsnextc _wcsnextc - #define _tcsnicmp _wcsnicmp - #define _tcsnicoll _wcsnicoll - #define _tcsninc _wcsninc - #define _tcsnccnt _wcsncnt - #define _tcsnset _wcsnset - #define _tcspbrk wcspbrk - #define _tcsspnp _wcsspnp - #define _tcsrchr wcsrchr - #define _tcsrev _wcsrev - #define _tcsset _wcsset - #define _tcsspn wcsspn - #define _tcsstr wcsstr - #define _tcstod wcstod - #define _tcstok wcstok - #define _tcstol wcstol - #define _tcstoul wcstoul - #define _tcsupr _wcsupr - #define _tcsxfrm wcsxfrm - #define _tctime _wctime - #define _texecl _wexecl - #define _texecle _wexecle - #define _texeclp _wexeclp - #define _texeclpe _wexeclpe - #define _texecv _wexecv - #define _texecve _wexecve - #define _texecvp _wexecvp - #define _texecvpe _wexecvpe - #define _tfdopen _wfdopen - #define _tfindfirst _wfindfirst - #define _tfindnext _wfindnext - #define _tfopen _wfopen - #define _tfreopen _wfreopen - #define _tfsopen _wfsopen - #define _tfullpath _wfullpath - #define _tgetcwd _wgetcwd - #define _tgetenv _wgetenv - #define _tmain wmain - #define _tmakepath _wmakepath - #define _tmkdir _wmkdir - #define _tmktemp _wmktemp - #define _tperror _wperror - #define _topen _wopen - #define _totlower towlower - #define _totupper towupper - #define _tpopen _wpopen - #define _tprintf wprintf - #define _tremove _wremove - #define _trename _wrename - #define _trmdir _wrmdir - #define _tsearchenv _wsearchenv - #define _tscanf wscanf - #define _tsetlocale _wsetlocale - #define _tsopen _wsopen - #define _tspawnl _wspawnl - #define _tspawnle _wspawnle - #define _tspawnlp _wspawnlp - #define _tspawnlpe _wspawnlpe - #define _tspawnv _wspawnv - #define _tspawnve _wspawnve - #define _tspawnvp _wspawnvp - #define _tspawnvpe _wspawnvpe - #define _tsplitpath _wsplitpath - #define _tstat _wstat - #define _tstrdate _wstrdate - #define _tstrtime _wstrtime - #define _tsystem _wsystem - #define _ttempnam _wtempnam - #define _ttmpnam _wtmpnam - #define _ttoi _wtoi - #define _ttol _wtol - #define _tutime _wutime - #define _tWinMain wWinMain - #define _ultot _ultow - #define _ungettc ungetwc - #define _vftprintf vfwprintf - #define _vsntprintf _vsnwprintf - #define _vstprintf vswprintf - #define _vtprintf vwprintf - - #define _wcsdec(_wcs1, _wcs2) ((_wcs1)>=(_wcs2) ? NULL : (_wcs2)-1) - #define _wcsinc(_wcs) ((_wcs)+1) - #define _wcsnextc(_wcs) ((unsigned int) *(_wcs)) - #define _wcsninc(_wcs, _inc) (((_wcs)+(_inc))) - #define _wcsncnt(_wcs, _cnt) ((wcslen(_wcs)>_cnt) ? _count : wcslen(_wcs)) - #define _wcsspnp(_wcs1, _wcs2) ((*((_wcs1)+wcsspn(_wcs1,_wcs2))) ? ((_wcs1)+wcsspn(_wcs1,_wcs2)) : NULL) - +#ifdef __cplusplus +extern "C" { +#endif + +#define _TEOF EOF + +#define __T(x) x + +#define _tmain main +#define _tWinMain WinMain +#ifdef _POSIX_ +#define _tenviron environ #else - - #define __T(q) q - - #ifndef _TCHAR_DEFINED - #ifndef RC_INVOKED - typedef char TCHAR; - typedef char _TCHAR; - #endif - #define _TCHAR_DEFINED - #endif - - #define _TINT int - #define _TSCHAR signed char - #define _TUCHAR unsigned char - #define _TXCHAR char - #define _TEOF EOF - #define _tenviron _environ - #define _tfinddata_t _finddata_t - - /* dirent structures and functions */ - #define _tdirent dirent - #define _TDIR DIR - #define _topendir opendir - #define _tclosedir closedir - #define _treaddir readdir - #define _trewinddir rewinddir - #define _ttelldir telldir - #define _tseekdir seekdir - - #define _ttoi64 _atoi64 - #define _i64tot _i64toa - #define _ui64tot _ui64toa - #define _tcsnccoll _strncoll - #define _tcsncoll _strncoll - #define _tcsncicoll _strnicoll - #define _tfindfirsti64 _findfirsti64 - #define _tfindnexti64 _findnexti64 - #define _tfinddatai64_t _finddatai64_t - - #define _tunlink _unlink - #define _tgetdcwd _getdcwd - - #define _fgettc fgetc - #define _fgettchar fgetchar - #define _fgetts fgets - #define _fputtc fputc - #define _fputtchar fputchar - #define _fputts fputs - #define _ftprintf fprintf - #define _ftscanf fscanf - #define _gettc getc - #define _gettchar getchar - #define _getts gets - #define _istalnum isalnum - #define _istalpha isalpha - #define _istascii __isascii - #define _istcntrl iscntrl - #define _istdigit isdigit - #define _istgraph isgraph - #define _istlead(c) 0 - #define _istleadbyte(c) 0 - #define _istlegal(c) 1 - #define _istlower islower - #define _istprint isprint - #define _istpunct ispunct - #define _istspace isspace - #define _istupper isupper - #define _istxdigit isxdigit - #define _itot _itoa - #define _ltot _ltoa - #define _puttc putc - #define _puttchar putchar - #define _putts puts - #define _tmain main - #define _sntprintf _snprintf - #define _stprintf sprintf - #define _stscanf sscanf - #define _taccess _access - #define _tasctime asctime - #define _tccpy(d,s) (*(d)=*(s)) - #define _tchdir _chdir - #define _tclen(c) 1 - #define _tchmod _chmod - #define _tcreat _creat - #define _tcscat strcat - #define _tcschr strchr - #define _tcsclen strlen - #define _tcscmp strcmp - #define _tcscoll strcoll - #define _tcscpy strcpy - #define _tcscspn strcspn - #define _tcsdec _strdec - #define _tcsdup _strdup - #define _tcsftime strftime - #define _tcsicmp _stricmp - #define _tcsicoll _stricoll - #define _tcsinc _strinc - #define _tcslen strlen - #define _tcslwr _strlwr - #define _tcsnbcnt _strncnt - #define _tcsncat strncat - #define _tcsnccat strncat - #define _tcsncmp strncmp - #define _tcsnccmp strncmp - #define _tcsnccnt _strncnt - #define _tcsnccpy strncpy - #define _tcsncicmp _strnicmp - #define _tcsncpy strncpy - #define _tcsncset _strnset - #define _tcsnextc _strnextc - #define _tcsnicmp _strnicmp - #define _tcsnicoll _strnicoll - #define _tcsninc _strninc - #define _tcsnccnt _strncnt - #define _tcsnset _strnset - #define _tcspbrk strpbrk - #define _tcsspnp _strspnp - #define _tcsrchr strrchr - #define _tcsrev _strrev - #define _tcsset _strset - #define _tcsspn strspn - #define _tcsstr strstr - #define _tcstod strtod - #define _tcstok strtok - #define _tcstol strtol - #define _tcstoul strtoul - #define _tcsupr _strupr - #define _tcsxfrm strxfrm - #define _tctime ctime - #define _texecl _execl - #define _texecle _execle - #define _texeclp _execlp - #define _texeclpe _execlpe - #define _texecv _execv - #define _texecve _execve - #define _texecvp _execvp - #define _texecvpe _execvpe - #define _tfdopen _fdopen - #define _tfindfirst _findfirst - #define _tfindnext _findnext - #define _tfopen fopen - #define _tfreopen freopen - #define _tfsopen _fsopen - #define _tfullpath _fullpath - #define _tgetcwd _getcwd - #define _tgetenv getenv - #define _tmain main - #define _tmakepath _makepath - #define _tmkdir _mkdir - #define _tmktemp _mktemp - #define _tperror perror - #define _topen _open - #define _totlower tolower - #define _totupper toupper - #define _tpopen _popen - #define _tprintf printf - #define _tremove remove - #define _trename rename - #define _trmdir _rmdir - #define _tsearchenv _searchenv - #define _tscanf scanf - #define _tsetlocale setlocale - #define _tsopen _sopen - #define _tspawnl _spawnl - #define _tspawnle _spawnle - #define _tspawnlp _spawnlp - #define _tspawnlpe _spawnlpe - #define _tspawnv _spawnv - #define _tspawnve _spawnve - #define _tspawnvp _spawnvp - #define _tspawnvpe _spawnvpe - #define _tsplitpath _splitpath - #define _tstat _stat - #define _tstrdate _strdate - #define _tstrtime _strtime - #define _tsystem system - #define _ttempnam _tempnam - #define _ttmpnam tmpnam - #define _ttoi atoi - #define _ttol atol - #define _tutime _utime - #define _tWinMain WinMain - #define _ultot _ultoa - #define _ungettc ungetc - #define _vftprintf vfprintf - #define _vsntprintf _vsnprintf - #define _vstprintf vsprintf - #define _vtprintf vprintf - - #define _strdec(_str1, _str2) ((_str1)>=(_str2) ? NULL : (_str2)-1) - #define _strinc(_str) ((_str)+1) - #define _strnextc(_str) ((unsigned int) *(_str)) - #define _strninc(_str, _inc) (((_str)+(_inc))) - #define _strncnt(_str, _cnt) ((strlen(_str)>_cnt) ? _count : strlen(_str)) - #define _strspnp(_str1, _str2) ((*((_str1)+strspn(_str1,_str2))) ? ((_str1)+strspn(_str1,_str2)) : NULL) - -#endif - - - - -#define _TEXT(x) __T(x) -#define _T(x) __T(x) - -#endif /* _TCHAR_H_ */ - +#define _tenviron _environ +#endif +#define __targv __argv + +#define _tprintf printf +#define _tprintf_l _printf_l +#define _tprintf_p _printf_p +#define _tprintf_p_l _printf_p_l +#define _tcprintf _cprintf +#define _tcprintf_l _cprintf_l +#define _tcprintf_p _cprintf_p +#define _tcprintf_p_l _cprintf_p_l +#define _vtcprintf _vcprintf +#define _vtcprintf_l _vcprintf_l +#define _vtcprintf_p _vcprintf_p +#define _vtcprintf_p_l _vcprintf_p_l +#define _ftprintf fprintf +#define _ftprintf_l _fprintf_l +#define _ftprintf_p _fprintf_p +#define _ftprintf_p_l _fprintf_p_l +#define _stprintf sprintf +#define _stprintf_l _sprintf_l +#define _stprintf_p _sprintf_p +#define _stprintf_p_l _sprintf_p_l +#define _sctprintf _scprintf +#define _sctprintf_l _scprintf_l +#define _sctprintf_p _scprintf_p +#define _sctprintf_p_l _scprintf_p_l +#define _sntprintf _snprintf +#define _sntprintf_l _snprintf_l +#define _vtprintf vprintf +#define _vtprintf_l _vprintf_l +#define _vtprintf_p _vprintf_p +#define _vtprintf_p_l _vprintf_p_l +#define _vftprintf vfprintf +#define _vftprintf_l _vfprintf_l +#define _vftprintf_p _vfprintf_p +#define _vftprintf_p_l _vfprintf_p_l +#define _vstprintf vsprintf +#define _vstprintf_l _vsprintf_l +#define _vstprintf_p _vsprintf_p +#define _vstprintf_p_l _vsprintf_p_l +#define _vsctprintf _vscprintf +#define _vsctprintf_l _vscprintf_l +#define _vsctprintf_p _vscprintf_p +#define _vsctprintf_p_l _vscprintf_p_l +#define _vsntprintf _vsnprintf +#define _vsntprintf_l _vsnprintf_l + +#define _tscanf scanf +#define _tscanf_l _scanf_l +#define _tcscanf _cscanf +#define _tcscanf_l _cscanf_l +#define _ftscanf fscanf +#define _ftscanf_l _fscanf_l +#define _stscanf sscanf +#define _stscanf_l _sscanf_l +#define _sntscanf _snscanf +#define _sntscanf_l _snscanf_l + +#define _fgettc fgetc +#define _fgettc_nolock _fgetc_nolock +#define _fgettchar _fgetchar +#define _fgetts fgets +#define _fputtc fputc +#define _fputtc_nolock _fputc_nolock +#define _fputtchar _fputchar +#define _fputts fputs +#define _cputts _cputs +#define _gettc getc +#define _gettc_nolock _getc_nolock +#define _gettch _getch +#define _gettch_nolock _getch_nolock +#define _gettche _getche +#define _gettche_nolock _getche_nolock +#define _gettchar getchar +#define _gettchar_nolock _getchar_nolock +#define _getts gets +#define _cgetts _cgets +#define _puttc putc +#define _puttc_nolock _putc_nolock +#define _puttchar putchar +#define _puttchar_nolock _putchar_nolock +#define _puttch _putch +#define _puttch_nolock _putch_nolock +#define _putts puts +#define _ungettc ungetc +#define _ungettc_nolock _ungetc_nolock +#define _ungettch _ungetch +#define _ungettch_nolock _ungetch_nolock + +#define _tcstod strtod +#define _tcstol strtol +#define _tcstoul strtoul +#define _tstof atof +#define _tstol atol +#define _tstoi atoi +#define _tstoi64 _atoi64 +#define _tcstod_l _strtod_l +#define _tcstol_l _strtol_l +#define _tcstoul_l _strtoul_l +#define _tstof_l _atof_l +#define _tstol_l _atol_l +#define _tstoi_l _atoi_l +#define _tstoi64_l _atoi64_l + +#define _itot _itoa +#define _ltot _ltoa +#define _ultot _ultoa +#define _ttoi atoi +#define _ttol atol + +#define _ttoi64 _atoi64 +#define _tcstoi64 _strtoi64 +#define _tcstoi64_l _strtoi64_l +#define _tcstoui64 _strtoui64 +#define _tcstoui64_l _strtoui64_l +#define _i64tot _i64toa +#define _ui64tot _ui64toa + +#define _tcscat strcat +#define _tcscpy strcpy +#define _tcsdup _strdup +#define _tcslen strlen +#if 0 +#define _tcsnlen strnlen +#endif +#define _tcsxfrm strxfrm +#define _tcsxfrm_l _strxfrm_l +#define _tcserror strerror +#define __tcserror _strerror + +#define _texecl _execl +#define _texecle _execle +#define _texeclp _execlp +#define _texeclpe _execlpe +#define _texecv _execv +#define _texecve _execve +#define _texecvp _execvp +#define _texecvpe _execvpe + +#define _tspawnl _spawnl +#define _tspawnle _spawnle +#define _tspawnlp _spawnlp +#define _tspawnlpe _spawnlpe +#define _tspawnv _spawnv +#define _tspawnve _spawnve +#define _tspawnvp _spawnvp +#define _tspawnvpe _spawnvpe + +#define _tsystem system + +#define _tasctime asctime +#define _tctime ctime +#define _tctime32 _ctime32 +#define _tctime64 _ctime64 +#define _tstrdate _strdate +#define _tstrtime _strtime +#define _tutime _utime +#define _tutime32 _utime32 +#define _tutime64 _utime64 +#define _tcsftime strftime +#define _tcsftime_l _strftime_l + +#define _tchdir _chdir +#define _tgetcwd _getcwd +#define _tgetdcwd _getdcwd +#define _tgetdcwd_nolock _getdcwd_nolock +#define _tmkdir _mkdir +#define _trmdir _rmdir + +#define _tfullpath _fullpath +#define _tgetenv getenv +#define _tmakepath _makepath +#define _tpgmptr _pgmptr +#define _get_tpgmptr _get_pgmptr +#define _tputenv _putenv +#define _tsearchenv _searchenv +#define _tsplitpath _splitpath + +#ifdef _POSIX_ +#define _tfdopen fdopen +#else +#define _tfdopen _fdopen +#endif +#define _tfsopen _fsopen +#define _tfopen fopen +#define _tfreopen freopen +#define _tperror perror +#define _tpopen _popen +#define _ttempnam _tempnam +#define _ttmpnam tmpnam + +#define _tchmod _chmod +#define _tcreat _creat +#define _tfindfirst _findfirst +#define _tfindfirst32 _findfirst32 +#define _tfindfirst64 _findfirst64 +#define _tfindfirsti64 _findfirsti64 +#define _tfindfirst32i64 _findfirst32i64 +#define _tfindfirst64i32 _findfirst64i32 +#define _tfindnext _findnext +#define _tfindnext32 _findnext32 +#define _tfindnext64 _findnext64 +#define _tfindnexti64 _findnexti64 +#define _tfindnext32i64 _findnext32i64 +#define _tfindnext64i32 _findnext64i32 +#define _tmktemp _mktemp + +#ifdef _POSIX_ +#define _topen open +#define _taccess access +#else +#define _topen _open +#define _taccess _access +#endif + +#define _tremove remove +#define _trename rename +#define _tsopen _sopen +#define _tunlink _unlink + +#define _tfinddata_t _finddata_t +#define _tfinddata32_t _finddata32_t +#define _tfinddata64_t __finddata64_t +#define _tfinddatai64_t _finddatai64_t +#define _tfinddata32i64_t _finddata32i64_t +#define _tfinddata64i32_t _finddata64i32_t + +#define _istascii __isascii +#define _istcntrl iscntrl +#define _istcntrl_l _iscntrl_l +#define _istxdigit isxdigit +#define _istxdigit_l _isxdigit_l + +#define _tstat _stat +#define _tstat32 _stat32 +#define _tstat32i64 _stat32i64 +#define _tstat64 _stat64 +#define _tstat64i32 _stat64i32 +#define _tstati64 _stati64 + +#define _tsetlocale setlocale + +#ifdef _MBCS + +#ifdef __cplusplus +} +#endif + +#include <mbstring.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef __TCHAR_DEFINED + typedef char _TCHAR; + typedef signed char _TSCHAR; + typedef unsigned char _TUCHAR; + typedef unsigned char _TXCHAR; + typedef unsigned int _TINT; +#define __TCHAR_DEFINED +#endif + +#ifndef _TCHAR_DEFINED +#ifndef NO_OLDNAMES + typedef char TCHAR; +#endif +#define _TCHAR_DEFINED +#endif + +#ifdef _MB_MAP_DIRECT + +#define _tcschr _mbschr +#define _tcscspn _mbscspn +#define _tcsncat _mbsnbcat +#define _tcsncat_l _mbsnbcat_l +#define _tcsncpy _mbsnbcpy +#define _tcsncpy_l _mbsnbcpy_l +#define _tcspbrk _mbspbrk +#define _tcsrchr _mbsrchr +#define _tcsspn _mbsspn +#define _tcsstr _mbsstr +#define _tcstok _mbstok +#define _tcstok_l _mbstok_l + +#define _tcsnset _mbsnbset +#define _tcsnset_l _mbsnbset_l +#define _tcsrev _mbsrev +#define _tcsset _mbsset +#define _tcsset_l _mbsset_l + +#define _tcscmp _mbscmp +#define _tcsicmp _mbsicmp +#define _tcsicmp_l _mbsicmp_l +#define _tcsnccmp _mbsncmp +#define _tcsncmp _mbsnbcmp +#define _tcsncicmp _mbsnicmp +#define _tcsncicmp_l _mbsnicmp_l +#define _tcsnicmp _mbsnbicmp +#define _tcsnicmp_l _mbsnbicmp_l + +#define _tcscoll _mbscoll +#define _tcscoll_l _mbscoll_l +#define _tcsicoll _mbsicoll +#define _tcsicoll_l _mbsicoll_l +#define _tcsnccoll _mbsncoll +#define _tcsnccoll_l _mbsncoll_l +#define _tcsncoll _mbsnbcoll +#define _tcsncoll_l _mbsnbcoll_l +#define _tcsncicoll _mbsnicoll +#define _tcsncicoll_l _mbsnicoll_l +#define _tcsnicoll _mbsnbicoll +#define _tcsnicoll_l _mbsnbicoll_l + +#define _tcsclen _mbslen +#define _tcscnlen _mbsnlen +#define _tcsclen_l _mbslen_l +#define _tcscnlen_l _mbsnlen_l +#define _tcsnccat _mbsncat +#define _tcsnccat_l _mbsncat_l +#define _tcsnccpy _mbsncpy +#define _tcsnccpy_l _mbsncpy_l +#define _tcsncset _mbsnset +#define _tcsncset_l _mbsnset_l + +#define _tcsdec _mbsdec +#define _tcsinc _mbsinc +#define _tcsnbcnt _mbsnbcnt +#define _tcsnccnt _mbsnccnt +#define _tcsnextc _mbsnextc +#define _tcsninc _mbsninc +#define _tcsspnp _mbsspnp + +#define _tcslwr _mbslwr +#define _tcslwr_l _mbslwr_l +#define _tcsupr _mbsupr +#define _tcsupr_l _mbsupr_l + +#define _tclen _mbclen +#define _tccpy _mbccpy +#define _tccpy_l _mbccpy_l +#else + + _CRTIMP _CONST_RETURN char *__cdecl _tcschr(const char *_Str,unsigned int _Val); + _CRTIMP size_t __cdecl _tcscspn(const char *_Str,const char *_Control); + _CRTIMP char *__cdecl _tcsncat(char *_Dst,const char *_Src,size_t _MaxCount); + _CRTIMP char *__cdecl _tcsncat_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); + _CRTIMP char *__cdecl _tcsncpy(char *_Dst,const char *_Src,size_t _MaxCount); + _CRTIMP char *__cdecl _tcsncpy_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); + _CRTIMP _CONST_RETURN char *__cdecl _tcspbrk(const char *_Str,const char *_Control); + _CRTIMP _CONST_RETURN char *__cdecl _tcsrchr(const char *_Str,unsigned int _Ch); + _CRTIMP size_t __cdecl _tcsspn(const char *_Str,const char *_Control); + _CRTIMP _CONST_RETURN char *__cdecl _tcsstr(const char *_Str,const char *_Substr); + _CRTIMP char *__cdecl _tcstok(char *_Str,const char *_Delim); + _CRTIMP char *__cdecl _tcstok_l(char *_Str,const char *_Delim,_locale_t _Locale); + _CRTIMP char *__cdecl _tcsnset(char *_Str,unsigned int _Val,size_t _MaxCount); + _CRTIMP char *__cdecl _tcsrev(char *_Str); + _CRTIMP char *__cdecl _tcsset(char *_Str,unsigned int _Val); + _CRTIMP char *__cdecl _tcsset_l(char *_Str,unsigned int _Val,_locale_t _Locale); + _CRTIMP int __cdecl _tcscmp(const char *_Str1,const char *_Str); + _CRTIMP int __cdecl _tcsicmp(const char *_Str1,const char *_Str2); + _CRTIMP int __cdecl _tcsicmp_l(const char *_Str1,const char *_Str2,_locale_t _Locale); + _CRTIMP int __cdecl _tcsnccmp(const char *_Str1,const char *_Str2,size_t _MaxCount); + _CRTIMP int __cdecl _tcsncmp(const char *_Str1,const char *_Str2,size_t _MaxCount); + _CRTIMP int __cdecl _tcsncicmp(const char *_Str1,const char *_Str2,size_t _MaxCount); + _CRTIMP int __cdecl _tcsncicmp_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); + _CRTIMP int __cdecl _tcsnicmp(const char *_Str1,const char *_Str2,size_t _MaxCount); + _CRTIMP int __cdecl _tcsnicmp_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); + _CRTIMP int __cdecl _tcscoll(const char *_Str1,const char *_Str2); + _CRTIMP int __cdecl _tcscoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); + _CRTIMP int __cdecl _tcsicoll(const char *_Str1,const char *_Str2); + _CRTIMP int __cdecl _tcsicoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); + _CRTIMP int __cdecl _tcsnccoll(const char *_Str1,const char *_Str2,size_t _MaxCount); + _CRTIMP int __cdecl _tcsnccoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); + _CRTIMP int __cdecl _tcsncoll(const char *_Str1,const char *_Str2,size_t _MaxCount); + _CRTIMP int __cdecl _tcsncoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); + _CRTIMP int __cdecl _tcsncicoll(const char *_Str1,const char *_Str2,size_t _MaxCount); + _CRTIMP int __cdecl _tcsncicoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); + _CRTIMP int __cdecl _tcsnicoll(const char *_Str1,const char *_Str2,size_t _MaxCount); + _CRTIMP int __cdecl _tcsnicoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); + _CRTIMP size_t __cdecl _tcsclen(const char *_Str); + _CRTIMP size_t __cdecl _tcscnlen(const char *_Str,size_t _MaxCount); + _CRTIMP size_t __cdecl _tcsclen_l(const char *_Str,_locale_t _Locale); + _CRTIMP size_t __cdecl _tcscnlen_l(const char *_Str,size_t _MaxCount,_locale_t _Locale); + _CRTIMP char *__cdecl _tcsnccat(char *_Dst,const char *_Src,size_t _MaxCount); + _CRTIMP char *__cdecl _tcsnccat_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); + _CRTIMP char *__cdecl _tcsnccpy(char *_Dst,const char *_Src,size_t _MaxCount); + _CRTIMP char *__cdecl _tcsnccpy_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); + _CRTIMP char *__cdecl _tcsncset(char *_Str,unsigned int _Val,size_t _MaxCount); + _CRTIMP char *__cdecl _tcsdec(const char *_Start,const char *_Pos); + _CRTIMP char *__cdecl _tcsinc(const char *_Ptr); + _CRTIMP size_t __cdecl _tcsnbcnt(const char *_Str,size_t _MaxCount); + _CRTIMP size_t __cdecl _tcsnccnt(const char *_Str,size_t _MaxCount); + _CRTIMP unsigned int __cdecl _tcsnextc (const char *_Str); + _CRTIMP char *__cdecl _tcsninc(const char *_Ptr,size_t _Count); + _CRTIMP char *__cdecl _tcsspnp(const char *_Str1,const char *_Str2); + _CRTIMP char *__cdecl _tcslwr(char *_Str); + _CRTIMP char *__cdecl _tcslwr_l(char *_Str,_locale_t _Locale); + _CRTIMP char *__cdecl _tcsupr(char *_Str); + _CRTIMP char *__cdecl _tcsupr_l(char *_Str,_locale_t _Locale); + _CRTIMP size_t __cdecl _tclen(const char *_Str); + _CRTIMP void __cdecl _tccpy(char *_DstCh,const char *_SrcCh); + +#ifdef __cplusplus +#ifndef _CPP_TCHAR_INLINES_DEFINED +#define _CPP_TCHAR_INLINES_DEFINED + extern "C++" { + extern inline char *__cdecl _tcschr(char *_S,unsigned int _C) { return ((char *)_tcschr((const char *)_S,_C)); } + extern inline char *__cdecl _tcspbrk(char *_S,const char *_P) { return ((char *)_tcspbrk((const char *)_S,_P)); } + extern inline char *__cdecl _tcsrchr(char *_S,unsigned int _C) { return ((char *)_tcsrchr((const char *)_S,_C)); } + extern inline char *__cdecl _tcsstr(char *_S,const char *_P) { return ((char *)_tcsstr((const char *)_S,_P)); } + } +#endif +#endif +#endif + +#define _tccmp(_cp1,_cp2) _tcsnccmp(_cp1,_cp2,1) + +#define _istalnum _ismbcalnum +#define _istalnum_l _ismbcalnum_l +#define _istalpha _ismbcalpha +#define _istalpha_l _ismbcalpha_l +#define _istdigit _ismbcdigit +#define _istdigit_l _ismbcdigit_l +#define _istgraph _ismbcgraph +#define _istgraph_l _ismbcgraph_l +#define _istlegal _ismbclegal +#define _istlegal_l _ismbclegal_l +#define _istlower _ismbclower +#define _istlower_l _ismbclower_l +#define _istprint _ismbcprint +#define _istprint_l _ismbcprint_l +#define _istpunct _ismbcpunct +#define _istpunct_l _ismbcpunct_l +#define _istspace _ismbcspace +#define _istspace_l _ismbcspace_l +#define _istupper _ismbcupper +#define _istupper_l _ismbcupper_l + +#define _totupper _mbctoupper +#define _totupper_l _mbctoupper_l +#define _totlower _mbctolower +#define _totlower_l _mbctolower_l + +#define _istlead _ismbblead +#define _istleadbyte isleadbyte +#define _istleadbyte_l _isleadbyte_l +#else + +#ifndef __TCHAR_DEFINED +#define __TCHAR_DEFINED + typedef char _TCHAR; + typedef signed char _TSCHAR; + typedef unsigned char _TUCHAR; + typedef char _TXCHAR; + typedef int _TINT; +#endif + +#ifndef _TCHAR_DEFINED +#define _TCHAR_DEFINED +#ifndef NO_OLDNAMES + typedef char TCHAR; +#endif +#endif + +#define _tcschr strchr +#define _tcscspn strcspn +#define _tcsncat strncat +#define _tcsncat_l _strncat_l +#define _tcsncpy strncpy +#define _tcsncpy_l _strncpy_l +#define _tcspbrk strpbrk +#define _tcsrchr strrchr +#define _tcsspn strspn +#define _tcsstr strstr +#define _tcstok strtok +#define _tcstok_l _strtok_l + +#define _tcsnset _strnset +#define _tcsnset_l _strnset_l +#define _tcsrev _strrev +#define _tcsset _strset + +#define _tcscmp strcmp +#define _tcsicmp _stricmp +#define _tcsicmp_l _stricmp_l +#define _tcsnccmp strncmp +#define _tcsncmp strncmp +#define _tcsncicmp _strnicmp +#define _tcsncicmp_l _strnicmp_l +#define _tcsnicmp _strnicmp +#define _tcsnicmp_l _strnicmp_l + +#define _tcscoll strcoll +#define _tcscoll_l _strcoll_l +#define _tcsicoll _stricoll +#define _tcsicoll_l _stricoll_l +#define _tcsnccoll _strncoll +#define _tcsnccoll_l _strncoll_l +#define _tcsncoll _strncoll +#define _tcsncoll_l _strncoll_l +#define _tcsncicoll _strnicoll +#define _tcsncicoll_l _strnicoll_l +#define _tcsnicoll _strnicoll +#define _tcsnicoll_l _strnicoll_l + +#define _tcsclen strlen +#define _tcscnlen strnlen +#define _tcsclen_l(_String,_Locale) strlen(_String) +#define _tcscnlen_l(_String,_Max_count,_Locale) strnlen_l((_String),(_Max_count)) +#define _tcsnccat strncat +#define _tcsnccat_l _strncat_l +#define _tcsnccpy strncpy +#define _tcsnccpy_l _strncpy_l +#define _tcsncset _strnset + +#define _tcsdec _strdec +#define _tcsinc _strinc +#define _tcsnbcnt _strncnt +#define _tcsnccnt _strncnt +#define _tcsnextc _strnextc +#define _tcsninc _strninc +#define _tcsspnp _strspnp + +#define _tcslwr _strlwr +#define _tcslwr_l _strlwr_l +#define _tcsupr _strupr +#define _tcsupr_l _strupr_l +#define _tcsxfrm strxfrm +#define _tcsxfrm_l _strxfrm_l + +#define _istlead(_Char) (0) +#define _istleadbyte(_Char) (0) +#define _istleadbyte_l(_Char,_Locale) (0) + +#define _tclen(_pc) (1) +#define _tccpy(_pc1,_cpc2) (*(_pc1) = *(_cpc2)) +#define _tccmp(_cpc1,_cpc2) (((unsigned char)*(_cpc1))-((unsigned char)*(_cpc2))) + + /* dirent structures and functions */ +#define _tdirent dirent +#define _TDIR DIR +#define _topendir opendir +#define _tclosedir closedir +#define _treaddir readdir +#define _trewinddir rewinddir +#define _ttelldir telldir +#define _tseekdir seekdir + +#define _istalnum isalnum +#define _istalnum_l _isalnum_l +#define _istalpha isalpha +#define _istalpha_l _isalpha_l +#define _istdigit isdigit +#define _istdigit_l _isdigit_l +#define _istgraph isgraph +#define _istgraph_l _isgraph_l +#define _istlower islower +#define _istlower_l _islower_l +#define _istprint isprint +#define _istprint_l _isprint_l +#define _istpunct ispunct +#define _istpunct_l _ispunct_l +#define _istspace isspace +#define _istspace_l _isspace_l +#define _istupper isupper +#define _istupper_l _isupper_l + +#define _totupper toupper +#define _totupper_l _toupper_l +#define _totlower tolower +#define _totlower_l _tolower_l + +#define _istlegal(_c) (1) + +#ifndef NULL +#ifdef __cplusplus +#define NULL 0 +#else +#define NULL ((void *)0) +#endif +#endif + +#define _strdec(_cpc1,_cpc2) ((_cpc1)>=(_cpc2) ? NULL : (_cpc2)-1) +#define _strinc(_pc) ((_pc)+1) +#define _strnextc(_cpc) ((unsigned int) *(const unsigned char *)(_cpc)) +#define _strninc(_pc,_sz) (((_pc)+(_sz))) + _CRTIMP size_t __cdecl __strncnt(const char *_Str,size_t _Cnt); +#define _strncnt(_cpc,_sz) (__strncnt(_cpc,_sz)) +#define _strspnp(_cpc1,_cpc2) (!_cpc1 ? NULL : ((*((_cpc1)+strspn(_cpc1,_cpc2))) ? ((_cpc1)+strspn(_cpc1,_cpc2)) : NULL)) + +#define _strncpy_l(_Destination,_Source,_Count,_Locale) (strncpy(_Destination,_Source,_Count)) +#define _strncat_l(_Destination,_Source,_Count,_Locale) (strncat(_Destination,_Source,_Count)) +#define _strtok_l(_String,_Delimiters,_Locale) (strtok(_String,_Delimiters)) +#define _strnset_l(_Destination,_Value,_Count,_Locale) (_strnset(_Destination,_Value,_Count)) +#define _strset_l(_Destination,_Value,_Locale) (_strset(_Destination,_Value)) +#endif +#endif + +#define _T(x) __T(x) +#define _TEXT(x) __T(x) + +#ifdef __cplusplus +} +#endif + +#include <sec_api/tchar_s.h> +#endif Modified: branches/ros-amd64-bringup/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/wchar.h [iso-8859-1] Tue Sep 2 17:09:01 2008 @@ -14,8 +14,12 @@ extern "C" { #endif +#ifndef WCHAR_MIN #define WCHAR_MIN 0 -#define WCHAR_MAX ((wchar_t) -1) /* UINT16_MAX */ +#endif +#ifndef WCHAR_MAX +#define WCHAR_MAX ((wchar_t)-1) /* UINT16_MAX */ +#endif #ifndef __GNUC_VA_LIST #define __GNUC_VA_LIST Removed: branches/ros-amd64-bringup/reactos/include/psdk/tchar.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/tchar.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/tchar.h (removed) @@ -1,410 +1,0 @@ - -#ifndef _TCHAR_H_ -#define _TCHAR_H_ - -#include <string.h> - -#ifdef _UNICODE - - #define __T(q) L##q - - #ifndef _TCHAR_DEFINED - #ifndef RC_INVOKED - typedef wchar_t TCHAR; - typedef wchar_t _TCHAR; - #endif /* Not RC_INVOKED */ - #define _TCHAR_DEFINED - #endif - - #define _TINT wint_t - #define _TSCHAR wchar_t - #define _TUCHAR wchar_t - #define _TXCHAR wchar_t - #define _TEOF WEOF - #define _tenviron _wenviron - #define _tfinddata_t _wfinddata_t - - /* dirent structures and functions */ - #define _tdirent _wdirent - #define _TDIR _WDIR - #define _topendir _wopendir - #define _tclosedir _wclosedir - #define _treaddir _wreaddir - #define _trewinddir _wrewinddir - #define _ttelldir _wtelldir - #define _tseekdir _wseekdir - - #define _ttoi64 _wtoi64 - #define _i64tot _i64tow - #define _ui64tot _ui64tow - #define _tcsnccoll _wstrncoll - #define _tcsncoll _wstrncoll - #define _tcsncicoll _wstrnicoll - #define _tfindfirsti64 _wfindfirsti64 - #define _tfindnexti64 _wfindnexti64 - #define _tfinddatai64_t _wfinddatai64_t - - #define _tunlink _wunlink - #define _tgetdcwd _wgetdcwd - - #define _fgettc fgetwc - #define _fgettchar _fgetwchar - #define _fgetts fgetws - #define _fputtc fputwc - #define _fputtchar _fputwchar - #define _fputts fputws - #define _ftprintf fwprintf - #define _ftscanf fwscanf - #define _gettc getwc - #define _gettchar getwchar - #define _getts getws - #define _istalnum iswalnum - #define _istalpha iswalpha - #define _istascii iswascii - #define _istcntrl iswcntrl - #define _istdigit iswdigit - #define _istgraph iswgraph - #define _istlead(c) 0 - #define _istleadbyte(c) 0 - #define _istlegal(c) 1 - #define _istlower iswlower - #define _istprint iswprint - #define _istpunct iswpunct - #define _istspace iswspace - #define _istupper iswupper - #define _istxdigit iswxdigit - #define _itot _itow - #define _ltot _ltow - #define _puttc putwc - #define _puttchar putwchar - #define _putts putws - #define _tmain wmain - #define _sntprintf _snwprintf - #define _stprintf swprintf - #define _stscanf swscanf - #define _taccess _waccess - #define _tasctime _wasctime - #define _tccpy(d,s) (*(d)=*(s)) - #define _tchdir _wchdir - #define _tclen(c) 2 - #define _tchmod _wchmod - #define _tcreat _wcreat - #define _tcscat wcscat - #define _tcschr wcschr - #define _tcsclen wcslen - #define _tcscmp wcscmp - #define _tcscoll wcscoll - #define _tcscpy wcscpy - #define _tcscspn wcscspn - #define _tcsdec _wcsdec - #define _tcsdup _wcsdup - #define _tcsftime wcsftime - #define _tcsicmp _wcsicmp - #define _tcsicoll _wcsicoll - #define _tcsinc _wcsinc - #define _tcslen wcslen - #define _tcslwr _wcslwr - #define _tcsnbcnt _wcnscnt - #define _tcsncat wcsncat - #define _tcsnccat wcsncat - #define _tcsncmp wcsncmp - #define _tcsnccmp wcsncmp - #define _tcsnccnt _wcsncnt - #define _tcsnccpy wcsncpy - #define _tcsncicmp _wcsnicmp - #define _tcsncpy wcsncpy - #define _tcsncset _wcsnset - #define _tcsnextc _wcsnextc - #define _tcsnicmp _wcsnicmp - #define _tcsnicoll _wcsnicoll - #define _tcsninc _wcsninc - #define _tcsnccnt _wcsncnt - #define _tcsnset _wcsnset - #define _tcspbrk wcspbrk - #define _tcsspnp _wcsspnp - #define _tcsrchr wcsrchr - #define _tcsrev _wcsrev - #define _tcsset _wcsset - #define _tcsspn wcsspn - #define _tcsstr wcsstr - #define _tcstod wcstod - #define _tcstok wcstok - #define _tcstol wcstol - #define _tcstoul wcstoul - #define _tcsupr _wcsupr - #define _tcsxfrm wcsxfrm - #define _tctime _wctime - #define _texecl _wexecl - #define _texecle _wexecle - #define _texeclp _wexeclp - #define _texeclpe _wexeclpe - #define _texecv _wexecv - #define _texecve _wexecve - #define _texecvp _wexecvp - #define _texecvpe _wexecvpe - #define _tfdopen _wfdopen - #define _tfindfirst _wfindfirst - #define _tfindnext _wfindnext - #define _tfopen _wfopen - #define _tfreopen _wfreopen - #define _tfsopen _wfsopen - #define _tfullpath _wfullpath - #define _tgetcwd _wgetcwd - #define _tgetenv _wgetenv - #define _tmain wmain - #define _tmakepath _wmakepath - #define _tmkdir _wmkdir - #define _tmktemp _wmktemp - #define _tperror _wperror - #define _topen _wopen - #define _totlower towlower - #define _totupper towupper - #define _tpopen _wpopen - #define _tprintf wprintf - #define _tremove _wremove - #define _trename _wrename - #define _trmdir _wrmdir - #define _tsearchenv _wsearchenv - #define _tscanf wscanf - #define _tsetlocale _wsetlocale - #define _tsopen _wsopen - #define _tspawnl _wspawnl - #define _tspawnle _wspawnle - #define _tspawnlp _wspawnlp - #define _tspawnlpe _wspawnlpe - #define _tspawnv _wspawnv - #define _tspawnve _wspawnve - #define _tspawnvp _wspawnvp - #define _tspawnvpe _wspawnvpe - #define _tsplitpath _wsplitpath - #define _tstat _wstat - #define _tstrdate _wstrdate - #define _tstrtime _wstrtime - #define _tsystem _wsystem - #define _ttempnam _wtempnam - #define _ttmpnam _wtmpnam - #define _ttoi _wtoi - #define _ttol _wtol - #define _tutime _wutime - #define _tWinMain wWinMain - #define _ultot _ultow - #define _ungettc ungetwc - #define _vftprintf vfwprintf - #define _vsntprintf _vsnwprintf - #define _vstprintf vswprintf - #define _vtprintf vwprintf - - #define _wcsdec(_wcs1, _wcs2) ((_wcs1)>=(_wcs2) ? NULL : (_wcs2)-1) - #define _wcsinc(_wcs) ((_wcs)+1) - #define _wcsnextc(_wcs) ((unsigned int) *(_wcs)) - #define _wcsninc(_wcs, _inc) (((_wcs)+(_inc))) - #define _wcsncnt(_wcs, _cnt) ((wcslen(_wcs)>_cnt) ? _count : wcslen(_wcs)) - #define _wcsspnp(_wcs1, _wcs2) ((*((_wcs1)+wcsspn(_wcs1,_wcs2))) ? ((_wcs1)+wcsspn(_wcs1,_wcs2)) : NULL) - -#else - - #define __T(q) q - - #ifndef _TCHAR_DEFINED - #ifndef RC_INVOKED - typedef char TCHAR; - typedef char _TCHAR; - #endif - #define _TCHAR_DEFINED - #endif - - #define _TINT int - #define _TSCHAR signed char - #define _TUCHAR unsigned char - #define _TXCHAR char - #define _TEOF EOF - #define _tenviron _environ - #define _tfinddata_t _finddata_t - - /* dirent structures and functions */ - #define _tdirent dirent - #define _TDIR DIR - #define _topendir opendir - #define _tclosedir closedir - #define _treaddir readdir - #define _trewinddir rewinddir - #define _ttelldir telldir - #define _tseekdir seekdir - - #define _ttoi64 _atoi64 - #define _i64tot _i64toa - #define _ui64tot _ui64toa - #define _tcsnccoll _strncoll - #define _tcsncoll _strncoll - #define _tcsncicoll _strnicoll - #define _tfindfirsti64 _findfirsti64 - #define _tfindnexti64 _findnexti64 - #define _tfinddatai64_t _finddatai64_t - - #define _tunlink _unlink - #define _tgetdcwd _getdcwd - - #define _fgettc fgetc - #define _fgettchar fgetchar - #define _fgetts fgets - #define _fputtc fputc - #define _fputtchar fputchar - #define _fputts fputs - #define _ftprintf fprintf - #define _ftscanf fscanf - #define _gettc getc - #define _gettchar getchar - #define _getts gets - #define _istalnum isalnum - #define _istalpha isalpha - #define _istascii __isascii - #define _istcntrl iscntrl - #define _istdigit isdigit - #define _istgraph isgraph - #define _istlead(c) 0 - #define _istleadbyte(c) 0 - #define _istlegal(c) 1 - #define _istlower islower - #define _istprint isprint - #define _istpunct ispunct - #define _istspace isspace - #define _istupper isupper - #define _istxdigit isxdigit - #define _itot _itoa - #define _ltot _ltoa - #define _puttc putc - #define _puttchar putchar - #define _putts puts - #define _tmain main - #define _sntprintf _snprintf - #define _stprintf sprintf - #define _stscanf sscanf - #define _taccess _access - #define _tasctime asctime - #define _tccpy(d,s) (*(d)=*(s)) - #define _tchdir _chdir - #define _tclen(c) 1 - #define _tchmod _chmod - #define _tcreat _creat - #define _tcscat strcat - #define _tcschr strchr - #define _tcsclen strlen - #define _tcscmp strcmp - #define _tcscoll strcoll - #define _tcscpy strcpy - #define _tcscspn strcspn - #define _tcsdec _strdec - #define _tcsdup _strdup - #define _tcsftime strftime - #define _tcsicmp _stricmp - #define _tcsicoll _stricoll - #define _tcsinc _strinc - #define _tcslen strlen - #define _tcslwr _strlwr - #define _tcsnbcnt _strncnt - #define _tcsncat strncat - #define _tcsnccat strncat - #define _tcsncmp strncmp - #define _tcsnccmp strncmp - #define _tcsnccnt _strncnt - #define _tcsnccpy strncpy - #define _tcsncicmp _strnicmp - #define _tcsncpy strncpy - #define _tcsncset _strnset - #define _tcsnextc _strnextc - #define _tcsnicmp _strnicmp - #define _tcsnicoll _strnicoll - #define _tcsninc _strninc - #define _tcsnccnt _strncnt - #define _tcsnset _strnset - #define _tcspbrk strpbrk - #define _tcsspnp _strspnp - #define _tcsrchr strrchr - #define _tcsrev _strrev - #define _tcsset _strset - #define _tcsspn strspn - #define _tcsstr strstr - #define _tcstod strtod - #define _tcstok strtok - #define _tcstol strtol - #define _tcstoul strtoul - #define _tcsupr _strupr - #define _tcsxfrm strxfrm - #define _tctime ctime - #define _texecl _execl - #define _texecle _execle - #define _texeclp _execlp - #define _texeclpe _execlpe - #define _texecv _execv - #define _texecve _execve - #define _texecvp _execvp - #define _texecvpe _execvpe - #define _tfdopen _fdopen - #define _tfindfirst _findfirst - #define _tfindnext _findnext - #define _tfopen fopen - #define _tfreopen freopen - #define _tfsopen _fsopen - #define _tfullpath _fullpath - #define _tgetcwd _getcwd - #define _tgetenv getenv - #define _tmain main - #define _tmakepath _makepath - #define _tmkdir _mkdir - #define _tmktemp _mktemp - #define _tperror perror - #define _topen _open - #define _totlower tolower - #define _totupper toupper - #define _tpopen _popen - #define _tprintf printf - #define _tremove remove - #define _trename rename - #define _trmdir _rmdir - #define _tsearchenv _searchenv - #define _tscanf scanf - #define _tsetlocale setlocale - #define _tsopen _sopen - #define _tspawnl _spawnl - #define _tspawnle _spawnle - #define _tspawnlp _spawnlp - #define _tspawnlpe _spawnlpe - #define _tspawnv _spawnv - #define _tspawnve _spawnve - #define _tspawnvp _spawnvp - #define _tspawnvpe _spawnvpe - #define _tsplitpath _splitpath - #define _tstat _stat - #define _tstrdate _strdate - #define _tstrtime _strtime - #define _tsystem system - #define _ttempnam _tempnam - #define _ttmpnam tmpnam - #define _ttoi atoi - #define _ttol atol - #define _tutime _utime - #define _tWinMain WinMain - #define _ultot _ultoa - #define _ungettc ungetc - #define _vftprintf vfprintf - #define _vsntprintf _vsnprintf - #define _vstprintf vsprintf - #define _vtprintf vprintf - - #define _strdec(_str1, _str2) ((_str1)>=(_str2) ? NULL : (_str2)-1) - #define _strinc(_str) ((_str)+1) - #define _strnextc(_str) ((unsigned int) *(_str)) - #define _strninc(_str, _inc) (((_str)+(_inc))) - #define _strncnt(_str, _cnt) ((strlen(_str)>_cnt) ? _count : strlen(_str)) - #define _strspnp(_str1, _str2) ((*((_str1)+strspn(_str1,_str2))) ? ((_str1)+strspn(_str1,_str2)) : NULL) - -#endif - - - - -#define _TEXT(x) __T(x) -#define _T(x) __T(x) - -#endif /* _TCHAR_H_ */ -

1 0

[sginsberg] 35886: - Fix 2 warnings (properly comment out unused code)
by sginsberg＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: sginsberg Date: Tue Sep 2 17:07:27 2008 New Revision: 35886 URL: http://svn.reactos.org/svn/reactos?rev=35886&view=rev Log: - Fix 2 warnings (properly comment out unused code) Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp [iso-8859-1] Tue Sep 2 17:07:27 2008 @@ -111,8 +111,8 @@ IN PDRIVER_OBJECT Context1, IN PUNICODE_STRING Context2) { - PDEVICE_OBJECT DeviceObject; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\MPU401Static"); + //PDEVICE_OBJECT DeviceObject; + //UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\MPU401Static"); // KeBugCheck(0x0000007F); DPRINT1("MPU401_KS DriverEntry called, redirecting to PcInitializeAdapterDriver\n");

1 0

[sserapion] 35885: Copied remotely
by sserapion＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: sserapion Date: Tue Sep 2 17:03:53 2008 New Revision: 35885 URL: http://svn.reactos.org/svn/reactos?rev=35885&view=rev Log: Copied remotely Added: branches/ros-amd64-bringup/reactos/include/crt/tchar.h - copied unchanged from r35884, branches/ros-amd64-bringup/reactos/include/psdk/tchar.h

1 0

[sginsberg] 35884: - Patch from hackbunny: Add _SEH_SetExceptionCode
by sginsberg＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: sginsberg Date: Tue Sep 2 16:41:57 2008 New Revision: 35884 URL: http://svn.reactos.org/svn/reactos?rev=35884&view=rev Log: - Patch from hackbunny: Add _SEH_SetExceptionCode Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/framebased.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/framebased.h [iso-8859-1] Tue Sep 2 16:41:57 2008 @@ -154,6 +154,7 @@ _SEHHandlers.SH_Finally = (FINALLY_); #endif +#define _SEH_SetExceptionCode(CODE_) (_SEHPortableFrame->SPF_Code = (CODE_)) #define _SEH_GetExceptionCode() (unsigned long)(_SEHPortableFrame->SPF_Code) #define _SEH_GetExceptionPointers() \

1 0

[cwittich] 35883: remove the sysreg checkpoint as it isn't needed anymore, sysreg2 is smart enough to notice when the vm is shut down
by cwittich＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cwittich Date: Tue Sep 2 16:37:34 2008 New Revision: 35883 URL: http://svn.reactos.org/svn/reactos?rev=35883&view=rev Log: remove the sysreg checkpoint as it isn't needed anymore, sysreg2 is smart enough to notice when the vm is shut down Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue Sep 2 16:37:34 2008 @@ -3752,10 +3752,6 @@ } } - /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL - /// DO NOT REMOVE!!! - DPRINT1("SYSREG_CHECKPOINT:USETUP_COMPLETE\n"); - FreeConsole(); /* Avoid bugcheck */

1 0

[dreimer] 35882: %ROS_ARCH% == x86 does not exist. It's i386 Btw, can someone tell me why I get "The System could not find the drive specified" in "clean all" and "update" ?
by dreimer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: dreimer Date: Tue Sep 2 16:30:47 2008 New Revision: 35882 URL: http://svn.reactos.org/svn/reactos?rev=35882&view=rev Log: %ROS_ARCH% == x86 does not exist. It's i386 Btw, can someone tell me why I get "The System could not find the drive specified" in "clean all" and "update" ? Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Tue Sep 2 16:30:47 2008 @@ -64,7 +64,7 @@ set TARGET_CC=ccache arm-pc-mingw32-gcc set TARGET_CPP=ccache arm-pc-mingw32-g++ ) - if .%ROS_ARCH%. == .x86. ( + if .%ROS_ARCH%. == .i386. ( set TARGET_CC=ccache gcc set TARGET_CPP=ccache g++ ) @@ -83,7 +83,7 @@ set TARGET_CC=arm-pc-mingw32-gcc set TARGET_CPP=arm-pc-mingw32-g++ ) - if .%ROS_ARCH%. == .x86. ( + if .%ROS_ARCH%. == .i386. ( set TARGET_CC=gcc set TARGET_CPP=g++ ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Tue Sep 2 16:30:47 2008 @@ -68,7 +68,7 @@ echo ERROR: There is no compiler output to clean. ) ) -if .%ROS_ARCH%. == .x86. ( +if .%ROS_ARCH%. == .i386. ( :: :: Check if we have something to clean, if so, clean it. :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Tue Sep 2 16:30:47 2008 @@ -24,7 +24,7 @@ ) else ( set _1=%1 ) -if /i "%_1%" == "x86" ( +if /i "%_1%" == "i386" ( set ROS_ARCH= set ROS_PREFIX= goto :EOC @@ -39,7 +39,7 @@ set ROS_PREFIX=mingw32-ppc goto :EOC ) -if /i "%_1%" == "x64" ( +if /i "%_1%" == "amd64" ( set ROS_ARCH=amd64 set ROS_PREFIX=mingw32-x86_64 goto :EOC

1 0

[cwittich] 35881: -hackfix 2nd and 3rd stage (setting boot dev to cdrom) -test all three stages -return the status (fail|success) in ProcessDebugData
by cwittich＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cwittich Date: Tue Sep 2 16:30:18 2008 New Revision: 35881 URL: http://svn.reactos.org/svn/reactos?rev=35881&view=rev Log: -hackfix 2nd and 3rd stage (setting boot dev to cdrom) -test all three stages -return the status (fail|success) in ProcessDebugData Modified: trunk/tools/sysreg2/console.c trunk/tools/sysreg2/sysreg.h trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=35881&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Tue Sep 2 16:30:18 2008 @@ -2,19 +2,20 @@ #include <termios.h> #include <poll.h> -void ProcessDebugData(const char* tty, int timeout, int stage ) +bool ProcessDebugData(const char* tty, int timeout, int stage ) { int ttyfd, i; struct termios ttyattr, rawattr; + bool Ret = true; if ((ttyfd = open(tty, O_NOCTTY | O_RDWR)) < 0) { printf("error opening tty\n"); - return; + return false; } if (tcgetattr(STDIN_FILENO, &ttyattr) < 0) - return; + return false; rawattr = ttyattr; rawattr.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP @@ -25,7 +26,7 @@ rawattr.c_cflag |= CS8; if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &rawattr) < 0) - return; + return false; while (1) { @@ -46,6 +47,7 @@ { /* timeout */ printf("timeout\n"); + Ret = false; goto cleanup; } @@ -59,10 +61,13 @@ int got, sent = 0; got = read(fds[i].fd, buf, sizeof(buf)); - if (got < 0) + if (got < 0) { goto cleanup; + } if (!got || got == 1 && buf[0] == '\33') + { goto cleanup; + } if (fds[i].fd != STDIN_FILENO) { @@ -72,6 +77,7 @@ if ((done = safewrite(STDOUT_FILENO, buf + sent, got -sent)) <= 0) { + Ret = false; goto cleanup; } sent += done; @@ -86,7 +92,6 @@ cleanup: tcsetattr(STDIN_FILENO, TCSAFLUSH, &ttyattr); close(ttyfd); - - + return Ret; } Modified: trunk/tools/sysreg2/sysreg.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.h?rev=35881&r… ============================================================================== --- trunk/tools/sysreg2/sysreg.h [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.h [iso-8859-1] Tue Sep 2 16:30:18 2008 @@ -33,4 +33,4 @@ bool LoadSettings(const char* XmlConfig); /* console.c */ -void ProcessDebugData(const char* tty, int timeout, int stage); +bool ProcessDebugData(const char* tty, int timeout, int stage); Modified: trunk/tools/sysreg2/virt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=35881&r1=… ============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Tue Sep 2 16:30:18 2008 @@ -56,7 +56,7 @@ return false; numids = virConnectListDomains(vConn, &ids[0], maxids); - if (numids > -1) + if (numids > -1) { int i; for(i=0; i<numids; i++) @@ -139,17 +139,18 @@ { virConnectPtr vConn; virDomainPtr vDom; - virDomainInfo info; + virDomainInfo info; int Stage; - int Stages = 1; /* 1 for testing, should be set to 3 later */ + int Stages = 3; char qemu_img_cmdline[300]; FILE* file; - char config[255]; - - if (argc == 2) - strcpy(config, argv[1]); - else - strcpy(config, "sysreg.xml"); + char config[255]; + int Ret = EXIT_SUCCESS; + + if (argc == 2) + strcpy(config, argv[1]); + else + strcpy(config, "sysreg.xml"); if (!LoadSettings(config)) { @@ -189,20 +190,31 @@ { if (vDom) { + if (Stage > 0) + printf("\n\n\n\n\n"); + printf("Running stage %d...\n", Stage + 1); printf("Domain %s started.\n", virDomainGetName(vDom)); - ProcessDebugData(GetConsole(vDom), - AppSettings.Timeout, Stage); - - virDomainGetInfo(vDom, &info); - if (info.state != VIR_DOMAIN_SHUTOFF) + if (!ProcessDebugData(GetConsole(vDom), + AppSettings.Timeout, Stage)) + { + Ret = EXIT_FAILURE; + } + virDomainGetInfo(vDom, &info); + if (info.state != VIR_DOMAIN_SHUTOFF) virDomainDestroy(vDom); virDomainUndefine(vDom); virDomainFree(vDom); + if (Ret == EXIT_FAILURE) + break; } - } + } } virConnectClose(vConn); - return EXIT_SUCCESS; -} - + if (Ret == EXIT_SUCCESS) + printf("Test succeeded!\n"); + else + printf("Test failed!\n"); + return Ret; +} +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs