Ros-diffs March 2013

ros-diffs@reactos.org

14 participants
249 discussions

[tkreuzer] 58431: [CDMAKE] Fix a warning with new RosBE

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 5 08:07:21 2013 New Revision: 58431 URL: http://svn.reactos.org/svn/reactos?rev=58431&view=rev Log: [CDMAKE] Fix a warning with new RosBE Modified: trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Tue Mar 5 08:07:21 2013 @@ -529,7 +529,7 @@ return c; } -#if _WIN32 +#if defined(_WIN32) && !defined(strcasecmp) #define strcasecmp stricmp #endif//_WIN32

11 years, 8 months

[akhaldi] 58430: [CRT] * Annotate stdio.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 4 21:59:28 2013 New Revision: 58430 URL: http://svn.reactos.org/svn/reactos?rev=58430&view=rev Log: [CRT] * Annotate stdio.h. Modified: trunk/reactos/include/crt/stdio.h Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=58… ============================================================================== --- trunk/reactos/include/crt/stdio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdio.h [iso-8859-1] Mon Mar 4 21:59:28 2013 @@ -139,90 +139,532 @@ #ifndef _STDIO_DEFINED - _CRTIMP int __cdecl _filbuf(FILE *_File); - _CRTIMP int __cdecl _flsbuf(int _Ch,FILE *_File); + _Check_return_ + _CRTIMP + int + __cdecl + _filbuf( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _flsbuf( + _In_ int _Ch, + _Inout_ FILE *_File); + #ifdef _POSIX_ - _CRTIMP FILE *__cdecl _fsopen(const char *_Filename,const char *_Mode); + _CRTIMP + FILE* + __cdecl + _fsopen( + const char *_Filename, + const char *_Mode); #else - _CRTIMP FILE *__cdecl _fsopen(const char *_Filename,const char *_Mode,int _ShFlag); -#endif - _CRTIMP void __cdecl clearerr(FILE *_File); - _CRTIMP int __cdecl fclose(FILE *_File); - _CRTIMP int __cdecl _fcloseall(void); + _Check_return_ + _CRTIMP + FILE* + __cdecl + _fsopen( + _In_z_ const char *_Filename, + _In_z_ const char *_Mode, + _In_ int _ShFlag); +#endif + + _CRTIMP + void + __cdecl + clearerr( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fclose( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fcloseall(void); + #ifdef _POSIX_ - FILE *__cdecl fdopen(int _FileHandle,const char *_Mode); + FILE* + __cdecl + fdopen( + int _FileHandle, + const char *_Mode); #else - _CRTIMP FILE *__cdecl _fdopen(int _FileHandle,const char *_Mode); -#endif - _CRTIMP int __cdecl feof(FILE *_File); - _CRTIMP int __cdecl ferror(FILE *_File); - _CRTIMP int __cdecl fflush(FILE *_File); - _CRTIMP int __cdecl fgetc(FILE *_File); - _CRTIMP int __cdecl _fgetchar(void); - _CRTIMP int __cdecl fgetpos(FILE *_File ,fpos_t *_Pos); - _CRTIMP char *__cdecl fgets(char *_Buf,int _MaxCount,FILE *_File); + _Check_return_ + _CRTIMP + FILE* + __cdecl + _fdopen( + _In_ int _FileHandle, + _In_z_ const char *_Mode); +#endif + + _Check_return_ + _CRTIMP + int + __cdecl + feof( + _In_ FILE *_File); + + _Check_return_ + _CRTIMP + int + __cdecl + ferror( + _In_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fflush( + _Inout_opt_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fgetc( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fgetchar(void); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fgetpos( + _Inout_ FILE *_File, + _Out_ fpos_t *_Pos); + + _Check_return_opt_ + _CRTIMP + char* + __cdecl + fgets( + _Out_writes_z_(_MaxCount) char *_Buf, + _In_ int _MaxCount, + _Inout_ FILE *_File); + #ifdef _POSIX_ - int __cdecl fileno(FILE *_File); + int + __cdecl + fileno( + FILE *_File); #else - _CRTIMP int __cdecl _fileno(FILE *_File); -#endif - _CRTIMP char *__cdecl _tempnam(const char *_DirName,const char *_FilePrefix); - _CRTIMP int __cdecl _flushall(void); - _CRTIMP FILE *__cdecl fopen(const char *_Filename,const char *_Mode); - _CRTIMP int __cdecl fprintf(FILE *_File,const char *_Format,...); - _CRTIMP int __cdecl fputc(int _Ch,FILE *_File); - _CRTIMP int __cdecl _fputchar(int _Ch); - _CRTIMP int __cdecl fputs(const char *_Str,FILE *_File); - _CRTIMP size_t __cdecl fread(void *_DstBuf,size_t _ElementSize,size_t _Count,FILE *_File); - _CRTIMP _CRT_INSECURE_DEPRECATE(freopen_s) FILE *__cdecl freopen(const char *_Filename,const char *_Mode,FILE *_File); - _CRTIMP _CRT_INSECURE_DEPRECATE(fscanf_s) int __cdecl fscanf(FILE *_File,const char *_Format,...); - _CRTIMP int __cdecl fsetpos(FILE *_File,const fpos_t *_Pos); - _CRTIMP int __cdecl fseek(FILE *_File,long _Offset,int _Origin); - _CRTIMP long __cdecl ftell(FILE *_File); - __MINGW_EXTENSION _CRTIMP int __cdecl _fseeki64(FILE *_File,__int64 _Offset,int _Origin); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _ftelli64(FILE *_File); - _CRTIMP size_t __cdecl fwrite(const void *_Str,size_t _Size,size_t _Count,FILE *_File); - _CRTIMP int __cdecl getc(FILE *_File); - _CRTIMP int __cdecl getchar(void); - _CRTIMP int __cdecl _getmaxstdio(void); - _CRTIMP char *__cdecl gets(char *_Buffer); // FIXME: non-standard - _CRTIMP int __cdecl _getw(FILE *_File); + _Check_return_ + _CRTIMP + int + __cdecl + _fileno( + _In_ FILE *_File); +#endif + + _Check_return_ + _CRTIMP + char* + __cdecl + _tempnam( + _In_opt_z_ const char *_DirName, + _In_opt_z_ const char *_FilePrefix); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _flushall(void); + + _Check_return_ + _CRTIMP + FILE* + __cdecl + fopen( + _In_z_ const char *_Filename, + _In_z_ const char *_Mode); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fprintf( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fputc( + _In_ int _Ch, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fputchar( + _In_ int _Ch); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fputs( + _In_z_ const char *_Str, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + fread( + _Out_writes_bytes_(_ElementSize * _Count) void *_DstBuf, + _In_ size_t _ElementSize, + _In_ size_t _Count, + _Inout_ FILE *_File); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(freopen_s) + FILE* + __cdecl + freopen( + _In_z_ const char *_Filename, + _In_z_ const char *_Mode, + _Inout_ FILE *_File); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(fscanf_s) + int + __cdecl + fscanf( + _Inout_ FILE *_File, + _In_z_ _Scanf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fsetpos( + _Inout_ FILE *_File, + _In_ const fpos_t *_Pos); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fseek( + _Inout_ FILE *_File, + _In_ long _Offset, + _In_ int _Origin); + + _Check_return_ + _CRTIMP + long + __cdecl + ftell( + _Inout_ FILE *_File); + + _Check_return_opt_ + __MINGW_EXTENSION + _CRTIMP + int + __cdecl + _fseeki64( + _Inout_ FILE *_File, + _In_ __int64 _Offset, + _In_ int _Origin); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _ftelli64( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + fwrite( + _In_reads_bytes_(_Size * _Count) const void *_Str, + _In_ size_t _Size, + _In_ size_t _Count, + _Inout_ FILE *_File); + + _Check_return_ + _CRTIMP + int + __cdecl + getc( + _Inout_ FILE *_File); + + _Check_return_ + _CRTIMP + int + __cdecl + getchar(void); + + _Check_return_ + _CRTIMP + int + __cdecl + _getmaxstdio(void); + + _CRTIMP + char* + __cdecl + gets( + char *_Buffer); // FIXME: non-standard + + _Check_return_ + _CRTIMP + int + __cdecl + _getw( + _Inout_ FILE *_File); + #ifndef _CRT_PERROR_DEFINED #define _CRT_PERROR_DEFINED - _CRTIMP void __cdecl perror(const char *_ErrMsg); -#endif - _CRTIMP int __cdecl _pclose(FILE *_File); - _CRTIMP FILE *__cdecl _popen(const char *_Command,const char *_Mode); - _CRTIMP int __cdecl printf(const char *_Format,...); - _CRTIMP int __cdecl putc(int _Ch,FILE *_File); - _CRTIMP int __cdecl putchar(int _Ch); - _CRTIMP int __cdecl puts(const char *_Str); - _CRTIMP int __cdecl _putw(int _Word,FILE *_File); + _CRTIMP + void + __cdecl + perror( + _In_opt_z_ const char *_ErrMsg); +#endif + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _pclose( + _Inout_ FILE *_File); + + _Check_return_ + _CRTIMP + FILE* + __cdecl + _popen( + _In_z_ const char *_Command, + _In_z_ const char *_Mode); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + printf( + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + putc( + _In_ int _Ch, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + putchar( + _In_ int _Ch); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + puts( + _In_z_ const char *_Str); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _putw( + _In_ int _Word, + _Inout_ FILE *_File); + #ifndef _CRT_DIRECTORY_DEFINED #define _CRT_DIRECTORY_DEFINED - _CRTIMP int __cdecl remove(const char *_Filename); - _CRTIMP int __cdecl rename(const char *_OldFilename,const char *_NewFilename); - _CRTIMP int __cdecl _unlink(const char *_Filename); + + _Check_return_ + _CRTIMP + int + __cdecl + remove( + _In_z_ const char *_Filename); + + _Check_return_ + _CRTIMP + int + __cdecl + rename( + _In_z_ const char *_OldFilename, + _In_z_ const char *_NewFilename); + + _Check_return_ + _CRTIMP + int + __cdecl + _unlink( + _In_z_ const char *_Filename); + #ifndef NO_OLDNAMES - _CRTIMP _CRT_NONSTDC_DEPRECATE(_unlink) int __cdecl unlink(const char *_Filename); -#endif -#endif - _CRTIMP void __cdecl rewind(FILE *_File); - _CRTIMP int __cdecl _rmtmp(void); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(scanf_s) int __cdecl scanf(const char *_Format,...); - _CRTIMP _CRT_INSECURE_DEPRECATE(setvbuf) void __cdecl setbuf(FILE *_File,char *_Buffer); - _CRTIMP int __cdecl _setmaxstdio(int _Max); - _CRTIMP unsigned int __cdecl _set_output_format(unsigned int _Format); - _CRTIMP unsigned int __cdecl _get_output_format(void); - _CRTIMP int __cdecl setvbuf(FILE *_File,char *_Buf,int _Mode,size_t _Size); - _CRTIMP int __cdecl _scprintf(const char *_Format,...); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(sscanf_s) int __cdecl sscanf(const char *_Src,const char *_Format,...); - _CRTIMP _CRT_INSECURE_DEPRECATE_CORE(_snscanf_s) int __cdecl _snscanf(const char *_Src,size_t _MaxCount,const char *_Format,...); - _CRTIMP _CRT_INSECURE_DEPRECATE(tmpfile_s) FILE *__cdecl tmpfile(void); - _CRTIMP char *__cdecl tmpnam(char *_Buffer); - _CRTIMP_ALT int __cdecl ungetc(int _Ch,FILE *_File); - _CRTIMP int __cdecl vfprintf(FILE *_File,const char *_Format,va_list _ArgList); - _CRTIMP int __cdecl vprintf(const char *_Format,va_list _ArgList); + _Check_return_ + _CRTIMP + _CRT_NONSTDC_DEPRECATE(_unlink) + int + __cdecl + unlink( + _In_z_ const char *_Filename); +#endif + +#endif /* _CRT_DIRECTORY_DEFINED */ + + _CRTIMP + void + __cdecl + rewind( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _rmtmp(void); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(scanf_s) + int + __cdecl + scanf( + _In_z_ _Scanf_format_string_ const char *_Format, + ...); + + _CRTIMP + _CRT_INSECURE_DEPRECATE(setvbuf) + void + __cdecl + setbuf( + _Inout_ FILE *_File, + _Inout_updates_opt_(BUFSIZ) _Post_readable_size_(0) char *_Buffer); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _setmaxstdio( + _In_ int _Max); + + _Check_return_opt_ + _CRTIMP + unsigned int + __cdecl + _set_output_format( + _In_ unsigned int _Format); + + _Check_return_opt_ + _CRTIMP + unsigned int + __cdecl + _get_output_format(void); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + setvbuf( + _Inout_ FILE *_File, + _Inout_updates_opt_z_(_Size) char *_Buf, + _In_ int _Mode, + _In_ size_t _Size); + + _Check_return_ + _CRTIMP + int + __cdecl + _scprintf( + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(sscanf_s) + int + __cdecl + sscanf( + _In_z_ const char *_Src, + _In_z_ _Scanf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + _CRT_INSECURE_DEPRECATE_CORE(_snscanf_s) + int + __cdecl + _snscanf( + _In_reads_bytes_(_MaxCount) _Pre_z_ const char *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_format_string_ const char *_Format, + ...); + + _Check_return_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(tmpfile_s) + FILE* + __cdecl + tmpfile(void); + + _CRTIMP + char* + __cdecl + tmpnam( + _Pre_maybenull_ _Post_z_ char *_Buffer); + + _Check_return_opt_ + _CRTIMP_ALT + int + __cdecl + ungetc( + _In_ int _Ch, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + vfprintf( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + vprintf( + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + /* Make sure macros are not defined. */ #if __MINGW_GNUC_PREREQ(4,4) #pragma push_macro("vsnprintf") @@ -230,17 +672,30 @@ #endif #undef vsnprintf #undef snprintf - _CRTIMP _CRT_INSECURE_DEPRECATE(vsnprintf_s) int __cdecl vsnprintf(char *_DstBuf,size_t _MaxCount,const char *_Format,va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + _CRT_INSECURE_DEPRECATE(vsnprintf_s) + int + __cdecl + vsnprintf( + _Out_writes_(_MaxCount) char *_DstBuf, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + _CRTIMP int __cdecl _snprintf(char *_Dest,size_t _Count,const char *_Format,...); _CRTIMP int __cdecl _vsnprintf(char *_Dest,size_t _Count,const char *_Format,va_list _Args); int __cdecl sprintf(char *_Dest,const char *_Format,...); int __cdecl vsprintf(char *_Dest,const char *_Format,va_list _Args); + #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ int __cdecl snprintf(char* s, size_t n, const char* format, ...); int __cdecl vscanf(const char * __restrict__ Format, va_list argp); int __cdecl vfscanf (FILE * __restrict__ fp, const char * Format,va_list argp); int __cdecl vsscanf (const char * __restrict__ _Str,const char * __restrict__ Format,va_list argp); #endif + /* Restore may prior defined macros snprintf/vsnprintf. */ #if __MINGW_GNUC_PREREQ(4,4) #pragma pop_macro("snprintf") @@ -254,12 +709,19 @@ #define snprintf _snprintf #endif - _CRTIMP int __cdecl _vscprintf(const char *_Format,va_list _ArgList); + _Check_return_ + _CRTIMP + int + __cdecl + _vscprintf( + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + #ifdef _SAFECRT_IMPL #define _set_printf_count_output(i) #define _get_printf_count_output() (FALSE) #else - _CRTIMP int __cdecl _set_printf_count_output(int _Value); + _CRTIMP int __cdecl _set_printf_count_output(_In_ int _Value); _CRTIMP int __cdecl _get_printf_count_output(void); #endif @@ -270,32 +732,196 @@ #endif #ifdef _POSIX_ - _CRTIMP FILE *__cdecl _wfsopen(const wchar_t *_Filename,const wchar_t *_Mode); + _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 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 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 + 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 + 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( + 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); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + swprintf( + _Out_ wchar_t*, + _Printf_format_string_ 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 */ @@ -333,28 +959,139 @@ #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 fwscanf(FILE *_File,const wchar_t *_Format,...); - _CRTIMP int __cdecl swscanf(const wchar_t *_Src,const wchar_t *_Format,...); - _CRTIMP int __cdecl _snwscanf(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); - _CRTIMP int __cdecl wscanf(const wchar_t *_Format,...); - _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 + fwscanf( + _Inout_ FILE *_File, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_ + _CRTIMP + int + __cdecl + swscanf( + _In_z_ const wchar_t *_Src, + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _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_ + _CRTIMP + int + __cdecl + wscanf( + _In_z_ _Scanf_format_string_ const wchar_t *_Format, + ...); + + _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 @@ -386,33 +1123,168 @@ #define _getwchar_nolock() _getwc_nolock(stdin) #define _putwchar_nolock(_c) _putwc_nolock((_c),stdout) - _CRTIMP void __cdecl _lock_file(FILE *_File); - _CRTIMP void __cdecl _unlock_file(FILE *_File); - _CRTIMP int __cdecl _fclose_nolock(FILE *_File); - _CRTIMP int __cdecl _fflush_nolock(FILE *_File); - _CRTIMP size_t __cdecl _fread_nolock(void *_DstBuf,size_t _ElementSize,size_t _Count,FILE *_File); - _CRTIMP int __cdecl _fseek_nolock(FILE *_File,long _Offset,int _Origin); - _CRTIMP long __cdecl _ftell_nolock(FILE *_File); - __MINGW_EXTENSION _CRTIMP int __cdecl _fseeki64_nolock(FILE *_File,__int64 _Offset,int _Origin); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _ftelli64_nolock(FILE *_File); - _CRTIMP size_t __cdecl _fwrite_nolock(const void *_DstBuf,size_t _Size,size_t _Count,FILE *_File); - _CRTIMP int __cdecl _ungetc_nolock(int _Ch,FILE *_File); + _CRTIMP + void + __cdecl + _lock_file( + _Inout_ FILE *_File); + + _CRTIMP + void + __cdecl + _unlock_file( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fclose_nolock( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fflush_nolock( + _Inout_opt_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + _fread_nolock( + _Out_writes_bytes_(_ElementSize * _Count) void *_DstBuf, + _In_ size_t _ElementSize, + _In_ size_t _Count, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fseek_nolock( + _Inout_ FILE *_File, + _In_ long _Offset, + _In_ int _Origin); + + _Check_return_ + _CRTIMP + long + __cdecl + _ftell_nolock( + _Inout_ FILE *_File); + + _Check_return_opt_ + __MINGW_EXTENSION + _CRTIMP + int + __cdecl + _fseeki64_nolock( + _Inout_ FILE *_File, + _In_ __int64 _Offset, + _In_ int _Origin); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _ftelli64_nolock( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + size_t + __cdecl + _fwrite_nolock( + _In_reads_bytes_(_Size * _Count) const void *_DstBuf, + _In_ size_t _Size, + _In_ size_t _Count, + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _ungetc_nolock( + _In_ int _Ch, + _Inout_ FILE *_File); #if !defined(NO_OLDNAMES) || !defined(_POSIX) + #define P_tmpdir _P_tmpdir #define SYS_OPEN _SYS_OPEN - _CRTIMP char *__cdecl tempnam(const char *_Directory,const char *_FilePrefix); - _CRTIMP int __cdecl fcloseall(void); - _CRTIMP FILE *__cdecl fdopen(int _FileHandle,const char *_Format); - _CRTIMP int __cdecl fgetchar(void); - _CRTIMP int __cdecl fileno(FILE *_File); - _CRTIMP int __cdecl flushall(void); - _CRTIMP int __cdecl fputchar(int _Ch); - _CRTIMP int __cdecl getw(FILE *_File); - _CRTIMP int __cdecl putw(int _Ch,FILE *_File); - _CRTIMP int __cdecl rmtmp(void); -#endif + _CRTIMP + char* + __cdecl + tempnam( + _In_opt_z_ const char *_Directory, + _In_opt_z_ const char *_FilePrefix); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fcloseall(void); + + _Check_return_ + _CRTIMP + FILE* + __cdecl + fdopen( + _In_ int _FileHandle, + _In_z_ const char *_Format); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fgetchar(void); + + _Check_return_ + _CRTIMP + int + __cdecl + fileno( + _In_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + flushall(void); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + fputchar( + _In_ int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + getw( + _Inout_ FILE *_File); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + putw( + _In_ int _Ch, + _Inout_ FILE *_File); + + _Check_return_ + _CRTIMP + int + __cdecl + rmtmp(void); + +#endif /* !defined(NO_OLDNAMES) || !defined(_POSIX) */ #ifdef __cplusplus }

11 years, 8 months

[akhaldi] 58429: [SAL] * Add _Field_size_part_ annotation.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 4 21:58:35 2013 New Revision: 58429 URL: http://svn.reactos.org/svn/reactos?rev=58429&view=rev Log: [SAL] * Add _Field_size_part_ annotation. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=584… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Mon Mar 4 21:58:35 2013 @@ -609,7 +609,7 @@ #define _Field_size_bytes_part_opt_(size, count) _SAL2_NAME(_Field_size_bytes_part_opt_) _Group_(_Maybenull_ _Writable_bytes_(size) _Readable_bytes_(count)) //#define _Field_size_full_(size) //#define _Field_size_full_opt_(size) -//#define _Field_size_part_(size, count) +#define _Field_size_part_(size,count) _SAL2_NAME(_Field_size_part_) _Group_(_Notnull_ _Writable_elements_(size) _Readable_elements_(count)) //#define _Field_size_part_opt_(size, count) //#define _Field_z_ #define _Function_class_(x) _SA_annotes1(SAL_functionClassNew, _SA_SPECSTRIZE(x))

11 years, 8 months

[akhaldi] 58428: [NDK] * Correct the annotation of ObOpenObjectByName's 4th param.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 4 21:49:07 2013 New Revision: 58428 URL: http://svn.reactos.org/svn/reactos?rev=58428&view=rev Log: [NDK] * Correct the annotation of ObOpenObjectByName's 4th param. Modified: trunk/reactos/include/ndk/obfuncs.h Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] Mon Mar 4 21:49:07 2013 @@ -105,7 +105,7 @@ _In_ POBJECT_ATTRIBUTES ObjectAttributes, _In_ POBJECT_TYPE ObjectType, _In_ KPROCESSOR_MODE AccessMode, - _In_ PACCESS_STATE PassedAccessState, + _In_opt_ PACCESS_STATE PassedAccessState, _In_ ACCESS_MASK DesiredAccess, _Inout_ PVOID ParseContext, _Out_ PHANDLE Handle

