Ros-diffs March 2013

ros-diffs@reactos.org

14 participants
249 discussions

[akhaldi] 58511: [CRT] * Annotate stdlib_s.h. * Annotate more functions in stdlib.h.

by akhaldi＠svn.reactos.org

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);

11 years, 7 months

[akhaldi] 58510: [APPLICATIONS] * Fix some format specifiers.

by akhaldi＠svn.reactos.org

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);

11 years, 7 months

[akhaldi] 58509: [SAL] * Add _Outptr_result_z_ annotation.

by akhaldi＠svn.reactos.org

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)

11 years, 7 months

[akhaldi] 58508: [SC] * Fix some format specifiers.

by akhaldi＠svn.reactos.org

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"),

11 years, 7 months

[akhaldi] 58507: [CRT] * Annotate mbctype.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 15 17:03:42 2013 New Revision: 58507 URL: http://svn.reactos.org/svn/reactos?rev=58507&view=rev Log: [CRT] * Annotate mbctype.h. Modified: trunk/reactos/include/crt/mbctype.h Modified: trunk/reactos/include/crt/mbctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbctype.h?rev=… ============================================================================== --- trunk/reactos/include/crt/mbctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mbctype.h [iso-8859-1] Fri Mar 15 17:03:42 2013 @@ -17,8 +17,8 @@ #if 1 #if defined (_DLL) && defined (_M_IX86) /* Retained for compatibility with VC++ 5.0 and earlier versions */ - _CRTIMP unsigned char * __cdecl __p__mbctype(void); - _CRTIMP unsigned char * __cdecl __p__mbcasemap(void); + _Check_return_ _CRTIMP unsigned char * __cdecl __p__mbctype(void); + _Check_return_ _CRTIMP unsigned char * __cdecl __p__mbcasemap(void); #endif /* defined (_DLL) && defined (_M_IX86) */ #endif #ifndef _mbctype @@ -70,40 +70,225 @@ #ifndef _MBCTYPE_DEFINED #define _MBCTYPE_DEFINED - _CRTIMP int __cdecl _setmbcp(int _CodePage); - _CRTIMP int __cdecl _getmbcp(void); - _CRTIMP int __cdecl _ismbbkalnum(unsigned int _C); - _CRTIMP int __cdecl _ismbbkalnum_l(unsigned int _C,_locale_t _Locale); - _CRTIMP int __cdecl _ismbbkana(unsigned int _C); - _CRTIMP int __cdecl _ismbbkana_l(unsigned int _C,_locale_t _Locale); - _CRTIMP int __cdecl _ismbbkpunct(unsigned int _C); - _CRTIMP int __cdecl _ismbbkpunct_l(unsigned int _C,_locale_t _Locale); - _CRTIMP int __cdecl _ismbbkprint(unsigned int _C); - _CRTIMP int __cdecl _ismbbkprint_l(unsigned int _C,_locale_t _Locale); - _CRTIMP int __cdecl _ismbbalpha(unsigned int _C); - _CRTIMP int __cdecl _ismbbalpha_l(unsigned int _C,_locale_t _Locale); - _CRTIMP int __cdecl _ismbbpunct(unsigned int _C); - _CRTIMP int __cdecl _ismbbpunct_l(unsigned int _C,_locale_t _Locale); - _CRTIMP int __cdecl _ismbbalnum(unsigned int _C); - _CRTIMP int __cdecl _ismbbalnum_l(unsigned int _C,_locale_t _Locale); - _CRTIMP int __cdecl _ismbbprint(unsigned int _C); - _CRTIMP int __cdecl _ismbbprint_l(unsigned int _C,_locale_t _Locale); - _CRTIMP int __cdecl _ismbbgraph(unsigned int _C); - _CRTIMP int __cdecl _ismbbgraph_l(unsigned int _C,_locale_t _Locale); + _CRTIMP + int + __cdecl + _setmbcp( + _In_ int _CodePage); + + _CRTIMP + int + __cdecl + _getmbcp(void); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbkalnum( + _In_ unsigned int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbkalnum_l( + _In_ unsigned int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbkana( + _In_ unsigned int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbkana_l( + _In_ unsigned int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbkpunct( + _In_ unsigned int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbkpunct_l( + _In_ unsigned int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbkprint( + _In_ unsigned int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbkprint_l( + _In_ unsigned int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbalpha( + _In_ unsigned int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbalpha_l( + _In_ unsigned int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbpunct( + _In_ unsigned int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbpunct_l( + _In_ unsigned int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbalnum( + _In_ unsigned int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbalnum_l( + _In_ unsigned int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbprint( + _In_ unsigned int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbprint_l( + _In_ unsigned int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbgraph( + _In_ unsigned int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbgraph_l( + _In_ unsigned int _C, + _In_opt_ _locale_t _Locale); + #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED - _CRTIMP int __cdecl _ismbblead(unsigned int _C); - _CRTIMP int __cdecl _ismbblead_l(unsigned int _C,_locale_t _Locale); - _CRTIMP int __cdecl _ismbbtrail(unsigned int _C); - _CRTIMP int __cdecl _ismbbtrail_l(unsigned int _C,_locale_t _Locale); - _CRTIMP int __cdecl _ismbslead(const unsigned char *_Str,const unsigned char *_Pos); - _CRTIMP int __cdecl _ismbslead_l(const unsigned char *_Str,const unsigned char *_Pos,_locale_t _Locale); - _CRTIMP int __cdecl _ismbstrail(const unsigned char *_Str,const unsigned char *_Pos); - _CRTIMP int __cdecl _ismbstrail_l(const unsigned char *_Str,const unsigned char *_Pos,_locale_t _Locale); -#endif -#endif + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbblead( + _In_ unsigned int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbblead_l( + _In_ unsigned int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbtrail( + _In_ unsigned int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbtrail_l( + _In_ unsigned int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbslead( + _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str, + _In_z_ const unsigned char *_Pos); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbslead_l( + _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str, + _In_z_ const unsigned char *_Pos, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbstrail( + _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str, + _In_z_ const unsigned char *_Pos); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbstrail_l( + _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str, + _In_z_ const unsigned char *_Pos, + _In_opt_ _locale_t _Locale); + +#endif /* _MBLEADTRAIL_DEFINED */ + +#endif /* _MBCTYPE_DEFINED */ #ifdef __cplusplus } #endif -#endif + +#endif /* _INC_MBCTYPE */

11 years, 7 months

[akhaldi] 58506: [WINMINE] * Fix some format specifiers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 15 15:47:39 2013 New Revision: 58506 URL: http://svn.reactos.org/svn/reactos?rev=58506&view=rev Log: [WINMINE] * Fix some format specifiers. Modified: trunk/reactos/base/applications/games/winmine/main.c Modified: trunk/reactos/base/applications/games/winmine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] Fri Mar 15 15:47:39 2013 @@ -108,7 +108,7 @@ p_board->IsMarkQ = TRUE; for( i = 0; i < 3; i++ ) { - wsprintf( key_name, "Name%d", i+1 ); + wsprintf( key_name, "Name%u", i+1 ); size = sizeof( data ); if( RegQueryValueEx( hkey, key_name, NULL, &type, (LPBYTE) data, &size ) == ERROR_SUCCESS ) @@ -118,7 +118,7 @@ } for( i = 0; i < 3; i++ ) { - wsprintf( key_name, "Time%d", i+1 ); + wsprintf( key_name, "Time%u", i+1 ); size = sizeof( p_board->best_time[i] ); if( !RegQueryValueEx( hkey, key_name, NULL, &type, (LPBYTE) &p_board->best_time[i], &size ) == ERROR_SUCCESS )

11 years, 7 months

