Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 58437: [WIN32K] Use _SEH2_YIELD to return from except block. Thanks Hermes.
by tkreuzer＠svn.reactos.org 05 Mar '13

05 Mar '13

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

1 0

[gadamopoulos] 58436: [win32k] - Initialize NewPos before using it in co_WinPosShowWindow
by gadamopoulos＠svn.reactos.org 05 Mar '13

05 Mar '13

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

1 0

[akhaldi] 58435: [CRT] * Annotate ctype.h.
by akhaldi＠svn.reactos.org 05 Mar '13

05 Mar '13

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

1 0

[tkreuzer] 58434: [WIN32K] - Fix a bug in EngLoadModuleEx - Fix a bug in co_IntLoadSysMenuTemplate - Fix / improve a number of annotations - Improve code in NtGdiExtGetObjectW - Check return value ...
by tkreuzer＠svn.reactos.org 05 Mar '13

05 Mar '13

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

1 0

[tkreuzer] 58433: [RTL] Formatting, no code change.
by tkreuzer＠svn.reactos.org 05 Mar '13

05 Mar '13

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

1 0

[tkreuzer] 58432: [CMAKE] Add -mstackrealign option for GCC 4.7+. Seems to fix some problems.
by tkreuzer＠svn.reactos.org 05 Mar '13

05 Mar '13

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

1 0

[tkreuzer] 58431: [CDMAKE] Fix a warning with new RosBE
by tkreuzer＠svn.reactos.org 05 Mar '13

05 Mar '13

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

1 0

[akhaldi] 58430: [CRT] * Annotate stdio.h.
by akhaldi＠svn.reactos.org 04 Mar '13

04 Mar '13

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 }

1 0

[akhaldi] 58429: [SAL] * Add _Field_size_part_ annotation.
by akhaldi＠svn.reactos.org 04 Mar '13

04 Mar '13

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

1 0

[akhaldi] 58428: [NDK] * Correct the annotation of ObOpenObjectByName's 4th param.
by akhaldi＠svn.reactos.org 04 Mar '13

04 Mar '13

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

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs