Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 58517: [CRT] Implement _splitpath_s and _wsplitpath_s [MSVCRT] Export _splitpath_s and _wsplitpath_s
by tkreuzer＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: tkreuzer Date: Sat Mar 16 14:46:35 2013 New Revision: 58517 URL: http://svn.reactos.org/svn/reactos?rev=58517&view=rev Log: [CRT] Implement _splitpath_s and _wsplitpath_s [MSVCRT] Export _splitpath_s and _wsplitpath_s Added: trunk/reactos/lib/sdk/crt/string/_splitpath.c (with props) trunk/reactos/lib/sdk/crt/string/_splitpath_s.c (with props) trunk/reactos/lib/sdk/crt/string/_tsplitpath_x.h - copied, changed from r58513, trunk/reactos/lib/sdk/crt/string/splitp.c trunk/reactos/lib/sdk/crt/string/_wsplitpath.c (with props) trunk/reactos/lib/sdk/crt/string/_wsplitpath_s.c (with props) Removed: trunk/reactos/lib/sdk/crt/string/splitp.c trunk/reactos/lib/sdk/crt/string/wsplitp.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sat Mar 16 14:46:35 2013 @@ -857,7 +857,7 @@ @ cdecl _spawnvp(long str ptr) @ cdecl _spawnvpe(long str ptr ptr) @ cdecl _splitpath(str ptr ptr ptr ptr) -# stub _splitpath_s +@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) # stub _sprintf_l # stub _sprintf_p_l # stub _sprintf_s_l @@ -1127,7 +1127,7 @@ @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) -# @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) +@ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) @ cdecl _wstat(wstr ptr) @ cdecl _wstati64(wstr ptr) @ cdecl _wstat64(wstr ptr) Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sat Mar 16 14:46:35 2013 @@ -260,6 +260,10 @@ stdlib/wmakpath_s.c string/_mbsnlen.c string/_mbstrnlen.c + string/_splitpath.c + string/_splitpath_s.c + string/_wsplitpath.c + string/_wsplitpath_s.c string/atof.c string/atoi.c string/atoi64.c @@ -271,7 +275,6 @@ string/itow.c string/mbstowcs_s.c string/scanf.c - string/splitp.c string/strcoll.c string/strcspn.c string/strdup.c @@ -299,7 +302,6 @@ string/wcstombs_s.c string/wcstoul.c string/wctype.c - string/wsplitp.c string/wtoi.c string/wtoi64.c string/wtol.c Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Sat Mar 16 14:46:35 2013 @@ -26,6 +26,8 @@ search/bsearch.c search/lfind.c stdlib/qsort.c + string/_splitpath.c + string/_wsplitpath.c string/ctype.c string/iswctype.c string/is_wctype.c @@ -46,7 +48,6 @@ string/itoa.c string/itow.c string/mbstowcs_nt.c - string/splitp.c string/strtol.c string/strtoul.c string/strtoull.c @@ -55,7 +56,6 @@ string/wcstombs_nt.c string/wcstoul.c string/wctype.c - string/wsplitp.c string/wtoi64.c string/wtoi.c string/wtol.c Added: trunk/reactos/lib/sdk/crt/string/_splitpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/_splitp… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/_splitpath.c (added) +++ trunk/reactos/lib/sdk/crt/string/_splitpath.c [iso-8859-1] Sat Mar 16 14:46:35 2013 @@ -1,0 +1,11 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/string/_splitpath.c + * PURPOSE: Implementation of _splitpath + * PROGRAMMER: Timo Kreuzer + */ + +#define _tsplitpath_x _splitpath + +#include "_tsplitpath_x.h" Propchange: trunk/reactos/lib/sdk/crt/string/_splitpath.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/string/_splitpath_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/_splitp… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/_splitpath_s.c (added) +++ trunk/reactos/lib/sdk/crt/string/_splitpath_s.c [iso-8859-1] Sat Mar 16 14:46:35 2013 @@ -1,0 +1,12 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/string/_splitpath_s.c + * PURPOSE: Implementation of _splitpath_s + * PROGRAMMER: Timo Kreuzer + */ + +#define _tsplitpath_x _splitpath_s +#define IS_SECAPI 1 + +#include "_tsplitpath_x.h" Propchange: trunk/reactos/lib/sdk/crt/string/_splitpath_s.c ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/lib/sdk/crt/string/_tsplitpath_x.h (from r58513, trunk/reactos/lib/sdk/crt/string/splitp.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/_tsplit… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/_tsplitpath_x.h [iso-8859-1] Sat Mar 16 14:46:35 2013 @@ -1,19 +1,66 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * PURPOSE: CRT: implementation of _splitpath / _wsplitpath + * PURPOSE: CRT: implementation of __[w]splitpath[_s] * PROGRAMMERS: Timo Kreuzer */ #include <precomp.h> #include <tchar.h> -/* - * @implemented - */ -void _tsplitpath(const _TCHAR* path, _TCHAR* drive, _TCHAR* dir, _TCHAR* fname, _TCHAR* ext) +#if IS_SECAPI +#define _FAILURE -1 +#define _SUCCESS 0 + +_Check_return_wat_ +_CRTIMP_ALTERNATIVE +errno_t +__cdecl +_tsplitpath_x( + _In_z_ const _TCHAR* path, + _Out_writes_opt_z_(drive_size) _TCHAR* drive, + _In_ size_t drive_size, + _Out_writes_opt_z_(dir_size) _TCHAR* dir, + _In_ size_t dir_size, + _Out_writes_opt_z_(fname_size) _TCHAR* fname, + _In_ size_t fname_size, + _Out_writes_opt_z_(ext_size) _TCHAR* ext, + _In_ size_t ext_size) +#else +#define _FAILURE +#define _SUCCESS + +_CRT_INSECURE_DEPRECATE(_splitpath_s) +_CRTIMP +void +__cdecl +_tsplitpath_x( + _In_z_ const _TCHAR* path, + _Pre_maybenull_ _Post_z_ _TCHAR* drive, + _Pre_maybenull_ _Post_z_ _TCHAR* dir, + _Pre_maybenull_ _Post_z_ _TCHAR* fname, + _Pre_maybenull_ _Post_z_ _TCHAR* ext) +#endif { const _TCHAR *src, *dir_start, *file_start = 0, *ext_start = 0; + size_t count; +#if !IS_SECAPI + const size_t drive_size = INT_MAX, dir_size = INT_MAX, + fname_size = INT_MAX, ext_size = INT_MAX; +#endif + +#if IS_SECAPI + /* Validate parameters */ + if (MSVCRT_CHECK_PMT((path == NULL) || + ((drive != NULL) && (drive_size == 0)) || + ((dir != NULL) && (dir_size == 0)) || + ((fname != NULL) && (fname_size == 0)) || + ((ext != NULL) && (ext_size == 0)))) + { + errno = EINVAL; + return -1; + } +#endif /* Truncate all output strings */ if (drive) drive[0] = '\0'; @@ -28,7 +75,7 @@ #ifndef _LIBCNT_ _set_errno(EINVAL); #endif - return; + return _FAILURE; } #endif @@ -40,12 +87,12 @@ (path[2] == '?') && (path[3] == '\\')) path += 4; #endif - if (path[0] == '\0') return; + if (path[0] == '\0') return _FAILURE; /* Check if we have a drive letter (only 1 char supported) */ if (path[1] == ':') { - if (drive) + if (drive && (drive_size >= 3)) { drive[0] = path[0]; drive[1] = ':'; @@ -58,7 +105,7 @@ dir_start = path; while (*path != '\0') { - /* Remember last path seperator and last dot */ + /* Remember last path separator and last dot */ if ((*path == '\\') || (*path == '/')) file_start = path + 1; if (*path == '.') ext_start = path; path++; @@ -73,22 +120,27 @@ if (dir) { src = dir_start; - while (src < file_start) *dir++ = *src++; + count = dir_size - 1; + while (src < file_start && count--) *dir++ = *src++; *dir = '\0'; } if (fname) { src = file_start; - while (src < ext_start) *fname++ = *src++; + count = fname_size - 1; + while (src < ext_start && count--) *fname++ = *src++; *fname = '\0'; } if (ext) { src = ext_start; - while (*src != '\0') *ext++ = *src++; + count = ext_size - 1; + while (*src != '\0' && count--) *ext++ = *src++; *ext = '\0'; } + + return _SUCCESS; } Added: trunk/reactos/lib/sdk/crt/string/_wsplitpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/_wsplit… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/_wsplitpath.c (added) +++ trunk/reactos/lib/sdk/crt/string/_wsplitpath.c [iso-8859-1] Sat Mar 16 14:46:35 2013 @@ -1,0 +1,12 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/string/_wsplitpath.c + * PURPOSE: Implementation of _wsplitpath + * PROGRAMMER: Timo Kreuzer + */ + +#define _tsplitpath_x _wsplitpath +#define _UNICODE + +#include "_tsplitpath_x.h" Propchange: trunk/reactos/lib/sdk/crt/string/_wsplitpath.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/string/_wsplitpath_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/_wsplit… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/_wsplitpath_s.c (added) +++ trunk/reactos/lib/sdk/crt/string/_wsplitpath_s.c [iso-8859-1] Sat Mar 16 14:46:35 2013 @@ -1,0 +1,13 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/string/_wsplitpath_s.c + * PURPOSE: Implementation of _wsplitpath_s + * PROGRAMMER: Timo Kreuzer + */ + +#define _tsplitpath_x _wsplitpath_s +#define _UNICODE +#define IS_SECAPI 1 + +#include "_tsplitpath_x.h" Propchange: trunk/reactos/lib/sdk/crt/string/_wsplitpath_s.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c (removed) @@ -1,94 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: BSD - See COPYING.ARM in the top level directory - * PURPOSE: CRT: implementation of _splitpath / _wsplitpath - * PROGRAMMERS: Timo Kreuzer - */ - -#include <precomp.h> -#include <tchar.h> - -/* - * @implemented - */ -void _tsplitpath(const _TCHAR* path, _TCHAR* drive, _TCHAR* dir, _TCHAR* fname, _TCHAR* ext) -{ - const _TCHAR *src, *dir_start, *file_start = 0, *ext_start = 0; - - /* Truncate all output strings */ - if (drive) drive[0] = '\0'; - if (dir) dir[0] = '\0'; - if (fname) fname[0] = '\0'; - if (ext) ext[0] = '\0'; - -#if WINVER >= 0x600 - /* Check parameter */ - if (!path) - { -#ifndef _LIBCNT_ - _set_errno(EINVAL); -#endif - return; - } -#endif - - _Analysis_assume_(path != 0); - -#if WINVER == 0x600 - /* Skip '\\?\' prefix */ - if ((path[0] == '\\') && (path[1] == '\\') && - (path[2] == '?') && (path[3] == '\\')) path += 4; -#endif - - if (path[0] == '\0') return; - - /* Check if we have a drive letter (only 1 char supported) */ - if (path[1] == ':') - { - if (drive) - { - drive[0] = path[0]; - drive[1] = ':'; - drive[2] = '\0'; - } - path += 2; - } - - /* Scan the rest of the string */ - dir_start = path; - while (*path != '\0') - { - /* Remember last path seperator and last dot */ - if ((*path == '\\') || (*path == '/')) file_start = path + 1; - if (*path == '.') ext_start = path; - path++; - } - - /* Check if we got a file name / extension */ - if (!file_start) - file_start = dir_start; - if (!ext_start || ext_start < file_start) - ext_start = path; - - if (dir) - { - src = dir_start; - while (src < file_start) *dir++ = *src++; - *dir = '\0'; - } - - if (fname) - { - src = file_start; - while (src < ext_start) *fname++ = *src++; - *fname = '\0'; - } - - if (ext) - { - src = ext_start; - while (*src != '\0') *ext++ = *src++; - *ext = '\0'; - } -} - Removed: trunk/reactos/lib/sdk/crt/string/wsplitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wsplitp… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wsplitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wsplitp.c (removed) @@ -1,7 +1,0 @@ - -#define _UNICODE -#define UNICODE - -#include <tchar.h> - -#include "splitp.c"