[akhaldi] 58505: [CRT] * Annotate io.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 15 14:52:20 2013 New Revision: 58505 URL: http://svn.reactos.org/svn/reactos?rev=58505&view=rev Log: [CRT] * Annotate io.h. Modified: trunk/reactos/include/crt/io.h Modified: trunk/reactos/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/io.h?rev=58505… ============================================================================== --- trunk/reactos/include/crt/io.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/io.h [iso-8859-1] Fri Mar 15 14:52:20 2013 @@ -18,7 +18,15 @@ extern "C" { #endif -_CRTIMP char* __cdecl _getcwd (char*, int); +_Check_return_ +_Ret_opt_z_ +_CRTIMP +char* +__cdecl +_getcwd( + _Out_writes_opt_(_SizeInBytes) char *_DstBuf, + _In_ int _SizeInBytes); + #ifndef _FSIZE_T_DEFINED typedef unsigned long _fsize_t; #define _FSIZE_T_DEFINED @@ -162,57 +170,316 @@ #define W_OK 2 /* Check for write permission */ #define R_OK 4 /* Check for read permission */ - _CRTIMP int __cdecl _access(const char *_Filename,int _AccessMode); - _CRTIMP int __cdecl _chmod(const char *_Filename,int _Mode); - _CRTIMP int __cdecl _chsize(int _FileHandle,long _Size); - _CRTIMP int __cdecl _close(int _FileHandle); - _CRTIMP int __cdecl _commit(int _FileHandle); - _CRTIMP int __cdecl _creat(const char *_Filename,int _PermissionMode); - _CRTIMP int __cdecl _dup(int _FileHandle); - _CRTIMP int __cdecl _dup2(int _FileHandleSrc,int _FileHandleDst); - _CRTIMP int __cdecl _eof(int _FileHandle); - _CRTIMP long __cdecl _filelength(int _FileHandle); - _CRTIMP intptr_t __cdecl _findfirst(const char *_Filename, struct _finddata_t *_FindData); - _CRTIMP intptr_t __cdecl _findfirst32(const char *_Filename,struct _finddata32_t *_FindData); - _CRTIMP int __cdecl _findnext(intptr_t _FindHandle,struct _finddata_t *_FindData); - _CRTIMP int __cdecl _findnext32(intptr_t _FindHandle,struct _finddata32_t *_FindData); - _CRTIMP int __cdecl _findclose(intptr_t _FindHandle); - _CRTIMP int __cdecl _isatty(int _FileHandle); - _CRTIMP int __cdecl _locking(int _FileHandle,int _LockMode,long _NumOfBytes); - _CRTIMP long __cdecl _lseek(int _FileHandle,long _Offset,int _Origin); - _CRTIMP char *__cdecl _mktemp(char *_TemplateName); - _CRTIMP int __cdecl _pipe(int *_PtHandles,unsigned int _PipeSize,int _TextMode); - _CRTIMP int __cdecl _read(int _FileHandle,void *_DstBuf,unsigned int _MaxCharCount); + _Check_return_ + _CRTIMP + int + __cdecl + _access( + _In_z_ const char *_Filename, + _In_ int _AccessMode); + + _Check_return_ + _CRTIMP + int + __cdecl + _chmod( + _In_z_ const char *_Filename, + _In_ int _Mode); + + _Check_return_ + _CRTIMP + int + __cdecl + _chsize( + _In_ int _FileHandle, + _In_ long _Size); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _close( + _In_ int _FileHandle); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _commit( + _In_ int _FileHandle); + + _Check_return_ + _CRTIMP + int + __cdecl + _creat( + _In_z_ const char *_Filename, + _In_ int _PermissionMode); + + _Check_return_ + _CRTIMP + int + __cdecl + _dup( + _In_ int _FileHandle); + + _Check_return_ + _CRTIMP + int + __cdecl + _dup2( + _In_ int _FileHandleSrc, + _In_ int _FileHandleDst); + + _Check_return_ + _CRTIMP + int + __cdecl + _eof( + _In_ int _FileHandle); + + _Check_return_ + _CRTIMP + long + __cdecl + _filelength( + _In_ int _FileHandle); + + _CRTIMP + intptr_t + __cdecl + _findfirst( + const char *_Filename, + struct _finddata_t *_FindData); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _findfirst32( + _In_z_ const char *_Filename, + _Out_ struct _finddata32_t *_FindData); + + _CRTIMP + int + __cdecl + _findnext( + intptr_t _FindHandle, + struct _finddata_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _findnext32( + _In_ intptr_t _FindHandle, + _Out_ struct _finddata32_t *_FindData); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _findclose( + _In_ intptr_t _FindHandle); + + _Check_return_ + _CRTIMP + int + __cdecl + _isatty( + _In_ int _FileHandle); + + _CRTIMP + int + __cdecl + _locking( + _In_ int _FileHandle, + _In_ int _LockMode, + _In_ long _NumOfBytes); + + _Check_return_opt_ + _CRTIMP + long + __cdecl + _lseek( + _In_ int _FileHandle, + _In_ long _Offset, + _In_ int _Origin); + + _Check_return_ + _CRTIMP + char* + __cdecl + _mktemp( + _Inout_z_ char *_TemplateName); + + _Check_return_ + _CRTIMP + int + __cdecl + _pipe( + _Inout_updates_(2) int *_PtHandles, + _In_ unsigned int _PipeSize, + _In_ int _TextMode); + + _Check_return_ + _CRTIMP + int + __cdecl + _read( + _In_ int _FileHandle, + _Out_writes_bytes_(_MaxCharCount) void *_DstBuf, + _In_ unsigned int _MaxCharCount); #ifndef _CRT_DIRECTORY_DEFINED #define _CRT_DIRECTORY_DEFINED - int __cdecl remove(const char *_Filename); - int __cdecl rename(const char *_OldFilename,const char *_NewFilename); - _CRTIMP int __cdecl _unlink(const char *_Filename); -#ifndef NO_OLDNAMES - _CRTIMP int __cdecl unlink(const char *_Filename); -#endif -#endif - - _CRTIMP int __cdecl _setmode(int _FileHandle,int _Mode); - _CRTIMP long __cdecl _tell(int _FileHandle); - _CRTIMP int __cdecl _umask(int _Mode); - _CRTIMP int __cdecl _write(int _FileHandle,const void *_Buf,unsigned int _MaxCharCount); + + _Check_return_ + int + __cdecl + remove( + _In_z_ const char *_Filename); + + _Check_return_ + int + __cdecl + rename( + _In_z_ const char *_OldFilename, + _In_z_ const char *_NewFilename); + + _Check_return_ + _CRTIMP + int + __cdecl + _unlink( + _In_z_ const char *_Filename); + +#ifndef NO_OLDNAMES + _Check_return_ + _CRTIMP + int + __cdecl + unlink( + _In_z_ const char *_Filename); +#endif + +#endif /* _CRT_DIRECTORY_DEFINED */ + + _Check_return_ + _CRTIMP + int + __cdecl + _setmode( + _In_ int _FileHandle, + _In_ int _Mode); + + _Check_return_ + _CRTIMP + long + __cdecl + _tell( + _In_ int _FileHandle); + + _CRTIMP + int + __cdecl + _umask( + _In_ int _Mode); + + _CRTIMP + int + __cdecl + _write( + _In_ int _FileHandle, + _In_reads_bytes_(_MaxCharCount) const void *_Buf, + _In_ unsigned int _MaxCharCount); #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _filelengthi64(int _FileHandle); - _CRTIMP intptr_t __cdecl _findfirst32i64(const char *_Filename,struct _finddata32i64_t *_FindData); - _CRTIMP intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *_FindData); - _CRTIMP intptr_t __cdecl _findfirst64(const char *_Filename,struct __finddata64_t *_FindData); - _CRTIMP int __cdecl _findnext32i64(intptr_t _FindHandle,struct _finddata32i64_t *_FindData); - _CRTIMP int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindData); - _CRTIMP int __cdecl _findnext64(intptr_t _FindHandle,struct __finddata64_t *_FindData); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _lseeki64(int _FileHandle,__int64 _Offset,int _Origin); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _telli64(int _FileHandle); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _filelengthi64( + _In_ int _FileHandle); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _findfirst32i64( + _In_z_ const char *_Filename, + _Out_ struct _finddata32i64_t *_FindData); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _findfirst64i32( + _In_z_ const char *_Filename, + _Out_ struct _finddata64i32_t *_FindData); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _findfirst64( + _In_z_ const char *_Filename, + _Out_ struct __finddata64_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _findnext32i64( + _In_ intptr_t _FindHandle, + _Out_ struct _finddata32i64_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _findnext64i32( + _In_ intptr_t _FindHandle, + _Out_ struct _finddata64i32_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _findnext64( + _In_ intptr_t _FindHandle, + _Out_ struct __finddata64_t *_FindData); + + _Check_return_opt_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _lseeki64( + _In_ int _FileHandle, + _In_ __int64 _Offset, + _In_ int _Origin); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _telli64( + _In_ int _FileHandle); + #ifdef __cplusplus #include <string.h> #endif - __CRT_INLINE intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *_FindData) + + __CRT_INLINE + intptr_t + __cdecl + _findfirst64i32( + const char *_Filename, + struct _finddata64i32_t *_FindData) { struct __finddata64_t fd; intptr_t ret = _findfirst64(_Filename,&fd); @@ -224,7 +491,13 @@ strncpy(_FindData->name,fd.name,260); return ret; } - __CRT_INLINE int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindData) + + __CRT_INLINE + int + __cdecl + _findnext64i32( + intptr_t _FindHandle, + struct _finddata64i32_t *_FindData) { struct __finddata64_t fd; int ret = _findnext64(_FindHandle,&fd); @@ -236,20 +509,69 @@ strncpy(_FindData->name,fd.name,260); return ret; } -#endif + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ #ifndef NO_OLDNAMES #ifndef _UWIN - _CRTIMP int __cdecl chdir (const char *); - _CRTIMP char *__cdecl getcwd (char *, int); - _CRTIMP int __cdecl mkdir (const char *); - _CRTIMP char *__cdecl mktemp(char *); - _CRTIMP int __cdecl rmdir (const char*); - _CRTIMP int __cdecl chmod (const char *, int); + + _Check_return_ + _CRTIMP + int + __cdecl + chdir( + _In_z_ const char *_Path); + + _Check_return_ + _Ret_opt_z_ + _CRTIMP + char* + __cdecl + getcwd( + _Out_writes_opt_(_SizeInBytes) char *_DstBuf, + _In_ int _SizeInBytes); + + _Check_return_ + _CRTIMP + int + __cdecl + mkdir( + _In_z_ const char *_Path); + + _CRTIMP + char* + __cdecl + mktemp( + _Inout_z_ char *_TemplateName); + + _Check_return_ + _CRTIMP + int + __cdecl + rmdir( + _In_z_ const char *_Path); + + _Check_return_ + _CRTIMP + int + __cdecl + chmod( + _In_z_ const char *_Filename, + _In_ int _AccessMode); + #endif /* _UWIN */ #endif /* Not NO_OLDNAMES */ - _CRTIMP errno_t __cdecl _sopen_s(int *_FileHandle,const char *_Filename,int _OpenFlag,int _ShareFlag,int _PermissionMode); + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _sopen_s( + _Out_ int *_FileHandle, + _In_z_ const char *_Filename, + _In_ int _OpenFlag, + _In_ int _ShareFlag, + _In_ int _PermissionMode); #ifndef __cplusplus _CRTIMP int __cdecl _open(const char *_Filename,int _OpenFlag,...); @@ -261,25 +583,130 @@ #ifndef _WIO_DEFINED #define _WIO_DEFINED - _CRTIMP int __cdecl _waccess(const wchar_t *_Filename,int _AccessMode); - _CRTIMP int __cdecl _wchmod(const wchar_t *_Filename,int _Mode); - _CRTIMP int __cdecl _wcreat(const wchar_t *_Filename,int _PermissionMode); - _CRTIMP intptr_t __cdecl _wfindfirst32(const wchar_t *_Filename,struct _wfinddata32_t *_FindData); - _CRTIMP int __cdecl _wfindnext32(intptr_t _FindHandle,struct _wfinddata32_t *_FindData); - _CRTIMP int __cdecl _wunlink(const wchar_t *_Filename); - _CRTIMP int __cdecl _wrename(const wchar_t *_NewFilename,const wchar_t *_OldFilename); - _CRTIMP wchar_t *__cdecl _wmktemp(wchar_t *_TemplateName); + + _Check_return_ + _CRTIMP + int + __cdecl + _waccess( + _In_z_ const wchar_t *_Filename, + _In_ int _AccessMode); + + _Check_return_ + _CRTIMP + int + __cdecl + _wchmod( + _In_z_ const wchar_t *_Filename, + _In_ int _Mode); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcreat( + _In_z_ const wchar_t *_Filename, + _In_ int _PermissionMode); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _wfindfirst32( + _In_z_ const wchar_t *_Filename, + _Out_ struct _wfinddata32_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _wfindnext32( + _In_ intptr_t _FindHandle, + _Out_ struct _wfinddata32_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _wunlink( + _In_z_ const wchar_t *_Filename); + + _Check_return_ + _CRTIMP + int + __cdecl + _wrename( + _In_z_ const wchar_t *_NewFilename, + _In_z_ const wchar_t *_OldFilename); + + _CRTIMP + wchar_t* + __cdecl + _wmktemp( + _Inout_z_ wchar_t *_TemplateName); #if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP intptr_t __cdecl _wfindfirst32i64(const wchar_t *_Filename,struct _wfinddata32i64_t *_FindData); - intptr_t __cdecl _wfindfirst64i32(const wchar_t *_Filename,struct _wfinddata64i32_t *_FindData); - _CRTIMP intptr_t __cdecl _wfindfirst64(const wchar_t *_Filename,struct _wfinddata64_t *_FindData); - _CRTIMP int __cdecl _wfindnext32i64(intptr_t _FindHandle,struct _wfinddata32i64_t *_FindData); - int __cdecl _wfindnext64i32(intptr_t _FindHandle,struct _wfinddata64i32_t *_FindData); - _CRTIMP int __cdecl _wfindnext64(intptr_t _FindHandle,struct _wfinddata64_t *_FindData); -#endif - - _CRTIMP errno_t __cdecl _wsopen_s(int *_FileHandle,const wchar_t *_Filename,int _OpenFlag,int _ShareFlag,int _PermissionFlag); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _wfindfirst32i64( + _In_z_ const wchar_t *_Filename, + _Out_ struct _wfinddata32i64_t *_FindData); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _wfindfirst64i32( + _In_z_ const wchar_t *_Filename, + _Out_ struct _wfinddata64i32_t *_FindData); + + _Check_return_ + _CRTIMP + intptr_t + __cdecl + _wfindfirst64( + _In_z_ const wchar_t *_Filename, + _Out_ struct _wfinddata64_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _wfindnext32i64( + _In_ intptr_t _FindHandle, + _Out_ struct _wfinddata32i64_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _wfindnext64i32( + _In_ intptr_t _FindHandle, + _Out_ struct _wfinddata64i32_t *_FindData); + + _Check_return_ + _CRTIMP + int + __cdecl + _wfindnext64( + _In_ intptr_t _FindHandle, + _Out_ struct _wfinddata64_t *_FindData); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wsopen_s( + _Out_ int *_FileHandle, + _In_z_ const wchar_t *_Filename, + _In_ int _OpenFlag, + _In_ int _ShareFlag, + _In_ int _PermissionFlag); #if !defined(__cplusplus) || !(defined(_X86_) && !defined(__x86_64)) _CRTIMP int __cdecl _wopen(const wchar_t *_Filename,int _OpenFlag,...); @@ -291,33 +718,187 @@ #endif /* !_WIO_DEFINED */ - int __cdecl __lock_fhandle(int _Filehandle); - void __cdecl _unlock_fhandle(int _Filehandle); - _CRTIMP intptr_t __cdecl _get_osfhandle(int _FileHandle); - _CRTIMP int __cdecl _open_osfhandle(intptr_t _OSFileHandle,int _Flags); - -#ifndef NO_OLDNAMES - _CRTIMP int __cdecl access(const char *_Filename,int _AccessMode); - _CRTIMP int __cdecl chmod(const char *_Filename,int _AccessMode); - _CRTIMP int __cdecl chsize(int _FileHandle,long _Size); - _CRTIMP int __cdecl close(int _FileHandle); - _CRTIMP int __cdecl creat(const char *_Filename,int _PermissionMode); - _CRTIMP int __cdecl dup(int _FileHandle); - _CRTIMP int __cdecl dup2(int _FileHandleSrc,int _FileHandleDst); - _CRTIMP int __cdecl eof(int _FileHandle); - _CRTIMP long __cdecl filelength(int _FileHandle); - _CRTIMP int __cdecl isatty(int _FileHandle); - _CRTIMP int __cdecl locking(int _FileHandle,int _LockMode,long _NumOfBytes); - _CRTIMP long __cdecl lseek(int _FileHandle,long _Offset,int _Origin); - _CRTIMP char *__cdecl mktemp(char *_TemplateName); - _CRTIMP int __cdecl open(const char *_Filename,int _OpenFlag,...); - _CRTIMP int __cdecl read(int _FileHandle,void *_DstBuf,unsigned int _MaxCharCount); - _CRTIMP int __cdecl setmode(int _FileHandle,int _Mode); - _CRTIMP int __cdecl sopen(const char *_Filename,int _OpenFlag,int _ShareFlag,...); - _CRTIMP long __cdecl tell(int _FileHandle); - _CRTIMP int __cdecl umask(int _Mode); - _CRTIMP int __cdecl write(int _Filehandle,const void *_Buf,unsigned int _MaxCharCount); -#endif + int + __cdecl + __lock_fhandle( + _In_ int _Filehandle); + + void + __cdecl + _unlock_fhandle( + _In_ int _Filehandle); + + _CRTIMP + intptr_t + __cdecl + _get_osfhandle( + _In_ int _FileHandle); + + _CRTIMP + int + __cdecl + _open_osfhandle( + _In_ intptr_t _OSFileHandle, + _In_ int _Flags); + +#ifndef NO_OLDNAMES + + _Check_return_ + _CRTIMP + int + __cdecl + access( + _In_z_ const char *_Filename, + _In_ int _AccessMode); + + _Check_return_ + _CRTIMP + int + __cdecl + chmod( + _In_z_ const char *_Filename, + _In_ int _AccessMode); + + _Check_return_ + _CRTIMP + int + __cdecl + chsize( + _In_ int _FileHandle, + _In_ long _Size); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + close( + _In_ int _FileHandle); + + _Check_return_ + _CRTIMP + int + __cdecl + creat( + _In_z_ const char *_Filename, + _In_ int _PermissionMode); + + _Check_return_ + _CRTIMP + int + __cdecl + dup( + _In_ int _FileHandle); + + _Check_return_ + _CRTIMP + int + __cdecl + dup2( + _In_ int _FileHandleSrc, + _In_ int _FileHandleDst); + + _Check_return_ + _CRTIMP + int + __cdecl + __cdecl eof( + _In_ int _FileHandle); + + _Check_return_ + _CRTIMP + long + __cdecl + filelength( + _In_ int _FileHandle); + + _Check_return_ + _CRTIMP + int + __cdecl + isatty( + _In_ int _FileHandle); + + _Check_return_ + _CRTIMP + int + __cdecl + locking( + _In_ int _FileHandle, + _In_ int _LockMode, + _In_ long _NumOfBytes); + + _Check_return_opt_ + _CRTIMP + long + __cdecl + lseek( + _In_ int _FileHandle, + _In_ long _Offset, + _In_ int _Origin); + + _CRTIMP + char* + __cdecl + mktemp( + _Inout_z_ char *_TemplateName); + + _Check_return_ + _CRTIMP + int + __cdecl + open( + _In_z_ const char *_Filename, + _In_ int _OpenFlag, + ...); + + _CRTIMP + int + __cdecl + read( + _In_ int _FileHandle, + _Out_writes_bytes_(_MaxCharCount) void *_DstBuf, + _In_ unsigned int _MaxCharCount); + + _Check_return_ + _CRTIMP + int + __cdecl + setmode( + _In_ int _FileHandle, + _In_ int _Mode); + + _CRTIMP + int + __cdecl + sopen( + const char *_Filename, + int _OpenFlag, + int _ShareFlag, + ...); + + _Check_return_ + _CRTIMP + long + __cdecl + tell( + _In_ int _FileHandle); + + _CRTIMP + int + __cdecl + umask( + _In_ int _Mode); + + _Check_return_ + _CRTIMP + int + __cdecl + write( + _In_ int _Filehandle, + _In_reads_bytes_(_MaxCharCount) const void *_Buf, + _In_ unsigned int _MaxCharCount); + +#endif /* NO_OLDNAMES */ #ifdef __cplusplus } @@ -345,12 +926,10 @@ #define access(__f,__m) __mingw_access (__f, __m) #endif - #ifdef __cplusplus } #endif - #pragma pack(pop) #include <sec_api/io_s.h>

11 years, 7 months

[akhaldi] 58504: [FREELDR] * Fix a format specifiers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 15 14:51:02 2013 New Revision: 58504 URL: http://svn.reactos.org/svn/reactos?rev=58504&view=rev Log: [FREELDR] * Fix a format specifiers. Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/parse.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/parse.c [iso-8859-1] Fri Mar 15 14:51:02 2013 @@ -122,7 +122,7 @@ // First check to make sure we're inside a [section] if (CurrentSection == NULL) { - printf("Error: freeldr.ini:%ld: Setting '%s' found outside of a [section].\n", CurrentLineNumber, IniFileLine); + printf("Error: freeldr.ini:%lu: Setting '%s' found outside of a [section].\n", CurrentLineNumber, IniFileLine); printf("Press any key to continue...\n"); MachConsGetCh(); CurrentLineNumber++;

11 years, 7 months

[akhaldi] 58503: [CALC] * Fix some format specifiers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 15 13:34:52 2013 New Revision: 58503 URL: http://svn.reactos.org/svn/reactos?rev=58503&view=rev Log: [CALC] * Fix some format specifiers. Modified: trunk/reactos/base/applications/calc/winmain.c Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Fri Mar 15 13:34:52 2013 @@ -229,12 +229,12 @@ /* Try to load last selected layout */ GetProfileString(TEXT("SciCalc"), TEXT("layout"), TEXT("0"), buf, SIZEOF(buf)); - if (_stscanf(buf, TEXT("%ld"), &calc.layout) != 1) + if (_stscanf(buf, TEXT("%lu"), &calc.layout) != 1) calc.layout = CALC_LAYOUT_STANDARD; /* Try to load last selected formatting option */ GetProfileString(TEXT("SciCalc"), TEXT("UseSep"), TEXT("0"), buf, SIZEOF(buf)); - if (_stscanf(buf, TEXT("%ld"), &tmp) != 1) + if (_stscanf(buf, TEXT("%lu"), &tmp) != 1) calc.usesep = FALSE; else calc.usesep = (tmp == 1) ? TRUE : FALSE;