11 years, 8 months

[ekohl] 58427: [LSASRV] - Get all procedure addresses of the loaded authentication packages and keep them in the authentication package entry. - Implement parts of the lda dispatch table (allocate ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Mar 4 21:32:44 2013 New Revision: 58427 URL: http://svn.reactos.org/svn/reactos?rev=58427&view=rev Log: [LSASRV] - Get all procedure addresses of the loaded authentication packages and keep them in the authentication package entry. - Implement parts of the lda dispatch table (allocate heap and free heap) and pass the table to LsaApInitializePackage call. - Implement authentication package lookup by name. [MSV1_0] - Store the dispatch table entries passed to the LsaApInitializePackage call and use them to allocate a STRING to return the package name. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/authport.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Mon Mar 4 21:32:44 2013 @@ -13,29 +13,67 @@ WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - -typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PVOID /*PLSA_DISPATCH_TABLE*/, +typedef PVOID (NTAPI *PLSA_ALLOCATE_LSA_HEAP)(ULONG); +typedef VOID (NTAPI *PLSA_FREE_LSA_HEAP)(PVOID); + +typedef struct LSA_DISPATCH_TABLE +{ + PVOID /*PLSA_CREATE_LOGON_SESSION */ CreateLogonSession; + PVOID /*PLSA_DELETE_LOGON_SESSION */ DeleteLogonSession; + PVOID /*PLSA_ADD_CREDENTIAL */ AddCredential; + PVOID /*PLSA_GET_CREDENTIALS */ GetCredentials; + PVOID /*PLSA_DELETE_CREDENTIAL */ DeleteCredential; + PLSA_ALLOCATE_LSA_HEAP AllocateLsaHeap; + PLSA_FREE_LSA_HEAP FreeLsaHeap; + PVOID /*PLSA_ALLOCATE_CLIENT_BUFFER */ AllocateClientBuffer; + PVOID /*PLSA_FREE_CLIENT_BUFFER */ FreeClientBuffer; + PVOID /*PLSA_COPY_TO_CLIENT_BUFFER */ CopyToClientBuffer; + PVOID /*PLSA_COPY_FROM_CLIENT_BUFFER */ CopyFromClientBuffer; +} LSA_DISPATCH_TABLE, *PLSA_DISPATCH_TABLE; + + +typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PLSA_DISPATCH_TABLE, PLSA_STRING, PLSA_STRING, PLSA_STRING *); +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE)(PUNICODE_STRING, PVOID, ULONG, + PVOID *, PULONG, PNTSTATUS); +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_PASSTHROUGH)(PUNICODE_STRING, + PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_UNTRUSTED)(PVOID/*PLSA_CLIENT_REQUEST*/, + PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); +typedef VOID (NTAPI *PLSA_AP_LOGON_TERMINATED)(PLUID); +typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX2)(PVOID /*PLSA_CLIENT_REQUEST*/, + SECURITY_LOGON_TYPE, PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID, PNTSTATUS, + PVOID /*PLSA_TOKEN_INFORMATION_TYPE*/, PVOID *, PUNICODE_STRING *, PUNICODE_STRING *, + PUNICODE_STRING *, PVOID /*PSECPKG_PRIMARY_CRED*/, PVOID /*PSECPKG_SUPPLEMENTAL_CRED_ARRAY **/); +typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX)(PVOID /*PLSA_CLIENT_REQUEST*/, + SECURITY_LOGON_TYPE, PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID, PNTSTATUS, + PVOID /*PLSA_TOKEN_INFORMATION_TYPE*/, PVOID *, PUNICODE_STRING *, PUNICODE_STRING *, + PUNICODE_STRING *); +typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER)(LPWSTR, LPWSTR, LPWSTR, LPWSTR, + DWORD, DWORD, PHANDLE); typedef struct _AUTH_PACKAGE { LIST_ENTRY Entry; PSTRING Name; + ULONG Id; PVOID ModuleHandle; PLSA_AP_INITIALIZE_PACKAGE LsaApInitializePackage; -// PLSA_AP_CALL_PACKAGE LsaApCallPackage; -// PLSA_AP_CALL_PACKAGE_UNTRUSTED LsaApCallPackageUntrusted; -// PLSA_AP_LOGON_TERMINATED LsaApLogonTerminated; -// PLSA_AP_LOGON_USER_EX2 LsaApLogonUserEx2; -// PLSA_AP_LOGON_USER_EX LsaApLogonUserEx; -// PLSA_AP_LOGON_USER LsaApLogonUser; + PLSA_AP_CALL_PACKAGE LsaApCallPackage; + PLSA_AP_CALL_PACKAGE_PASSTHROUGH LsaApCallPackagePassthrough; + PLSA_AP_CALL_PACKAGE_UNTRUSTED LsaApCallPackageUntrusted; + PLSA_AP_LOGON_TERMINATED LsaApLogonTerminated; + PLSA_AP_LOGON_USER_EX2 LsaApLogonUserEx2; + PLSA_AP_LOGON_USER_EX LsaApLogonUserEx; + PLSA_AP_LOGON_USER LsaApLogonUser; } AUTH_PACKAGE, *PAUTH_PACKAGE; /* GLOBALS *****************************************************************/ static LIST_ENTRY PackageListHead; static ULONG PackageId; +static LSA_DISPATCH_TABLE DispatchTable; /* FUNCTIONS ***************************************************************/ @@ -90,8 +128,80 @@ goto done; } + RtlInitAnsiString(&ProcName, "LsaApCallPackage"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApCallPackage); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitAnsiString(&ProcName, "LsaApCallPackagePassthrough"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApCallPackagePassthrough); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitAnsiString(&ProcName, "LsaApCallPackageUntrusted"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApCallPackageUntrusted); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitAnsiString(&ProcName, "LsaApLogonTerminated"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApLogonTerminated); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitAnsiString(&ProcName, "LsaApLogonUserEx2"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApLogonUserEx2); + if (!NT_SUCCESS(Status)) + { + RtlInitAnsiString(&ProcName, "LsaApLogonUserEx"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApLogonUserEx); + if (!NT_SUCCESS(Status)) + { + RtlInitAnsiString(&ProcName, "LsaApLogonUser"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApLogonUser); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + } + } + + /* Initialize the current package */ Status = Package->LsaApInitializePackage(*Id, - NULL, + &DispatchTable, NULL, NULL, &Package->Name); @@ -101,6 +211,9 @@ goto done; } + TRACE("Package Name: %s\n", Package->Name->Buffer); + + Package->Id = *Id; *Id++; InsertTailList(&PackageListHead, &Package->Entry); @@ -113,11 +226,36 @@ if (Package->ModuleHandle != NULL) LdrUnloadDll(Package->ModuleHandle); + if (Package->Name != NULL) + { + if (Package->Name->Buffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Package->Name->Buffer); + + RtlFreeHeap(RtlGetProcessHeap(), 0, Package->Name); + } + RtlFreeHeap(RtlGetProcessHeap(), 0, Package); } } return Status; +} + + +static +PVOID +NTAPI +LsapAllocateHeap(ULONG Size) +{ + return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Size); +} + +static +VOID +NTAPI +LsapFreeHeap(PVOID Ptr) +{ + RtlFreeHeap(RtlGetProcessHeap(), 0, Ptr); } @@ -132,6 +270,19 @@ InitializeListHead(&PackageListHead); PackageId = 0; + + /* Initialize the dispatch table */ + DispatchTable.CreateLogonSession = NULL; + DispatchTable.DeleteLogonSession = NULL; + DispatchTable.AddCredential = NULL; + DispatchTable.GetCredentials = NULL; + DispatchTable.DeleteCredential = NULL; + DispatchTable.AllocateLsaHeap = &LsapAllocateHeap; + DispatchTable.FreeLsaHeap = &LsapFreeHeap; + DispatchTable.AllocateClientBuffer = NULL; + DispatchTable.FreeClientBuffer = NULL; + DispatchTable.CopyToClientBuffer = NULL; + DispatchTable.CopyFromClientBuffer = NULL; /* Add registered authentication packages */ Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, @@ -144,4 +295,30 @@ return STATUS_SUCCESS; } + +NTSTATUS +LsapLookupAuthenticationPackageByName(IN PSTRING PackageName, + OUT PULONG PackageId) +{ + PLIST_ENTRY ListEntry; + PAUTH_PACKAGE Package; + + ListEntry = PackageListHead.Flink; + while (ListEntry != &PackageListHead) + { + Package = CONTAINING_RECORD(ListEntry, AUTH_PACKAGE, Entry); + + if ((PackageName->Length == Package->Name->Length) && + (_strnicmp(PackageName->Buffer, Package->Name->Buffer, Package->Name->Length) == 0)) + { + *PackageId = Package->Id; + return STATUS_SUCCESS; + } + + ListEntry = ListEntry->Flink; + } + + return STATUS_NO_SUCH_PACKAGE; +} + /* EOF */ Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Mon Mar 4 21:32:44 2013 @@ -61,6 +61,9 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, PLSAP_LOGON_CONTEXT LogonContext) { + PVOID LocalAuthInfo = NULL; + NTSTATUS Status = STATUS_SUCCESS; + TRACE("(%p %p)\n", RequestMsg, LogonContext); TRACE("LogonType: %lu\n", RequestMsg->LogonUser.Request.LogonType); @@ -68,6 +71,48 @@ TRACE("AuthenticationInformation: %p\n", RequestMsg->LogonUser.Request.AuthenticationInformation); TRACE("AuthenticationInformationLength: %lu\n", RequestMsg->LogonUser.Request.AuthenticationInformationLength); + LocalAuthInfo = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + RequestMsg->LogonUser.Request.AuthenticationInformationLength); + if (LocalAuthInfo == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Read the authentication info from the callers adress space */ + Status = NtReadVirtualMemory(LogonContext->ClientProcessHandle, + RequestMsg->LogonUser.Request.AuthenticationInformation, + LocalAuthInfo, + RequestMsg->LogonUser.Request.AuthenticationInformationLength, + NULL); + if (!NT_SUCCESS(Status)) + goto done; + + if (RequestMsg->LogonUser.Request.LogonType == Interactive || + RequestMsg->LogonUser.Request.LogonType == Batch || + RequestMsg->LogonUser.Request.LogonType == Service) + { + PMSV1_0_INTERACTIVE_LOGON LogonInfo; + ULONG_PTR PtrOffset; + + LogonInfo = (PMSV1_0_INTERACTIVE_LOGON)LocalAuthInfo; + + /* Fix-up pointers in the authentication info */ + PtrOffset = (ULONG_PTR)LocalAuthInfo - (ULONG_PTR)RequestMsg->LogonUser.Request.AuthenticationInformation; + + LogonInfo->LogonDomainName.Buffer = (PWSTR)((ULONG_PTR)LogonInfo->LogonDomainName.Buffer + PtrOffset); + LogonInfo->UserName.Buffer = (PWSTR)((ULONG_PTR)LogonInfo->UserName.Buffer + PtrOffset); + LogonInfo->Password.Buffer = (PWSTR)((ULONG_PTR)LogonInfo->Password.Buffer + PtrOffset); + + TRACE("Domain: %S\n", LogonInfo->LogonDomainName.Buffer); + TRACE("User: %S\n", LogonInfo->UserName.Buffer); + TRACE("Password: %S\n", LogonInfo->Password.Buffer); + } + else + { + FIXME("LogonType %lu is not supported yet!\n", RequestMsg->LogonUser.Request.LogonType); + } @@ -78,7 +123,11 @@ // QUOTA_LIMITS Quotas; RequestMsg->LogonUser.Reply.SubStatus = STATUS_SUCCESS; - return STATUS_SUCCESS; +done: + if (LocalAuthInfo != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, LocalAuthInfo); + + return Status; } @@ -86,13 +135,25 @@ LsapLookupAuthenticationPackage(PLSA_API_MSG RequestMsg, PLSAP_LOGON_CONTEXT LogonContext) { + STRING PackageName; + ULONG PackageId; + NTSTATUS Status; + TRACE("(%p %p)\n", RequestMsg, LogonContext); - TRACE("PackageName: %s\n", RequestMsg->LookupAuthenticationPackage.Request.PackageName); - RequestMsg->LookupAuthenticationPackage.Reply.Package = 0x12345678; - - return STATUS_SUCCESS; + PackageName.Length = RequestMsg->LookupAuthenticationPackage.Request.PackageNameLength; + PackageName.MaximumLength = LSASS_MAX_PACKAGE_NAME_LENGTH + 1; + PackageName.Buffer = RequestMsg->LookupAuthenticationPackage.Request.PackageName; + + Status = LsapLookupAuthenticationPackageByName(&PackageName, + &PackageId); + if (NT_SUCCESS(Status)) + { + RequestMsg->LookupAuthenticationPackage.Reply.Package = PackageId; + } + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Mon Mar 4 21:32:44 2013 @@ -85,6 +85,10 @@ NTSTATUS LsapInitAuthPackages(VOID); +NTSTATUS +LsapLookupAuthenticationPackageByName(IN PSTRING PackageName, + OUT PULONG PackageId); + /* authport.c */ NTSTATUS StartAuthenticationPort(VOID); Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Mon Mar 4 21:32:44 2013 @@ -11,6 +11,11 @@ #include "msv1_0.h" WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); + + +/* GLOBALS *****************************************************************/ + +LSA_DISPATCH_TABLE DispatchTable; /* FUNCTIONS ***************************************************************/ @@ -80,10 +85,35 @@ IN PLSA_STRING Confidentiality OPTIONAL, OUT PLSA_STRING *AuthenticationPackageName) { + PANSI_STRING NameString; + PCHAR NameBuffer; + TRACE("(%lu %p %p %p %p)\n", AuthenticationPackageId, LsaDispatchTable, Database, Confidentiality, AuthenticationPackageName); + /* Get the dispatch table entries */ + DispatchTable.AllocateLsaHeap = LsaDispatchTable->AllocateLsaHeap; + DispatchTable.FreeLsaHeap = LsaDispatchTable->FreeLsaHeap; + + + /* Return the package name */ + NameString = DispatchTable.AllocateLsaHeap(sizeof(LSA_STRING)); + if (NameString == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + NameBuffer = DispatchTable.AllocateLsaHeap(sizeof(MSV1_0_PACKAGE_NAME)); + if (NameBuffer == NULL) + { + DispatchTable.FreeLsaHeap(NameString); + return STATUS_INSUFFICIENT_RESOURCES; + } + + strcpy(NameBuffer, MSV1_0_PACKAGE_NAME); + + RtlInitAnsiString(NameString, NameBuffer); + + *AuthenticationPackageName = (PLSA_STRING)NameString; return STATUS_SUCCESS; }

11 years, 8 months

[akhaldi] 58426: [CRT] * Annotate assert.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 4 21:24:47 2013 New Revision: 58426 URL: http://svn.reactos.org/svn/reactos?rev=58426&view=rev Log: [CRT] * Annotate assert.h. Modified: trunk/reactos/include/crt/assert.h Modified: trunk/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/assert.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/assert.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/assert.h [iso-8859-1] Mon Mar 4 21:24:47 2013 @@ -20,8 +20,21 @@ extern "C" { #endif - _CRTIMP void __cdecl _assert(const char *_Message,const char *_File,unsigned _Line); - _CRTIMP void __cdecl _wassert(const wchar_t *_Message,const wchar_t *_File,unsigned _Line); + _CRTIMP + void + __cdecl + _assert( + _In_z_ const char *_Message, + _In_z_ const char *_File, + _In_ unsigned _Line); + + _CRTIMP + void + __cdecl + _wassert( + _In_z_ const wchar_t *_Message, + _In_z_ const wchar_t *_File, + _In_ unsigned _Line); #ifdef __cplusplus }

11 years, 8 months

[akhaldi] 58425: [SAL] * Add _Deref_post_opt_valid_, _Deref_pre_opt_valid_, _Deref_pre_z_, _Deref_prepost_opt_valid_, _Deref_prepost_z_, _Out_writes_all_ and _Out_writes_all_opt_ annotations.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 4 16:32:18 2013 New Revision: 58425 URL: http://svn.reactos.org/svn/reactos?rev=58425&view=rev Log: [SAL] * Add _Deref_post_opt_valid_, _Deref_pre_opt_valid_, _Deref_pre_z_, _Deref_prepost_opt_valid_, _Deref_prepost_z_, _Out_writes_all_ and _Out_writes_all_opt_ annotations. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=584… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Mon Mar 4 16:32:18 2013 @@ -475,7 +475,7 @@ //#define _Deref_post_opt_count_(size) //#define _Deref_post_opt_count_c_(size) //#define _Deref_post_opt_count_x_(size) -//#define _Deref_post_opt_valid_ +#define _Deref_post_opt_valid_ _SAL11_NAME(_Deref_post_opt_valid_) _Group_([SA_Post(Deref=1,Null=SA_Maybe,Notref=1)] [SA_Post(Valid=SA_Yes)]) //#define _Deref_post_opt_valid_bytecap_(size) //#define _Deref_post_opt_valid_bytecap_c_(size) //#define _Deref_post_opt_valid_bytecap_x_(size) @@ -531,7 +531,7 @@ //#define _Deref_pre_opt_count_(size) //#define _Deref_pre_opt_count_c_(size) //#define _Deref_pre_opt_count_x_(size) -//#define _Deref_pre_opt_valid_ +#define _Deref_pre_opt_valid_ _SAL11_NAME(_Deref_pre_opt_valid_) _Group_([SA_Pre(Deref=1,Null=SA_Maybe,Notref=1)] [SA_Pre(Valid=SA_Yes)]) //#define _Deref_pre_opt_valid_bytecap_(size) //#define _Deref_pre_opt_valid_bytecap_c_(size) //#define _Deref_pre_opt_valid_bytecap_x_(size) @@ -554,7 +554,7 @@ //#define _Deref_pre_valid_cap_c_(size) //#define _Deref_pre_valid_cap_x_(size) //#define _Deref_pre_writeonly_ -//#define _Deref_pre_z_ +#define _Deref_pre_z_ _SAL11_NAME(_Deref_pre_z_) _Group_([SA_Pre(Deref=1,Null=SA_No,Notref=1)] [SA_Pre(Deref=1,NullTerminated=SA_Yes)] [SA_Pre(Valid=SA_Yes)]) //#define _Deref_pre_z_bytecap_(size) //#define _Deref_pre_z_bytecap_c_(size) //#define _Deref_pre_z_bytecap_x_(size) @@ -577,7 +577,7 @@ //#define _Deref_prepost_opt_cap_x_(size) //#define _Deref_prepost_opt_count_(size) //#define _Deref_prepost_opt_count_x_(size) -//#define _Deref_prepost_opt_valid_ +#define _Deref_prepost_opt_valid_ _SAL11_NAME(_Deref_prepost_opt_valid_) _Group_(_Deref_pre_opt_valid_ _Deref_post_opt_valid_) //#define _Deref_prepost_opt_valid_bytecap_(size) //#define _Deref_prepost_opt_valid_bytecap_x_(size) //#define _Deref_prepost_opt_valid_cap_(size) @@ -590,7 +590,7 @@ //#define _Deref_prepost_valid_bytecap_x_(size) //#define _Deref_prepost_valid_cap_(size) //#define _Deref_prepost_valid_cap_x_(size) -//#define _Deref_prepost_z_ +#define _Deref_prepost_z_ _SAL11_NAME(_Deref_prepost_z_) _Group_(_Deref_pre_z_ _Deref_post_z_) //#define _Deref_prepost_z_bytecap_(size) //#define _Deref_prepost_z_cap_(size) //#define _Deref_ret_bound_ @@ -777,8 +777,8 @@ //#define _Out_ptrdiff_cap_(size) #define _Out_range_(lb,ub) _SAL2_NAME(_Out_range_) _Group_(_Post_ _SA_annotes2(SAL_range, lb, ub)) #define _Out_writes_(size) _SAL2_NAME(_Out_writes_) _Group_(_Pre_cap_(size) [SA_Post(Valid=SA_Yes)]) -//#define _Out_writes_all_(size) -//#define _Out_writes_all_opt_(size) +#define _Out_writes_all_(size) _SAL2_NAME(_Out_writes_all_) _Group_(_Out_writes_to_(_Old_(size), _Old_(size))) +#define _Out_writes_all_opt_(size) _SAL2_NAME(_Out_writes_all_opt_) _Group_(_Out_writes_to_opt_(_Old_(size), _Old_(size))) #define _Out_writes_bytes_(size) _SAL2_NAME(_Out_writes_bytes_) _Group_(_Pre_bytecap_(size) [SA_Post(Valid=SA_Yes)]) #define _Out_writes_bytes_all_(size) _SAL2_NAME(_Out_writes_bytes_all_) _Group_(_Out_writes_bytes_to_(_Old_(size), _Old_(size))) #define _Out_writes_bytes_all_opt_(size) _SAL2_NAME(_Out_writes_bytes_all_opt_) _Group_(_Out_writes_bytes_to_opt_(_Old_(size), _Old_(size)))

11 years, 8 months

[spetreolle] 58424: [TRANSLATION] Erdem Ersoy : - Fix Turkish translation of solitaire and winmine. - Fix typos of Turkish spider resource file and Ukrainian winmine resource file. CORE-6991 #resol...

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Mar 3 23:24:55 2013 New Revision: 58424 URL: http://svn.reactos.org/svn/reactos?rev=58424&view=rev Log: [TRANSLATION] Erdem Ersoy : - Fix Turkish translation of solitaire and winmine. - Fix typos of Turkish spider resource file and Ukrainian winmine resource file. CORE-6991 #resolve #comment Committed in r58424, thanks. Modified: trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc trunk/reactos/base/applications/games/spider/lang/tr-TR.rc trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc [iso-8859-1] Sun Mar 3 23:24:55 2013 @@ -4,7 +4,7 @@ * FILE: base/applications/games/solitaire/lang/tr-TR.rc * PURPOSE: Turkish Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) - * TRANSLATOR: Erdem ERSOY (eersoy93) + * TRANSLATOR: Erdem Ersoy (eersoy93) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -18,10 +18,10 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "KaÄÄ±tlar", -1, 7, 7, 90, 40 - AUTORADIOBUTTON "&Tekli Ã§ekme", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "&ÃÃ§lÃ¼ Ã§ekme", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 + AUTORADIOBUTTON "&Tekli Ã§ek", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&ÃÃ§lÃ¼ Ã§ek", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 - AUTOCHECKBOX "&ZamanÄ± gÃ¶ster", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "&SÃ¼reyi gÃ¶ster", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED AUTOCHECKBOX "&Durum Ã§ubuÄu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "Tamam", IDOK, 35, 97, 50, 14 Modified: trunk/reactos/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/tr-TR.rc [iso-8859-1] Sun Mar 3 23:24:55 2013 @@ -3,7 +3,7 @@ * LICENSE: See COPYING in top level directory * FILE: base/applications/games/spider/lang/tr-TR.rc * PURPOSE: Turkish Language File for Spider Solitaire - * TRANSLATOR: Erdem ERSOY (eersoy93) + * TRANSLATOR: Erdem Ersoy (eersoy93) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc [iso-8859-1] Sun Mar 3 23:24:55 2013 @@ -2,7 +2,8 @@ * WineMine * Turkish Language Support * - * Copyright 2006 Fatih AÃ¾Ã½cÃ½ + * Copyright 2006 Fatih AÅÄ±cÄ± + * Copyright 2013 Erdem Ersoy (eersoy93) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,40 +23,40 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_APPNAME, "Wine MayÃ½n TarlasÃ½" + IDS_APPNAME, "Wine MayÄ±n TarlasÄ±" IDS_NOBODY, "HiÃ§ kimse" - IDS_ABOUT, "Telif hakkÃ½ 2000, Joshua Thielen" + IDS_ABOUT, "Telif hakkÄ±: Joshua Thielen, 2000" END MENU_WINEMINE MENU BEGIN POPUP "&SeÃ§enekler" BEGIN - MENUITEM "&Yeni\tF2", IDM_NEW + MENUITEM "&Yeni\tF2", IDM_NEW MENUITEM SEPARATOR - MENUITEM "&Soru ÃÃ¾areti", IDM_MARKQ + MENUITEM "&Soru Ä°mi", IDM_MARKQ MENUITEM SEPARATOR - MENUITEM "&Acemi", IDM_BEGINNER - MENUITEM "&GeliÃ¾miÃ¾", IDM_ADVANCED - MENUITEM "&Uzman", IDM_EXPERT - MENUITEM "&Ãzel", IDM_CUSTOM + MENUITEM "&BaÅlangÄ±Ã§", IDM_BEGINNER + MENUITEM "&Orta", IDM_ADVANCED + MENUITEM "&Ä°leri", IDM_EXPERT + MENUITEM "&Ãzel", IDM_CUSTOM MENUITEM SEPARATOR - MENUITEM "&ÃÃ½kÃ½Ã¾\tAlt+X", IDM_EXIT + MENUITEM "&ÃÄ±kÄ±Å\tAlt+X", IDM_EXIT END POPUP "&Bilgi" BEGIN - MENUITEM "&En KÃ½sa SÃ¼reler", IDM_TIMES - MENUITEM "&HakkÃ½nda", IDM_ABOUT + MENUITEM "&En KÄ±sa SÃ¼reler", IDM_TIMES + MENUITEM "&HakkÄ±nda", IDM_ABOUT END END DLG_TIMES DIALOGEX 0, 0, 160, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "En KÃ½sa SÃ¼reler" +CAPTION "En KÄ±sa SÃ¼reler" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "En KÃ½sa SÃ¼reler", -1, 10, 10, 140, 45 - LTEXT "Acemi", -1, 20, 20, 40, 8 - LTEXT "GeliÃ¾miÃ¾", -1, 20, 30, 40, 8 - LTEXT "Uzman", -1, 20, 40, 40, 8 + GROUPBOX "En KÄ±sa SÃ¼reler", -1, 10, 10, 140, 45 + LTEXT "BaÅlangÄ±Ã§", -1, 20, 20, 40, 8 + LTEXT "Orta", -1, 20, 30, 40, 8 + LTEXT "Ä°leri", -1, 20, 40, 40, 8 LTEXT "999", IDC_TIME1, 70, 20, 15, 8 LTEXT "999", IDC_TIME2, 70, 30, 15, 8 LTEXT "999", IDC_TIME3, 70, 40, 15, 8 @@ -70,9 +71,9 @@ CAPTION "Tebrikler!" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "LÃ¼tfen adÃ½nÃ½zÃ½ girin", -1, 10, 10, 150, 10 + LTEXT "LÃ¼tfen adÄ±nÄ±zÄ± giriniz:", -1, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Tamam", IDOK, 60, 40, 40, 15 + DEFPUSHBUTTON "Tamam", IDOK, 60, 40, 40, 15 END DLG_CUSTOM DIALOGEX 0, 0, 100, 100 @@ -80,12 +81,12 @@ CAPTION "Ãzel Oyun" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "SatÃ½rlar", -1, 5, 5, 30, 10 + LTEXT "SatÄ±rlar", -1, 5, 5, 30, 10 LTEXT "SÃ¼tunlar", -1, 5, 35, 30, 10 - LTEXT "MayÃ½nlar", -1, 5, 65, 30, 10 + LTEXT "MayÄ±nlar", -1, 5, 65, 30, 10 EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER - DEFPUSHBUTTON "Tamam", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Ãptal", IDCANCEL, 40, 50, 50, 15 + DEFPUSHBUTTON "Tamam", IDOK, 40, 30, 50, 15 + PUSHBUTTON "VazgeÃ§", IDCANCEL, 40, 50, 50, 15 END Modified: trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc [iso-8859-1] Sun Mar 3 23:24:55 2013 @@ -1,4 +1,3 @@ -/* /* * WineMine * Ukrainian Language Support

11 years, 8 months

[akhaldi] 58423: [CRT] * Annotate stdlib.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 3 22:28:47 2013 New Revision: 58423 URL: http://svn.reactos.org/svn/reactos?rev=58423&view=rev Log: [CRT] * Annotate stdlib.h. Modified: trunk/reactos/include/crt/stdlib.h Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Sun Mar 3 22:28:47 2013 @@ -25,6 +25,10 @@ #else #define NULL ((void *)0) #endif +#endif + +#ifndef MB_LEN_MAX +#define MB_LEN_MAX 5 #endif #define EXIT_SUCCESS 0 @@ -137,8 +141,8 @@ #include <errno.h> _CRTIMP unsigned long *__cdecl __doserrno(void); #define _doserrno (*__doserrno()) - errno_t __cdecl _set_doserrno(unsigned long _Value); - errno_t __cdecl _get_doserrno(unsigned long *_Value); + errno_t __cdecl _set_doserrno(_In_ unsigned long _Value); + errno_t __cdecl _get_doserrno(_Out_ unsigned long *_Value); _CRTIMP extern char *_sys_errlist[]; _CRTIMP extern int _sys_nerr; @@ -180,10 +184,10 @@ _CRTIMP extern wchar_t *_wpgmptr; #endif /* !_M_CEE_PURE */ - _CRTIMP errno_t __cdecl _get_environ(char***); - _CRTIMP errno_t __cdecl _get_wenviron(wchar_t***); - _CRTIMP errno_t __cdecl _get_pgmptr(char **_Value); - _CRTIMP errno_t __cdecl _get_wpgmptr(wchar_t **_Value); + _CRTIMP errno_t __cdecl _get_environ(_Out_ char***); + _CRTIMP errno_t __cdecl _get_wenviron(_Out_ wchar_t***); + _CRTIMP errno_t __cdecl _get_pgmptr(_Deref_out_z_ char **_Value); + _CRTIMP errno_t __cdecl _get_wpgmptr(_Deref_out_z_ wchar_t **_Value); #ifdef _M_CEE_PURE _CRTIMP int* __cdecl __p__fmode(); @@ -191,8 +195,8 @@ #else _CRTIMP extern int _fmode; #endif /* !_M_CEE_PURE */ - _CRTIMP errno_t __cdecl _set_fmode(int _Mode); - _CRTIMP errno_t __cdecl _get_fmode(int *_PMode); + _CRTIMP errno_t __cdecl _set_fmode(_In_ int _Mode); + _CRTIMP errno_t __cdecl _get_fmode(_Out_ int *_PMode); #ifdef _M_CEE_PURE _CRTIMP unsigned int* __cdecl __p__osplatform(); @@ -213,11 +217,11 @@ _CRTIMP extern unsigned int _winminor; #endif /* !_M_CEE_PURE */ - errno_t __cdecl _get_osplatform(unsigned int *_Value); - errno_t __cdecl _get_osver(unsigned int *_Value); - errno_t __cdecl _get_winver(unsigned int *_Value); - errno_t __cdecl _get_winmajor(unsigned int *_Value); - errno_t __cdecl _get_winminor(unsigned int *_Value); + errno_t __cdecl _get_osplatform(_Out_ unsigned int *_Value); + errno_t __cdecl _get_osver(_Out_ unsigned int *_Value); + errno_t __cdecl _get_winver(_Out_ unsigned int *_Value); + errno_t __cdecl _get_winmajor(_Out_ unsigned int *_Value); + errno_t __cdecl _get_winminor(_Out_ unsigned int *_Value); #ifndef _countof #ifndef __cplusplus @@ -233,8 +237,8 @@ #ifndef _CRT_TERMINATE_DEFINED #define _CRT_TERMINATE_DEFINED - __declspec(noreturn) void __cdecl exit(int _Code); - _CRTIMP __declspec(noreturn) void __cdecl _exit(int _Code); + __declspec(noreturn) void __cdecl exit(_In_ int _Code); + _CRTIMP __declspec(noreturn) void __cdecl _exit(_In_ int _Code); #if !defined __NO_ISOCEXT /* extern stub in static libmingwex.a */ /* C99 function name */ __declspec(noreturn) void __cdecl _Exit(int); /* Declare to get noreturn attribute. */ @@ -251,212 +255,1080 @@ #endif #endif - _CRTIMP unsigned int __cdecl _set_abort_behavior(unsigned int _Flags,unsigned int _Mask); + _CRTIMP unsigned int __cdecl _set_abort_behavior(_In_ unsigned int _Flags, _In_ unsigned int _Mask); #ifndef _CRT_ABS_DEFINED #define _CRT_ABS_DEFINED - int __cdecl abs(int _X); - long __cdecl labs(long _X); + int __cdecl abs(_In_ int _X); + long __cdecl labs(_In_ long _X); #endif #if _INTEGRAL_MAX_BITS >= 64 __MINGW_EXTENSION __int64 __cdecl _abs64(__int64); #endif int __cdecl atexit(void (__cdecl *)(void)); + #ifndef _CRT_ATOF_DEFINED #define _CRT_ATOF_DEFINED - double __cdecl atof(const char *_String); - double __cdecl _atof_l(const char *_String,_locale_t _Locale); -#endif - int __cdecl atoi(const char *_Str); - _CRTIMP int __cdecl _atoi_l(const char *_Str,_locale_t _Locale); - long __cdecl atol(const char *_Str); - _CRTIMP long __cdecl _atol_l(const char *_Str,_locale_t _Locale); + + _Check_return_ + double + __cdecl + atof( + _In_z_ const char *_String); + + _Check_return_ + double + __cdecl + _atof_l( + _In_z_ const char *_String, + _In_opt_ _locale_t _Locale); + +#endif /* _CRT_ATOF_DEFINED */ + + _Check_return_ + int + __cdecl + atoi( + _In_z_ const char *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _atoi_l( + _In_z_ const char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + long + __cdecl + atol( + _In_z_ const char *_Str); + + _Check_return_ + _CRTIMP + long + __cdecl + _atol_l( + _In_z_ const char *_Str, + _In_opt_ _locale_t _Locale); + #ifndef _CRT_ALGO_DEFINED #define _CRT_ALGO_DEFINED - void *__cdecl bsearch(const void *_Key,const void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); - void __cdecl qsort(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); -#endif + + _Check_return_ + void* + __cdecl + bsearch( + _In_ const void *_Key, + _In_reads_bytes_(_NumOfElements * _SizeOfElements) const void *_Base, + _In_ size_t _NumOfElements, + _In_ size_t _SizeOfElements, + _In_ int (__cdecl *_PtFuncCompare)(const void *,const void *)); + + void + __cdecl + qsort( + _Inout_updates_bytes_(_NumOfElements * _SizeOfElements) void *_Base, + _In_ size_t _NumOfElements, + _In_ size_t _SizeOfElements, + _In_ int (__cdecl *_PtFuncCompare)(const void *,const void *)); + +#endif /* _CRT_ALGO_DEFINED */ #if !defined(__GNUC__) && !defined(__clang__) - unsigned short __cdecl _byteswap_ushort(unsigned short _Short); - unsigned long __cdecl _byteswap_ulong (unsigned long _Long); + + _Check_return_ + unsigned short + __cdecl + _byteswap_ushort( + _In_ unsigned short _Short); + + _Check_return_ + unsigned long + __cdecl + _byteswap_ulong( + _In_ unsigned long _Long); + #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64 _Int64); -#endif -#endif - - div_t __cdecl div(int _Numerator,int _Denominator); - char *__cdecl getenv(const char *_VarName); - _CRTIMP char *__cdecl _itoa(int _Value,char *_Dest,int _Radix); + _Check_return_ + __MINGW_EXTENSION + unsigned __int64 + __cdecl + _byteswap_uint64( + _In_ unsigned __int64 _Int64); +#endif + +#endif /* !defined(__GNUC__) && !defined(__clang__) */ + + _Check_return_ + div_t + __cdecl + div( + _In_ int _Numerator, + _In_ int _Denominator); + + _Check_return_ + char* + __cdecl + getenv( + _In_z_ const char *_VarName); + + _CRTIMP + char* + __cdecl + _itoa( + _In_ int _Value, + _Pre_notnull_ _Post_z_ char *_Dest, + _In_ int _Radix); + #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION _CRTIMP char *__cdecl _i64toa(__int64 _Val,char *_DstBuf,int _Radix); - __MINGW_EXTENSION _CRTIMP char *__cdecl _ui64toa(unsigned __int64 _Val,char *_DstBuf,int _Radix); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _atoi64(const char *_String); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _atoi64_l(const char *_String,_locale_t _Locale); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _strtoi64(const char *_String,char **_EndPtr,int _Radix); - __MINGW_EXTENSION _CRTIMP __int64 __cdecl _strtoi64_l(const char *_String,char **_EndPtr,int _Radix,_locale_t _Locale); - __MINGW_EXTENSION _CRTIMP unsigned __int64 __cdecl _strtoui64(const char *_String,char **_EndPtr,int _Radix); - __MINGW_EXTENSION _CRTIMP unsigned __int64 __cdecl _strtoui64_l(const char *_String,char **_EndPtr,int _Radix,_locale_t _Locale); -#endif - ldiv_t __cdecl ldiv(long _Numerator,long _Denominator); - _CRTIMP char *__cdecl _ltoa(long _Value,char *_Dest,int _Radix); - int __cdecl mblen(const char *_Ch,size_t _MaxCount); - _CRTIMP int __cdecl _mblen_l(const char *_Ch,size_t _MaxCount,_locale_t _Locale); - _CRTIMP size_t __cdecl _mbstrlen(const char *_Str); - _CRTIMP size_t __cdecl _mbstrlen_l(const char *_Str,_locale_t _Locale); - _CRTIMP size_t __cdecl _mbstrnlen(const char *_Str,size_t _MaxCount); - _CRTIMP size_t __cdecl _mbstrnlen_l(const char *_Str,size_t _MaxCount,_locale_t _Locale); - int __cdecl mbtowc(wchar_t *_DstCh,const char *_SrcCh,size_t _SrcSizeInBytes); - _CRTIMP int __cdecl _mbtowc_l(wchar_t *_DstCh,const char *_SrcCh,size_t _SrcSizeInBytes,_locale_t _Locale); - size_t __cdecl mbstowcs(wchar_t *_Dest,const char *_Source,size_t _MaxCount); - _CRTIMP size_t __cdecl _mbstowcs_l(wchar_t *_Dest,const char *_Source,size_t _MaxCount,_locale_t _Locale); - int __cdecl rand(void); - _CRTIMP int __cdecl _set_error_mode(int _Mode); - void __cdecl srand(unsigned int _Seed); - double __cdecl strtod(const char *_Str,char **_EndPtr); - float __cdecl strtof(const char *nptr, char **endptr); + + __MINGW_EXTENSION + _CRTIMP + char* + __cdecl + _i64toa( + _In_ __int64 _Val, + _Pre_notnull_ _Post_z_ char *_DstBuf, + _In_ int _Radix); + + __MINGW_EXTENSION + _CRTIMP + char* + __cdecl + _ui64toa( + _In_ unsigned __int64 _Val, + _Pre_notnull_ _Post_z_ char *_DstBuf, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _atoi64( + _In_z_ const char *_String); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _atoi64_l( + _In_z_ const char *_String, + _In_opt_ _locale_t _Locale); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _strtoi64( + _In_z_ const char *_String, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + __int64 + __cdecl + _strtoi64_l( + _In_z_ const char *_String, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + unsigned __int64 + __cdecl + _strtoui64( + _In_z_ const char *_String, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix); + + _Check_return_ + __MINGW_EXTENSION + _CRTIMP + unsigned __int64 + __cdecl + _strtoui64_l( + _In_z_ const char *_String, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ + + ldiv_t + __cdecl + ldiv( + _In_ long _Numerator, + _In_ long _Denominator); + + _CRTIMP + char* + __cdecl + _ltoa( + _In_ long _Value, + _Pre_notnull_ _Post_z_ char *_Dest, + _In_ int _Radix); + + _Check_return_ + int + __cdecl + mblen( + _In_reads_bytes_opt_(_MaxCount) _Pre_opt_z_ const char *_Ch, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _mblen_l( + _In_reads_bytes_opt_(_MaxCount) _Pre_opt_z_ const char *_Ch, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbstrlen( + _In_z_ const char *_Str); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbstrlen_l( + _In_z_ const char *_Str, + _In_opt_ _locale_t _Locale); + + _Success_(return>0) + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbstrnlen( + _In_z_ const char *_Str, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbstrnlen_l( + _In_z_ const char *_Str, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + int + __cdecl + mbtowc( + _Pre_notnull_ _Post_z_ wchar_t *_DstCh, + _In_reads_bytes_opt_(_SrcSizeInBytes) _Pre_opt_z_ const char *_SrcCh, + _In_ size_t _SrcSizeInBytes); + + _CRTIMP + int + __cdecl + _mbtowc_l( + _Pre_notnull_ _Post_z_ wchar_t *_DstCh, + _In_reads_bytes_opt_(_SrcSizeInBytes) _Pre_opt_z_ const char *_SrcCh, + _In_ size_t _SrcSizeInBytes, + _In_opt_ _locale_t _Locale); + + size_t + __cdecl + mbstowcs( + _Out_writes_opt_z_(_MaxCount) wchar_t *_Dest, + _In_z_ const char *_Source, + _In_ size_t _MaxCount); + + _CRTIMP + size_t + __cdecl + _mbstowcs_l( + _Out_writes_opt_z_(_MaxCount) wchar_t *_Dest, + _In_z_ const char *_Source, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + int + __cdecl + rand(void); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _set_error_mode( + _In_ int _Mode); + + void + __cdecl + srand( + _In_ unsigned int _Seed); + + _Check_return_ + double + __cdecl + strtod( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr); + + float + __cdecl + strtof( + const char *nptr, + char **endptr); + #if !defined __NO_ISOCEXT /* in libmingwex.a */ float __cdecl strtof (const char * __restrict__, char ** __restrict__); long double __cdecl strtold(const char * __restrict__, char ** __restrict__); #endif /* __NO_ISOCEXT */ - _CRTIMP double __cdecl _strtod_l(const char *_Str,char **_EndPtr,_locale_t _Locale); - long __cdecl strtol(const char *_Str,char **_EndPtr,int _Radix); - _CRTIMP long __cdecl _strtol_l(const char *_Str,char **_EndPtr,int _Radix,_locale_t _Locale); - unsigned long __cdecl strtoul(const char *_Str,char **_EndPtr,int _Radix); - _CRTIMP unsigned long __cdecl _strtoul_l(const char *_Str,char **_EndPtr,int _Radix,_locale_t _Locale); + + _Check_return_ + _CRTIMP + double + __cdecl + _strtod_l( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_opt_ _locale_t _Locale); + + _Check_return_ + long + __cdecl + strtol( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + long + __cdecl + _strtol_l( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + + _Check_return_ + unsigned long + __cdecl + strtoul( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + unsigned long + __cdecl + _strtoul_l( + _In_z_ const char *_Str, + _Out_opt_ _Deref_post_z_ char **_EndPtr, + _In_ int _Radix, + _In_opt_ _locale_t _Locale); + #ifndef _CRT_SYSTEM_DEFINED #define _CRT_SYSTEM_DEFINED - int __cdecl system(const char *_Command); -#endif - _CRTIMP char *__cdecl _ultoa(unsigned long _Value,char *_Dest,int _Radix); - int __cdecl wctomb(char *_MbCh,wchar_t _WCh); - _CRTIMP int __cdecl _wctomb_l(char *_MbCh,wchar_t _WCh,_locale_t _Locale); - size_t __cdecl wcstombs(char *_Dest,const wchar_t *_Source,size_t _MaxCount); - _CRTIMP size_t __cdecl _wcstombs_l(char *_Dest,const wchar_t *_Source,size_t _MaxCount,_locale_t _Locale); + int + __cdecl + system( + _In_opt_z_ const char *_Command); +#endif + + _CRTIMP + char* + __cdecl + _ultoa( + _In_ unsigned long _Value, + _Pre_notnull_ _Post_z_ char *_Dest, + _In_ int _Radix); + + int + __cdecl + wctomb( + _Out_writes_opt_z_(MB_LEN_MAX) char *_MbCh, + _In_ wchar_t _WCh); + + _CRTIMP + int + __cdecl + _wctomb_l( + _Pre_maybenull_ _Post_z_ char *_MbCh, + _In_ wchar_t _WCh, + _In_opt_ _locale_t _Locale); + + size_t + __cdecl + wcstombs( + _Out_writes_opt_z_(_MaxCount) char *_Dest, + _In_z_ const wchar_t *_Source, + _In_ size_t _MaxCount); + + _CRTIMP + size_t + __cdecl + _wcstombs_l( + _Out_writes_opt_z_(_MaxCount) char *_Dest, + _In_z_ const wchar_t *_Source, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); #ifndef _CRT_ALLOCATION_DEFINED #define _CRT_ALLOCATION_DEFINED - void *__cdecl calloc(size_t _NumOfElements,size_t _SizeOfElements); - void __cdecl free(void *_Memory); - void *__cdecl malloc(size_t _Size); - void *__cdecl realloc(void *_Memory,size_t _NewSize); - _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_NumOfElements * _SizeOfElements) + void* + __cdecl + calloc( + _In_ size_t _NumOfElements, + _In_ size_t _SizeOfElements); + + void + __cdecl + free( + _Pre_maybenull_ _Post_invalid_ void *_Memory); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + void* + __cdecl + malloc( + _In_ size_t _Size); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_NewSize) + void* + __cdecl + realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _NewSize); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size); + /* Make sure that X86intrin.h doesn't produce here collisions. */ #if (!defined (_XMMINTRIN_H_INCLUDED) && !defined (_MM_MALLOC_H_INCLUDED)) || defined(_aligned_malloc) #pragma push_macro("_aligned_free") #pragma push_macro("_aligned_malloc") #undef _aligned_free #undef _aligned_malloc - _CRTIMP void __cdecl _aligned_free(void *_Memory); - _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); + + _CRTIMP + void + __cdecl + _aligned_free( + _Pre_maybenull_ _Post_invalid_ void *_Memory); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_malloc( + _In_ size_t _Size, + _In_ size_t _Alignment); + #pragma pop_macro("_aligned_free") #pragma pop_macro("_aligned_malloc") #endif - _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset); - _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment); - _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment); - _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset); - _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset); -#endif + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_offset_malloc( + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Size, + _In_ size_t _Alignment); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _aligned_recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size, + _In_ size_t _Alignment); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_offset_realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _aligned_offset_recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + +#endif /* _CRT_ALLOCATION_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); - float __cdecl wcstof(const wchar_t *nptr, wchar_t **endptr); + _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); + + 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 */ - _CRTIMP double __cdecl _wcstod_l(const wchar_t *_Str,wchar_t **_EndPtr,_locale_t _Locale); - 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_ + _CRTIMP + double + __cdecl + _wcstod_l( + _In_z_ const wchar_t *_Str, + _Out_opt_ _Deref_post_z_ wchar_t **_EndPtr, + _In_opt_ _locale_t _Locale); + + _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_ #define _CVTBUFSIZE (309+40) - _CRTIMP char *__cdecl _fullpath(char *_FullPath,const char *_Path,size_t _SizeInBytes); - _CRTIMP char *__cdecl _ecvt(double _Val,int _NumOfDigits,int *_PtDec,int *_PtSign); - _CRTIMP char *__cdecl _fcvt(double _Val,int _NumOfDec,int *_PtDec,int *_PtSign); - _CRTIMP char *__cdecl _gcvt(double _Val,int _NumOfDigits,char *_DstBuf); - _CRTIMP int __cdecl _atodbl(_CRT_DOUBLE *_Result,char *_Str); - _CRTIMP int __cdecl _atoldbl(_LDOUBLE *_Result,char *_Str); - _CRTIMP int __cdecl _atoflt(_CRT_FLOAT *_Result,char *_Str); - _CRTIMP int __cdecl _atodbl_l(_CRT_DOUBLE *_Result,char *_Str,_locale_t _Locale); - _CRTIMP int __cdecl _atoldbl_l(_LDOUBLE *_Result,char *_Str,_locale_t _Locale); - _CRTIMP int __cdecl _atoflt_l(_CRT_FLOAT *_Result,char *_Str,_locale_t _Locale); - unsigned long __cdecl _lrotl(unsigned long _Val,int _Shift); - unsigned long __cdecl _lrotr(unsigned long _Val,int _Shift); - _CRTIMP void __cdecl _makepath(char *_Path,const char *_Drive,const char *_Dir,const char *_Filename,const char *_Ext); - _onexit_t __cdecl _onexit(_onexit_t _Func); + + _Check_return_ + _CRTIMP + char* + __cdecl + _fullpath( + _Out_writes_opt_z_(_SizeInBytes) char *_FullPath, + _In_z_ const char *_Path, + _In_ size_t _SizeInBytes); + + _Check_return_ + _CRTIMP + char* + __cdecl + _ecvt( + _In_ double _Val, + _In_ int _NumOfDigits, + _Out_ int *_PtDec, + _Out_ int *_PtSign); + + _Check_return_ + _CRTIMP + char* + __cdecl + _fcvt( + _In_ double _Val, + _In_ int _NumOfDec, + _Out_ int *_PtDec, + _Out_ int *_PtSign); + + _CRTIMP + char* + __cdecl + _gcvt( + _In_ double _Val, + _In_ int _NumOfDigits, + _Pre_notnull_ _Post_z_ char *_DstBuf); + + _Check_return_ + _CRTIMP + int + __cdecl + _atodbl( + _Out_ _CRT_DOUBLE *_Result, + _In_z_ char *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _atoldbl( + _Out_ _LDOUBLE *_Result, + _In_z_ char *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _atoflt( + _Out_ _CRT_FLOAT *_Result, + _In_z_ char *_Str); + + _Check_return_ + _CRTIMP + int + __cdecl + _atodbl_l( + _Out_ _CRT_DOUBLE *_Result, + _In_z_ char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _atoldbl_l( + _Out_ _LDOUBLE *_Result, + _In_z_ char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _atoflt_l( + _Out_ _CRT_FLOAT *_Result, + _In_z_ char *_Str, + _In_opt_ _locale_t _Locale); + + unsigned long + __cdecl + _lrotl( + _In_ unsigned long _Val, + _In_ int _Shift); + + unsigned long + __cdecl + _lrotr( + _In_ unsigned long _Val, + _In_ int _Shift); + + _CRTIMP + void + __cdecl + _makepath( + _Pre_notnull_ _Post_z_ char *_Path, + _In_opt_z_ const char *_Drive, + _In_opt_z_ const char *_Dir, + _In_opt_z_ const char *_Filename, + _In_opt_z_ const char *_Ext); + + _onexit_t + __cdecl + _onexit( + _In_opt_ _onexit_t _Func); #ifndef _CRT_PERROR_DEFINED #define _CRT_PERROR_DEFINED - void __cdecl perror(const char *_ErrMsg); -#endif - _CRTIMP int __cdecl _putenv(const char *_EnvString); + void + __cdecl + perror( + _In_opt_z_ const char *_ErrMsg); +#endif + + _Check_return_ + _CRTIMP + int + __cdecl + _putenv( + _In_z_ const char *_EnvString); + #if !defined(__GNUC__) && !defined(__clang__) - unsigned int __cdecl _rotl(unsigned int _Val,int _Shift); + + unsigned int + __cdecl + _rotl( + _In_ unsigned int _Val, + _In_ int _Shift); + #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val,int _Shift); -#endif - unsigned int __cdecl _rotr(unsigned int _Val,int _Shift); + __MINGW_EXTENSION + unsigned __int64 + __cdecl + _rotl64( + _In_ unsigned __int64 _Val, + _In_ int _Shift); +#endif + + unsigned int + __cdecl + _rotr( + _In_ unsigned int _Val, + _In_ int _Shift); + #if _INTEGRAL_MAX_BITS >= 64 - __MINGW_EXTENSION unsigned __int64 __cdecl _rotr64(unsigned __int64 _Val,int _Shift); -#endif -#endif - _CRTIMP void __cdecl _searchenv(const char *_Filename,const char *_EnvVar,char *_ResultPath); - _CRTIMP void __cdecl _splitpath(const char *_FullPath,char *_Drive,char *_Dir,char *_Filename,char *_Ext); - _CRTIMP void __cdecl _swab(char *_Buf1,char *_Buf2,int _SizeInBytes); + __MINGW_EXTENSION + unsigned __int64 + __cdecl + _rotr64( + _In_ unsigned __int64 _Val, + _In_ int _Shift); +#endif + +#endif /* !defined(__GNUC__) && !defined(__clang__) */ + + _CRTIMP + void + __cdecl + _searchenv( + _In_z_ const char *_Filename, + _In_z_ const char *_EnvVar, + _Pre_notnull_ _Post_z_ char *_ResultPath); + + _CRTIMP + void + __cdecl + _splitpath( + _In_z_ const char *_FullPath, + _Pre_maybenull_ _Post_z_ char *_Drive, + _Pre_maybenull_ _Post_z_ char *_Dir, + _Pre_maybenull_ _Post_z_ char *_Filename, + _Pre_maybenull_ _Post_z_ char *_Ext); + + _CRTIMP + void + __cdecl + _swab( + _Inout_updates_(_SizeInBytes) _Post_readable_size_(_SizeInBytes) char *_Buf1, + _Inout_updates_(_SizeInBytes) _Post_readable_size_(_SizeInBytes) char *_Buf2, + int _SizeInBytes); #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 - - _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _beep(unsigned _Frequency,unsigned _Duration); + _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 */ + + _CRTIMP + __MINGW_ATTRIB_DEPRECATED + void + __cdecl + _beep( + _In_ unsigned _Frequency, + _In_ unsigned _Duration); + /* Not to be confused with _set_error_mode (int). */ - _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _seterrormode(int _Mode); - _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _sleep(unsigned long _Duration); -#endif - -#ifndef NO_OLDNAMES + _CRTIMP + __MINGW_ATTRIB_DEPRECATED + void + __cdecl + _seterrormode( + _In_ int _Mode); + + _CRTIMP + __MINGW_ATTRIB_DEPRECATED + void + __cdecl + _sleep( + _In_ unsigned long _Duration); + +#endif /* _POSIX_ */ + +#ifndef NO_OLDNAMES #ifndef _POSIX_ #if 0 #ifndef __cplusplus @@ -467,24 +1339,88 @@ #ifndef min #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif -#endif -#endif +#endif /* NOMINMAX */ +#endif /* __cplusplus */ #endif #define sys_errlist _sys_errlist #define sys_nerr _sys_nerr #define environ _environ - _CRTIMP char *__cdecl ecvt(double _Val,int _NumOfDigits,int *_PtDec,int *_PtSign); - _CRTIMP char *__cdecl fcvt(double _Val,int _NumOfDec,int *_PtDec,int *_PtSign); - _CRTIMP char *__cdecl gcvt(double _Val,int _NumOfDigits,char *_DstBuf); - _CRTIMP char *__cdecl itoa(int _Val,char *_DstBuf,int _Radix); - _CRTIMP char *__cdecl ltoa(long _Val,char *_DstBuf,int _Radix); - _CRTIMP int __cdecl putenv(const char *_EnvString); - _CRTIMP void __cdecl swab(char *_Buf1,char *_Buf2,int _SizeInBytes); - _CRTIMP char *__cdecl ultoa(unsigned long _Val,char *_Dstbuf,int _Radix); - onexit_t __cdecl onexit(onexit_t _Func); -#endif -#endif + + _Check_return_ + _CRTIMP + char* + __cdecl + ecvt( + _In_ double _Val, + _In_ int _NumOfDigits, + _Out_ int *_PtDec, + _Out_ int *_PtSign); + + _Check_return_ + _CRTIMP + char* + __cdecl + fcvt( + _In_ double _Val, + _In_ int _NumOfDec, + _Out_ int *_PtDec, + _Out_ int *_PtSign); + + _CRTIMP + char* + __cdecl + gcvt( + _In_ double _Val, + _In_ int _NumOfDigits, + _Pre_notnull_ _Post_z_ char *_DstBuf); + + _CRTIMP + char* + __cdecl + itoa( + _In_ int _Val, + _Pre_notnull_ _Post_z_ char *_DstBuf, + _In_ int _Radix); + + _CRTIMP + char* + __cdecl + ltoa( + _In_ long _Val, + _Pre_notnull_ _Post_z_ char *_DstBuf, + _In_ int _Radix); + + _Check_return_ + _CRTIMP + int + __cdecl + putenv( + _In_z_ const char *_EnvString); + + _CRTIMP + void + __cdecl + swab( + _Inout_updates_z_(_SizeInBytes) char *_Buf1, + _Inout_updates_z_(_SizeInBytes) char *_Buf2, + _In_ int _SizeInBytes); + + _CRTIMP + char* + __cdecl + ultoa( + _In_ unsigned long _Val, + _Pre_notnull_ _Post_z_ char *_Dstbuf, + _In_ int _Radix); + + onexit_t + __cdecl + onexit( + _In_opt_ onexit_t _Func); + +#endif /* _POSIX_ */ +#endif /* NO_OLDNAMES */ #if !defined __NO_ISOCEXT /* externs in static libmingwex.a */

11 years, 8 months

[akhaldi] 58422: [SAL] * Add _Inout_opt_z_, _Inout_z_, _Out_writes_bytes_all_opt_, _Post_maybez_, _Prepost_opt_z_ and _Prepost_z_ annotations.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 3 21:33:22 2013 New Revision: 58422 URL: http://svn.reactos.org/svn/reactos?rev=58422&view=rev Log: [SAL] * Add _Inout_opt_z_, _Inout_z_, _Out_writes_bytes_all_opt_, _Post_maybez_, _Prepost_opt_z_ and _Prepost_z_ annotations. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=584… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sun Mar 3 21:33:22 2013 @@ -681,7 +681,7 @@ //#define _Inout_opt_count_c_(size) //#define _Inout_opt_count_x_(size) //#define _Inout_opt_ptrdiff_count_(size) -//#define _Inout_opt_z_ +#define _Inout_opt_z_ _SAL2_NAME(_Inout_opt_z_) _Group_(_Prepost_opt_z_) //#define _Inout_opt_z_bytecap_(size) //#define _Inout_opt_z_bytecap_c_(size) //#define _Inout_opt_z_bytecap_x_(size) @@ -707,7 +707,7 @@ //#define _Inout_updates_to_(size,count) //#define _Inout_updates_to_opt_(size,count) #define _Inout_updates_z_(size) _SAL2_NAME(_Inout_updates_z_) _Group_(_Pre_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)] [SA_Pre(NullTerminated=SA_Yes)] [SA_Post(NullTerminated=SA_Yes)]) -//#define _Inout_z_ +#define _Inout_z_ _SAL2_NAME(_Inout_z_) _Group_(_Prepost_z_) //#define _Inout_z_bytecap_(size) //#define _Inout_z_bytecap_c_(size) //#define _Inout_z_bytecap_x_(size) @@ -781,7 +781,7 @@ //#define _Out_writes_all_opt_(size) #define _Out_writes_bytes_(size) _SAL2_NAME(_Out_writes_bytes_) _Group_(_Pre_bytecap_(size) [SA_Post(Valid=SA_Yes)]) #define _Out_writes_bytes_all_(size) _SAL2_NAME(_Out_writes_bytes_all_) _Group_(_Out_writes_bytes_to_(_Old_(size), _Old_(size))) -//#define _Out_writes_bytes_all_opt_(size) +#define _Out_writes_bytes_all_opt_(size) _SAL2_NAME(_Out_writes_bytes_all_opt_) _Group_(_Out_writes_bytes_to_opt_(_Old_(size), _Old_(size))) #define _Out_writes_bytes_opt_(size) _SAL2_NAME(_Out_writes_bytes_opt_) _Group_(_Pre_opt_bytecap_(size) [SA_Post(Valid=SA_Yes)]) #define _Out_writes_bytes_to_(size,count) _SAL2_NAME(_Out_writes_bytes_to_) _Group_(_Pre_bytecap_(size) [SA_Post(Valid=SA_Yes)] _Post_bytecount_(count)) #define _Out_writes_bytes_to_opt_(size,count) _SAL2_NAME(_Out_writes_bytes_to_opt_) _Group_(_Pre_opt_bytecap_(size) [SA_Post(Valid=SA_Yes)] _Post_bytecount_(count) ) @@ -867,7 +867,7 @@ #define _Post_equal_to_(expr) _SAL2_NAME(_Post_equal_to_) _Group_(_Out_range_(==,expr)) #define _Post_invalid_ _SAL2_NAME(_Post_invalid_) _Group_([SA_Post(Deref=1,Valid=SA_No)]) #define _Post_maybenull_ _SAL2_NAME(_Post_maybenull_) _Group_([SA_Post(Null=SA_Maybe)]) -//#define _Post_maybez_ +#define _Post_maybez_ _SAL11_NAME(_Post_maybez_) _Group_([SA_Post(NullTerminated=SA_Maybe)]) #define _Post_notnull_ _SAL2_NAME(_Post_notnull_) _Group_([SA_Post(Null=SA_No)]) //#define _Post_null_ #define _Post_ptr_invalid_ _SAL2_NAME(_Post_ptr_invalid_) _Group_([SA_Post(Valid=SA_No)]) @@ -973,9 +973,9 @@ //#define _Prepost_opt_count_c_(size) //#define _Prepost_opt_count_x_(size) #define _Prepost_opt_valid_ _SAL2_NAME(_Prepost_opt_valid_) _Group_(_Pre_opt_valid_ _Post_valid_) -//#define _Prepost_opt_z_ +#define _Prepost_opt_z_ _SAL11_NAME(_Prepost_opt_z_) _Group_(_Pre_opt_z_ _Post_z_) #define _Prepost_valid_ _SAL11_NAME(_Prepost_valid_) _Group_(_Pre_valid_ _Post_valid_) -//#define _Prepost_z_ +#define _Prepost_z_ _SAL2_NAME(_Prepost_z_) _Group_(_Pre_z_ _Post_z_) #define _Printf_format_string_ _SAL2_NAME(_Printf_format_string_) _Group_([SA_FormatString(Style="printf")] ) //#define _Raises_SEH_exception_ #define _Maybe_raises_SEH_exception_

11 years, 8 months

← Newer
1
...
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