1 0

[hbelusca] 58516: [SERVICES] - Precise the purpose of lock.c - Add an informative comment. No code changes.
by hbelusca＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: hbelusca Date: Sat Mar 16 13:50:24 2013 New Revision: 58516 URL: http://svn.reactos.org/svn/reactos?rev=58516&view=rev Log: [SERVICES] - Precise the purpose of lock.c - Add an informative comment. No code changes. Modified: trunk/reactos/base/system/services/driver.c trunk/reactos/base/system/services/lock.c Modified: trunk/reactos/base/system/services/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/drive… ============================================================================== --- trunk/reactos/base/system/services/driver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/driver.c [iso-8859-1] Sat Mar 16 13:50:24 2013 @@ -141,13 +141,11 @@ if (lpService->Status.dwServiceType == SERVICE_KERNEL_DRIVER) { - RtlInitUnicodeString(&DirName, - L"\\Driver"); - } - else - { - RtlInitUnicodeString(&DirName, - L"\\FileSystem"); + RtlInitUnicodeString(&DirName, L"\\Driver"); + } + else // if (lpService->Status.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER) + { + RtlInitUnicodeString(&DirName, L"\\FileSystem"); } InitializeObjectAttributes(&ObjectAttributes, Modified: trunk/reactos/base/system/services/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lock.… ============================================================================== --- trunk/reactos/base/system/services/lock.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/lock.c [iso-8859-1] Sat Mar 16 13:50:24 2013 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Service Control Manager * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/services/lock.c - * PURPOSE: Service lock functions + * PURPOSE: User-side Services Start Serialization Lock functions * COPYRIGHT: Copyright 2012 Hermès Bélusca */ @@ -16,6 +16,7 @@ /* GLOBALS *******************************************************************/ +/* The unique user service start lock of the SCM */ static PSTART_LOCK pServiceStartLock = NULL;

1 0

