Ros-diffs March 2013

ros-diffs@reactos.org

14 participants
249 discussions

[akhaldi] 58441: [CRT] * Annotate excpt.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 8 13:55:06 2013 New Revision: 58441 URL: http://svn.reactos.org/svn/reactos?rev=58441&view=rev Log: [CRT] * Annotate excpt.h. Modified: trunk/reactos/include/crt/excpt.h Modified: trunk/reactos/include/crt/excpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/excpt.h?rev=58… ============================================================================== --- trunk/reactos/include/crt/excpt.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/excpt.h [iso-8859-1] Fri Mar 8 13:55:06 2013 @@ -26,7 +26,14 @@ struct _EXCEPTION_RECORD; struct _CONTEXT; - EXCEPTION_DISPOSITION __cdecl _except_handler(struct _EXCEPTION_RECORD *_ExceptionRecord,void *_EstablisherFrame,struct _CONTEXT *_ContextRecord,void *_DispatcherContext); + EXCEPTION_DISPOSITION + __cdecl + _except_handler( + _In_ struct _EXCEPTION_RECORD *_ExceptionRecord, + _In_ void *_EstablisherFrame, + _Inout_ struct _CONTEXT *_ContextRecord, + _Inout_ void *_DispatcherContext); + #elif defined(__ia64__) typedef struct _EXCEPTION_POINTERS *Exception_info_ptr; @@ -34,14 +41,33 @@ struct _CONTEXT; struct _DISPATCHER_CONTEXT; - __MINGW_EXTENSION _CRTIMP EXCEPTION_DISPOSITION __cdecl __C_specific_handler (struct _EXCEPTION_RECORD *_ExceptionRecord,unsigned __int64 _MemoryStackFp,unsigned __int64 _BackingStoreFp,struct _CONTEXT *_ContextRecord,struct _DISPATCHER_CONTEXT *_DispatcherContext,unsigned __int64 _GlobalPointer); + __MINGW_EXTENSION + _CRTIMP + EXCEPTION_DISPOSITION + __cdecl + __C_specific_handler( + _In_ struct _EXCEPTION_RECORD *_ExceptionRecord, + _In_ unsigned __int64 _MemoryStackFp, + _In_ unsigned __int64 _BackingStoreFp, + _Inout_ struct _CONTEXT *_ContextRecord, + _Inout_ struct _DISPATCHER_CONTEXT *_DispatcherContext, + _In_ unsigned __int64 _GlobalPointer); + #elif defined(__x86_64) struct _EXCEPTION_RECORD; struct _CONTEXT; struct _DISPATCHER_CONTEXT; - _CRTIMP EXCEPTION_DISPOSITION __cdecl __C_specific_handler (struct _EXCEPTION_RECORD *_ExceptionRecord,void *_EstablisherFrame,struct _CONTEXT *_ContextRecord,struct _DISPATCHER_CONTEXT *_DispatcherContext); + _CRTIMP + EXCEPTION_DISPOSITION + __cdecl + __C_specific_handler( + _In_ struct _EXCEPTION_RECORD *_ExceptionRecord, + _In_ void *_EstablisherFrame, + _Inout_ struct _CONTEXT *_ContextRecord, + _Inout_ struct _DISPATCHER_CONTEXT *_DispatcherContext); + #endif #ifdef _MSC_VER

11 years, 9 months