11 years, 7 months

[akhaldi] 58502: [CRT] * Annotate float.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 15 13:32:56 2013 New Revision: 58502 URL: http://svn.reactos.org/svn/reactos?rev=58502&view=rev Log: [CRT] * Annotate float.h. Modified: trunk/reactos/include/crt/float.h Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=58… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Fri Mar 15 13:32:56 2013 @@ -105,9 +105,22 @@ /* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask), * i.e. change the bits in unMask to have the values they have in unNew, * leaving other bits unchanged. */ -__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _controlfp (unsigned int unNew, unsigned int unMask); -__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _control87 (unsigned int unNew, unsigned int unMask); - + +__MINGW_NOTHROW +_CRTIMP +unsigned int +__cdecl +_controlfp( + _In_ unsigned int unNew, + _In_ unsigned int unMask); + +__MINGW_NOTHROW +_CRTIMP +unsigned int +__cdecl +_control87( + _In_ unsigned int unNew, + _In_ unsigned int unMask); __MINGW_NOTHROW _CRTIMP unsigned int __cdecl _clearfp (void); /* Clear the FPU status word */ __MINGW_NOTHROW _CRTIMP unsigned int __cdecl _statusfp (void); /* Report the FPU status word */ @@ -136,17 +149,74 @@ * but they really belong in math.h. */ -__MINGW_NOTHROW _CRTIMP double __cdecl _chgsign (double); -__MINGW_NOTHROW _CRTIMP double __cdecl _copysign (double, double); -__MINGW_NOTHROW _CRTIMP double __cdecl _logb (double); -__MINGW_NOTHROW _CRTIMP double __cdecl _nextafter (double, double); -__MINGW_NOTHROW _CRTIMP double __cdecl _scalb (double, long); - -__MINGW_NOTHROW _CRTIMP int __cdecl _finite (double); -__MINGW_NOTHROW _CRTIMP int __cdecl _fpclass (double); -__MINGW_NOTHROW _CRTIMP int __cdecl _isnan (double); - -#ifdef __cplusplus +_Check_return_ +__MINGW_NOTHROW +_CRTIMP +double +__cdecl +_chgsign( + _In_ double); + +_Check_return_ +__MINGW_NOTHROW +_CRTIMP +double +__cdecl +_copysign( + _In_ double, + _In_ double); + +_Check_return_ +__MINGW_NOTHROW +_CRTIMP +double +__cdecl +_logb( + _In_ double); + +_Check_return_ +__MINGW_NOTHROW +_CRTIMP +double +__cdecl +_nextafter( + _In_ double, + _In_ double); + +_Check_return_ +__MINGW_NOTHROW +_CRTIMP +double +__cdecl +_scalb( + _In_ double, + _In_ long); + +_Check_return_ +__MINGW_NOTHROW +_CRTIMP +int +__cdecl +_finite( + _In_ double); + +_Check_return_ +__MINGW_NOTHROW +_CRTIMP +int +__cdecl +_fpclass( + _In_ double); + +_Check_return_ +__MINGW_NOTHROW +_CRTIMP +int +__cdecl +_isnan( + _In_ double); + +#ifdef __cplusplus } #endif

11 years, 7 months

← Newer
1
...
10
11
12
13
14
15
16
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2013