[tkreuzer] 58515: [CRT] Implement [v]s[nw]printf_s [MSVCRT] Enable [v]s[nw]printf_s exports
by tkreuzer＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: tkreuzer Date: Sat Mar 16 13:40:28 2013 New Revision: 58515 URL: http://svn.reactos.org/svn/reactos?rev=58515&view=rev Log: [CRT] Implement [v]s[nw]printf_s [MSVCRT] Enable [v]s[nw]printf_s exports Added: trunk/reactos/lib/sdk/crt/printf/_snprintf_s.c (with props) trunk/reactos/lib/sdk/crt/printf/_snwprintf_s.c (with props) trunk/reactos/lib/sdk/crt/printf/_vsnprintf_s.c (with props) trunk/reactos/lib/sdk/crt/printf/_vsnwprintf_s.c (with props) trunk/reactos/lib/sdk/crt/printf/sprintf_s.c (with props) trunk/reactos/lib/sdk/crt/printf/swprintf_s.c (with props) trunk/reactos/lib/sdk/crt/printf/vsprintf_s.c (with props) trunk/reactos/lib/sdk/crt/printf/vswprintf_s.c (with props) Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/printf/_sxprintf.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sat Mar 16 13:40:28 2013 @@ -832,7 +832,7 @@ # stub _snprintf_c # stub _snprintf_c_l # stub _snprintf_l -# stub _snprintf_s +@ varargs _snprintf_s(ptr long long ptr) # stub _snprintf_s_l # stub _snscanf # stub _snscanf_l @@ -840,7 +840,7 @@ # stub _snscanf_s_l @ varargs _snwprintf(ptr long wstr) # stub _snwprintf_l -# stub _snwprintf_s +@ varargs _snwprintf_s(ptr long long ptr) # stub _snwprintf_s_l # stub _snwscanf # stub _snwscanf_l @@ -985,11 +985,11 @@ @ cdecl _vsnprintf_c(ptr long str ptr) _vsnprintf # @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) _vsnprintf_l # @ cdecl _vsnprintf_l(ptr long str ptr ptr) -# @ cdecl _vsnprintf_s(ptr long long str ptr) +@ cdecl _vsnprintf_s(ptr long long str ptr) # @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) @ cdecl _vsnwprintf(ptr long wstr ptr) # @ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) -# @ cdecl _vsnwprintf_s(ptr long long wstr ptr) +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) # @ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) # stub _vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) @@ -1313,7 +1313,7 @@ @ cdecl -arch=x86_64 sinf(long) @ cdecl sinh(double) @ varargs sprintf(ptr str) -# @ varargs sprintf_s(ptr long str) +@ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) @ cdecl -arch=x86_64 sqrtf(long) @ cdecl srand(long) @@ -1348,7 +1348,7 @@ @ cdecl strtoul(str ptr long) @ cdecl strxfrm(ptr str long) @ varargs swprintf(ptr wstr) -# @ varargs swprintf_s(ptr long wstr) +@ varargs swprintf_s(ptr long wstr) @ varargs swscanf(wstr wstr) # @ varargs swscanf_s(wstr wstr) @ cdecl system(str) @@ -1374,9 +1374,9 @@ @ cdecl vprintf_s(str ptr) # stub vsnprintf @ cdecl vsprintf(ptr str ptr) -# @ cdecl vsprintf_s(ptr long str ptr) +@ cdecl vsprintf_s(ptr long str ptr) @ cdecl vswprintf(ptr wstr ptr) -# @ cdecl vswprintf_s(ptr long wstr ptr) +@ cdecl vswprintf_s(ptr long wstr ptr) @ cdecl vwprintf(wstr ptr) @ cdecl vwprintf_s(wstr ptr) # stub wcrtomb Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sat Mar 16 13:40:28 2013 @@ -135,13 +135,17 @@ printf/_cprintf.c printf/_cwprintf.c printf/_snprintf.c + printf/_snprintf_s.c printf/_snwprintf.c + printf/_snwprintf_s.c printf/_vcprintf.c printf/_vcwprintf.c printf/_vscprintf.c printf/_vscwprintf.c printf/_vsnprintf.c + printf/_vsnprintf_s.c printf/_vsnwprintf.c + printf/_vsnwprintf_s.c printf/_vsprintf_p.c printf/fprintf.c printf/fprintf_s.c @@ -150,8 +154,10 @@ printf/printf.c printf/printf_s.c printf/sprintf.c + printf/sprintf_s.c printf/streamout.c printf/swprintf.c + printf/swprintf_s.c printf/vfprintf.c printf/vfprintf_s.c printf/vfwprintf.c @@ -159,7 +165,9 @@ printf/vprintf.c printf/vprintf_s.c printf/vsprintf.c + printf/vsprintf_s.c printf/vswprintf.c + printf/vswprintf_s.c printf/vwprintf.c printf/vwprintf_s.c printf/wprintf.c Added: trunk/reactos/lib/sdk/crt/printf/_snprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_snprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_snprintf_s.c (added) +++ trunk/reactos/lib/sdk/crt/printf/_snprintf_s.c [iso-8859-1] Sat Mar 16 13:40:28 2013 @@ -1,0 +1,13 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/_snprintf_s.c + * PURPOSE: Implementation of _snprintf_s + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf _snprintf_s +#define USE_COUNT 1 +#define IS_SECAPI 1 + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/_snprintf_s.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/_snwprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_snwpri… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_snwprintf_s.c (added) +++ trunk/reactos/lib/sdk/crt/printf/_snwprintf_s.c [iso-8859-1] Sat Mar 16 13:40:28 2013 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/_snwprintf_s.c + * PURPOSE: Implementation of _snwprintf_s + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf _snwprintf_s +#define USE_COUNT 1 +#define _UNICODE +#define IS_SECAPI 1 + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/_snwprintf_s.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/printf/_sxprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_sxprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_sxprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_sxprintf.c [iso-8859-1] Sat Mar 16 13:40:28 2013 @@ -10,12 +10,17 @@ #include <stdarg.h> #include <limits.h> #include <tchar.h> +#if IS_SECAPI +#include <internal/safecrt.h> +#endif #ifdef _UNICODE #define _tstreamout wstreamout #else #define _tstreamout streamout #endif + +#define min(a,b) (((a) < (b)) ? (a) : (b)) int _cdecl _tstreamout(FILE *stream, const TCHAR *format, va_list argptr); @@ -27,6 +32,9 @@ #endif _sxprintf( TCHAR *buffer, +#if IS_SECAPI + size_t sizeOfBuffer, +#endif #if USE_COUNT size_t count, #endif @@ -37,20 +45,42 @@ ...) #endif { +#if !USE_COUNT + const size_t count = INT_MAX; +#endif +#if !IS_SECAPI + const size_t sizeOfBuffer = count; +#endif #if !USE_VARARGS va_list argptr; #endif int result; FILE stream; + /* Check trivial case */ + if ((buffer == NULL) && (count == 0) && (sizeOfBuffer == 0)) + { + return 0; + } + +#if IS_SECAPI + /* Validate parameters */ + if (MSVCRT_CHECK_PMT(((buffer == NULL) || (format == NULL) || (sizeOfBuffer <= 0)))) + { + errno = EINVAL; + return -1; + } + + /* Limit output to count + 1 characters */ + if (count != -1) + sizeOfBuffer = min(sizeOfBuffer, count + 1); +#endif + + /* Setup the FILE structure */ stream._base = (char*)buffer; stream._ptr = stream._base; stream._charbuf = 0; -#if USE_COUNT - stream._cnt = (int)(count * sizeof(TCHAR)); -#else - stream._cnt = INT_MAX; -#endif + stream._cnt = (int)(sizeOfBuffer * sizeof(TCHAR)); stream._bufsiz = 0; stream._flag = _IOSTRG | _IOWRT; stream._tmpfname = 0; @@ -63,8 +93,33 @@ va_end(argptr); #endif +#if IS_SECAPI + /* Check for failure or unterminated string */ + if ((result < 0) || (result == sizeOfBuffer)) + { + /* Null-terminate the buffer at the end */ + buffer[sizeOfBuffer-1] = _T('\0'); + + /* Check if we can truncate */ + if (count != _TRUNCATE) + { + /* We can't, invoke invalid parameter handler */ + MSVCRT_INVALID_PMT("Buffer is too small"); + + /* If we came back, set the buffer to an empty string */ + *buffer = 0; + } + + /* Return failure */ + return -1; + } + + /* Null-terminate the buffer after the string */ + buffer[result] = _T('\0'); +#else /* Only zero terminate if there is enough space left */ if (stream._cnt >= sizeof(TCHAR)) *(TCHAR*)stream._ptr = _T('\0'); +#endif return result; } Added: trunk/reactos/lib/sdk/crt/printf/_vsnprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_vsnpri… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_vsnprintf_s.c (added) +++ trunk/reactos/lib/sdk/crt/printf/_vsnprintf_s.c [iso-8859-1] Sat Mar 16 13:40:28 2013 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/_vsnprintf_s.c + * PURPOSE: Implementation of _vsnprintf_s + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf _vsnprintf_s +#define USE_COUNT 1 +#define USE_VARARGS 1 +#define IS_SECAPI 1 + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/_vsnprintf_s.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/_vsnwprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_vsnwpr… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_vsnwprintf_s.c (added) +++ trunk/reactos/lib/sdk/crt/printf/_vsnwprintf_s.c [iso-8859-1] Sat Mar 16 13:40:28 2013 @@ -1,0 +1,15 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/_vsnwprintf_s.c + * PURPOSE: Implementation of _vsnwprintf_s + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf _vsnwprintf_s +#define USE_COUNT 1 +#define USE_VARARGS 1 +#define _UNICODE +#define IS_SECAPI 1 + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/_vsnwprintf_s.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/sprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/sprintf… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/sprintf_s.c (added) +++ trunk/reactos/lib/sdk/crt/printf/sprintf_s.c [iso-8859-1] Sat Mar 16 13:40:28 2013 @@ -1,0 +1,13 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/sprintf_s.c + * PURPOSE: Implementation of sprintf_s + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf sprintf_s +#define USE_COUNT 0 +#define IS_SECAPI 1 + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/sprintf_s.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/swprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/swprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/swprintf_s.c (added) +++ trunk/reactos/lib/sdk/crt/printf/swprintf_s.c [iso-8859-1] Sat Mar 16 13:40:28 2013 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/swprintf_s.c + * PURPOSE: Implementation of swprintf_s + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf swprintf_s +#define USE_COUNT 0 +#define USE_VARARGS 0 +#define IS_SECAPI 1 + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/swprintf_s.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/vsprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vsprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vsprintf_s.c (added) +++ trunk/reactos/lib/sdk/crt/printf/vsprintf_s.c [iso-8859-1] Sat Mar 16 13:40:28 2013 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/vsprintf_s.c + * PURPOSE: Implementation of vsprintf_s + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf vsprintf_s +#define USE_COUNT 0 +#define USE_VARARGS 1 +#define IS_SECAPI 1 + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/vsprintf_s.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/vswprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vswprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vswprintf_s.c (added) +++ trunk/reactos/lib/sdk/crt/printf/vswprintf_s.c [iso-8859-1] Sat Mar 16 13:40:28 2013 @@ -1,0 +1,15 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/vswprintf_s.c + * PURPOSE: Implementation of vswprintf_s + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf vswprintf_s +#define USE_COUNT 0 +#define USE_VARARGS 1 +#define _UNICODE +#define IS_SECAPI 1 + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/vswprintf_s.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 58514: [win32k] - Store the session id in WINSTATION_OBJECT when we create a window station. - Don't allow switching to a desktop that belongs to a different session This is a modifi...
by gadamopoulos＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: gadamopoulos Date: Sat Mar 16 10:12:16 2013 New Revision: 58514 URL: http://svn.reactos.org/svn/reactos?rev=58514&view=rev Log: [win32k] - Store the session id in WINSTATION_OBJECT when we create a window station. - Don't allow switching to a desktop that belongs to a different session This is a modified version of the patch from CORE-5531 Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/winsta.c trunk/reactos/win32ss/user/ntuser/winsta.h Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sat Mar 16 10:12:16 2013 @@ -1632,6 +1632,12 @@ RETURN(FALSE); } + if (PsGetCurrentProcessSessionId() != pdesk->rpwinstaParent->dwSessionId) + { + ERR("NtUserSwitchDesktop called for a desktop of a different session\n"); + RETURN(FALSE); + } + if(pdesk == gpdeskInputDesktop) { WARN("NtUserSwitchDesktop called for active desktop\n"); Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Sat Mar 16 10:12:16 2013 @@ -432,6 +432,7 @@ Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); WindowStationObject->SystemMenuTemplate = (HANDLE)0; WindowStationObject->Name = WindowStationName; + WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId; if (InputWindowStation == NULL) { Modified: trunk/reactos/win32ss/user/ntuser/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.h [iso-8859-1] Sat Mar 16 10:12:16 2013 @@ -9,6 +9,8 @@ typedef struct _WINSTATION_OBJECT { + DWORD dwSessionId; + KSPIN_LOCK Lock; UNICODE_STRING Name; LIST_ENTRY DesktopListHead;