[akhaldi] 58440: [CRT] * Annotate wchar.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 7 16:46:59 2013 New Revision: 58440 URL: http://svn.reactos.org/svn/reactos?rev=58440&view=rev Log: [CRT] * Annotate wchar.h. Modified: trunk/reactos/include/crt/wchar.h Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=58… ============================================================================== --- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Thu Mar 7 16:46:59 2013 @@ -183,42 +183,43 @@ #ifndef _WCTYPE_DEFINED #define _WCTYPE_DEFINED - _CRTIMP int __cdecl iswalpha(wint_t _C); - _CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswupper(wint_t _C); - _CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswlower(wint_t _C); - _CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswdigit(wint_t _C); - _CRTIMP int __cdecl _iswdigit_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswxdigit(wint_t _C); - _CRTIMP int __cdecl _iswxdigit_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswspace(wint_t _C); - _CRTIMP int __cdecl _iswspace_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswpunct(wint_t _C); - _CRTIMP int __cdecl _iswpunct_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswalnum(wint_t _C); - _CRTIMP int __cdecl _iswalnum_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswprint(wint_t _C); - _CRTIMP int __cdecl _iswprint_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswgraph(wint_t _C); - _CRTIMP int __cdecl _iswgraph_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswcntrl(wint_t _C); - _CRTIMP int __cdecl _iswcntrl_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswascii(wint_t _C); - _CRTIMP int __cdecl isleadbyte(int _C); - _CRTIMP int __cdecl _isleadbyte_l(int _C,_locale_t _Locale); - _CRTIMP wint_t __cdecl towupper(wint_t _C); - _CRTIMP wint_t __cdecl _towupper_l(wint_t _C,_locale_t _Locale); - _CRTIMP wint_t __cdecl towlower(wint_t _C); - _CRTIMP wint_t __cdecl _towlower_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswctype(wint_t _C,wctype_t _Type); - _CRTIMP int __cdecl _iswctype_l(wint_t _C,wctype_t _Type,_locale_t _Locale); - _CRTIMP int __cdecl __iswcsymf(wint_t _C); - _CRTIMP int __cdecl _iswcsymf_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl __iswcsym(wint_t _C); - _CRTIMP int __cdecl _iswcsym_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type); + _Check_return_ _CRTIMP int __cdecl iswalpha(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswalpha_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswupper(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswupper_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswlower(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswlower_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswdigit(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswdigit_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswxdigit(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswxdigit_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswspace(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswspace_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswpunct(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswpunct_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswalnum(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswalnum_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswprint(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswprint_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswgraph(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswgraph_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswcntrl(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswcntrl_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswascii(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl isleadbyte(_In_ int _C); + _Check_return_ _CRTIMP int __cdecl _isleadbyte_l(_In_ int _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP wint_t __cdecl towupper(_In_ wint_t _C); + _Check_return_ _CRTIMP wint_t __cdecl _towupper_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP wint_t __cdecl towlower(_In_ wint_t _C); + _Check_return_ _CRTIMP wint_t __cdecl _towlower_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl iswctype(_In_ wint_t _C, _In_ wctype_t _Type); + _Check_return_ _CRTIMP int __cdecl _iswctype_l(_In_ wint_t _C, _In_ wctype_t _Type, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl __iswcsymf(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswcsymf_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _Check_return_ _CRTIMP int __cdecl __iswcsym(_In_ wint_t _C); + _Check_return_ _CRTIMP int __cdecl _iswcsym_l(_In_ wint_t _C, _In_opt_ _locale_t _Locale); + _CRTIMP int __cdecl is_wctype(_In_ wint_t _C, _In_ wctype_t _Type); + #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) _CRTIMP int __cdecl iswblank(wint_t _C); #endif @@ -226,33 +227,185 @@ #ifndef _WDIRECT_DEFINED #define _WDIRECT_DEFINED - _CRTIMP wchar_t *__cdecl _wgetcwd(wchar_t *_DstBuf,int _SizeInWords); - _CRTIMP wchar_t *__cdecl _wgetdcwd(int _Drive,wchar_t *_DstBuf,int _SizeInWords); - wchar_t *__cdecl _wgetdcwd_nolock(int _Drive,wchar_t *_DstBuf,int _SizeInWords); - _CRTIMP int __cdecl _wchdir(const wchar_t *_Path); - _CRTIMP int __cdecl _wmkdir(const wchar_t *_Path); - _CRTIMP int __cdecl _wrmdir(const wchar_t *_Path); -#endif + + _Check_return_ + _Ret_opt_z_ + _CRTIMP + wchar_t* + __cdecl + _wgetcwd( + _Out_writes_opt_(_SizeInWords) wchar_t *_DstBuf, + _In_ int _SizeInWords); + + _Check_return_ + _Ret_opt_z_ + _CRTIMP + wchar_t* + __cdecl + _wgetdcwd( + _In_ int _Drive, + _Out_writes_opt_(_SizeInWords) wchar_t *_DstBuf, + _In_ int _SizeInWords); + + _Check_return_ + _Ret_opt_z_ + wchar_t* + __cdecl + _wgetdcwd_nolock( + _In_ int _Drive, + _Out_writes_opt_(_SizeInWords) wchar_t *_DstBuf, + _In_ int _SizeInWords); + + _Check_return_ + _CRTIMP + int + __cdecl + _wchdir( + _In_z_ const wchar_t *_Path); + + _Check_return_ + _CRTIMP + int + __cdecl + _wmkdir( + _In_z_ const wchar_t *_Path); + + _Check_return_ + _CRTIMP + int + __cdecl + _wrmdir( + _In_z_ const wchar_t *_Path); + +#endif /* _WDIRECT_DEFINED */ #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 *_OldFilename, + _In_z_ const wchar_t *_NewFilename); + + _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); - _CRTIMP 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); - _CRTIMP 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,...); _CRTIMP int __cdecl _wsopen(const wchar_t *_Filename,int _OpenFlag,int _ShareFlag,...); @@ -260,35 +413,164 @@ extern "C++" _CRTIMP int __cdecl _wopen(const wchar_t *_Filename,int _OpenFlag,int _PermissionMode = 0); extern "C++" _CRTIMP int __cdecl _wsopen(const wchar_t *_Filename,int _OpenFlag,int _ShareFlag,int _PermissionMode = 0); #endif + #endif /* !_WIO_DEFINED */ #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED - _CRTIMP wchar_t *__cdecl _wsetlocale(int _Category,const wchar_t *_Locale); + _Check_return_opt_ + _CRTIMP + wchar_t* + __cdecl + _wsetlocale( + _In_ int _Category, + _In_opt_z_ const wchar_t *_Locale); #endif #ifndef _WPROCESS_DEFINED #define _WPROCESS_DEFINED - _CRTIMP intptr_t __cdecl _wexecl(const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wexecle(const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wexeclp(const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wexeclpe(const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wexecv(const wchar_t *_Filename,const wchar_t *const *_ArgList); - _CRTIMP intptr_t __cdecl _wexecve(const wchar_t *_Filename,const wchar_t *const *_ArgList,const wchar_t *const *_Env); - _CRTIMP intptr_t __cdecl _wexecvp(const wchar_t *_Filename,const wchar_t *const *_ArgList); - _CRTIMP intptr_t __cdecl _wexecvpe(const wchar_t *_Filename,const wchar_t *const *_ArgList,const wchar_t *const *_Env); - _CRTIMP intptr_t __cdecl _wspawnl(int _Mode,const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wspawnle(int _Mode,const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wspawnlp(int _Mode,const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wspawnlpe(int _Mode,const wchar_t *_Filename,const wchar_t *_ArgList,...); - _CRTIMP intptr_t __cdecl _wspawnv(int _Mode,const wchar_t *_Filename,const wchar_t *const *_ArgList); - _CRTIMP intptr_t __cdecl _wspawnve(int _Mode,const wchar_t *_Filename,const wchar_t *const *_ArgList,const wchar_t *const *_Env); - _CRTIMP intptr_t __cdecl _wspawnvp(int _Mode,const wchar_t *_Filename,const wchar_t *const *_ArgList); - _CRTIMP intptr_t __cdecl _wspawnvpe(int _Mode,const wchar_t *_Filename,const wchar_t *const *_ArgList,const wchar_t *const *_Env); + + _CRTIMP + intptr_t + __cdecl + _wexecl( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wexecle( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wexeclp( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wexeclpe( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wexecv( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList); + + _CRTIMP + intptr_t + __cdecl + _wexecve( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList, + _In_opt_z_ const wchar_t *const *_Env); + + _CRTIMP + intptr_t + __cdecl + _wexecvp( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList); + + _CRTIMP + intptr_t + __cdecl + _wexecvpe( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList, + _In_opt_z_ const wchar_t *const *_Env); + + _CRTIMP + intptr_t + __cdecl + _wspawnl( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wspawnle( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wspawnlp( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wspawnlpe( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_ArgList, + ...); + + _CRTIMP + intptr_t + __cdecl + _wspawnv( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList); + + _CRTIMP + intptr_t + __cdecl + _wspawnve( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList, + _In_opt_z_ const wchar_t *const *_Env); + + _CRTIMP + intptr_t + __cdecl + _wspawnvp( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList); + + _CRTIMP + intptr_t + __cdecl + _wspawnvpe( + _In_ int _Mode, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *const *_ArgList, + _In_opt_z_ const wchar_t *const *_Env); + #ifndef _CRT_WSYSTEM_DEFINED #define _CRT_WSYSTEM_DEFINED - _CRTIMP int __cdecl _wsystem(const wchar_t *_Command); + _CRTIMP + int + __cdecl + _wsystem( + _In_opt_z_ const wchar_t *_Command); #endif /* !_CRT_WSYSTEM_DEFINED */ + #endif /* !_WPROCESS_DEFINED */ #ifndef _WCTYPE_INLINE_DEFINED @@ -329,7 +611,7 @@ #ifndef _INO_T_DEFINED #define _INO_T_DEFINED typedef unsigned short _ino_t; -#ifndef NO_OLDNAMES +#ifndef NO_OLDNAMES typedef unsigned short ino_t; #endif #endif @@ -337,7 +619,7 @@ #ifndef _DEV_T_DEFINED #define _DEV_T_DEFINED typedef unsigned int _dev_t; -#ifndef NO_OLDNAMES +#ifndef NO_OLDNAMES typedef unsigned int dev_t; #endif #endif @@ -456,40 +738,195 @@ #ifndef _WSTAT_DEFINED #define _WSTAT_DEFINED - _CRTIMP int __cdecl _wstat(const wchar_t *_Name,struct _stat *_Stat); - _CRTIMP int __cdecl _wstat32(const wchar_t *_Name,struct _stat32 *_Stat); + + _CRTIMP + int + __cdecl + _wstat( + _In_z_ const wchar_t *_Name, + _Out_ struct _stat *_Stat); + + _CRTIMP + int + __cdecl + _wstat32( + _In_z_ const wchar_t *_Name, + _Out_ struct _stat32 *_Stat); + #if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP int __cdecl _wstat32i64(const wchar_t *_Name,struct _stat32i64 *_Stat); - _CRTIMP int __cdecl _wstat64i32(const wchar_t *_Name,struct _stat64i32 *_Stat); - _CRTIMP int __cdecl _wstat64(const wchar_t *_Name,struct _stat64 *_Stat); -#endif -#endif -#endif + + _CRTIMP + int + __cdecl + _wstat32i64( + _In_z_ const wchar_t *_Name, + _Out_ struct _stat32i64 *_Stat); + + _CRTIMP + int + __cdecl + _wstat64i32( + _In_z_ const wchar_t *_Name, + _Out_ struct _stat64i32 *_Stat); + + _CRTIMP + int + __cdecl + _wstat64( + _In_z_ const wchar_t *_Name, + _Out_ struct _stat64 *_Stat); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ + +#endif /* _WSTAT_DEFINED */ + +#endif /* !defined(_POSIX_) || defined(__GNUC__) */ #ifndef _WCONIO_DEFINED #define _WCONIO_DEFINED - _CRTIMP wchar_t *_cgetws(wchar_t *_Buffer); - _CRTIMP wint_t __cdecl _getwch(void); - _CRTIMP wint_t __cdecl _getwche(void); - _CRTIMP wint_t __cdecl _putwch(wchar_t _WCh); - _CRTIMP wint_t __cdecl _ungetwch(wint_t _WCh); - _CRTIMP int __cdecl _cputws(const wchar_t *_String); - _CRTIMP int __cdecl _cwprintf(const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf(const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _cwprintf_p(const wchar_t *_Format,...); - _CRTIMP int __cdecl _vcwprintf_p(const wchar_t *_Format,va_list _ArgList); - - _CRTIMP int __cdecl _cwprintf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _cwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - wint_t __cdecl _putwch_nolock(wchar_t _WCh); - wint_t __cdecl _getwch_nolock(void); - wint_t __cdecl _getwche_nolock(void); - wint_t __cdecl _ungetwch_nolock(wint_t _WCh); -#endif + + _CRTIMP + wchar_t* + _cgetws( + _Inout_z_ wchar_t *_Buffer); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + _getwch(void); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + _getwche(void); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + _putwch( + wchar_t _WCh); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + _ungetwch( + wint_t _WCh); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cputws( + _In_z_ const wchar_t *_String); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cwprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cwscanf( + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cwscanf_l( + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vcwprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vcwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _CRTIMP + int + __cdecl + _cwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _CRTIMP + int + __cdecl + _vcwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _CRTIMP + int + __cdecl + _cwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _CRTIMP + int + __cdecl + _vcwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + wint_t + __cdecl + _putwch_nolock( + wchar_t _WCh); + + _Check_return_ + wint_t + __cdecl + _getwch_nolock(void); + + _Check_return_ + wint_t + __cdecl + _getwche_nolock(void); + + _Check_return_opt_ + wint_t + __cdecl + _ungetwch_nolock( + wint_t _WCh); + +#endif /* _WCONIO_DEFINED */ #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED @@ -497,33 +934,191 @@ #ifdef _POSIX_ _CRTIMP FILE *__cdecl _wfsopen(const wchar_t *_Filename,const wchar_t *_Mode); #else - _CRTIMP FILE *__cdecl _wfsopen(const wchar_t *_Filename,const wchar_t *_Mode,int _ShFlag); -#endif - - _CRTIMP_ALT wint_t __cdecl fgetwc(FILE *_File); - _CRTIMP wint_t __cdecl _fgetwchar(void); - _CRTIMP wint_t __cdecl fputwc(wchar_t _Ch,FILE *_File); - _CRTIMP wint_t __cdecl _fputwchar(wchar_t _Ch); - _CRTIMP wint_t __cdecl getwc(FILE *_File); - _CRTIMP wint_t __cdecl getwchar(void); - _CRTIMP wint_t __cdecl putwc(wchar_t _Ch,FILE *_File); - _CRTIMP wint_t __cdecl putwchar(wchar_t _Ch); - _CRTIMP_ALT wint_t __cdecl ungetwc(wint_t _Ch,FILE *_File); - _CRTIMP wchar_t *__cdecl fgetws(wchar_t *_Dst,int _SizeInWords,FILE *_File); - _CRTIMP int __cdecl fputws(const wchar_t *_Str,FILE *_File); - _CRTIMP wchar_t *__cdecl _getws(wchar_t *_String); - _CRTIMP int __cdecl _putws(const wchar_t *_Str); - _CRTIMP int __cdecl fwprintf(FILE *_File,const wchar_t *_Format,...); - _CRTIMP int __cdecl wprintf(const wchar_t *_Format,...); - _CRTIMP int __cdecl _scwprintf(const wchar_t *_Format,...); - _CRTIMP int __cdecl vfwprintf(FILE *_File,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl vwprintf(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl swprintf(wchar_t*, const wchar_t*, ...); - _CRTIMP int __cdecl vswprintf(wchar_t*, const wchar_t*,va_list); - _CRTIMP int __cdecl _swprintf_c(wchar_t *_DstBuf,size_t _SizeInWords,const wchar_t *_Format,...); - _CRTIMP int __cdecl _vswprintf_c(wchar_t *_DstBuf,size_t _SizeInWords,const wchar_t *_Format,va_list _ArgList); + _Check_return_ + _CRTIMP + FILE* + __cdecl + _wfsopen( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_Mode, + _In_ int _ShFlag); +#endif + + _Check_return_opt_ + _CRTIMP_ALT + wint_t + __cdecl + fgetwc( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + _fgetwchar(void); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + fputwc( + _In_ wchar_t _Ch, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + _fputwchar( + _In_ wchar_t _Ch); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + getwc( + _Inout_ FILE *_File); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + getwchar(void); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + putwc( + _In_ wchar_t _Ch, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + putwchar( + _In_ wchar_t _Ch); + + _Check_return_opt_ + _CRTIMP_ALT + wint_t + __cdecl + ungetwc( + _In_ wint_t _Ch, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wchar_t* + __cdecl + fgetws( + _Out_writes_z_(_SizeInWords) wchar_t *_Dst, + _In_ int _SizeInWords, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fputws( + _In_z_ const wchar_t *_Str, + _Inout_ FILE *_File); + + _CRTIMP + wchar_t* + __cdecl + _getws( + _Pre_notnull_ _Post_z_ wchar_t *_String); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _putws( + _In_z_ const wchar_t *_Str); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fwprintf( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + wprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _scwprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + vfwprintf( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + vwprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _CRTIMP + int + __cdecl + swprintf( + _Out_ wchar_t*, + const wchar_t*, + ...); + + _CRTIMP + int + __cdecl + vswprintf( + _Out_ wchar_t*, + const wchar_t*, + va_list); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_c( + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_c( + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + _CRTIMP int __cdecl _snwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,...); _CRTIMP int __cdecl _vsnwprintf(wchar_t *_Dest,size_t _Count,const wchar_t *_Format,va_list _Args); + #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ _CRTIMP int __cdecl snwprintf (wchar_t *s, size_t n, const wchar_t * format, ...); __CRT_INLINE int __cdecl vsnwprintf (wchar_t *s, size_t n, const wchar_t *format, va_list arg) { return _vsnwprintf(s,n,format,arg); } @@ -531,33 +1126,263 @@ _CRTIMP int __cdecl vfwscanf (FILE *,const wchar_t *,va_list); _CRTIMP int __cdecl vswscanf (const wchar_t *,const wchar_t *,va_list); #endif - _CRTIMP int __cdecl _fwprintf_p(FILE *_File,const wchar_t *_Format,...); - _CRTIMP int __cdecl _wprintf_p(const wchar_t *_Format,...); - _CRTIMP int __cdecl _vfwprintf_p(FILE *_File,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _vwprintf_p(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _swprintf_p(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,...); - _CRTIMP int __cdecl _vswprintf_p(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _scwprintf_p(const wchar_t *_Format,...); - _CRTIMP int __cdecl _vscwprintf_p(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _wprintf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _wprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _fwprintf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _fwprintf_p_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vfwprintf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vfwprintf_p_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _swprintf_c_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _swprintf_p_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vswprintf_c_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _vswprintf_p_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _scwprintf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _scwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vscwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _snwprintf_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vsnwprintf_l(wchar_t *_DstBuf,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _swprintf(wchar_t *_Dest,const wchar_t *_Format,...); - _CRTIMP int __cdecl _vswprintf(wchar_t *_Dest,const wchar_t *_Format,va_list _Args); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwprintf_p( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfwprintf_p( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_p( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_p( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_ + _CRTIMP + int + __cdecl + _scwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscwprintf_p( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwprintf_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwprintf_p_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfwprintf_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfwprintf_p_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_c_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_p_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_c_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_p_l( + _Out_writes_z_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_ + _CRTIMP + int + __cdecl + _scwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _scwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscwprintf_p_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwprintf_l( + _Out_writes_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnwprintf_l( + _Out_writes_(_MaxCount) wchar_t *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _CRTIMP + int + __cdecl + _swprintf( + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _CRTIMP + int + __cdecl + _vswprintf( + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _Args); + + _CRTIMP int __cdecl __swprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,...); _CRTIMP int __cdecl __vswprintf_l(wchar_t *_Dest,const wchar_t *_Format,_locale_t _Plocinfo,va_list _Args); @@ -572,34 +1397,185 @@ #endif #endif - _CRTIMP wchar_t *__cdecl _wtempnam(const wchar_t *_Directory,const wchar_t *_FilePrefix); - _CRTIMP int __cdecl _vscwprintf(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _vscwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - int __cdecl fwscanf(FILE *_File,const wchar_t *_Format,...); - _CRTIMP int __cdecl _fwscanf_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - int __cdecl swscanf(const wchar_t *_Src,const wchar_t *_Format,...); - _CRTIMP int __cdecl _swscanf_l(const wchar_t *_Src,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _snwscanf(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); - _CRTIMP int __cdecl _snwscanf_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - int __cdecl wscanf(const wchar_t *_Format,...); - _CRTIMP int __cdecl _wscanf_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP FILE *__cdecl _wfdopen(int _FileHandle ,const wchar_t *_Mode); - _CRTIMP FILE *__cdecl _wfopen(const wchar_t *_Filename,const wchar_t *_Mode); - _CRTIMP FILE *__cdecl _wfreopen(const wchar_t *_Filename,const wchar_t *_Mode,FILE *_OldFile); + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wtempnam( + _In_opt_z_ const wchar_t *_Directory, + _In_opt_z_ const wchar_t *_FilePrefix); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscwprintf( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_ + _CRTIMP + int + __cdecl + _vscwprintf_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_ + int + __cdecl + fwscanf( + _Inout_ FILE *_File, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwscanf_l( + _Inout_ FILE *_File, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + int + __cdecl + swscanf( + _In_z_ const wchar_t *_Src, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swscanf_l( + _In_z_ const wchar_t *_Src, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwscanf( + _In_reads_(_MaxCount) _Pre_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwscanf_l( + _In_reads_(_MaxCount) _Pre_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + int + __cdecl + wscanf( + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wscanf_l( + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_ + _CRTIMP + FILE* + __cdecl + _wfdopen( + _In_ int _FileHandle, + _In_z_ const wchar_t *_Mode); + + _Check_return_ + _CRTIMP + FILE* + __cdecl + _wfopen( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_Mode); + + _Check_return_ + _CRTIMP + FILE* + __cdecl + _wfreopen( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_Mode, + _Inout_ FILE *_OldFile); #ifndef _CRT_WPERROR_DEFINED #define _CRT_WPERROR_DEFINED - _CRTIMP void __cdecl _wperror(const wchar_t *_ErrMsg); -#endif - _CRTIMP FILE *__cdecl _wpopen(const wchar_t *_Command,const wchar_t *_Mode); + _CRTIMP + void + __cdecl + _wperror( + _In_opt_z_ const wchar_t *_ErrMsg); +#endif + + _Check_return_ + _CRTIMP + FILE* + __cdecl + _wpopen( + _In_z_ const wchar_t *_Command, + _In_z_ const wchar_t *_Mode); + #if !defined(NO_OLDNAMES) && !defined(wpopen) -#define wpopen _wpopen -#endif - _CRTIMP int __cdecl _wremove(const wchar_t *_Filename); - _CRTIMP wchar_t *__cdecl _wtmpnam(wchar_t *_Buffer); - _CRTIMP wint_t __cdecl _fgetwc_nolock(FILE *_File); - _CRTIMP wint_t __cdecl _fputwc_nolock(wchar_t _Ch,FILE *_File); - _CRTIMP wint_t __cdecl _ungetwc_nolock(wint_t _Ch,FILE *_File); +#define wpopen _wpopen +#endif + + _Check_return_ + _CRTIMP + int + __cdecl + _wremove( + _In_z_ const wchar_t *_Filename); + + _CRTIMP + wchar_t* + __cdecl + _wtmpnam( + _Pre_maybenull_ _Post_z_ wchar_t *_Buffer); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + _fgetwc_nolock( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + _fputwc_nolock( + _In_ wchar_t _Ch, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + wint_t + __cdecl + _ungetwc_nolock( + _In_ wint_t _Ch, + _Inout_ FILE *_File); #undef _CRT_GETPUTWCHAR_NOINLINE @@ -607,127 +1583,682 @@ #define getwchar() fgetwc(stdin) #define putwchar(_c) fputwc((_c),stdout) #else - __CRT_INLINE wint_t __cdecl getwchar() {return (fgetwc(stdin)); } - __CRT_INLINE wint_t __cdecl putwchar(wchar_t _C) {return (fputwc(_C,stdout)); } + _Check_return_ __CRT_INLINE wint_t __cdecl getwchar() {return (fgetwc(stdin)); } + _Check_return_opt_ __CRT_INLINE wint_t __cdecl putwchar(_In_ wchar_t _C) {return (fputwc(_C,stdout)); } #endif #define getwc(_stm) fgetwc(_stm) #define putwc(_c,_stm) fputwc(_c,_stm) #define _putwc_nolock(_c,_stm) _fputwc_nolock(_c,_stm) #define _getwc_nolock(_c) _fgetwc_nolock(_c) -#endif + +#endif /* _WSTDIO_DEFINED */ #ifndef _WSTDLIB_DEFINED #define _WSTDLIB_DEFINED - _CRTIMP wchar_t *__cdecl _itow(int _Value,wchar_t *_Dest,int _Radix); - _CRTIMP wchar_t *__cdecl _ltow(long _Value,wchar_t *_Dest,int _Radix); - _CRTIMP wchar_t *__cdecl _ultow(unsigned long _Value,wchar_t *_Dest,int _Radix); - double __cdecl wcstod(const wchar_t *_Str,wchar_t **_EndPtr); - _CRTIMP double __cdecl _wcstod_l(const wchar_t *_Str,wchar_t **_EndPtr,_locale_t _Locale); + _CRTIMP + wchar_t* + __cdecl + _itow( + _In_ int _Value, + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_ int _Radix); + + _CRTIMP + wchar_t* + __cdecl + _ltow( + _In_ long _Value, + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_ int _Radix); + + _CRTIMP + wchar_t* + __cdecl + _ultow( + _In_ unsigned long _Value, + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _In_ int _Radix); + + _Check_return_ + double + __cdecl + wcstod( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr); + + _Check_return_ + _CRTIMP + double + __cdecl + _wcstod_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_opt_ _locale_t _Locale); + float __cdecl wcstof( const wchar_t *nptr, wchar_t **endptr); + #if !defined __NO_ISOCEXT /* in libmingwex.a */ float __cdecl wcstof (const wchar_t * __restrict__, wchar_t ** __restrict__); long double __cdecl wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__); #endif /* __NO_ISOCEXT */ - long __cdecl wcstol(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - _CRTIMP long __cdecl _wcstol_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); - unsigned long __cdecl wcstoul(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - _CRTIMP unsigned long __cdecl _wcstoul_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wgetenv(const wchar_t *_VarName); + + _Check_return_ + long + __cdecl + wcstol( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + long + __cdecl + _wcstol_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + unsigned long + __cdecl + wcstoul( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + unsigned long + __cdecl + _wcstoul_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wgetenv( + _In_z_ const wchar_t *_VarName); + #ifndef _CRT_WSYSTEM_DEFINED #define _CRT_WSYSTEM_DEFINED - _CRTIMP int __cdecl _wsystem(const wchar_t *_Command); -#endif - _CRTIMP double __cdecl _wtof(const wchar_t *_Str); - _CRTIMP double __cdecl _wtof_l(const wchar_t *_Str,_locale_t _Locale); - _CRTIMP int __cdecl _wtoi(const wchar_t *_Str); - _CRTIMP int __cdecl _wtoi_l(const wchar_t *_Str,_locale_t _Locale); - _CRTIMP long __cdecl _wtol(const wchar_t *_Str); - _CRTIMP long __cdecl _wtol_l(const wchar_t *_Str,_locale_t _Locale); + _CRTIMP + int + __cdecl + _wsystem( + _In_opt_z_ const wchar_t *_Command); +#endif + + _Check_return_ + _CRTIMP + double + __cdecl + _wtof( + _In_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + double + __cdecl + _wtof_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wtoi( + _In_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _wtoi_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + long + __cdecl + _wtol( + _In_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + long + __cdecl + _wtol_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION _CRTIMP wchar_t *__cdecl _i64tow(__int64 _Val,wchar_t *_DstBuf,int _Radix); - __MINGW_EXTENSION _CRTIMP wchar_t *__cdecl _ui64tow(unsigned __int64 _Val,wchar_t *_DstBuf,int _Radix); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wtoi64(const wchar_t *_Str); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wtoi64_l(const wchar_t *_Str,_locale_t _Locale); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wcstoi64(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); - __MINGW_EXTENSION _CRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix); - __MINGW_EXTENSION _CRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t *_Str,wchar_t **_EndPtr,int _Radix,_locale_t _Locale); -#endif -#endif + + __MINGW_EXTENSION + _CRTIMP + wchar_t* + __cdecl + _i64tow( + _In_ __int64 _Val, + _Pre_notnull_ _Post_z_ wchar_t *_DstBuf, + _In_ int _Radix); + + __MINGW_EXTENSION + _CRTIMP + wchar_t* + __cdecl + _ui64tow( + _In_ unsigned __int64 _Val, + _Pre_notnull_ _Post_z_ wchar_t *_DstBuf, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wtoi64( + _In_z_ const wchar_t *_Str); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wtoi64_l( + _In_z_ const wchar_t *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wcstoi64( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _wcstoi64_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + unsigned __int64 + __cdecl + _wcstoui64( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + unsigned __int64 + __cdecl + _wcstoui64_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ + +#endif /* _WSTDLIB_DEFINED */ #ifndef _POSIX_ + #ifndef _WSTDLIBP_DEFINED #define _WSTDLIBP_DEFINED - _CRTIMP wchar_t *__cdecl _wfullpath(wchar_t *_FullPath,const wchar_t *_Path,size_t _SizeInWords); - _CRTIMP void __cdecl _wmakepath(wchar_t *_ResultPath,const wchar_t *_Drive,const wchar_t *_Dir,const wchar_t *_Filename,const wchar_t *_Ext); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wfullpath( + _Out_writes_opt_z_(_SizeInWords) wchar_t *_FullPath, + _In_z_ const wchar_t *_Path, + _In_ size_t _SizeInWords); + + _CRTIMP + void + __cdecl + _wmakepath( + _Pre_notnull_ _Post_z_ wchar_t *_ResultPath, + _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); + #ifndef _CRT_WPERROR_DEFINED #define _CRT_WPERROR_DEFINED - _CRTIMP void __cdecl _wperror(const wchar_t *_ErrMsg); -#endif - _CRTIMP int __cdecl _wputenv(const wchar_t *_EnvString); - _CRTIMP void __cdecl _wsearchenv(const wchar_t *_Filename,const wchar_t *_EnvVar,wchar_t *_ResultPath); - _CRTIMP void __cdecl _wsplitpath(const wchar_t *_FullPath,wchar_t *_Drive,wchar_t *_Dir,wchar_t *_Filename,wchar_t *_Ext); -#endif -#endif + _CRTIMP + void + __cdecl + _wperror( + _In_opt_z_ const wchar_t *_ErrMsg); +#endif + + _Check_return_ + _CRTIMP + int + __cdecl + _wputenv( + _In_z_ const wchar_t *_EnvString); + + _CRTIMP + void + __cdecl + _wsearchenv( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_EnvVar, + _Pre_notnull_ _Post_z_ wchar_t *_ResultPath); + + _CRTIMP + void + __cdecl + _wsplitpath( + _In_z_ const wchar_t *_FullPath, + _Pre_maybenull_ _Post_z_ wchar_t *_Drive, + _Pre_maybenull_ _Post_z_ wchar_t *_Dir, + _Pre_maybenull_ _Post_z_ wchar_t *_Filename, + _Pre_maybenull_ _Post_z_ wchar_t *_Ext); + +#endif /* _WSTDLIBP_DEFINED */ + +#endif /* _POSIX_ */ #ifndef _WSTRING_DEFINED #define _WSTRING_DEFINED - _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); - wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); - _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); - int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); - wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); - size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); - size_t __cdecl wcslen(const wchar_t *_Str); - size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); - wchar_t *__cdecl wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - wchar_t *__cdecl wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); - _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); - size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); - _CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr); - wchar_t *__cdecl wcstok(wchar_t *_Str,const wchar_t *_Delim); - _CRTIMP wchar_t *__cdecl _wcserror(int _ErrNum); - _CRTIMP wchar_t *__cdecl __wcserror(const wchar_t *_Str); - _CRTIMP int __cdecl _wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcsicmp_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsnicmp_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); - _CRTIMP wchar_t *__cdecl _wcsrev(wchar_t *_Str); - _CRTIMP wchar_t *__cdecl _wcsset(wchar_t *_Str,wchar_t _Val); - _CRTIMP wchar_t *__cdecl _wcslwr(wchar_t *_String); - _CRTIMP wchar_t *_wcslwr_l(wchar_t *_String,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wcsupr(wchar_t *_String); - _CRTIMP wchar_t *_wcsupr_l(wchar_t *_String,_locale_t _Locale); - size_t __cdecl wcsxfrm(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount); - _CRTIMP size_t __cdecl _wcsxfrm_l(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount,_locale_t _Locale); - int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcscoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcsicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsncoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsncoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _wcsnicoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); - -#ifndef NO_OLDNAMES - _CRTIMP wchar_t *__cdecl wcsdup(const wchar_t *_Str); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wcsdup( + _In_z_ const wchar_t *_Str); + + wchar_t* + __cdecl + wcscat( + _Inout_updates_z_(_String_length_(_Dest) + _String_length_(_Source) + 1) wchar_t *_Dest, + _In_z_ const wchar_t *_Source); + + _CONST_RETURN + wchar_t* + __cdecl + wcschr( + _In_z_ const wchar_t *_Str, + wchar_t _Ch); + + _Check_return_ + int + __cdecl + wcscmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + wchar_t* + __cdecl + wcscpy( + _Out_writes_z_(_String_length_(_Source) + 1) wchar_t *_Dest, + _In_z_ const wchar_t *_Source); + + _Check_return_ + size_t + __cdecl + wcscspn( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + size_t + __cdecl + wcslen( + _In_z_ const wchar_t *_Str); + + _When_(_MaxCount > _String_length_(_Src), + _Post_satisfies_(return == _String_length_(_Src))) + _When_(_MaxCount <= _String_length_(_Src), + _Post_satisfies_(return == _MaxCount)) + size_t + __cdecl + wcsnlen( + _In_reads_or_z_(_MaxCount) const wchar_t *_Src, + _In_ size_t _MaxCount); + + wchar_t* + __cdecl + wcsncat( + wchar_t *_Dest, + const wchar_t *_Source, + size_t _Count); + + _Check_return_ + int + __cdecl + wcsncmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + wchar_t* + __cdecl + wcsncpy( + wchar_t *_Dest, + const wchar_t *_Source, + size_t _Count); + + _Check_return_ + _CONST_RETURN + wchar_t* + __cdecl + wcspbrk( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + _Check_return_ + _CONST_RETURN + wchar_t* + __cdecl + wcsrchr( + _In_z_ const wchar_t *_Str, + _In_ wchar_t _Ch); + + _Check_return_ + size_t + __cdecl + wcsspn( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + _CONST_RETURN + wchar_t* + __cdecl + wcsstr( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_SubStr); + + _Check_return_ + wchar_t* + __cdecl + wcstok( + _Inout_opt_z_ wchar_t *_Str, + _In_z_ const wchar_t *_Delim); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wcserror( + _In_ int _ErrNum); + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + __wcserror( + _In_opt_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicmp_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicmp_l( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + wchar_t* + __cdecl + _wcsnset( + wchar_t *_Str, + wchar_t _Val, + size_t _MaxCount); + + _CRTIMP + wchar_t* + __cdecl + _wcsrev( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + wchar_t* + __cdecl + _wcsset( + wchar_t *_Str, + wchar_t _Val); + + _CRTIMP + wchar_t* + __cdecl + _wcslwr( + _Inout_z_ wchar_t *_String); + + _CRTIMP + wchar_t* + _wcslwr_l( + wchar_t *_String, + _locale_t _Locale); + + _CRTIMP + wchar_t* + __cdecl + _wcsupr( + _Inout_z_ wchar_t *_String); + + _CRTIMP + wchar_t* + _wcsupr_l( + wchar_t *_String, + _locale_t _Locale); + + _Check_return_opt_ + size_t + __cdecl + wcsxfrm( + _Out_writes_opt_(_MaxCount) _Post_maybez_ wchar_t *_Dst, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + _wcsxfrm_l( + _Out_writes_opt_(_MaxCount) _Post_maybez_ wchar_t *_Dst, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + int + __cdecl + wcscoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcscoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsncoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsncoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + +#ifndef NO_OLDNAMES + + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + wcsdup( + _In_z_ const wchar_t *_Str); + #define wcswcs wcsstr - _CRTIMP int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP wchar_t *__cdecl wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); - _CRTIMP wchar_t *__cdecl wcsrev(wchar_t *_Str); - _CRTIMP wchar_t *__cdecl wcsset(wchar_t *_Str,wchar_t _Val); - _CRTIMP wchar_t *__cdecl wcslwr(wchar_t *_Str); - _CRTIMP wchar_t *__cdecl wcsupr(wchar_t *_Str); - _CRTIMP int __cdecl wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); -#endif -#endif + + _Check_return_ + _CRTIMP + int + __cdecl + wcsicmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + wcsnicmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _CRTIMP + wchar_t* + __cdecl + wcsnset( + _Inout_updates_z_(_MaxCount) wchar_t *_Str, + _In_ wchar_t _Val, + _In_ size_t _MaxCount); + + _CRTIMP + wchar_t* + __cdecl + wcsrev( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + wchar_t* + __cdecl + wcsset( + _Inout_z_ wchar_t *_Str, + wchar_t _Val); + + _CRTIMP + wchar_t* + __cdecl + wcslwr( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + wchar_t* + __cdecl + wcsupr( + _Inout_z_ wchar_t *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + wcsicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + +#endif /* NO_OLDNAMES */ + +#endif /* _WSTRING_DEFINED */ #ifndef _TM_DEFINED #define _TM_DEFINED @@ -747,22 +2278,97 @@ #ifndef _WTIME_DEFINED #define _WTIME_DEFINED - _CRTIMP wchar_t *__cdecl _wasctime(const struct tm *_Tm); - _CRTIMP wchar_t *__cdecl _wctime32(const __time32_t *_Time); - size_t __cdecl wcsftime(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm); - _CRTIMP size_t __cdecl _wcsftime_l(wchar_t *_Buf,size_t _SizeInWords,const wchar_t *_Format,const struct tm *_Tm,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wstrdate(wchar_t *_Buffer); - _CRTIMP wchar_t *__cdecl _wstrtime(wchar_t *_Buffer); - - _CRTIMP errno_t __cdecl _wasctime_s(wchar_t *_Buf,size_t _SizeInWords,const struct tm *_Tm); - _CRTIMP errno_t __cdecl _wctime32_s(wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords); + _CRTIMP + wchar_t* + __cdecl + _wasctime( + _In_ const struct tm *_Tm); + + _CRTIMP + wchar_t* + __cdecl + _wctime32( + _In_ const __time32_t *_Time); + + _Success_(return > 0) + size_t + __cdecl + wcsftime( + _Out_writes_z_(_SizeInWords) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_ const struct tm *_Tm); + + _Success_(return > 0) + _CRTIMP + size_t + __cdecl + _wcsftime_l( + _Out_writes_z_(_SizeInWords) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_ const struct tm *_Tm, + _In_opt_ _locale_t _Locale); + + _CRTIMP + wchar_t* + __cdecl + _wstrdate( + _Out_writes_z_(9) wchar_t *_Buffer); + + _CRTIMP + wchar_t* + __cdecl + _wstrtime( + _Out_writes_z_(9) wchar_t *_Buffer); + + _CRTIMP + errno_t + __cdecl + _wasctime_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const struct tm *_Tm); + + _CRTIMP + errno_t + __cdecl + _wctime32_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const __time32_t *_Time); + + _CRTIMP + errno_t + __cdecl + _wstrdate_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(9) wchar_t *_Buf, + _In_range_(>=, 9) size_t _SizeInWords); + + _CRTIMP + errno_t + __cdecl + _wstrtime_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(9) wchar_t *_Buf, + _In_ size_t _SizeInWords); #if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP wchar_t *__cdecl _wctime64(const __time64_t *_Time); - _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time); -#endif + + _CRTIMP + wchar_t* + __cdecl + _wctime64( + _In_ const __time64_t *_Time); + + _CRTIMP + errno_t + __cdecl + _wctime64_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const __time64_t *_Time); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ #if !defined (RC_INVOKED) && !defined (_INC_WTIME_INL) #define _INC_WTIME_INL @@ -778,33 +2384,216 @@ typedef int mbstate_t; typedef wchar_t _Wint_t; - wint_t __cdecl btowc(int); - size_t __cdecl mbrlen(const char *_Ch,size_t _SizeInBytes,mbstate_t *_State); - size_t __cdecl mbrtowc(wchar_t *_DstCh,const char *_SrcCh,size_t _SizeInBytes,mbstate_t *_State); - size_t __cdecl mbsrtowcs(wchar_t *_Dest,const char **_PSrc,size_t _Count,mbstate_t *_State); - size_t __cdecl wcrtomb(char *_Dest,wchar_t _Source,mbstate_t *_State); - size_t __cdecl wcsrtombs(char *_Dest,const wchar_t **_PSource,size_t _Count,mbstate_t *_State); - int __cdecl wctob(wint_t _WCh); + wint_t + __cdecl + btowc( + int); + + size_t + __cdecl + mbrlen( + _In_reads_bytes_opt_(_SizeInBytes) _Pre_opt_z_ const char *_Ch, + _In_ size_t _SizeInBytes, + _Out_opt_ mbstate_t *_State); + + size_t + __cdecl + mbrtowc( + _Pre_maybenull_ _Post_z_ wchar_t *_DstCh, + _In_reads_bytes_opt_(_SizeInBytes) _Pre_opt_z_ const char *_SrcCh, + _In_ size_t _SizeInBytes, + _Out_opt_ mbstate_t *_State); + + size_t + __cdecl + mbsrtowcs( + _Pre_notnull_ _Post_z_ wchar_t *_Dest, + _Inout_ _Deref_prepost_opt_valid_ const char **_PSrc, + _In_ size_t _Count, + _Inout_opt_ mbstate_t *_State); + + size_t + __cdecl + wcrtomb( + _Pre_maybenull_ _Post_z_ char *_Dest, + _In_ wchar_t _Source, + _Out_opt_ mbstate_t *_State); + + size_t + __cdecl + wcsrtombs( + _Pre_maybenull_ _Post_z_ char *_Dest, + _Inout_ _Deref_prepost_z_ const wchar_t **_PSource, + _In_ size_t _Count, + _Out_opt_ mbstate_t *_State); + + int + __cdecl + wctob( + _In_ wint_t _WCh); #ifndef __NO_ISOCEXT /* these need static lib libmingwex.a */ - wchar_t *__cdecl wmemset(wchar_t *s, wchar_t c, size_t n); - _CONST_RETURN wchar_t *__cdecl wmemchr(const wchar_t *s, wchar_t c, size_t n); - int wmemcmp(const wchar_t *s1, const wchar_t *s2,size_t n); - wchar_t *__cdecl wmemcpy(wchar_t *s1,const wchar_t *s2,size_t n); - wchar_t *__cdecl wmemmove(wchar_t *s1, const wchar_t *s2, size_t n); - __MINGW_EXTENSION long long __cdecl wcstoll(const wchar_t *nptr,wchar_t **endptr, int base); - __MINGW_EXTENSION unsigned long long __cdecl wcstoull(const wchar_t *nptr,wchar_t **endptr, int base); + + wchar_t* + __cdecl + wmemset( + _Out_writes_all_(_N) wchar_t *_S, + _In_ wchar_t _C, + _In_ size_t _N); + + _CONST_RETURN + wchar_t* + __cdecl + wmemchr( + _In_reads_(_N) const wchar_t *_S, + _In_ wchar_t _C, + _In_ size_t _N); + + int + wmemcmp( + _In_reads_(_N) const wchar_t *_S1, + _In_reads_(_N) const wchar_t *_S2, + _In_ size_t _N); + + _Post_equal_to_(_S1) + _At_buffer_(_S1, _Iter_, _N, _Post_satisfies_(_S1[_Iter_] == _S2[_Iter_])) + wchar_t* + __cdecl + wmemcpy( + _Out_writes_all_(_N) wchar_t *_S1, + _In_reads_(_N) const wchar_t *_S2, + _In_ size_t _N); + + wchar_t* + __cdecl + wmemmove( + _Out_writes_all_opt_(_N) wchar_t *_S1, + _In_reads_opt_(_N) const wchar_t *_S2, + _In_ size_t _N); + + __MINGW_EXTENSION + long long + __cdecl + wcstoll( + const wchar_t *nptr, + wchar_t **endptr, + int base); + + __MINGW_EXTENSION + unsigned long long + __cdecl + wcstoull( + const wchar_t *nptr, + wchar_t **endptr, + int base); + #endif /* __NO_ISOCEXT */ - void *__cdecl memmove(void *_Dst,const void *_Src,size_t _MaxCount); - void *__cdecl memcpy(void *_Dst,const void *_Src,size_t _MaxCount); - __CRT_INLINE int __cdecl fwide(FILE *_F,int _M) { (void)_F; return (_M); } - __CRT_INLINE int __cdecl mbsinit(const mbstate_t *_P) { return (!_P || *_P==0); } - __CRT_INLINE _CONST_RETURN wchar_t *__cdecl wmemchr(const wchar_t *_S,wchar_t _C,size_t _N) { for (;0<_N;++_S,--_N) if (*_S==_C) return (_CONST_RETURN wchar_t *)(_S); return (0); } - __CRT_INLINE int __cdecl wmemcmp(const wchar_t *_S1,const wchar_t *_S2,size_t _N) { for (; 0 < _N; ++_S1,++_S2,--_N) if (*_S1!=*_S2) return (*_S1 < *_S2 ? -1 : +1); return (0); } - __CRT_INLINE wchar_t *__cdecl wmemcpy(wchar_t *_S1,const wchar_t *_S2,size_t _N) { return (wchar_t *)memcpy(_S1,_S2,_N*sizeof(wchar_t)); } - __CRT_INLINE wchar_t *__cdecl wmemmove(wchar_t *_S1,const wchar_t *_S2,size_t _N) { return (wchar_t *)memmove(_S1,_S2,_N*sizeof(wchar_t)); } - __CRT_INLINE wchar_t *__cdecl wmemset(wchar_t *_S,wchar_t _C,size_t _N) { + void* + __cdecl + memmove( + _Out_writes_bytes_all_opt_(_MaxCount) void *_Dst, + _In_reads_bytes_opt_(_MaxCount) const void *_Src, + _In_ size_t _MaxCount); + + _Post_equal_to_(_Dst) + _At_buffer_((unsigned char*)_Dst, + _Iter_, + _MaxCount, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == ((unsigned char*)_Src)[_Iter_])) + void* + __cdecl + memcpy( + _Out_writes_bytes_all_(_MaxCount) void *_Dst, + _In_reads_bytes_(_MaxCount) const void *_Src, + _In_ size_t _MaxCount); + + __CRT_INLINE + int + __cdecl + fwide( + _In_opt_ FILE *_F, + int _M) + { + (void)_F; + return (_M); + } + + __CRT_INLINE + int + __cdecl + mbsinit( + _In_opt_ const mbstate_t *_P) + { + return (!_P || *_P==0); + } + + __CRT_INLINE + _CONST_RETURN + wchar_t* + __cdecl + wmemchr( + _In_reads_(_N) const wchar_t *_S, + _In_ wchar_t _C, + _In_ size_t _N) + { + for (;0<_N;++_S,--_N) + { + if (*_S==_C) return (_CONST_RETURN wchar_t *)(_S); + } + return (0); + } + + __CRT_INLINE + int + __cdecl + wmemcmp( + _In_reads_(_N) const wchar_t *_S1, + _In_reads_(_N) const wchar_t *_S2, + _In_ size_t _N) + { + for (; 0 < _N; ++_S1,++_S2,--_N) + { + if (*_S1!=*_S2) return (*_S1 < *_S2 ? -1 : +1); + } + return (0); + } + + _Post_equal_to_(_S1) + _At_buffer_(_S1, + _Iter_, + _N, + _Post_satisfies_(_S1[_Iter_] == _S2[_Iter_])) + __CRT_INLINE + wchar_t* + __cdecl + wmemcpy( + _Out_writes_all_(_N) wchar_t *_S1, + _In_reads_(_N) const wchar_t *_S2, + _In_ size_t _N) + { + return (wchar_t *)memcpy(_S1,_S2,_N*sizeof(wchar_t)); + } + + __CRT_INLINE + wchar_t* + __cdecl + wmemmove( + _Out_writes_all_opt_(_N) wchar_t *_S1, + _In_reads_opt_(_N) const wchar_t *_S2, + _In_ size_t _N) + { + return (wchar_t *)memmove(_S1,_S2,_N*sizeof(wchar_t)); + } + + __CRT_INLINE + wchar_t* + __cdecl + wmemset( + _Out_writes_all_(_N) wchar_t *_S, + _In_ wchar_t _C, + _In_ size_t _N) + { wchar_t *_Su = _S; for (;0<_N;++_Su,--_N) { *_Su = _C;