1 0

[gadamopoulos] 58513: [win32csr] - When we close a window during shutdown, switch to the desktop of the window CORE-5439
by gadamopoulos＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: gadamopoulos Date: Sat Mar 16 09:09:53 2013 New Revision: 58513 URL: http://svn.reactos.org/svn/reactos?rev=58513&view=rev Log: [win32csr] - When we close a window during shutdown, switch to the desktop of the window CORE-5439 Modified: trunk/reactos/win32ss/user/win32csr/exitros.c Modified: trunk/reactos/win32ss/user/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/exit… ============================================================================== --- trunk/reactos/win32ss/user/win32csr/exitros.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/exitros.c [iso-8859-1] Sat Mar 16 09:09:53 2013 @@ -61,6 +61,7 @@ WPARAM wParam; LPARAM lParam; HDESK Desktop; + HDESK OldDesktop; DWORD StartTime; DWORD QueryResult; HWND Dlg; @@ -412,7 +413,12 @@ return FALSE; } + Context->OldDesktop = GetThreadDesktop(GetCurrentThreadId()); + SwitchDesktop(Context->Desktop); + EnumDesktopWindows(Context->Desktop, NotifyTopLevelEnum, lParam); + + SwitchDesktop(Context->OldDesktop); CloseDesktop(Context->Desktop);

1 0

[dreimer] 58512: Update Rapps Database. Welcome to CLT2013 ^^
by dreimer＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: dreimer Date: Sat Mar 16 08:17:19 2013 New Revision: 58512 URL: http://svn.reactos.org/svn/reactos?rev=58512&view=rev Log: Update Rapps Database. Welcome to CLT2013 ^^ Modified: trunk/reactos/base/applications/rapps/rapps/bittorrent.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt Modified: trunk/reactos/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/bittorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/bittorrent.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -2,13 +2,13 @@ [Section] Name = BitTorrent -Version = 7.7.2 +Version = 7.8 Licence = Freeware for non-commercial uses Description = The Original BitTorrent Client. -Size = 956KB +Size = 1012KB Category = 5 URLSite = http://www.bittorrent.com/ -URLDownload = http://download.bittorrent.com/7.7.2/BitTorrent.exe +URLDownload = http://download.bittorrent.com/7.8/BitTorrent.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -1,33 +1,33 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Firefox 17 -Version = 17.0.1 +Name = Mozilla Firefox 19 +Version = 19.0.2 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 15.8MB Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/e… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 15.7MB URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/d… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/d… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 15.6MB URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/e… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 15.9MB URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/f… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/f… [Section.0413] Description = De meest populaire en een van de beste gratis Web browsers. @@ -38,34 +38,34 @@ Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 15.6MB URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/n… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/n… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 16.5MB URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/p… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/p… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. Size = 16,1 Mo URLSite = http://www.mozilla-europe.org/ro/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/r… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/r… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 16.1MB URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/r… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/r… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. Size = 16.3MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/s… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/s… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 16.1MB URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/u… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/u… Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -2,13 +2,13 @@ [Section] Name = K Desktop Environment -Version = 0.9.9-7 +Version = 0.9.9-8 Licence = GPL Description = KDE for Windows. Size = 2.21MB Category = 15 URLSite = http://www.winkde.org/ -URLDownload = http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.… +URLDownload = http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 3.6.4 +Version = 4.0.1 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. Size = 200.0MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.6.4/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.0.1/win/x86/Lib… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.10.9 +Version = 0.10.11 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 3.1MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.10.9-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.10.11-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -2,13 +2,13 @@ [Section] Name = mIRC 7 -Version = 7.27 +Version = 7.29 Licence = Shareware Description = The most popular client for the Internet Relay Chat (IRC). Size = 1.82MB Category = 5 URLSite = http://www.mirc.com/ -URLDownload = http://download.mirc.com/6/mirc727.exe +URLDownload = http://download.mirc.com/7/mirc729.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -8,7 +8,7 @@ Size = 91.9MB Category = 14 URLSite = http://www.mono-project.com/Main_Page -URLDownload = http://download.mono-project.com/archive/2.11.4/windows-installer/mono-2.11… +URLDownload = http://download.mono-project.com/archive/2.10.9/windows-installer/0/mono-2.… CDPath = none [Section.040a] Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -2,13 +2,13 @@ [Section] Name = Opera -Version = 12.12 +Version = 12.14 Licence = Freeware Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client. Size = 12.00MB Category = 5 URLSite = http://www.opera.com/ -URLDownload = http://ftp.opera.com/pub/opera/win/1212/int/Opera_1212_int_Setup.exe +URLDownload = http://ftp.opera.com/pub/opera/win/1214/int/Opera_1214_int_Setup.exe CDPath = none [Section.0405] Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -2,13 +2,13 @@ [Section] Name = SciTE -Version = 3.2.3 +Version = 3.2.5 Licence = Freeware Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. Size = 685kB Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.2.3/Sc323.exe +URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.2.5/Sc325.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -2,39 +2,39 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.14.1 +Version = 2.16.2 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 20.0MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/en-U… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/en-U… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 20.0MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/de/S… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/de/S… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. Size = 19.9MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/es-E… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/es-E… [Section.040c] Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin. Size = 20.2MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/fr/S… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/fr/S… [Section.0413] Description = Mozilla Suite bundelt alle applicaties voor het Web: Browser, Mail, Chat, Composer. Size = 20.6MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/nl/S… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/nl/S… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 20.8MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/pl/S… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/pl/S… [Section.0418] Description = Suita Mozilla. Acest pachet ce Ã®ncorporeazÄ navigator, poÈtÄ electronicÄ, client IRC Èi editor HTML, acoperind astfel o arie largÄ de necesitÄÈi. @@ -43,9 +43,9 @@ [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 20.5MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/ru/S… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/ru/S… [Section.0422] Description = ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Mozilla Suite. ÐÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑÑÐ½Ñ, IRC-ÐºÐ»ÑÑÐ½Ñ ÑÐ° HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 20.5MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/ru/S… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/ru/S… Modified: trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -2,13 +2,13 @@ [Section] Name = SumatraPDF -Version = 2.2 +Version = 2.2.1 Licence = GPLv3 Description = Sumatra PDF is a slim, free, open-source PDF reader. Portable out of the box. Size = 4.8MB Category = 6 URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader.html -URLDownload = https://kjkpub.s3.amazonaws.com/sumatrapdf/rel/SumatraPDF-2.2-install.exe +URLDownload = https://kjkpub.s3.amazonaws.com/sumatrapdf/rel/SumatraPDF-2.2.1-install.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -2,32 +2,32 @@ [Section] Name = Mozilla Thunderbird 17 -Version = 17.0 +Version = 17.0.4 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 17.6MB Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/en… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 17.5MB URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/de… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 17.4MB URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/es… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 17.8MB URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/fr… [Section.0413] Description = De meest populaire en een van de beste gratis e-mail-programma's. @@ -39,22 +39,22 @@ Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 18.3MB URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/pl… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune clientele gratuite de poÈtÄ electronicÄ. Size = 18,0 Mo URLSite = http://www.mozilla-europe.org/ro/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/ro… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 17.9MB URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/ru… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 17.9MB URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/uk… Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Sat Mar 16 08:17:19 2013 @@ -2,13 +2,13 @@ [Section] Name = ÂµTorrent -Version = 3.2.3 +Version = 3.3 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. Size = 946.00kB Category = 5 URLSite = http://www.utorrent.com/ -URLDownload = http://download.utorrent.com/3.2.3/uTorrent.exe +URLDownload = http://download.utorrent.com/3.3/uTorrent.exe CDPath = none

1 0

[akhaldi] 58511: [CRT] * Annotate stdlib_s.h. * Annotate more functions in stdlib.h.
by akhaldi＠svn.reactos.org 15 Mar '13

15 Mar '13