11 years, 9 months

[akhaldi] 58439: [CRT] * Annotate string.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 7 16:45:18 2013 New Revision: 58439 URL: http://svn.reactos.org/svn/reactos?rev=58439&view=rev Log: [CRT] * Annotate string.h. Modified: trunk/reactos/include/crt/string.h Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Thu Mar 7 16:45:18 2013 @@ -27,163 +27,1114 @@ #ifndef _CRT_MEMORY_DEFINED #define _CRT_MEMORY_DEFINED - _CRTIMP void *__cdecl _memccpy(void *_Dst,const void *_Src,int _Val,size_t _MaxCount); - _CRTIMP _CONST_RETURN void *__cdecl memchr(const void *_Buf ,int _Val,size_t _MaxCount); - _CRTIMP int __cdecl _memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); - _CRTIMP int __cdecl _memicmp_l(const void *_Buf1,const void *_Buf2,size_t _Size,_locale_t _Locale); - int __cdecl memcmp(const void *_Buf1,const void *_Buf2,size_t _Size); - _CRT_INSECURE_DEPRECATE_MEMORY(memcpy_s) void *__cdecl memcpy(void *_Dst,const void *_Src,size_t _Size); - void *__cdecl memset(void *_Dst,int _Val,size_t _Size); -#ifndef NO_OLDNAMES - _CRTIMP _CRT_NONSTDC_DEPRECATE(_memccpy) void *__cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_memicmp) int __cdecl memicmp(const void *_Buf1,const void *_Buf2,size_t _Size); -#endif -#endif - - char *__cdecl _strset(char *_Str,int _Val); - char *__cdecl strcpy(char *_Dest,const char *_Source); - char *__cdecl strcat(char *_Dest,const char *_Source); - int __cdecl strcmp(const char *_Str1,const char *_Str2); - size_t __cdecl strlen(const char *_Str); - _CRTIMP size_t __cdecl strnlen(const char *_Str,size_t _MaxCount); - - _CRT_INSECURE_DEPRECATE_MEMORY(memmove_s) void *__cdecl memmove(void *_Dst,const void *_Src,size_t _Size); - _CRTIMP char *__cdecl _strdup(const char *_Src); - _CRTIMP _CONST_RETURN char *__cdecl strchr(const char *_Str,int _Val); - _CRTIMP int __cdecl _stricmp(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _strcmpi(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _stricmp_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl strcoll(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _strcoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _stricoll(const char *_Str1,const char *_Str2); - _CRTIMP int __cdecl _stricoll_l(const char *_Str1,const char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _strncoll (const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _strncoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _strnicoll (const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _strnicoll_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP size_t __cdecl strcspn(const char *_Str,const char *_Control); - _CRTIMP _CRT_INSECURE_DEPRECATE(_strerror_s) char *__cdecl _strerror(const char *_ErrMsg); - _CRTIMP _CRT_INSECURE_DEPRECATE(strerror_s) char *__cdecl strerror(int); - _CRTIMP char *__cdecl _strlwr(char *_String); - char *strlwr_l(char *_String,_locale_t _Locale); - char *__cdecl strncat(char *_Dest,const char *_Source,size_t _Count); - int __cdecl strncmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _strnicmp(const char *_Str1,const char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _strnicmp_l(const char *_Str1,const char *_Str2,size_t _MaxCount,_locale_t _Locale); - char *strncpy(char *_Dest,const char *_Source,size_t _Count); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(_strnset_s) char *__cdecl _strnset(char *_Str,int _Val,size_t _MaxCount); - _CRTIMP _CONST_RETURN char *__cdecl strpbrk(const char *_Str,const char *_Control); - _CRTIMP _CONST_RETURN char *__cdecl strrchr(const char *_Str,int _Ch); - _CRTIMP char *__cdecl _strrev(char *_Str); - _CRTIMP size_t __cdecl strspn(const char *_Str,const char *_Control); - _CRTIMP _CONST_RETURN char *__cdecl strstr(const char *_Str,const char *_SubStr); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(strtok_s) char *__cdecl strtok(char *_Str,const char *_Delim); - _CRTIMP char *__cdecl _strupr(char *_String); - _CRTIMP char *_strupr_l(char *_String,_locale_t _Locale); - _CRTIMP size_t __cdecl strxfrm(char *_Dst,const char *_Src,size_t _MaxCount); - _CRTIMP size_t __cdecl _strxfrm_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); + + _CRTIMP + void* + __cdecl + _memccpy( + _Out_writes_bytes_opt_(_MaxCount) void *_Dst, + _In_ const void *_Src, + _In_ int _Val, + _In_ size_t _MaxCount); + + _Must_inspect_result_ + _CRTIMP + _CONST_RETURN + void* + __cdecl + memchr( + _In_reads_bytes_opt_(_MaxCount) const void *_Buf, + _In_ int _Val, + _In_ size_t _MaxCount); + + _Must_inspect_result_ + _CRTIMP + int + __cdecl + _memicmp( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size); + + _Must_inspect_result_ + _CRTIMP + int + __cdecl + _memicmp_l( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + + _Must_inspect_result_ + int + __cdecl + memcmp( + _In_reads_bytes_(_Size) const void *_Buf1, + _In_reads_bytes_(_Size) const void *_Buf2, + _In_ size_t _Size); + + _Post_equal_to_(_Dst) + _At_buffer_((unsigned char*)_Dst, + _Iter_, + _MaxCount, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == ((unsigned char*)_Src)[_Iter_])) + _CRT_INSECURE_DEPRECATE_MEMORY(memcpy_s) + void* + __cdecl + memcpy( + _Out_writes_bytes_all_(_MaxCount) void *_Dst, + _In_reads_bytes_(_MaxCount) const void *_Src, + _In_ size_t _MaxCount); + + _Post_equal_to_(_Dst) + _At_buffer_((unsigned char*)_Dst, + _Iter_, + _Size, + _Post_satisfies_(((unsigned char*)_Dst)[_Iter_] == _Val)) + void* + __cdecl + memset( + _Out_writes_bytes_all_(_Size) void *_Dst, + _In_ int _Val, + _In_ size_t _Size); + +#ifndef NO_OLDNAMES + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_memccpy) + void* + __cdecl + memccpy( + _Out_writes_bytes_opt_(_Size) void *_Dst, + _In_reads_bytes_opt_(_Size) const void *_Src, + _In_ int _Val, + _In_ size_t _Size); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_memicmp) + int + __cdecl + memicmp( + _In_reads_bytes_opt_(_Size) const void *_Buf1, + _In_reads_bytes_opt_(_Size) const void *_Buf2, + _In_ size_t _Size); + +#endif /* NO_OLDNAMES */ + +#endif /* _CRT_MEMORY_DEFINED */ + + char* + __cdecl + _strset( + _Inout_z_ char *_Str, + _In_ int _Val); + + char* + __cdecl + strcpy( + _Out_writes_z_(_String_length_(_Source) + 1) char *_Dest, + _In_z_ const char *_Source); + + char* + __cdecl + strcat( + _Inout_updates_z_(_String_length_(_Dest) + _String_length_(_Source) + 1) char *_Dest, + _In_z_ const char *_Source); + + _Check_return_ + int + __cdecl + strcmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + size_t + __cdecl + strlen( + _In_z_ const char *_Str); + + _When_(_MaxCount > _String_length_(_Str), + _Post_satisfies_(return == _String_length_(_Str))) + _When_(_MaxCount <= _String_length_(_Str), + _Post_satisfies_(return == _MaxCount)) + _CRTIMP + size_t + __cdecl + strnlen( + _In_reads_or_z_(_MaxCount) const char *_Str, + _In_ size_t _MaxCount); + + _CRT_INSECURE_DEPRECATE_MEMORY(memmove_s) + void* + __cdecl + memmove( + _Out_writes_bytes_all_opt_(_MaxCount) void *_Dst, + _In_reads_bytes_opt_(_MaxCount) const void *_Src, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + char* + __cdecl + _strdup( + _In_opt_z_ const char *_Src); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + strchr( + _In_z_ const char *_Str, + _In_ int _Val); + + _Check_return_ + _CRTIMP + int + __cdecl + _stricmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _strcmpi( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _stricmp_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + strcoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _strcoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _stricoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _stricoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _strncoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _strncoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _strnicoll( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _strnicoll_l( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + strcspn( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(_strerror_s) + char* + __cdecl + _strerror( + _In_opt_z_ const char *_ErrMsg); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(strerror_s) + char* + __cdecl + strerror( + _In_ int); + + _CRTIMP + char* + __cdecl + _strlwr( + _Inout_z_ char *_String); + + char* + strlwr_l( + char *_String, + _locale_t _Locale); + + char* + __cdecl + strncat( + char *_Dest, + const char *_Source, + size_t _Count); + + _Check_return_ + int + __cdecl + strncmp( + _In_reads_or_z_(_MaxCount) const char *_Str1, + _In_reads_or_z_(_MaxCount) const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _strnicmp( + _In_reads_or_z_(_MaxCount) const char *_Str1, + _In_reads_or_z_(_MaxCount) const char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _strnicmp_l( + _In_reads_or_z_(_MaxCount) const char *_Str1, + _In_reads_or_z_(_MaxCount) const char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + char* + strncpy( + char *_Dest, + const char *_Source, + size_t _Count); + + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(_strnset_s) + char* + __cdecl + _strnset( + char *_Str, + int _Val, + size_t _MaxCount); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + strpbrk( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + strrchr( + _In_z_ const char *_Str, + _In_ int _Ch); + + _CRTIMP + char* + __cdecl + _strrev( + _Inout_z_ char *_Str); + + _Check_return_ + _CRTIMP + size_t + __cdecl + strspn( + _In_z_ const char *_Str, + _In_z_ const char *_Control); + + _Check_return_ + _CRTIMP + _CONST_RETURN + char* + __cdecl + strstr( + _In_z_ const char *_Str, + _In_z_ const char *_SubStr); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(strtok_s) + char* + __cdecl + strtok( + _Inout_opt_z_ char *_Str, + _In_z_ const char *_Delim); + + _CRTIMP + char* + __cdecl + _strupr( + _Inout_z_ char *_String); + + _CRTIMP + char* + _strupr_l( + char *_String, + _locale_t _Locale); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + strxfrm( + _Out_writes_opt_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + _strxfrm_l( + _Out_writes_opt_(_MaxCount) _Post_maybez_ char *_Dst, + _In_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + #if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl _strset_s(char *_Dst,size_t _DstSize,int _Value); - _CRTIMP errno_t __cdecl _strerror_s(char *_Buf,size_t _SizeInBytes,const char *_ErrMsg); - _CRTIMP errno_t __cdecl _strlwr_s(char *_Str,size_t _Size); - _CRTIMP errno_t __cdecl _strlwr_s_l(char *_Str,size_t _Size,_locale_t _Locale); - _CRTIMP errno_t __cdecl _strnset_s(char *_Str,size_t _Size,int _Val,size_t _MaxCount); - _CRTIMP errno_t __cdecl _strupr_s(char *_Str,size_t _Size); - _CRTIMP errno_t __cdecl _strupr_s_l(char *_Str,size_t _Size,_locale_t _Locale); - _CRTIMP errno_t __cdecl strcpy_s(char *_Dst, size_t _Size, const char *_Src); - _CRTIMP errno_t __cdecl strcat_s(char *_Dst, size_t _Size, const char *_Src); -#endif - -#ifndef NO_OLDNAMES - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strdup) char *__cdecl strdup(const char *_Src); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strcmpi) int __cdecl strcmpi(const char *_Str1,const char *_Str2); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_stricmp) int __cdecl stricmp(const char *_Str1,const char *_Str2); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strlwr) char *__cdecl strlwr(char *_Str); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strnicmp) int __cdecl strnicmp(const char *_Str1,const char *_Str,size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strset_s( + _Inout_updates_z_(_DstSize) char *_Dst, + _In_ size_t _DstSize, + _In_ int _Value); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strerror_s( + _Out_writes_z_(_SizeInBytes) char *_Buf, + _In_ size_t _SizeInBytes, + _In_opt_z_ const char *_ErrMsg); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strlwr_s( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strlwr_s_l( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strnset_s( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size, + _In_ int _Val, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strupr_s( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _strupr_s_l( + _Inout_updates_z_(_Size) char *_Str, + _In_ size_t _Size, + _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + strcpy_s( + _Out_writes_z_(_Size) char *_Dst, + _In_ size_t _Size, + _In_z_ const char *_Src); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + strcat_s( + _Inout_updates_z_(_Size) char *_Dst, + _In_ size_t _Size, + _In_z_ const char *_Src); + +#endif /* __STDC_WANT_SECURE_LIB__ */ + +#ifndef NO_OLDNAMES + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strdup) + char* + __cdecl + strdup( + _In_opt_z_ const char *_Src); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strcmpi) + int + __cdecl + strcmpi( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_stricmp) + int + __cdecl + stricmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str2); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strlwr) + char* + __cdecl + strlwr( + _Inout_z_ char *_Str); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strnicmp) + int + __cdecl + strnicmp( + _In_z_ const char *_Str1, + _In_z_ const char *_Str, + _In_ size_t _MaxCount); + // __CRT_INLINE int __cdecl strncasecmp (const char *__sz1, const char *__sz2, size_t __sizeMaxCompare) { return _strnicmp (__sz1, __sz2, __sizeMaxCompare); } // __CRT_INLINE int __cdecl strcasecmp (const char *__sz1, const char *__sz2) { return _stricmp (__sz1, __sz2); } - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strnset) char *__cdecl strnset(char *_Str,int _Val,size_t _MaxCount); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strrev) char *__cdecl strrev(char *_Str); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strset) char *__cdecl strset(char *_Str,int _Val); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_strupr) char *__cdecl strupr(char *_Str); -#endif + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strnset) + char* + __cdecl + strnset( + _Inout_updates_z_(_MaxCount) char *_Str, + _In_ int _Val, + _In_ size_t _MaxCount); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strrev) + char* + __cdecl + strrev( + _Inout_z_ char *_Str); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strset) + char* + __cdecl + strset( + _Inout_z_ char *_Str, + _In_ int _Val); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_strupr) + char* + __cdecl + strupr( + _Inout_z_ char *_Str); + +#endif /* NO_OLDNAMES */ #ifndef _WSTRING_DEFINED #define _WSTRING_DEFINED - _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); - _CRTIMP _CRT_INSECURE_DEPRECATE(wcsat_s) wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); - _CRTIMP _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); - _CRTIMP int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP _CRT_INSECURE_DEPRECATE(wcscpy_s) wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); - _CRTIMP size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); - _CRTIMP wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - -_Ret_range_(==,_String_length_(_Str)) -_CRTIMP -size_t -__cdecl -wcslen( + _Check_return_ + _CRTIMP + wchar_t* + __cdecl + _wcsdup( _In_z_ const wchar_t *_Str); - _CRTIMP _CRT_INSECURE_DEPRECATE(wcsnlen_s) size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); - _CRTIMP int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP _CRT_INSECURE_DEPRECATE(wcsncpy_s) wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); - _CRTIMP _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); - _CRTIMP _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); - _CRTIMP size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); - _CRTIMP _CONST_RETURN wchar_t *__cdecl wcsstr(const wchar_t *_Str,const wchar_t *_SubStr); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(wcstok_s) wchar_t *__cdecl wcstok(wchar_t *_Str,const wchar_t *_Delim); - _CRTIMP _CRT_INSECURE_DEPRECATE(_wcserror_s) wchar_t *__cdecl _wcserror(int _ErrNum); - _CRTIMP _CRT_INSECURE_DEPRECATE(__wcserror_s) wchar_t *__cdecl __wcserror(const wchar_t *_Str); - _CRTIMP int __cdecl _wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcsicmp_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsnicmp_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(_wcsnset_s) wchar_t *__cdecl _wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); - _CRTIMP wchar_t *__cdecl _wcsrev(wchar_t *_Str); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(_wcsset_s) wchar_t *__cdecl _wcsset(wchar_t *_Str,wchar_t _Val); - _CRTIMP wchar_t *__cdecl _wcslwr(wchar_t *_String); - _CRTIMP wchar_t *_wcslwr_l(wchar_t *_String,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wcsupr(wchar_t *_String); - _CRTIMP wchar_t *_wcsupr_l(wchar_t *_String,_locale_t _Locale); - _CRTIMP size_t __cdecl wcsxfrm(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount); - _CRTIMP size_t __cdecl _wcsxfrm_l(wchar_t *_Dst,const wchar_t *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl wcscoll(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcscoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP int __cdecl _wcsicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _wcsncoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsncoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _wcsnicoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); + _CRTIMP + _CRT_INSECURE_DEPRECATE(wcsat_s) + wchar_t* + __cdecl + wcscat( + _Inout_updates_z_(_String_length_(_Dest) + _String_length_(_Source) + 1) wchar_t *_Dest, + _In_z_ const wchar_t *_Source); + + _Check_return_ + _When_(return != 0, _Ret_range_(_Str, _Str + _String_length_(_Str) - 1)) + _CRTIMP + _CONST_RETURN + wchar_t* + __cdecl + wcschr( + _In_z_ const wchar_t *_Str, + wchar_t _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + wcscmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(wcscpy_s) + wchar_t* + __cdecl + wcscpy( + _Out_writes_z_(_String_length_(_Source) + 1) wchar_t *_Dest, + _In_z_ const wchar_t *_Source); + + _Check_return_ + _CRTIMP + size_t + __cdecl + wcscspn( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + _CRTIMP + wchar_t* + wcsncat( + wchar_t *_Dest, + const wchar_t *_Source, + size_t _Count); + + _Ret_range_(==,_String_length_(_Str)) + _CRTIMP + size_t + __cdecl + wcslen( + _In_z_ const wchar_t *_Str); + + _When_(_MaxCount > _String_length_(_Src), + _Post_satisfies_(return == _String_length_(_Src))) + _When_(_MaxCount <= _String_length_(_Src), + _Post_satisfies_(return == _MaxCount)) + _CRTIMP + _CRT_INSECURE_DEPRECATE(wcsnlen_s) + size_t + __cdecl + wcsnlen( + _In_reads_or_z_(_MaxCount) const wchar_t *_Src, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + wcsncmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(wcsncpy_s) + wchar_t* + wcsncpy( + wchar_t *_Dest, + const wchar_t *_Source, + size_t _Count); + + _Check_return_ + _CRTIMP + _CONST_RETURN + wchar_t* + __cdecl + wcspbrk( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + _Check_return_ + _CRTIMP + _CONST_RETURN + wchar_t* + __cdecl + wcsrchr( + _In_z_ const wchar_t *_Str, + _In_ wchar_t _Ch); + + _Check_return_ + _CRTIMP + size_t + __cdecl + wcsspn( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_Control); + + _When_(return != 0, + _Ret_range_(_Str, _Str + _String_length_(_Str) - 1)) + _CRTIMP + _CONST_RETURN + wchar_t* + __cdecl + wcsstr( + _In_z_ const wchar_t *_Str, + _In_z_ const wchar_t *_SubStr); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(wcstok_s) + wchar_t* + __cdecl + wcstok( + _Inout_opt_z_ wchar_t *_Str, + _In_z_ const wchar_t *_Delim); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(_wcserror_s) + wchar_t* + __cdecl + _wcserror( + _In_ int _ErrNum); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(__wcserror_s) + wchar_t* + __cdecl + __wcserror( + _In_opt_z_ const wchar_t *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicmp_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicmp_l( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(_wcsnset_s) + wchar_t* + __cdecl + _wcsnset( + wchar_t *_Str, + wchar_t _Val, + size_t _MaxCount); + + _CRTIMP + wchar_t* + __cdecl + _wcsrev( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(_wcsset_s) + wchar_t* + __cdecl + _wcsset( + wchar_t *_Str, + wchar_t _Val); + + _CRTIMP + wchar_t* + __cdecl + _wcslwr( + _Inout_z_ wchar_t *_String); + + _CRTIMP + wchar_t* + _wcslwr_l( + wchar_t *_String, + _locale_t _Locale); + + _CRTIMP + wchar_t* + __cdecl + _wcsupr( + _Inout_z_ wchar_t *_String); + + _CRTIMP + wchar_t* + _wcsupr_l( + wchar_t *_String, + _locale_t _Locale); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + wcsxfrm( + _Out_writes_opt_(_MaxCount) _Post_maybez_ wchar_t *_Dst, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + _wcsxfrm_l( + _Out_writes_opt_(_MaxCount) _Post_maybez_ wchar_t *_Dst, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + wcscoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcscoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsicoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsncoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsncoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _wcsnicoll_l( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + #if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsat_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); - _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); - _CRTIMP errno_t __cdecl wcsnlen_s(wchar_t **_Src, size_t _MaxCount); - _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dest, size_t SizeInWords, const wchar_t *_Source ,size_t _Count); - _CRTIMP errno_t __cdecl _wcserror_s(wchar_t *_Buf,size_t _SizeInWords,int _ErrNum); - _CRTIMP errno_t __cdecl __wcserror_s(wchar_t *_Buffer,size_t _SizeInWords,const wchar_t *_ErrMsg); - _CRTIMP errno_t __cdecl _wcsnset_s(wchar_t *_Dst,size_t _DstSizeInWords,wchar_t _Val,size_t _MaxCount); - _CRTIMP errno_t __cdecl _wcsset_s(wchar_t *_Str,size_t _SizeInWords,wchar_t _Val); - _CRTIMP errno_t __cdecl _wcslwr_s(wchar_t *_Str,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wcslwr_s_l(wchar_t *_Str,size_t _SizeInWords,_locale_t _Locale); - _CRTIMP errno_t __cdecl _wcsupr_s(wchar_t *_Str,size_t _Size); - _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale); -#endif - -#ifndef NO_OLDNAMES - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsdup) wchar_t *__cdecl wcsdup(const wchar_t *_Str); + + _CRTIMP + errno_t + __cdecl + wcsat_s( + wchar_t *Dest, + size_t SizeInWords, + const wchar_t *_Source); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + wcscpy_s( + _Out_writes_z_(SizeInWords) wchar_t *Dest, + _In_ size_t SizeInWords, + _In_z_ const wchar_t *_Source); + + _CRTIMP + errno_t + __cdecl + wcsnlen_s( + wchar_t **_Src, + size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + wcsncpy_s( + _Out_writes_z_(SizeInWords) wchar_t *_Dest, + _In_ size_t SizeInWords, + _In_z_ const wchar_t *_Source, + _In_ size_t _Count); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcserror_s( + _Out_writes_opt_z_(_SizeInWords) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ int _ErrNum); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + __wcserror_s( + _Out_writes_opt_z_(_SizeInWords) wchar_t *_Buffer, + _In_ size_t _SizeInWords, + _In_z_ const wchar_t *_ErrMsg); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsnset_s( + _Inout_updates_z_(_DstSizeInWords) wchar_t *_Dst, + _In_ size_t _DstSizeInWords, + _In_ wchar_t _Val, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsset_s( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords, + _In_ wchar_t _Val); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcslwr_s( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcslwr_s_l( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsupr_s( + _Inout_updates_z_(_Size) wchar_t *_Str, + _In_ size_t _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsupr_s_l( + _Inout_updates_z_(_Size) wchar_t *_Str, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + +#endif /* __STDC_WANT_SECURE_LIB__ */ + +#ifndef NO_OLDNAMES + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsdup) + wchar_t* + __cdecl + wcsdup( + _In_z_ const wchar_t *_Str); + #define wcswcs wcsstr - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsicmp) int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsnicmp) int __cdecl wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsnset) wchar_t *__cdecl wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsrev) wchar_t *__cdecl wcsrev(wchar_t *_Str); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsset) wchar_t *__cdecl wcsset(wchar_t *_Str,wchar_t _Val); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcslwr) wchar_t *__cdecl wcslwr(wchar_t *_Str); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsupr) wchar_t *__cdecl wcsupr(wchar_t *_Str); - _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsicoll) int __cdecl wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2); -#endif + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsicmp) + int + __cdecl + wcsicmp( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsnicmp) + int + __cdecl + wcsnicmp( + _In_reads_or_z_(_MaxCount) const wchar_t *_Str1, + _In_reads_or_z_(_MaxCount) const wchar_t *_Str2, + _In_ size_t _MaxCount); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsnset) + wchar_t* + __cdecl + wcsnset( + _Inout_updates_z_(_MaxCount) wchar_t *_Str, + _In_ wchar_t _Val, + _In_ size_t _MaxCount); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsrev) + wchar_t* + __cdecl + wcsrev( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsset) + wchar_t* + __cdecl + wcsset( + _Inout_z_ wchar_t *_Str, + wchar_t _Val); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcslwr) + wchar_t* + __cdecl + wcslwr( + _Inout_z_ wchar_t *_Str); + + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsupr) + wchar_t* + __cdecl + wcsupr( + _Inout_z_ wchar_t *_Str); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_wcsicoll) + int + __cdecl + wcsicoll( + _In_z_ const wchar_t *_Str1, + _In_z_ const wchar_t *_Str2); + +#endif /* NO_OLDNAMES */ #endif /* !_WSTRING_DEFINED */