Author: akhaldi Date: Fri Mar 15 22:04:05 2013 New Revision: 58511 URL: http://svn.reactos.org/svn/reactos?rev=58511&view=rev Log: [CRT] * Annotate stdlib_s.h. * Annotate more functions in stdlib.h. Modified: trunk/reactos/include/crt/sec_api/stdlib_s.h trunk/reactos/include/crt/stdlib.h Modified: trunk/reactos/include/crt/sec_api/stdlib_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/stdlib… ============================================================================== --- trunk/reactos/include/crt/sec_api/stdlib_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/stdlib_s.h [iso-8859-1] Fri Mar 15 22:04:05 2013 @@ -14,50 +14,330 @@ extern "C" { #endif - _CRTIMP errno_t __cdecl _dupenv_s(char **_PBuffer,size_t *_PBufferSizeInBytes,const char *_VarName); - _CRTIMP errno_t __cdecl _itoa_s(int _Value,char *_DstBuf,size_t _Size,int _Radix); - _CRTIMP errno_t __cdecl _i64toa_s(__int64 _Val,char *_DstBuf,size_t _Size,int _Radix); - _CRTIMP errno_t __cdecl _ui64toa_s(unsigned __int64 _Val,char *_DstBuf,size_t _Size,int _Radix); - _CRTIMP errno_t __cdecl _ltoa_s(long _Val,char *_DstBuf,size_t _Size,int _Radix); - _CRTIMP errno_t __cdecl mbstowcs_s(size_t *_PtNumOfCharConverted,wchar_t *_DstBuf,size_t _SizeInWords,const char *_SrcBuf,size_t _MaxCount); - _CRTIMP errno_t __cdecl _mbstowcs_s_l(size_t *_PtNumOfCharConverted,wchar_t *_DstBuf,size_t _SizeInWords,const char *_SrcBuf,size_t _MaxCount,_locale_t _Locale); - _CRTIMP errno_t __cdecl _ultoa_s(unsigned long _Val,char *_DstBuf,size_t _Size,int _Radix); - _CRTIMP errno_t __cdecl _wctomb_s_l(int *_SizeConverted,char *_MbCh,size_t _SizeInBytes,wchar_t _WCh,_locale_t _Locale); - _CRTIMP errno_t __cdecl wcstombs_s(size_t *_PtNumOfCharConverted,char *_Dst,size_t _DstSizeInBytes,const wchar_t *_Src,size_t _MaxCountInBytes); - _CRTIMP errno_t __cdecl _wcstombs_s_l(size_t *_PtNumOfCharConverted,char *_Dst,size_t _DstSizeInBytes,const wchar_t *_Src,size_t _MaxCountInBytes,_locale_t _Locale); + _Check_return_opt_ + _CRTIMP + errno_t + __cdecl + _dupenv_s( + _Outptr_result_buffer_maybenull_(*_PBufferSizeInBytes) _Outptr_result_z_ char **_PBuffer, + _Out_opt_ size_t *_PBufferSizeInBytes, + _In_z_ const char *_VarName); + + _Check_return_opt_ + _CRTIMP + errno_t + __cdecl + _itoa_s( + _In_ int _Value, + _Out_writes_z_(_Size) char *_DstBuf, + _In_ size_t _Size, + _In_ int _Radix); + + _Check_return_opt_ + _CRTIMP + errno_t + __cdecl + _i64toa_s( + _In_ __int64 _Val, + _Out_writes_z_(_Size) char *_DstBuf, + _In_ size_t _Size, + _In_ int _Radix); + + _Check_return_opt_ + _CRTIMP + errno_t + __cdecl + _ui64toa_s( + _In_ unsigned __int64 _Val, + _Out_writes_z_(_Size) char *_DstBuf, + _In_ size_t _Size, + _In_ int _Radix); + + _Check_return_opt_ + _CRTIMP + errno_t + __cdecl + _ltoa_s( + _In_ long _Val, + _Out_writes_z_(_Size) char *_DstBuf, + _In_ size_t _Size, + _In_ int _Radix); + + _Success_(return!=EINVAL) + _Check_return_opt_ + _CRTIMP + errno_t + __cdecl + mbstowcs_s( + _Out_opt_ size_t *pcchConverted, + _Out_writes_to_opt_(sizeInWords, *pcchConverted) wchar_t *pwcstr, + _In_ size_t sizeInWords, + _In_reads_or_z_(count) const char *pmbstr, + _In_ size_t count); + + _Check_return_opt_ + _CRTIMP + errno_t + __cdecl + _mbstowcs_s_l( + _Out_opt_ size_t *_PtNumOfCharConverted, + _Out_writes_to_opt_(_SizeInWords, *_PtNumOfCharConverted) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_reads_or_z_(_MaxCount) const char *_SrcBuf, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_opt_ + _CRTIMP + errno_t + __cdecl + _ultoa_s( + _In_ unsigned long _Val, + _Out_writes_z_(_Size) char *_DstBuf, + _In_ size_t _Size, + _In_ int _Radix); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wctomb_s_l( + _Out_opt_ int *_SizeConverted, + _Out_writes_opt_z_(_SizeInBytes) char *_MbCh, + _In_ size_t _SizeInBytes, + _In_ wchar_t _WCh, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + wcstombs_s( + _Out_opt_ size_t *_PtNumOfCharConverted, + _Out_writes_bytes_to_opt_(_DstSizeInBytes, *_PtNumOfCharConverted) char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCountInBytes); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcstombs_s_l( + _Out_opt_ size_t *_PtNumOfCharConverted, + _Out_writes_bytes_to_opt_(_DstSizeInBytes, *_PtNumOfCharConverted) char *_Dst, + _In_ size_t _DstSizeInBytes, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCountInBytes, + _In_opt_ _locale_t _Locale); #ifndef _WSTDLIB_S_DEFINED #define _WSTDLIB_S_DEFINED - _CRTIMP errno_t __cdecl _itow_s (int _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _ltow_s (long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _ultow_s (unsigned long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _wgetenv_s(size_t *_ReturnSize,wchar_t *_DstBuf,size_t _DstSizeInWords,const wchar_t *_VarName); - _CRTIMP errno_t __cdecl _wdupenv_s(wchar_t **_Buffer,size_t *_BufferSizeInWords,const wchar_t *_VarName); - _CRTIMP errno_t __cdecl _i64tow_s(__int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _ui64tow_s(unsigned __int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); -#endif + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _itow_s( + _In_ int _Val, + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_ int _Radix); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _ltow_s( + _In_ long _Val, + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_ int _Radix); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _ultow_s( + _In_ unsigned long _Val, + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_ int _Radix); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wgetenv_s( + _Out_ size_t *_ReturnSize, + _Out_writes_opt_z_(_DstSizeInWords) wchar_t *_DstBuf, + _In_ size_t _DstSizeInWords, + _In_z_ const wchar_t *_VarName); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wdupenv_s( + _Outptr_result_buffer_maybenull_(*_BufferSizeInWords) _Outptr_result_z_ wchar_t **_Buffer, + _Out_opt_ size_t *_BufferSizeInWords, + _In_z_ const wchar_t *_VarName); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _i64tow_s( + _In_ __int64 _Val, + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_ int _Radix); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _ui64tow_s( + _In_ unsigned __int64 _Val, + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_ int _Radix); + +#endif /* _WSTDLIB_S_DEFINED */ #ifndef _POSIX_ - _CRTIMP errno_t __cdecl _ecvt_s(char *_DstBuf,size_t _Size,double _Val,int _NumOfDights,int *_PtDec,int *_PtSign); - _CRTIMP errno_t __cdecl _fcvt_s(char *_DstBuf,size_t _Size,double _Val,int _NumOfDec,int *_PtDec,int *_PtSign); - _CRTIMP errno_t __cdecl _gcvt_s(char *_DstBuf,size_t _Size,double _Val,int _NumOfDigits); - _CRTIMP errno_t __cdecl _makepath_s(char *_PathResult,size_t _Size,const char *_Drive,const char *_Dir,const char *_Filename,const char *_Ext); - _CRTIMP errno_t __cdecl _putenv_s(const char *_Name,const char *_Value); - _CRTIMP errno_t __cdecl _searchenv_s(const char *_Filename,const char *_EnvVar,char *_ResultPath,size_t _SizeInBytes); - _CRTIMP errno_t __cdecl _splitpath_s(const char *_FullPath,char *_Drive,size_t _DriveSize,char *_Dir,size_t _DirSize,char *_Filename,size_t _FilenameSize,char *_Ext,size_t _ExtSize); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _ecvt_s( + _Out_writes_z_(_Size) char *_DstBuf, + _In_ size_t _Size, + _In_ double _Val, + _In_ int _NumOfDights, + _Out_ int *_PtDec, + _Out_ int *_PtSign); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _fcvt_s( + _Out_writes_z_(_Size) char *_DstBuf, + _In_ size_t _Size, + _In_ double _Val, + _In_ int _NumOfDec, + _Out_ int *_PtDec, + _Out_ int *_PtSign); + + _CRTIMP + errno_t + __cdecl + _gcvt_s( + _Out_writes_z_(_Size) char *_DstBuf, + _In_ size_t _Size, + _In_ double _Val, + _In_ int _NumOfDigits); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _makepath_s( + _Out_writes_z_(_Size) char *_PathResult, + _In_ size_t _Size, + _In_opt_z_ const char *_Drive, + _In_opt_z_ const char *_Dir, + _In_opt_z_ const char *_Filename, + _In_opt_z_ const char *_Ext); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _putenv_s( + _In_z_ const char *_Name, + _In_z_ const char *_Value); + + _CRTIMP + errno_t + __cdecl + _searchenv_s( + _In_z_ const char *_Filename, + _In_z_ const char *_EnvVar, + _Out_writes_z_(_SizeInBytes) char *_ResultPath, + _In_ size_t _SizeInBytes); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _splitpath_s( + _In_z_ const char *_FullPath, + _Out_writes_opt_z_(_DriveSize) char *_Drive, + _In_ size_t _DriveSize, + _Out_writes_opt_z_(_DirSize) char *_Dir, + _In_ size_t _DirSize, + _Out_writes_opt_z_(_FilenameSize) char *_Filename, + _In_ size_t _FilenameSize, + _Out_writes_opt_z_(_ExtSize) char *_Ext, + _In_ size_t _ExtSize); #ifndef _WSTDLIBP_S_DEFINED #define _WSTDLIBP_S_DEFINED - _CRTIMP errno_t __cdecl _wmakepath_s(wchar_t *_PathResult,size_t _SizeInWords,const wchar_t *_Drive,const wchar_t *_Dir,const wchar_t *_Filename,const wchar_t *_Ext); - _CRTIMP errno_t __cdecl _wputenv_s(const wchar_t *_Name,const wchar_t *_Value); - _CRTIMP errno_t __cdecl _wsearchenv_s(const wchar_t *_Filename,const wchar_t *_EnvVar,wchar_t *_ResultPath,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wsplitpath_s(const wchar_t *_FullPath,wchar_t *_Drive,size_t _DriveSizeInWords,wchar_t *_Dir,size_t _DirSizeInWords,wchar_t *_Filename,size_t _FilenameSizeInWords,wchar_t *_Ext,size_t _ExtSizeInWords); -#endif -#endif + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wmakepath_s( + _Out_writes_z_(_SizeInWords) wchar_t *_PathResult, + _In_ size_t _SizeInWords, + _In_opt_z_ const wchar_t *_Drive, + _In_opt_z_ const wchar_t *_Dir, + _In_opt_z_ const wchar_t *_Filename, + _In_opt_z_ const wchar_t *_Ext); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wputenv_s( + _In_z_ const wchar_t *_Name, + _In_z_ const wchar_t *_Value); + + _CRTIMP + errno_t + __cdecl + _wsearchenv_s( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_EnvVar, + _Out_writes_z_(_SizeInWords) wchar_t *_ResultPath, + _In_ size_t _SizeInWords); + + _CRTIMP + errno_t + __cdecl + _wsplitpath_s( + _In_z_ const wchar_t *_FullPath, + _Out_writes_opt_z_(_DriveSizeInWords) wchar_t *_Drive, + _In_ size_t _DriveSizeInWords, + _Out_writes_opt_z_(_DirSizeInWords) wchar_t *_Dir, + _In_ size_t _DirSizeInWords, + _Out_writes_opt_z_(_FilenameSizeInWords) wchar_t *_Filename, + _In_ size_t _FilenameSizeInWords, + _Out_writes_opt_z_(_ExtSizeInWords) wchar_t *_Ext, + _In_ size_t _ExtSizeInWords); + +#endif /* _WSTDLIBP_S_DEFINED */ + +#endif /* _POSIX_ */ #ifdef __cplusplus } #endif -#endif -#endif +#endif /* defined(MINGW_HAS_SECURE_API) */ + +#endif /* _INC_STDLIB_S */ Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Fri Mar 15 22:04:05 2013 @@ -131,11 +131,11 @@ typedef void (__cdecl *_purecall_handler)(void); - _CRTIMP _purecall_handler __cdecl _set_purecall_handler(_purecall_handler _Handler); + _CRTIMP _purecall_handler __cdecl _set_purecall_handler(_In_opt_ _purecall_handler _Handler); _CRTIMP _purecall_handler __cdecl _get_purecall_handler(void); typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t *,const wchar_t *,const wchar_t *,unsigned int,uintptr_t); - _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler _Handler); + _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_In_opt_ _invalid_parameter_handler _Handler); _invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void); #include <errno.h> @@ -186,8 +186,8 @@ _CRTIMP errno_t __cdecl _get_environ(_Out_ char***); _CRTIMP errno_t __cdecl _get_wenviron(_Out_ wchar_t***); - _CRTIMP errno_t __cdecl _get_pgmptr(_Deref_out_z_ char **_Value); - _CRTIMP errno_t __cdecl _get_wpgmptr(_Deref_out_z_ wchar_t **_Value); + _CRTIMP errno_t __cdecl _get_pgmptr(_Outptr_result_z_ char **_Value); + _CRTIMP errno_t __cdecl _get_wpgmptr(_Outptr_result_z_ wchar_t **_Value); #ifdef _M_CEE_PURE _CRTIMP int* __cdecl __p__fmode(); @@ -330,7 +330,7 @@ void __cdecl qsort( - _Inout_updates_bytes_(_NumOfElements * _SizeOfElements) void *_Base, + _Inout_updates_bytes_(_NumOfElements * _SizeOfElements) _Post_readable_byte_size_(_NumOfElements * _SizeOfElements) void *_Base, _In_ size_t _NumOfElements, _In_ size_t _SizeOfElements, _In_ int (__cdecl *_PtFuncCompare)(const void *,const void *)); @@ -464,6 +464,7 @@ #endif /* _INTEGRAL_MAX_BITS >= 64 */ + _Check_return_ ldiv_t __cdecl ldiv( @@ -710,6 +711,7 @@ malloc( _In_ size_t _Size); + _Success_(return != 0) _Check_return_ _Ret_maybenull_ _Post_writable_byte_size_(_NewSize) @@ -719,6 +721,7 @@ _Pre_maybenull_ _Post_invalid_ void *_Memory, _In_ size_t _NewSize); + _Success_(return != 0) _Check_return_ _Ret_maybenull_ _Post_writable_byte_size_(_Count * _Size) @@ -768,6 +771,7 @@ _In_ size_t _Alignment, _In_ size_t _Offset); + _Success_(return != 0) _Check_return_ _Ret_maybenull_ _Post_writable_byte_size_(_Size) @@ -779,6 +783,7 @@ _In_ size_t _Size, _In_ size_t _Alignment); + _Success_(return != 0) _Check_return_ _Ret_maybenull_ _Post_writable_byte_size_(_Count * _Size) @@ -791,6 +796,7 @@ _In_ size_t _Size, _In_ size_t _Alignment); + _Success_(return != 0) _Check_return_ _Ret_maybenull_ _Post_writable_byte_size_(_Size) @@ -1143,12 +1149,14 @@ _In_z_ char *_Str, _In_opt_ _locale_t _Locale); + _Check_return_ unsigned long __cdecl _lrotl( _In_ unsigned long _Val, _In_ int _Shift); + _Check_return_ unsigned long __cdecl _lrotr( @@ -1426,10 +1434,10 @@ __MINGW_EXTENSION typedef struct { long long quot, rem; } lldiv_t; - __MINGW_EXTENSION lldiv_t __cdecl lldiv(long long, long long); + _Check_return_ __MINGW_EXTENSION lldiv_t __cdecl lldiv(_In_ long long, _In_ long long); #ifndef _MSC_VER - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llabs(long long _j) { return (_j >= 0 ? _j : -_j); } + __MINGW_EXTENSION __CRT_INLINE long long __cdecl llabs(_In_ long long _j) { return (_j >= 0 ? _j : -_j); } #endif __MINGW_EXTENSION long long __cdecl strtoll(const char* __restrict__, char** __restrict, int);

1 0

[akhaldi] 58510: [APPLICATIONS] * Fix some format specifiers.
by akhaldi＠svn.reactos.org 15 Mar '13

15 Mar '13

Author: akhaldi Date: Fri Mar 15 21:59:57 2013 New Revision: 58510 URL: http://svn.reactos.org/svn/reactos?rev=58510&view=rev Log: [APPLICATIONS] * Fix some format specifiers. Modified: trunk/reactos/base/applications/cmdutils/hostname/hostname.c trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/setup16/main.c trunk/reactos/base/applications/shutdown/misc.c Modified: trunk/reactos/base/applications/cmdutils/hostname/hostname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/hostname.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/hostname/hostname.c [iso-8859-1] Fri Mar 15 21:59:57 2013 @@ -44,7 +44,7 @@ printf ("%s\n", ComputerName); return EXIT_SUCCESS; } - fprintf (stderr, "%s: Win32 error %ld.\n", + fprintf (stderr, "%s: Win32 error %lu.\n", argv[0], GetLastError()); return EXIT_FAILURE; }else{ Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Fri Mar 15 21:59:57 2013 @@ -695,7 +695,7 @@ else _snwprintf(szWindowTitle+i, dwMaxLength, L"%s", lpComputerName); - swprintf(szStatusText, L"%s has %d event(s)", lpLogName, dwTotalRecords); + swprintf(szStatusText, L"%s has %lu event(s)", lpLogName, dwTotalRecords); // Update the status bar SendMessageW(hwndStatus, SB_SETTEXT, (WPARAM)0, (LPARAM)szStatusText); Modified: trunk/reactos/base/applications/setup16/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/setup16/… ============================================================================== --- trunk/reactos/base/applications/setup16/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/setup16/main.c [iso-8859-1] Fri Mar 15 21:59:57 2013 @@ -143,7 +143,7 @@ else { WCHAR szMsg[MAX_PATH]; - wsprintf(szMsg, L"Failed to load the installer. Error %d", GetLastError()); + wsprintf(szMsg, L"Failed to load the installer. Error %lu", GetLastError()); MessageBoxW(0, szMsg, L"Error", MB_OK | MB_ICONERROR); DeleteDirectory(szTempPath); return 1; Modified: trunk/reactos/base/applications/shutdown/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/misc.c [iso-8859-1] Fri Mar 15 21:59:57 2013 @@ -179,7 +179,7 @@ /* Prints out the error message to the user */ fprintf(stderr, resMsg); - fwprintf(stderr, L"Error code: %d\n", dwError); + fwprintf(stderr, L"Error code: %lu\n", dwError); LocalFree(lpMsgBuf); LocalFree(resMsg);