11 years, 9 months

[akhaldi] 58438: [CMAKE] * Add "/nologo" to the MSVC resource compilation rule. Brought to you by Yu Pan (binsys {at} 163 dot com). CORE-6997 #resolve #comment Committed in r58438.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 7 16:22:49 2013 New Revision: 58438 URL: http://svn.reactos.org/svn/reactos?rev=58438&view=rev Log: [CMAKE] * Add "/nologo" to the MSVC resource compilation rule. Brought to you by Yu Pan (binsys {at} 163 dot com). CORE-6997 #resolve #comment Committed in r58438. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=58438… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu Mar 7 16:22:49 2013 @@ -57,7 +57,7 @@ # for VS builds we'll only have en-US in resource files add_definitions(/DLANGUAGE_EN_US) else() - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") set(CMAKE_ASM_COMPILE_OBJECT "cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")

11 years, 9 months

[tkreuzer] 58437: [WIN32K] Use _SEH2_YIELD to return from except block. Thanks Hermes.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 5 20:03:30 2013 New Revision: 58437 URL: http://svn.reactos.org/svn/reactos?rev=58437&view=rev Log: [WIN32K] Use _SEH2_YIELD to return from except block. Thanks Hermes. Modified: trunk/reactos/win32ss/gdi/ntgdi/text.c Modified: trunk/reactos/win32ss/gdi/ntgdi/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] Tue Mar 5 20:03:30 2013 @@ -539,7 +539,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - return FALSE; + _SEH2_YIELD(return FALSE); } _SEH2_END