1 0

[akhaldi] 58509: [SAL] * Add _Outptr_result_z_ annotation.
by akhaldi＠svn.reactos.org 15 Mar '13

15 Mar '13

Author: akhaldi Date: Fri Mar 15 21:36:13 2013 New Revision: 58509 URL: http://svn.reactos.org/svn/reactos?rev=58509&view=rev Log: [SAL] * Add _Outptr_result_z_ annotation. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=585… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Fri Mar 15 21:36:13 2013 @@ -838,7 +838,7 @@ #define _Outptr_result_maybenull_ _SAL2_NAME(_Outptr_result_maybenull_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_Maybe,Notref=1,ValidElements="\n""1")] ) //#define _Outptr_result_maybenull_z_ #define _Outptr_result_nullonfailure_ _SAL2_NAME(_Outptr_result_nullonfailure_) _Group_(_Outptr_ [SAL_context(p1="SAL_failed")] _Group_([SAL_post] _Deref_post_null_) ) -//#define _Outptr_result_z_ +#define _Outptr_result_z_ _SAL2_NAME(_Outptr_result_z_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] _Deref_post_z_) //#define _Outref_ //#define _Outref_result_buffer_(size) //#define _Outref_result_buffer_all_(size)

1 0

[akhaldi] 58508: [SC] * Fix some format specifiers.
by akhaldi＠svn.reactos.org 15 Mar '13

15 Mar '13

Author: akhaldi Date: Fri Mar 15 17:28:43 2013 New Revision: 58508 URL: http://svn.reactos.org/svn/reactos?rev=58508&view=rev Log: [SC] * Fix some format specifiers. Modified: trunk/reactos/base/applications/sc/print.c Modified: trunk/reactos/base/applications/sc/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/print… ============================================================================== --- trunk/reactos/base/applications/sc/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/print.c [iso-8859-1] Fri Mar 15 17:28:43 2013 @@ -81,10 +81,10 @@ _tprintf(_T(")\n")); - _tprintf(_T("\tWIN32_EXIT_CODE : %d (0x%x)\n"), + _tprintf(_T("\tWIN32_EXIT_CODE : %u (0x%x)\n"), (unsigned int)pStatus->dwWin32ExitCode, (unsigned int)pStatus->dwWin32ExitCode); - _tprintf(_T("\tSERVICE_EXIT_CODE : %d (0x%x)\n"), + _tprintf(_T("\tSERVICE_EXIT_CODE : %u (0x%x)\n"), (unsigned int)pStatus->dwServiceSpecificExitCode, (unsigned int)pStatus->dwServiceSpecificExitCode); _tprintf(_T("\tCHECKPOINT : 0x%x\n"),

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