11 years, 9 months

[gadamopoulos] 58436: [win32k] - Initialize NewPos before using it in co_WinPosShowWindow

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Mar 5 13:39:04 2013 New Revision: 58436 URL: http://svn.reactos.org/svn/reactos?rev=58436&view=rev Log: [win32k] - Initialize NewPos before using it in co_WinPosShowWindow Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Tue Mar 5 13:39:04 2013 @@ -2023,7 +2023,7 @@ { BOOLEAN WasVisible; UINT Swp = 0, EventMsg = 0; - RECTL NewPos; + RECTL NewPos = {0, 0, 0, 0}; BOOLEAN ShowFlag; LONG style; PWND Parent;

11 years, 9 months

[akhaldi] 58435: [CRT] * Annotate ctype.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 5 11:27:06 2013 New Revision: 58435 URL: http://svn.reactos.org/svn/reactos?rev=58435&view=rev Log: [CRT] * Annotate ctype.h. Modified: trunk/reactos/include/crt/ctype.h Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=58… ============================================================================== --- trunk/reactos/include/crt/ctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/ctype.h [iso-8859-1] Tue Mar 5 11:27:06 2013 @@ -77,88 +77,546 @@ #ifndef _CTYPE_DEFINED #define _CTYPE_DEFINED - _CRTIMP int __cdecl _isctype(int _C,int _Type); - _CRTIMP int __cdecl _isctype_l(int _C,int _Type,_locale_t _Locale); - _CRTIMP int __cdecl isalpha(int _C); - _CRTIMP int __cdecl _isalpha_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl isupper(int _C); - _CRTIMP int __cdecl _isupper_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl islower(int _C); - _CRTIMP int __cdecl _islower_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl isdigit(int _C); - _CRTIMP int __cdecl _isdigit_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl isxdigit(int _C); - _CRTIMP int __cdecl _isxdigit_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl isspace(int _C); - _CRTIMP int __cdecl _isspace_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl ispunct(int _C); - _CRTIMP int __cdecl _ispunct_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl isalnum(int _C); - _CRTIMP int __cdecl _isalnum_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl isprint(int _C); - _CRTIMP int __cdecl _isprint_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl isgraph(int _C); - _CRTIMP int __cdecl _isgraph_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl iscntrl(int _C); - _CRTIMP int __cdecl _iscntrl_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl toupper(int _C); - _CRTIMP int __cdecl tolower(int _C); - _CRTIMP int __cdecl _tolower(int _C); - _CRTIMP int __cdecl _tolower_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl _toupper(int _C); - _CRTIMP int __cdecl _toupper_l(int _C,_locale_t _Locale); - _CRTIMP int __cdecl __isascii(int _C); - _CRTIMP int __cdecl __toascii(int _C); - _CRTIMP int __cdecl __iscsymf(int _C); - _CRTIMP int __cdecl __iscsym(int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _isctype( + _In_ int _C, + _In_ int _Type); + + _Check_return_ + _CRTIMP + int + __cdecl + _isctype_l( + _In_ int _C, + _In_ int _Type, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + isalpha( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _isalpha_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + isupper( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _isupper_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + islower( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _islower_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + isdigit( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _isdigit_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + isxdigit( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _isxdigit_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + isspace( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _isspace_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + ispunct( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _ispunct_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + isalnum( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _isalnum_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + isprint( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _isprint_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + isgraph( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _isgraph_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iscntrl( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iscntrl_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + toupper( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + tolower( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _tolower( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _tolower_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _toupper( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _toupper_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + __isascii( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + __toascii( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + __iscsymf( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + __iscsym( + _In_ int _C); + #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) int __cdecl isblank(int _C); #endif + #endif /* !_CTYPE_DEFINED */ #ifndef _WCTYPE_DEFINED #define _WCTYPE_DEFINED - _CRTIMP int __cdecl iswalpha(wint_t _C); - _CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswupper(wint_t _C); - _CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswlower(wint_t _C); - _CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswdigit(wint_t _C); - _CRTIMP int __cdecl _iswdigit_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswxdigit(wint_t _C); - _CRTIMP int __cdecl _iswxdigit_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswspace(wint_t _C); - _CRTIMP int __cdecl _iswspace_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswpunct(wint_t _C); - _CRTIMP int __cdecl _iswpunct_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswalnum(wint_t _C); - _CRTIMP int __cdecl _iswalnum_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswprint(wint_t _C); - _CRTIMP int __cdecl _iswprint_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswgraph(wint_t _C); - _CRTIMP int __cdecl _iswgraph_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswcntrl(wint_t _C); - _CRTIMP int __cdecl _iswcntrl_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswascii(wint_t _C); - _CRTIMP int __cdecl isleadbyte(int _C); - _CRTIMP int __cdecl _isleadbyte_l(int _C,_locale_t _Locale); - _CRTIMP wint_t __cdecl towupper(wint_t _C); - _CRTIMP wint_t __cdecl _towupper_l(wint_t _C,_locale_t _Locale); - _CRTIMP wint_t __cdecl towlower(wint_t _C); - _CRTIMP wint_t __cdecl _towlower_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl iswctype(wint_t _C,wctype_t _Type); - _CRTIMP int __cdecl _iswctype_l(wint_t _C,wctype_t _Type,_locale_t _Locale); - _CRTIMP int __cdecl __iswcsymf(wint_t _C); - _CRTIMP int __cdecl _iswcsymf_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl __iswcsym(wint_t _C); - _CRTIMP int __cdecl _iswcsym_l(wint_t _C,_locale_t _Locale); - _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type); + + _Check_return_ + _CRTIMP + int + __cdecl + iswalpha( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswalpha_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswupper( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswupper_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswlower( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswlower_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswdigit( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswdigit_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswxdigit( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswxdigit_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswspace( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswspace_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswpunct( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswpunct_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswalnum( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswalnum_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswprint( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswprint_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswgraph( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswgraph_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswcntrl( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswcntrl_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswascii( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + isleadbyte( + _In_ int _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _isleadbyte_l( + _In_ int _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + towupper( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + _towupper_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + towlower( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + wint_t + __cdecl + _towlower_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + iswctype( + _In_ wint_t _C, + _In_ wctype_t _Type); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswctype_l( + _In_ wint_t _C, + _In_ wctype_t _Type, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + __iswcsymf( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswcsymf_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + __iswcsym( + _In_ wint_t _C); + + _Check_return_ + _CRTIMP + int + __cdecl + _iswcsym_l( + _In_ wint_t _C, + _In_opt_ _locale_t _Locale); + + _CRTIMP + int + __cdecl + is_wctype( + _In_ wint_t _C, + _In_ wctype_t _Type); #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) int __cdecl iswblank(wint_t _C); #endif -#endif + +#endif /* _WCTYPE_DEFINED */ #ifndef _CTYPE_DISABLE_MACROS @@ -240,18 +698,55 @@ #endif #ifndef NO_OLDNAMES + #ifndef _CTYPE_DEFINED - _CRTIMP _CRT_NONSTDC_DEPRECATE(__isascii) _CRTIMP int __cdecl isascii(int _C); - _CRTIMP _CRT_NONSTDC_DEPRECATE(__toascii) _CRTIMP int __cdecl toascii(int _C); - _CRTIMP _CRT_NONSTDC_DEPRECATE(__iscsymf) _CRTIMP int __cdecl iscsymf(int _C); - _CRTIMP _CRT_NONSTDC_DEPRECATE(__iscsym) _CRTIMP int __cdecl iscsym(int _C); -#else + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(__isascii) + _CRTIMP + int + __cdecl + isascii( + _In_ int _C); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(__toascii) + _CRTIMP + int + __cdecl + toascii( + _In_ int _C); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(__iscsymf) + _CRTIMP + int + __cdecl + iscsymf( + _In_ int _C); + + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(__iscsym) + _CRTIMP + int + __cdecl + iscsym( + _In_ int _C); + +#else /* _CTYPE_DEFINED */ + #define isascii __isascii #define toascii __toascii #define iscsymf __iscsymf #define iscsym __iscsym -#endif -#endif + +#endif /* _CTYPE_DEFINED */ + +#endif /* NO_OLDNAMES */ #ifdef __cplusplus }

11 years, 9 months

[tkreuzer] 58434: [WIN32K] - Fix a bug in EngLoadModuleEx - Fix a bug in co_IntLoadSysMenuTemplate - Fix / improve a number of annotations - Improve code in NtGdiExtGetObjectW - Check return value ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 5 08:47:51 2013 New Revision: 58434 URL: http://svn.reactos.org/svn/reactos?rev=58434&view=rev Log: [WIN32K] - Fix a bug in EngLoadModuleEx - Fix a bug in co_IntLoadSysMenuTemplate - Fix / improve a number of annotations - Improve code in NtGdiExtGetObjectW - Check return value of ZwAllocateVirtualMemory and handle error in GdiPoolAllocate - Fix possible memory leaks in NtGdiPolyDraw - Check for NtGdiExtCreatePen == NULL instead of passing it to ProbeForRead in NtGdiExtCreatePen - Simplify code in NtGdiGetTextMetricsW - Fix a number of format specifiers Modified: trunk/reactos/include/psdk/ntgdi.h trunk/reactos/win32ss/gdi/eng/bitblt.c trunk/reactos/win32ss/gdi/eng/engevent.c trunk/reactos/win32ss/gdi/eng/float.c trunk/reactos/win32ss/gdi/eng/mapping.c trunk/reactos/win32ss/gdi/eng/surface.c trunk/reactos/win32ss/gdi/eng/xlateobj.c trunk/reactos/win32ss/gdi/eng/xlateobj.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdipool.c trunk/reactos/win32ss/gdi/ntgdi/line.c trunk/reactos/win32ss/gdi/ntgdi/pen.c trunk/reactos/win32ss/gdi/ntgdi/text.c trunk/reactos/win32ss/reactx/ntddraw/dxeng.c trunk/reactos/win32ss/user/ntuser/callback.c Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -1169,6 +1169,7 @@ NtGdiGetColorSpaceforBitmap( _In_ HBITMAP hsurf); +_Success_(return != FALSE) W32KAPI BOOL APIENTRY @@ -2253,6 +2254,7 @@ _Out_ LPSIZE psize, _In_ UINT flOpts); +_Success_(return != FALSE) W32KAPI BOOL APIENTRY @@ -2372,6 +2374,7 @@ _In_ INT y, _Out_opt_ LPPOINT pptOut); +_Success_(return != 0) W32KAPI INT APIENTRY Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -305,10 +305,10 @@ _In_opt_ CLIPOBJ *pco, _In_opt_ XLATEOBJ *pxlo, _In_ RECTL *prclTrg, - _When_(psoSrc, _In_) POINTL *pptlSrc, - _When_(psoMask, _In_) POINTL *pptlMask, + _In_opt_ POINTL *pptlSrc, + _In_opt_ POINTL *pptlMask, _In_opt_ BRUSHOBJ *pbo, - _When_(pbo, _In_) POINTL *pptlBrush, + _In_opt_ POINTL *pptlBrush, _In_ ROP4 rop4) { BYTE clippingType; Modified: trunk/reactos/win32ss/gdi/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engevent.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engevent.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engevent.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -15,10 +15,12 @@ /* PUBLIC FUNCTIONS ***********************************************************/ +_Must_inspect_result_ +_Success_(return != FALSE) BOOL APIENTRY EngCreateEvent( - _Deref_out_opt_ PEVENT* Event) + _Outptr_ PEVENT *ppEvent) { BOOLEAN Result = TRUE; PENG_EVENT EngEvent; @@ -39,7 +41,7 @@ FALSE); /* Pass pointer to our structure to the caller */ - *Event = EngEvent; + *ppEvent = EngEvent; DPRINT("EngCreateEvent() created %p\n", EngEvent); } else Modified: trunk/reactos/win32ss/gdi/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/float.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/float.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/float.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -18,7 +18,7 @@ BOOL APIENTRY EngRestoreFloatingPointState( - _In_ VOID *Buffer) + PVOID Buffer) { NTSTATUS Status; @@ -34,7 +34,7 @@ ULONG APIENTRY EngSaveFloatingPointState( - VOID *Buffer, + PVOID Buffer, ULONG BufferSize) { KFLOATING_SAVE TempBuffer; Modified: trunk/reactos/win32ss/gdi/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mapping.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mapping.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mapping.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -393,7 +393,7 @@ Status = MmCreateSection(&pFileView->pSection, SECTION_ALL_ACCESS, NULL, - cjSizeOfModule ? &liSize : NULL, + &liSize, fl & FVF_READONLY ? PAGE_EXECUTE_READ : PAGE_EXECUTE_READWRITE, SEC_COMMIT, hFile, Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -279,7 +279,7 @@ _In_ LONG lWidth, _In_ ULONG iFormat, _In_ ULONG fl, - _In_ PVOID pvBits) + _In_opt_ PVOID pvBits) { PSURFACE psurf; HBITMAP hbmp; @@ -479,7 +479,7 @@ BOOL APIENTRY EngDeleteSurface( - _In_ HSURF hsurf) + _In_ _Post_ptr_invalid_ HSURF hsurf) { PSURFACE psurf; @@ -537,7 +537,7 @@ VOID APIENTRY EngUnlockSurface( - _In_ SURFOBJ *pso) + _In_ _Post_ptr_invalid_ SURFOBJ *pso) { if (pso != NULL) { Modified: trunk/reactos/win32ss/gdi/eng/xlateobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/xlateobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/xlateobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/xlateobj.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -11,7 +11,7 @@ #define NDEBUG #include <debug.h> -_Always_(_Post_satisfies_(return==iColor)) +_Post_satisfies_(return==iColor) _Function_class_(FN_XLATE) ULONG FASTCALL @@ -38,7 +38,7 @@ /** iXlate functions **********************************************************/ -_Always_(_Post_satisfies_(return==iColor)) +_Post_satisfies_(return==iColor) _Function_class_(FN_XLATE) ULONG FASTCALL Modified: trunk/reactos/win32ss/gdi/eng/xlateobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/xlateobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/xlateobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/xlateobj.h [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -58,8 +58,8 @@ NTAPI EXLATEOBJ_vInitialize( _Out_ PEXLATEOBJ pexlo, - _In_ PPALETTE ppalSrc, - _In_ PPALETTE ppalDst, + _In_opt_ PPALETTE ppalSrc, + _In_opt_ PPALETTE ppalDst, _In_ COLORREF crSrcBackColor, _In_ COLORREF crDstBackColor, _In_ COLORREF crDstForeColor); Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -1066,11 +1066,10 @@ APIENTRY NtGdiExtGetObjectW( IN HANDLE hobj, - IN INT cbCount, + IN INT cjBufferSize, OUT LPVOID lpBuffer) { - INT iRetCount = 0; - INT cbCopyCount; + UINT iResult, cjMaxSize; union { BITMAP bitmap; @@ -1083,33 +1082,33 @@ } object; /* Normalize to the largest supported object size */ - cbCount = min((UINT)cbCount, sizeof(object)); + cjMaxSize = min((UINT)cjBufferSize, sizeof(object)); /* Now do the actual call */ - iRetCount = GreGetObject(hobj, cbCount, lpBuffer ? &object : NULL); - cbCopyCount = min((UINT)cbCount, (UINT)iRetCount); - - /* Make sure we have a buffer and a copy size */ - if ((cbCopyCount) && (lpBuffer)) + iResult = GreGetObject(hobj, cjMaxSize, lpBuffer ? &object : NULL); + + /* Check if we have a buffer and data */ + if ((lpBuffer != NULL) && (iResult != 0)) { /* Enter SEH for buffer transfer */ _SEH2_TRY { /* Probe the buffer and copy it */ - ProbeForWrite(lpBuffer, cbCopyCount, sizeof(WORD)); - RtlCopyMemory(lpBuffer, &object, cbCopyCount); + cjMaxSize = min(cjMaxSize, iResult); + ProbeForWrite(lpBuffer, cjMaxSize, sizeof(WORD)); + RtlCopyMemory(lpBuffer, &object, cjMaxSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Clear the return value. * Do *NOT* set last error here! */ - iRetCount = 0; + iResult = 0; } _SEH2_END; } /* Return the count */ - return iRetCount; + return iResult; } W32KAPI Modified: trunk/reactos/win32ss/gdi/ntgdi/gdipool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdipool.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdipool.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdipool.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -127,6 +127,7 @@ PLIST_ENTRY ple; PVOID pvAlloc, pvBaseAddress; SIZE_T cjSize; + NTSTATUS status; /* Disable APCs and acquire the pool lock */ KeEnterCriticalRegion(); @@ -191,12 +192,17 @@ /* Commit the pages */ pvBaseAddress = PAGE_ALIGN(pvAlloc); cjSize = ADDRESS_AND_SIZE_TO_SPAN_PAGES(pvAlloc, pPool->cjAllocSize) * PAGE_SIZE; - ZwAllocateVirtualMemory(NtCurrentProcess(), - &pvBaseAddress, - 0, - &cjSize, - MEM_COMMIT, - PAGE_READWRITE); + status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &pvBaseAddress, + 0, + &cjSize, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(status)) + { + pvAlloc = NULL; + goto done; + } pSection->ulCommitBitmap |= ulPageBit; } Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -420,7 +420,8 @@ { PDC dc; PDC_ATTR pdcattr; - POINT *line_pts = NULL, *line_pts_old, *bzr_pts = NULL, bzr[4]; + POINT bzr[4]; + volatile PPOINT line_pts, line_pts_old, bzr_pts; INT num_pts, num_bzr_pts, space, space_old, size; ULONG i; BOOL result = FALSE; @@ -440,6 +441,10 @@ DC_UnlockDc(dc); return TRUE; } + + line_pts = NULL; + line_pts_old = NULL; + bzr_pts = NULL; _SEH2_TRY { @@ -475,6 +480,12 @@ space = cCount + 300; line_pts = ExAllocatePoolWithTag(PagedPool, space * sizeof(POINT), TAG_SHAPE); + if (line_pts == NULL) + { + result = FALSE; + _SEH2_LEAVE; + } + num_pts = 1; line_pts[0].x = pdcattr->ptlCurrent.x; @@ -510,10 +521,12 @@ if (!line_pts) _SEH2_LEAVE; RtlCopyMemory(line_pts, line_pts_old, space_old * sizeof(POINT)); ExFreePoolWithTag(line_pts_old, TAG_SHAPE); + line_pts_old = NULL; } RtlCopyMemory( &line_pts[num_pts], &bzr_pts[1], (num_bzr_pts - 1) * sizeof(POINT) ); num_pts += num_bzr_pts - 1; ExFreePoolWithTag(bzr_pts, TAG_BEZIER); + bzr_pts = NULL; } i += 2; break; @@ -523,14 +536,28 @@ if (num_pts >= 2) IntGdiPolyline( dc, line_pts, num_pts ); IntGdiMoveToEx( dc, line_pts[num_pts - 1].x, line_pts[num_pts - 1].y, NULL, TRUE ); + result = TRUE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + } + _SEH2_END; + + if (line_pts != NULL) + { ExFreePoolWithTag(line_pts, TAG_SHAPE); - result = TRUE; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - } - _SEH2_END; + } + + if ((line_pts_old != NULL) && (line_pts_old != line_pts)) + { + ExFreePoolWithTag(line_pts_old, TAG_SHAPE); + } + + if (bzr_pts != NULL) + { + ExFreePoolWithTag(bzr_pts, TAG_BEZIER); + } DC_UnlockDc(dc); Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -312,6 +312,12 @@ if (dwStyleCount > 0) { + if (pUnsafeStyle == NULL) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + pSafeStyle = ExAllocatePoolWithTag(NonPagedPool, dwStyleCount * sizeof(DWORD), GDITAG_PENSTYLE); Modified: trunk/reactos/win32ss/gdi/ntgdi/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -523,11 +523,9 @@ NtGdiGetTextMetricsW( IN HDC hDC, OUT TMW_INTERNAL * pUnsafeTmwi, - IN ULONG cj -) + IN ULONG cj) { TMW_INTERNAL Tmwi; - NTSTATUS Status = STATUS_SUCCESS; if ( cj <= sizeof(TMW_INTERNAL) ) { @@ -540,15 +538,11 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + SetLastNtError(_SEH2_GetExceptionCode()); + return FALSE; } _SEH2_END - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } return TRUE; } } Modified: trunk/reactos/win32ss/reactx/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/dxe… ============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/ntddraw/dxeng.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -286,7 +286,7 @@ DPRINT1("ReactX Calling : DxEngGetHdevData DXEGSHDEVDATA : %ld\n", Type); #if 1 - DPRINT1("HDEV hDev %08lx\n", hDev); + DPRINT1("HDEV hDev %p\n", hDev); #endif switch ( Type ) @@ -454,7 +454,7 @@ PDC pDC = DC_LockDc(hDC); DWORD_PTR retVal = 0; - DPRINT1("ReactX Calling : DxEngGetDCState type : %ld\n", type); + DPRINT1("ReactX Calling : DxEngGetDCState type : %lu\n", type); if (pDC) { @@ -474,7 +474,7 @@ } default: /* If a valid type is not found, zero is returned */ - DPRINT1("Warning: did not find type %d\n",type); + DPRINT1("Warning: did not find type %lu\n", type); break; } DC_UnlockDc(pDC); @@ -531,7 +531,7 @@ DPRINT1("ReactX Calling : DxEngLockHdev \n"); - DPRINT1("hDev : 0x%08lx\n",hDev); + DPRINT1("hDev : 0x%p\n",hDev); Resource = (PERESOURCE)ppdev->hsemDevLock; Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Tue Mar 5 08:47:51 2013 @@ -382,7 +382,7 @@ UserLeaveCo(); Status = KeUserModeCallback(USER32_CALLBACK_LOADSYSMENUTEMPLATE, - NULL, + &ResultPointer, 0, &ResultPointer, &ResultLength);

11 years, 9 months

[tkreuzer] 58433: [RTL] Formatting, no code change.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 5 08:38:18 2013 New Revision: 58433 URL: http://svn.reactos.org/svn/reactos?rev=58433&view=rev Log: [RTL] Formatting, no code change. Modified: trunk/reactos/lib/rtl/atom.c Modified: trunk/reactos/lib/rtl/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/atom.c?rev=58433&r… ============================================================================== --- trunk/reactos/lib/rtl/atom.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/atom.c [iso-8859-1] Tue Mar 5 08:38:18 2013 @@ -33,23 +33,24 @@ /* FUNCTIONS *****************************************************************/ -static PRTL_ATOM_TABLE_ENTRY -RtlpHashAtomName(IN PRTL_ATOM_TABLE AtomTable, - IN PWSTR AtomName, - OUT PRTL_ATOM_TABLE_ENTRY **HashLink) -{ - UNICODE_STRING Name; - ULONG Hash; - - RtlInitUnicodeString(&Name, - AtomName); - - if (Name.Length != 0 && - NT_SUCCESS(RtlHashUnicodeString(&Name, - TRUE, - HASH_STRING_ALGORITHM_X65599, - &Hash))) - { +static +PRTL_ATOM_TABLE_ENTRY +RtlpHashAtomName( + IN PRTL_ATOM_TABLE AtomTable, + IN PWSTR AtomName, + OUT PRTL_ATOM_TABLE_ENTRY **HashLink) +{ + UNICODE_STRING Name; + ULONG Hash; + + RtlInitUnicodeString(&Name, AtomName); + + if (Name.Length != 0 && + NT_SUCCESS(RtlHashUnicodeString(&Name, + TRUE, + HASH_STRING_ALGORITHM_X65599, + &Hash))) + { PRTL_ATOM_TABLE_ENTRY Current; PRTL_ATOM_TABLE_ENTRY *Link; @@ -58,237 +59,244 @@ /* search for an existing entry */ Current = *Link; while (Current != NULL) - { - if (Current->NameLength == Name.Length / sizeof(WCHAR) && - !_wcsicmp(Current->Name, Name.Buffer)) - { - *HashLink = Link; - return Current; - } - Link = &Current->HashLink; - Current = Current->HashLink; - } + { + if (Current->NameLength == Name.Length / sizeof(WCHAR) && + !_wcsicmp(Current->Name, Name.Buffer)) + { + *HashLink = Link; + return Current; + } + + Link = &Current->HashLink; + Current = Current->HashLink; + } /* no matching atom found, return the hash link */ *HashLink = Link; - } - else - *HashLink = NULL; - - return NULL; -} - -static BOOLEAN -RtlpCheckIntegerAtom(PWSTR AtomName, - PUSHORT AtomValue) -{ - UNICODE_STRING AtomString; - ULONG LongValue; - USHORT LoValue; - PWCHAR p; - - DPRINT("RtlpCheckIntegerAtom(AtomName '%S' AtomValue %p)\n", - AtomName, AtomValue); - - if (!((ULONG_PTR)AtomName & 0xFFFF0000)) - { + } + else + *HashLink = NULL; + + return NULL; +} + +static +BOOLEAN +RtlpCheckIntegerAtom( + PWSTR AtomName, + PUSHORT AtomValue) +{ + UNICODE_STRING AtomString; + ULONG LongValue; + USHORT LoValue; + PWCHAR p; + + DPRINT("RtlpCheckIntegerAtom(AtomName '%S' AtomValue %p)\n", + AtomName, AtomValue); + + if (!((ULONG_PTR)AtomName & 0xFFFF0000)) + { LoValue = (USHORT)((ULONG_PTR)AtomName & 0xFFFF); if (LoValue == 0) - LoValue = 0xC000; + LoValue = 0xC000; if (AtomValue != NULL) - *AtomValue = LoValue; + *AtomValue = LoValue; return TRUE; - } - - /* - * AtomName cannot be NULL because this - * case was caught by the previous test. - */ - ASSERT(AtomName != NULL); - - if (*AtomName != L'#') - return FALSE; - - p = AtomName; - p++; - while (*p) - { + } + + /* + * AtomName cannot be NULL because this + * case was caught by the previous test. + */ + ASSERT(AtomName != NULL); + + if (*AtomName != L'#') + return FALSE; + + p = AtomName; + p++; + while (*p) + { if ((*p < L'0') || (*p > L'9')) - return FALSE; + return FALSE; p++; - } - - p = AtomName; - p++; - RtlInitUnicodeString(&AtomString, - p); - - DPRINT("AtomString: %wZ\n", &AtomString); - - RtlUnicodeStringToInteger(&AtomString,10, &LongValue); - - DPRINT("LongValue: %lu\n", LongValue); - - *AtomValue = (USHORT)(LongValue & 0x0000FFFF); - - return TRUE; + } + + p = AtomName; + p++; + RtlInitUnicodeString(&AtomString, p); + + DPRINT("AtomString: %wZ\n", &AtomString); + + RtlUnicodeStringToInteger(&AtomString, 10, &LongValue); + + DPRINT("LongValue: %lu\n", LongValue); + + *AtomValue = (USHORT)(LongValue & 0x0000FFFF); + + return TRUE; } /* * @implemented */ -NTSTATUS NTAPI -RtlCreateAtomTable(IN ULONG TableSize, - IN OUT PRTL_ATOM_TABLE *AtomTable) -{ - PRTL_ATOM_TABLE Table; - NTSTATUS Status; - - DPRINT("RtlCreateAtomTable(TableSize %lu AtomTable %p)\n", - TableSize, AtomTable); - - if (*AtomTable != NULL) - { +NTSTATUS +NTAPI +RtlCreateAtomTable( + IN ULONG TableSize, + IN OUT PRTL_ATOM_TABLE *AtomTable) +{ + PRTL_ATOM_TABLE Table; + NTSTATUS Status; + + DPRINT("RtlCreateAtomTable(TableSize %lu AtomTable %p)\n", + TableSize, AtomTable); + + if (*AtomTable != NULL) + { return STATUS_SUCCESS; - } - - /* Use default if size was incorrect */ - if (TableSize <= 1) TableSize = 37; - - /* allocate atom table */ - Table = RtlpAllocAtomTable(((TableSize - 1) * sizeof(PRTL_ATOM_TABLE_ENTRY)) + - sizeof(RTL_ATOM_TABLE)); - if (Table == NULL) - { + } + + /* Use default if size was incorrect */ + if (TableSize <= 1) TableSize = 37; + + /* allocate atom table */ + Table = RtlpAllocAtomTable(((TableSize - 1) * sizeof(PRTL_ATOM_TABLE_ENTRY)) + + sizeof(RTL_ATOM_TABLE)); + if (Table == NULL) + { return STATUS_NO_MEMORY; - } - - /* initialize atom table */ - Table->NumberOfBuckets = TableSize; - - Status = RtlpInitAtomTableLock(Table); - if (!NT_SUCCESS(Status)) - { + } + + /* initialize atom table */ + Table->NumberOfBuckets = TableSize; + + Status = RtlpInitAtomTableLock(Table); + if (!NT_SUCCESS(Status)) + { RtlpFreeAtomTable(Table); return Status; - } - - if (!RtlpCreateAtomHandleTable(Table)) - { + } + + if (!RtlpCreateAtomHandleTable(Table)) + { RtlpDestroyAtomTableLock(Table); RtlpFreeAtomTable(Table); return STATUS_NO_MEMORY; - } - - *AtomTable = Table; - return STATUS_SUCCESS; + } + + *AtomTable = Table; + return STATUS_SUCCESS; } /* * @implemented */ -NTSTATUS NTAPI -RtlDestroyAtomTable(IN PRTL_ATOM_TABLE AtomTable) -{ - PRTL_ATOM_TABLE_ENTRY *CurrentBucket, *LastBucket; - PRTL_ATOM_TABLE_ENTRY CurrentEntry, NextEntry; - - DPRINT("RtlDestroyAtomTable (AtomTable %p)\n", AtomTable); - - if (!RtlpLockAtomTable(AtomTable)) - { +NTSTATUS +NTAPI +RtlDestroyAtomTable( + IN PRTL_ATOM_TABLE AtomTable) +{ + PRTL_ATOM_TABLE_ENTRY *CurrentBucket, *LastBucket; + PRTL_ATOM_TABLE_ENTRY CurrentEntry, NextEntry; + + DPRINT("RtlDestroyAtomTable (AtomTable %p)\n", AtomTable); + + if (!RtlpLockAtomTable(AtomTable)) + { return (STATUS_INVALID_PARAMETER); - } - - /* delete all atoms */ - LastBucket = AtomTable->Buckets + AtomTable->NumberOfBuckets; - for (CurrentBucket = AtomTable->Buckets; - CurrentBucket != LastBucket; - CurrentBucket++) - { + } + + /* delete all atoms */ + LastBucket = AtomTable->Buckets + AtomTable->NumberOfBuckets; + for (CurrentBucket = AtomTable->Buckets; + CurrentBucket != LastBucket; + CurrentBucket++) + { NextEntry = *CurrentBucket; *CurrentBucket = NULL; while (NextEntry != NULL) - { - CurrentEntry = NextEntry; - NextEntry = NextEntry->HashLink; - - /* no need to delete the atom handle, the handles will all be freed - up when destroying the atom handle table! */ - - RtlpFreeAtomTableEntry(CurrentEntry); - } - } - - RtlpDestroyAtomHandleTable(AtomTable); - - RtlpUnlockAtomTable(AtomTable); - - RtlpDestroyAtomTableLock(AtomTable); - - RtlpFreeAtomTable(AtomTable); - - return STATUS_SUCCESS; + { + CurrentEntry = NextEntry; + NextEntry = NextEntry->HashLink; + + /* no need to delete the atom handle, the handles will all be freed + up when destroying the atom handle table! */ + + RtlpFreeAtomTableEntry(CurrentEntry); + } + } + + RtlpDestroyAtomHandleTable(AtomTable); + + RtlpUnlockAtomTable(AtomTable); + + RtlpDestroyAtomTableLock(AtomTable); + + RtlpFreeAtomTable(AtomTable); + + return STATUS_SUCCESS; } /* * @implemented */ -NTSTATUS NTAPI -RtlEmptyAtomTable(PRTL_ATOM_TABLE AtomTable, - BOOLEAN DeletePinned) -{ - PRTL_ATOM_TABLE_ENTRY *CurrentBucket, *LastBucket; - PRTL_ATOM_TABLE_ENTRY CurrentEntry, NextEntry, *PtrEntry; - - DPRINT("RtlEmptyAtomTable (AtomTable %p DeletePinned %x)\n", - AtomTable, DeletePinned); - - if (RtlpLockAtomTable(AtomTable) == FALSE) - { +NTSTATUS +NTAPI +RtlEmptyAtomTable( + PRTL_ATOM_TABLE AtomTable, + BOOLEAN DeletePinned) +{ + PRTL_ATOM_TABLE_ENTRY *CurrentBucket, *LastBucket; + PRTL_ATOM_TABLE_ENTRY CurrentEntry, NextEntry, *PtrEntry; + + DPRINT("RtlEmptyAtomTable (AtomTable %p DeletePinned %x)\n", + AtomTable, DeletePinned); + + if (RtlpLockAtomTable(AtomTable) == FALSE) + { return (STATUS_INVALID_PARAMETER); - } - - /* delete all atoms */ - LastBucket = AtomTable->Buckets + AtomTable->NumberOfBuckets; - for (CurrentBucket = AtomTable->Buckets; - CurrentBucket != LastBucket; - CurrentBucket++) - { + } + + /* delete all atoms */ + LastBucket = AtomTable->Buckets + AtomTable->NumberOfBuckets; + for (CurrentBucket = AtomTable->Buckets; + CurrentBucket != LastBucket; + CurrentBucket++) + { NextEntry = *CurrentBucket; PtrEntry = CurrentBucket; while (NextEntry != NULL) - { - CurrentEntry = NextEntry; - NextEntry = NextEntry->HashLink; - - if (DeletePinned || !(CurrentEntry->Flags & RTL_ATOM_IS_PINNED)) - { - *PtrEntry = NextEntry; - - RtlpFreeAtomHandle(AtomTable, - CurrentEntry); - - RtlpFreeAtomTableEntry(CurrentEntry); - } - else - { - PtrEntry = &CurrentEntry->HashLink; - } - } - } - - RtlpUnlockAtomTable(AtomTable); - - return STATUS_SUCCESS; + { + CurrentEntry = NextEntry; + NextEntry = NextEntry->HashLink; + + if (DeletePinned || !(CurrentEntry->Flags & RTL_ATOM_IS_PINNED)) + { + *PtrEntry = NextEntry; + + RtlpFreeAtomHandle(AtomTable, CurrentEntry); + + RtlpFreeAtomTableEntry(CurrentEntry); + } + else + { + PtrEntry = &CurrentEntry->HashLink; + } + } + } + + RtlpUnlockAtomTable(AtomTable); + + return STATUS_SUCCESS; } @@ -300,187 +308,182 @@ IN PWSTR AtomName, OUT PRTL_ATOM Atom) { - USHORT AtomValue; - PRTL_ATOM_TABLE_ENTRY *HashLink; - PRTL_ATOM_TABLE_ENTRY Entry = NULL; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("RtlAddAtomToAtomTable (AtomTable %p AtomName %S Atom %p)\n", - AtomTable, AtomName, Atom); - - if (RtlpCheckIntegerAtom (AtomName, &AtomValue)) - { + USHORT AtomValue; + PRTL_ATOM_TABLE_ENTRY *HashLink; + PRTL_ATOM_TABLE_ENTRY Entry = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("RtlAddAtomToAtomTable (AtomTable %p AtomName %S Atom %p)\n", + AtomTable, AtomName, Atom); + + if (RtlpCheckIntegerAtom (AtomName, &AtomValue)) + { /* integer atom */ if (AtomValue >= 0xC000) - { - Status = STATUS_INVALID_PARAMETER; - } + { + Status = STATUS_INVALID_PARAMETER; + } else if (Atom != NULL) - { - *Atom = (RTL_ATOM)AtomValue; - } + { + *Atom = (RTL_ATOM)AtomValue; + } return Status; - } - - RtlpLockAtomTable(AtomTable); - - /* string atom, hash it and try to find an existing atom with the same name */ - Entry = RtlpHashAtomName(AtomTable, - AtomName, - &HashLink); - - if (Entry != NULL) - { + } + + RtlpLockAtomTable(AtomTable); + + /* string atom, hash it and try to find an existing atom with the same name */ + Entry = RtlpHashAtomName(AtomTable, AtomName, &HashLink); + + if (Entry != NULL) + { /* found another atom, increment the reference counter unless it's pinned */ if (!(Entry->Flags & RTL_ATOM_IS_PINNED)) - { - if (++Entry->ReferenceCount == 0) - { - /* FIXME - references overflowed, pin the atom? */ - Entry->Flags |= RTL_ATOM_IS_PINNED; - } - } + { + if (++Entry->ReferenceCount == 0) + { + /* FIXME - references overflowed, pin the atom? */ + Entry->Flags |= RTL_ATOM_IS_PINNED; + } + } if (Atom != NULL) - { - *Atom = (RTL_ATOM)Entry->Atom; - } - } - else - { + { + *Atom = (RTL_ATOM)Entry->Atom; + } + } + else + { /* couldn't find an existing atom, HashLink now points to either the HashLink pointer of the previous atom or to the bucket so we can simply add it to the list */ if (HashLink != NULL) - { - ULONG AtomNameLen = (ULONG)wcslen(AtomName); - - if (AtomNameLen > RTL_MAXIMUM_ATOM_LENGTH) - { + { + ULONG AtomNameLen = (ULONG)wcslen(AtomName); + + if (AtomNameLen > RTL_MAXIMUM_ATOM_LENGTH) + { Status = STATUS_INVALID_PARAMETER; goto end; - } - - Entry = RtlpAllocAtomTableEntry(sizeof(RTL_ATOM_TABLE_ENTRY) - - sizeof(Entry->Name) + - (AtomNameLen + 1) * sizeof(WCHAR)); - if (Entry != NULL) - { - Entry->HashLink = NULL; - Entry->ReferenceCount = 1; - Entry->Flags = 0x0; - - Entry->NameLength = (UCHAR)AtomNameLen; - RtlCopyMemory(Entry->Name, - AtomName, - (AtomNameLen + 1) * sizeof(WCHAR)); - - if (RtlpCreateAtomHandle(AtomTable, - Entry)) + } + + Entry = RtlpAllocAtomTableEntry(sizeof(RTL_ATOM_TABLE_ENTRY) - + sizeof(Entry->Name) + + (AtomNameLen + 1) * sizeof(WCHAR)); + if (Entry != NULL) + { + Entry->HashLink = NULL; + Entry->ReferenceCount = 1; + Entry->Flags = 0x0; + + Entry->NameLength = (UCHAR)AtomNameLen; + RtlCopyMemory(Entry->Name, + AtomName, + (AtomNameLen + 1) * sizeof(WCHAR)); + + if (RtlpCreateAtomHandle(AtomTable, Entry)) + { + /* append the atom to the list */ + *HashLink = Entry; + + if (Atom != NULL) { - /* append the atom to the list */ - *HashLink = Entry; - - if (Atom != NULL) - { - *Atom = (RTL_ATOM)Entry->Atom; - } + *Atom = (RTL_ATOM)Entry->Atom; } - else + } + else + { + RtlpFreeAtomTableEntry(Entry); + Status = STATUS_NO_MEMORY; + } + } + else + { + Status = STATUS_NO_MEMORY; + } + } + else + { + /* The caller supplied an empty atom name! */ + Status = STATUS_OBJECT_NAME_INVALID; + } + } +end: + RtlpUnlockAtomTable(AtomTable); + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlDeleteAtomFromAtomTable( + IN PRTL_ATOM_TABLE AtomTable, + IN RTL_ATOM Atom) +{ + PRTL_ATOM_TABLE_ENTRY Entry; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("RtlDeleteAtomFromAtomTable (AtomTable %p Atom %x)\n", + AtomTable, Atom); + + if (Atom >= 0xC000) + { + RtlpLockAtomTable(AtomTable); + + Entry = RtlpGetAtomEntry(AtomTable, (ULONG)((USHORT)Atom - 0xC000)); + + if (Entry != NULL && Entry->Atom == (USHORT)Atom) + { + if (!(Entry->Flags & RTL_ATOM_IS_PINNED)) + { + if (--Entry->ReferenceCount == 0) + { + PRTL_ATOM_TABLE_ENTRY *HashLink; + + /* it's time to delete the atom. we need to unlink it from + the list. The easiest way is to take the atom name and + hash it again, this way we get the pointer to either + the hash bucket or the previous atom that links to the + one we want to delete. This way we can easily bypass + this item. */ + if (RtlpHashAtomName(AtomTable, Entry->Name, &HashLink) != NULL) { - RtlpFreeAtomTableEntry(Entry); - Status = STATUS_NO_MEMORY; + /* bypass this atom */ + *HashLink = Entry->HashLink; + + RtlpFreeAtomHandle(AtomTable, Entry); + + RtlpFreeAtomTableEntry(Entry); } - } - else - { - Status = STATUS_NO_MEMORY; - } - } + else + { + /* WTF?! This should never happen!!! */ + ASSERT(FALSE); + } + } + } + else + { + /* tried to delete a pinned atom, do nothing and return + STATUS_WAS_LOCKED, which is NOT a failure code! */ + Status = STATUS_WAS_LOCKED; + } + } else - { - /* The caller supplied an empty atom name! */ - Status = STATUS_OBJECT_NAME_INVALID; - } - } -end: - RtlpUnlockAtomTable(AtomTable); - - return Status; -} - - -/* - * @implemented - */ -NTSTATUS NTAPI -RtlDeleteAtomFromAtomTable(IN PRTL_ATOM_TABLE AtomTable, - IN RTL_ATOM Atom) -{ - PRTL_ATOM_TABLE_ENTRY Entry; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("RtlDeleteAtomFromAtomTable (AtomTable %p Atom %x)\n", - AtomTable, Atom); - - if (Atom >= 0xC000) - { - RtlpLockAtomTable(AtomTable); - - Entry = RtlpGetAtomEntry(AtomTable, - (ULONG)((USHORT)Atom - 0xC000)); - - if (Entry != NULL && Entry->Atom == (USHORT)Atom) - { - if (!(Entry->Flags & RTL_ATOM_IS_PINNED)) - { - if (--Entry->ReferenceCount == 0) - { - PRTL_ATOM_TABLE_ENTRY *HashLink; - - /* it's time to delete the atom. we need to unlink it from - the list. The easiest way is to take the atom name and - hash it again, this way we get the pointer to either - the hash bucket or the previous atom that links to the - one we want to delete. This way we can easily bypass - this item. */ - if (RtlpHashAtomName(AtomTable, - Entry->Name, - &HashLink) != NULL) - { - /* bypass this atom */ - *HashLink = Entry->HashLink; - - RtlpFreeAtomHandle(AtomTable, - Entry); - - RtlpFreeAtomTableEntry(Entry); - } - else - { - /* WTF?! This should never happen!!! */ - ASSERT(FALSE); - } - } - } - else - { - /* tried to delete a pinned atom, do nothing and return - STATUS_WAS_LOCKED, which is NOT a failure code! */ - Status = STATUS_WAS_LOCKED; - } - } - else - { - Status = STATUS_INVALID_HANDLE; - } + { + Status = STATUS_INVALID_HANDLE; + } RtlpUnlockAtomTable(AtomTable); - } - - return Status; + } + + return Status; } @@ -492,47 +495,46 @@ IN PWSTR AtomName, OUT PRTL_ATOM Atom) { - PRTL_ATOM_TABLE_ENTRY Entry, *HashLink; - USHORT AtomValue; - RTL_ATOM FoundAtom = 0; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("RtlLookupAtomInAtomTable (AtomTable %p AtomName %S Atom %p)\n", - AtomTable, AtomName, Atom); - - if (RtlpCheckIntegerAtom (AtomName, &AtomValue)) - { + PRTL_ATOM_TABLE_ENTRY Entry, *HashLink; + USHORT AtomValue; + RTL_ATOM FoundAtom = 0; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("RtlLookupAtomInAtomTable (AtomTable %p AtomName %S Atom %p)\n", + AtomTable, AtomName, Atom); + + if (RtlpCheckIntegerAtom (AtomName, &AtomValue)) + { /* integer atom */ if (AtomValue >= 0xC000) - { - Status = STATUS_INVALID_PARAMETER; - } + { + Status = STATUS_INVALID_PARAMETER; + } else if (Atom != NULL) - { - *Atom = (RTL_ATOM)AtomValue; - } + { + *Atom = (RTL_ATOM)AtomValue; + } return Status; - } - - RtlpLockAtomTable(AtomTable); - Status = STATUS_OBJECT_NAME_NOT_FOUND; - - /* string atom */ - Entry = RtlpHashAtomName(AtomTable, - AtomName, - &HashLink); - if (Entry != NULL) - { + } + + RtlpLockAtomTable(AtomTable); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + + /* string atom */ + Entry = RtlpHashAtomName(AtomTable, AtomName, &HashLink); + if (Entry != NULL) + { Status = STATUS_SUCCESS; FoundAtom = (RTL_ATOM)Entry->Atom; - } - RtlpUnlockAtomTable(AtomTable); - if (NT_SUCCESS(Status) && Atom != NULL) - { + } + + RtlpUnlockAtomTable(AtomTable); + if (NT_SUCCESS(Status) && Atom != NULL) + { *Atom = FoundAtom; - } - return Status; + } + return Status; } @@ -543,33 +545,32 @@ RtlPinAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable, IN RTL_ATOM Atom) { - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("RtlPinAtomInAtomTable (AtomTable %p Atom %x)\n", - AtomTable, Atom); - - if (Atom >= 0xC000) - { + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("RtlPinAtomInAtomTable (AtomTable %p Atom %x)\n", + AtomTable, Atom); + + if (Atom >= 0xC000) + { PRTL_ATOM_TABLE_ENTRY Entry; RtlpLockAtomTable(AtomTable); - Entry = RtlpGetAtomEntry(AtomTable, - (ULONG)((USHORT)Atom - 0xC000)); + Entry = RtlpGetAtomEntry(AtomTable, (ULONG)((USHORT)Atom - 0xC000)); if (Entry != NULL && Entry->Atom == (USHORT)Atom) - { - Entry->Flags |= RTL_ATOM_IS_PINNED; - } + { + Entry->Flags |= RTL_ATOM_IS_PINNED; + } else - { - Status = STATUS_INVALID_HANDLE; - } + { + Status = STATUS_INVALID_HANDLE; + } RtlpUnlockAtomTable(AtomTable); - } - - return Status; + } + + return Status; } @@ -593,154 +594,155 @@ * (again EXCLUDING the null terminator) is returned in NameLength, at least * on Win2k, XP and ReactOS. NT4 will return 0 in that case. */ -NTSTATUS NTAPI -RtlQueryAtomInAtomTable(PRTL_ATOM_TABLE AtomTable, - RTL_ATOM Atom, - PULONG RefCount, - PULONG PinCount, - PWSTR AtomName, - PULONG NameLength) -{ - ULONG Length; - BOOL Unlock = FALSE; - - union - { - /* A RTL_ATOM_TABLE_ENTRY has a "WCHAR Name[1]" entry at the end. - * Make sure we reserve enough room to facilitate a 12 character name */ - RTL_ATOM_TABLE_ENTRY AtomTableEntry; - WCHAR StringBuffer[sizeof(RTL_ATOM_TABLE_ENTRY) / sizeof(WCHAR) + 12]; - } NumberEntry; - PRTL_ATOM_TABLE_ENTRY Entry; - NTSTATUS Status = STATUS_SUCCESS; - - if (Atom < 0xC000) - { +NTSTATUS +NTAPI +RtlQueryAtomInAtomTable( + PRTL_ATOM_TABLE AtomTable, + RTL_ATOM Atom, + PULONG RefCount, + PULONG PinCount, + PWSTR AtomName, + PULONG NameLength) +{ + ULONG Length; + BOOL Unlock = FALSE; + + union + { + /* A RTL_ATOM_TABLE_ENTRY has a "WCHAR Name[1]" entry at the end. + * Make sure we reserve enough room to facilitate a 12 character name */ + RTL_ATOM_TABLE_ENTRY AtomTableEntry; + WCHAR StringBuffer[sizeof(RTL_ATOM_TABLE_ENTRY) / sizeof(WCHAR) + 12]; + } NumberEntry; + PRTL_ATOM_TABLE_ENTRY Entry; + NTSTATUS Status = STATUS_SUCCESS; + + if (Atom < 0xC000) + { /* Synthesize an entry */ NumberEntry.AtomTableEntry.Atom = Atom; NumberEntry.AtomTableEntry.NameLength = swprintf(NumberEntry.AtomTableEntry.Name, - L"#%lu", - (ULONG)Atom); + L"#%lu", + (ULONG)Atom); NumberEntry.AtomTableEntry.ReferenceCount = 1; NumberEntry.AtomTableEntry.Flags = RTL_ATOM_IS_PINNED; Entry = &NumberEntry.AtomTableEntry; - } - else - { + } + else + { RtlpLockAtomTable(AtomTable); Unlock = TRUE; - Entry = RtlpGetAtomEntry(AtomTable, - (ULONG)((USHORT)Atom - 0xC000)); - } - - if (Entry != NULL && Entry->Atom == (USHORT)Atom) - { + Entry = RtlpGetAtomEntry(AtomTable, (ULONG)((USHORT)Atom - 0xC000)); + } + + if (Entry != NULL && Entry->Atom == (USHORT)Atom) + { DPRINT("Atom name: %wZ\n", &Entry->Name); if (RefCount != NULL) - { - *RefCount = Entry->ReferenceCount; - } + { + *RefCount = Entry->ReferenceCount; + } if (PinCount != NULL) - { - *PinCount = ((Entry->Flags & RTL_ATOM_IS_PINNED) != 0); - } + { + *PinCount = ((Entry->Flags & RTL_ATOM_IS_PINNED) != 0); + } if (NULL != NameLength) - { - Length = Entry->NameLength * sizeof(WCHAR); - if (NULL != AtomName) - { - if (*NameLength < Length + sizeof(WCHAR)) + { + Length = Entry->NameLength * sizeof(WCHAR); + if (NULL != AtomName) + { + if (*NameLength < Length + sizeof(WCHAR)) + { + if (*NameLength < 4) { - if (*NameLength < 4) - { - *NameLength = Length; - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - Length = *NameLength - sizeof(WCHAR); - } + *NameLength = Length; + Status = STATUS_BUFFER_TOO_SMALL; } - if (NT_SUCCESS(Status)) + else { - RtlCopyMemory(AtomName, - Entry->Name, - Length); - AtomName[Length / sizeof(WCHAR)] = L'\0'; - *NameLength = Length; + Length = *NameLength - sizeof(WCHAR); } - } - else - { - *NameLength = Length; - } - } + } + if (NT_SUCCESS(Status)) + { + RtlCopyMemory(AtomName, Entry->Name, Length); + AtomName[Length / sizeof(WCHAR)] = L'\0'; + *NameLength = Length; + } + } + else + { + *NameLength = Length; + } + } else if (NULL != AtomName) - { - Status = STATUS_INVALID_PARAMETER; - } - } - else - { + { + Status = STATUS_INVALID_PARAMETER; + } + } + else + { Status = STATUS_INVALID_HANDLE; - } - - if (Unlock) RtlpUnlockAtomTable(AtomTable); - - return Status; + } + + if (Unlock) RtlpUnlockAtomTable(AtomTable); + + return Status; } /* * @private - only used by NtQueryInformationAtom */ -NTSTATUS NTAPI -RtlQueryAtomListInAtomTable(IN PRTL_ATOM_TABLE AtomTable, - IN ULONG MaxAtomCount, - OUT ULONG *AtomCount, - OUT RTL_ATOM *AtomList) -{ - PRTL_ATOM_TABLE_ENTRY *CurrentBucket, *LastBucket; - PRTL_ATOM_TABLE_ENTRY CurrentEntry; - ULONG Atoms = 0; - NTSTATUS Status = STATUS_SUCCESS; - - RtlpLockAtomTable(AtomTable); - - LastBucket = AtomTable->Buckets + AtomTable->NumberOfBuckets; - for (CurrentBucket = AtomTable->Buckets; - CurrentBucket != LastBucket; - CurrentBucket++) - { +NTSTATUS +NTAPI +RtlQueryAtomListInAtomTable( + IN PRTL_ATOM_TABLE AtomTable, + IN ULONG MaxAtomCount, + OUT ULONG *AtomCount, + OUT RTL_ATOM *AtomList) +{ + PRTL_ATOM_TABLE_ENTRY *CurrentBucket, *LastBucket; + PRTL_ATOM_TABLE_ENTRY CurrentEntry; + ULONG Atoms = 0; + NTSTATUS Status = STATUS_SUCCESS; + + RtlpLockAtomTable(AtomTable); + + LastBucket = AtomTable->Buckets + AtomTable->NumberOfBuckets; + for (CurrentBucket = AtomTable->Buckets; + CurrentBucket != LastBucket; + CurrentBucket++) + { CurrentEntry = *CurrentBucket; while (CurrentEntry != NULL) - { - if (MaxAtomCount > 0) - { - *(AtomList++) = (RTL_ATOM)CurrentEntry->Atom; - MaxAtomCount--; - } - else - { - /* buffer too small, but don't bail. we need to determine the - total number of atoms in the table! */ - Status = STATUS_INFO_LENGTH_MISMATCH; - } - - Atoms++; - CurrentEntry = CurrentEntry->HashLink; - } - } - - *AtomCount = Atoms; - - RtlpUnlockAtomTable(AtomTable); - - return Status; -} - + { + if (MaxAtomCount > 0) + { + *(AtomList++) = (RTL_ATOM)CurrentEntry->Atom; + MaxAtomCount--; + } + else + { + /* buffer too small, but don't bail. we need to determine the + total number of atoms in the table! */ + Status = STATUS_INFO_LENGTH_MISMATCH; + } + + Atoms++; + CurrentEntry = CurrentEntry->HashLink; + } + } + + *AtomCount = Atoms; + + RtlpUnlockAtomTable(AtomTable); + + return Status; +} +

11 years, 9 months

[tkreuzer] 58432: [CMAKE] Add -mstackrealign option for GCC 4.7+. Seems to fix some problems.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 5 08:25:22 2013 New Revision: 58432 URL: http://svn.reactos.org/svn/reactos?rev=58432&view=rev Log: [CMAKE] Add -mstackrealign option for GCC 4.7+. Seems to fix some problems. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=58432&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Mar 5 08:25:22 2013 @@ -11,6 +11,9 @@ # Compiler Core add_compile_flags("-pipe -fms-extensions -fno-strict-aliasing") +if(GCC_VERSION VERSION_GREATER 4.7) + add_compile_flags("-mstackrealign") +endif() #bug #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE)

11 years, 9 months

← Newer
1
...
17
18
19
20
21
22
23
24
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