Ros-diffs March 2013

ros-diffs@reactos.org

14 participants
249 discussions

[akhaldi] 58401: [SAL] * Add _Deref_out_z_, _Deref_post_z_, _Out_writes_opt_z_, _Pre_notnull_ and _Ret_notnull_ annotations.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 2 17:47:17 2013 New Revision: 58401 URL: http://svn.reactos.org/svn/reactos?rev=58401&view=rev Log: [SAL] * Add _Deref_out_z_, _Deref_post_z_, _Out_writes_opt_z_, _Pre_notnull_ and _Ret_notnull_ 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] Sat Mar 2 17:47:17 2013 @@ -445,7 +445,7 @@ //#define _Deref_out_opt_ //#define _Deref_out_opt_z_ #define _Deref_out_range_(lb,ub) _SAL2_NAME(_Deref_out_range_) _Group_(_Post_ [SAL_notref] [SAL_deref] [SAL_annotes(Name="SAL_range", p1=_SA_SPECSTRIZE(lb), p2=_SA_SPECSTRIZE(ub))]) -//#define _Deref_out_z_ +#define _Deref_out_z_ _SAL11_NAME(_Deref_out_z_) _Group_(_Out_ _Deref_post_z_) //#define _Deref_out_z_bytecap_c_(size) //#define _Deref_out_z_cap_c_(size) #define _Deref_post_bytecap_(size) _SAL11_NAME(_Deref_post_bytecap_) _Group_([SA_Post(Deref=1,Null=SA_No,Notref=1)] [SA_Post(Deref=1,WritableBytes="\n" _SA_SPECSTRIZE(size))]) @@ -496,7 +496,7 @@ //#define _Deref_post_valid_cap_(size) //#define _Deref_post_valid_cap_c_(size) //#define _Deref_post_valid_cap_x_(size) -//#define _Deref_post_z_ +#define _Deref_post_z_ _SAL11_NAME(_Deref_post_z_) _Group_([SA_Post(Deref=1,Null=SA_No,Notref=1)] [SA_Post(Deref=1,NullTerminated=SA_Yes)] [SA_Post(Valid=SA_Yes)]) //#define _Deref_post_z_bytecap_(size) //#define _Deref_post_z_bytecap_c_(size) //#define _Deref_post_z_bytecap_x_(size) @@ -786,7 +786,7 @@ #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) ) #define _Out_writes_opt_(size) _SAL2_NAME(_Out_writes_opt_) _Group_(_Pre_opt_cap_(size) [SA_Post(Valid=SA_Yes)]) -//#define _Out_writes_opt_z_(size) +#define _Out_writes_opt_z_(size) _SAL2_NAME(_Out_writes_opt_z_) _Group_(_Pre_opt_cap_(size) [SA_Post(Valid=SA_Yes)] _Post_z_) #define _Out_writes_to_(size,count) _SAL2_NAME(_Out_writes_to_) _Group_(_Pre_cap_(size) [SA_Post(Valid=SA_Yes)] _Post_count_(count)) #define _Out_writes_to_opt_(size,count) _SAL2_NAME(_Out_writes_to_opt_) _Group_(_Pre_opt_cap_(size) [SA_Post(Valid=SA_Yes)] _Post_count_(count)) //#define _Out_writes_to_ptr_(ptr) @@ -903,7 +903,7 @@ //#define _Pre_equal_to_(expr) //#define _Pre_invalid_ #define _Pre_maybenull_ _SAL2_NAME(_Pre_maybenull_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)]) -//#define _Pre_notnull_ +#define _Pre_notnull_ _SAL2_NAME(_Pre_notnull_) _Group_([SA_Pre(Null=SA_No,Notref=1)]) //#define _Pre_null_ #define _Pre_opt_bytecap_(size) _SAL11_NAME(_Pre_opt_bytecap_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableBytes="\n" _SA_SPECSTRIZE(size))] ) //#define _Pre_opt_bytecap_c_(size) @@ -1001,7 +1001,7 @@ //#define _Ret_count_x_(size) #define _Ret_maybenull_ _SAL2_NAME(_Ret_maybenull_) _Group_([SA_Post(Null=SA_Maybe)]) //#define _Ret_maybenull_z_ -//#define _Ret_notnull_ +#define _Ret_notnull_ _SAL2_NAME(_Ret_notnull_) _Group_([SA_Post(Null=SA_No)]) //#define _Ret_null_ //#define _Ret_opt_ #define _Ret_opt_bytecap_(size) _SAL11_NAME(_Ret_opt_bytecap_) _Group_([SA_Post(Null=SA_Maybe,Notref=1)] [SA_Post(WritableBytes="\n" _SA_SPECSTRIZE(size))])

11 years, 6 months

[akhaldi] 58400: [LIBJPEG] * Sync to v9. * Brought to you by Ivan Di Francesco. CORE-6819 #resolve #comment Committed in r58400. Grazie ; )

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 2 17:14:06 2013 New Revision: 58400 URL: http://svn.reactos.org/svn/reactos?rev=58400&view=rev Log: [LIBJPEG] * Sync to v9. * Brought to you by Ivan Di Francesco. CORE-6819 #resolve #comment Committed in r58400. Grazie ;) Added: trunk/reactos/dll/3rdparty/libjpeg/jmemdos.c (with props) trunk/reactos/dll/3rdparty/libjpeg/jmemmac.c (with props) Modified: trunk/reactos/dll/3rdparty/libjpeg/README trunk/reactos/dll/3rdparty/libjpeg/change.log trunk/reactos/dll/3rdparty/libjpeg/cjpeg.c trunk/reactos/dll/3rdparty/libjpeg/djpeg.c trunk/reactos/dll/3rdparty/libjpeg/jaricom.c trunk/reactos/dll/3rdparty/libjpeg/jcarith.c trunk/reactos/dll/3rdparty/libjpeg/jccoefct.c trunk/reactos/dll/3rdparty/libjpeg/jccolor.c trunk/reactos/dll/3rdparty/libjpeg/jcmainct.c trunk/reactos/dll/3rdparty/libjpeg/jcmarker.c trunk/reactos/dll/3rdparty/libjpeg/jcparam.c trunk/reactos/dll/3rdparty/libjpeg/jctrans.c trunk/reactos/dll/3rdparty/libjpeg/jdarith.c trunk/reactos/dll/3rdparty/libjpeg/jdatadst.c trunk/reactos/dll/3rdparty/libjpeg/jdatasrc.c trunk/reactos/dll/3rdparty/libjpeg/jdcoefct.c trunk/reactos/dll/3rdparty/libjpeg/jdcolor.c trunk/reactos/dll/3rdparty/libjpeg/jdhuff.c trunk/reactos/dll/3rdparty/libjpeg/jdmainct.c trunk/reactos/dll/3rdparty/libjpeg/jdmarker.c trunk/reactos/dll/3rdparty/libjpeg/jdmaster.c trunk/reactos/dll/3rdparty/libjpeg/jerror.c trunk/reactos/dll/3rdparty/libjpeg/jmemmgr.c trunk/reactos/dll/3rdparty/libjpeg/jpegtran.c trunk/reactos/dll/3rdparty/libjpeg/jquant1.c trunk/reactos/dll/3rdparty/libjpeg/jquant2.c trunk/reactos/dll/3rdparty/libjpeg/jutils.c trunk/reactos/dll/3rdparty/libjpeg/transupp.c trunk/reactos/include/reactos/libs/libjpeg/jerror.h trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h trunk/reactos/include/reactos/libs/libjpeg/jpegint.h trunk/reactos/include/reactos/libs/libjpeg/jpeglib.h trunk/reactos/include/reactos/libs/libjpeg/jversion.h trunk/reactos/include/reactos/libs/libjpeg/transupp.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/libjpeg/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/READM… Modified: trunk/reactos/dll/3rdparty/libjpeg/change.log URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/chang… Modified: trunk/reactos/dll/3rdparty/libjpeg/cjpeg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/cjpeg… Modified: trunk/reactos/dll/3rdparty/libjpeg/djpeg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/djpeg… Modified: trunk/reactos/dll/3rdparty/libjpeg/jaricom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jaric… Modified: trunk/reactos/dll/3rdparty/libjpeg/jcarith.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jcari… Modified: trunk/reactos/dll/3rdparty/libjpeg/jccoefct.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jccoe… Modified: trunk/reactos/dll/3rdparty/libjpeg/jccolor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jccol… Modified: trunk/reactos/dll/3rdparty/libjpeg/jcmainct.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jcmai… Modified: trunk/reactos/dll/3rdparty/libjpeg/jcmarker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jcmar… Modified: trunk/reactos/dll/3rdparty/libjpeg/jcparam.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jcpar… Modified: trunk/reactos/dll/3rdparty/libjpeg/jctrans.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jctra… Modified: trunk/reactos/dll/3rdparty/libjpeg/jdarith.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jdari… Modified: trunk/reactos/dll/3rdparty/libjpeg/jdatadst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jdata… Modified: trunk/reactos/dll/3rdparty/libjpeg/jdatasrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jdata… Modified: trunk/reactos/dll/3rdparty/libjpeg/jdcoefct.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jdcoe… Modified: trunk/reactos/dll/3rdparty/libjpeg/jdcolor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jdcol… Modified: trunk/reactos/dll/3rdparty/libjpeg/jdhuff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jdhuf… Modified: trunk/reactos/dll/3rdparty/libjpeg/jdmainct.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jdmai… Modified: trunk/reactos/dll/3rdparty/libjpeg/jdmarker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jdmar… Modified: trunk/reactos/dll/3rdparty/libjpeg/jdmaster.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jdmas… Modified: trunk/reactos/dll/3rdparty/libjpeg/jerror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jerro… Added: trunk/reactos/dll/3rdparty/libjpeg/jmemdos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jmemd… Added: trunk/reactos/dll/3rdparty/libjpeg/jmemmac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jmemm… Modified: trunk/reactos/dll/3rdparty/libjpeg/jmemmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jmemm… Modified: trunk/reactos/dll/3rdparty/libjpeg/jpegtran.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jpegt… Modified: trunk/reactos/dll/3rdparty/libjpeg/jquant1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jquan… Modified: trunk/reactos/dll/3rdparty/libjpeg/jquant2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jquan… Modified: trunk/reactos/dll/3rdparty/libjpeg/jutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jutil… Modified: trunk/reactos/dll/3rdparty/libjpeg/transupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/trans… Modified: trunk/reactos/include/reactos/libs/libjpeg/jerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp… Modified: trunk/reactos/include/reactos/libs/libjpeg/jmorecfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp… Modified: trunk/reactos/include/reactos/libs/libjpeg/jpegint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp… Modified: trunk/reactos/include/reactos/libs/libjpeg/jpeglib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp… Modified: trunk/reactos/include/reactos/libs/libjpeg/jversion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp… Modified: trunk/reactos/include/reactos/libs/libjpeg/transupp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libjp…

11 years, 6 months

[tkreuzer] 58399: [GDI32] Forgot this one, too

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 2 15:49:48 2013 New Revision: 58399 URL: http://svn.reactos.org/svn/reactos?rev=58399&view=rev Log: [GDI32] Forgot this one, too Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h Modified: trunk/reactos/win32ss/gdi/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/precomp.h [iso-8859-1] Sat Mar 2 15:49:48 2013 @@ -23,6 +23,7 @@ #include <objbase.h> #include <ndk/rtlfuncs.h> #include <wingdi.h> +#define _ENGINE_EXPORT_ #include <winddi.h> #include <d3dnthal.h> #include <prntfont.h>

11 years, 6 months

[tkreuzer] 58398: [WIN32K] Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 2 15:43:23 2013 New Revision: 58398 URL: http://svn.reactos.org/svn/reactos?rev=58398&view=rev Log: [WIN32K] Fix build Modified: trunk/reactos/win32ss/pch.h Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=58398&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Sat Mar 2 15:43:23 2013 @@ -58,6 +58,7 @@ #include <winerror.h> #include <wingdi.h> #define NT_BUILD_ENVIRONMENT +#define _ENGINE_EXPORT_ #include <winddi.h> #include <winuser.h> #include <windowsx.h>

11 years, 6 months

[tkreuzer] 58397: [SAL] - Add _Out_opt_z_bytecap_ - ndk/rtlfuncs.h: Fix annotations for RtlQueryAtomInAtomTable - winddi.h: Use ENGAPI instead of WIN32KAPI, fix annotations for EngBitBlt, EngCreate...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 2 15:39:59 2013 New Revision: 58397 URL: http://svn.reactos.org/svn/reactos?rev=58397&view=rev Log: [SAL] - Add _Out_opt_z_bytecap_ - ndk/rtlfuncs.h: Fix annotations for RtlQueryAtomInAtomTable - winddi.h: Use ENGAPI instead of WIN32KAPI, fix annotations for EngBitBlt, EngCreateEvent, EngQuerySystemAttribute, EngRestoreFloatingPointState, EngSaveFloatingPointState Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/sal.h trunk/reactos/include/psdk/winddi.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Mar 2 15:39:59 2013 @@ -2316,9 +2316,9 @@ RtlQueryAtomInAtomTable( _In_ PRTL_ATOM_TABLE AtomTable, _In_ RTL_ATOM Atom, - _Inout_opt_ PULONG RefCount, - _Inout_opt_ PULONG PinCount, - _Inout_opt_ PWSTR AtomName, + _Out_opt_ PULONG RefCount, + _Out_opt_ PULONG PinCount, + _Out_opt_z_bytecap_(*NameLength) PWSTR AtomName, _Inout_opt_ PULONG NameLength ); Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=583… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sat Mar 2 15:39:59 2013 @@ -763,7 +763,7 @@ //#define _Out_opt_capcount_(capcount) //#define _Out_opt_capcount_x_(capcount) //#define _Out_opt_ptrdiff_cap_(size) -//#define _Out_opt_z_bytecap_(size) +#define _Out_opt_z_bytecap_(size) _SAL11_NAME(_Out_opt_z_bytecap_) _Group_(_Pre_opt_bytecap_(size) [SA_Post(Valid=SA_Yes)] _Post_z_) //#define _Out_opt_z_bytecap_c_(size) //#define _Out_opt_z_bytecap_post_bytecount_(cap,count) //#define _Out_opt_z_bytecap_x_(size) Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Sat Mar 2 15:39:59 2013 @@ -41,8 +41,10 @@ #define DECLSPEC_IMPORT __attribute__((dllimport)) #endif -#ifndef WIN32KAPI -#define WIN32KAPI DECLSPEC_ADDRSAFE +#if defined(_ENGINE_EXPORT_) +#define ENGAPI +#else +#define ENGAPI DECLSPEC_IMPORT #endif #define DDI_DRIVER_VERSION_NT4 0x00020000 @@ -1157,33 +1159,33 @@ _In_ FLONG fl); -WIN32KAPI +ENGAPI HANDLE APIENTRY BRUSHOBJ_hGetColorTransform( _In_ BRUSHOBJ *pbo); _Ret_opt_bytecount_(cj) -WIN32KAPI +ENGAPI PVOID APIENTRY BRUSHOBJ_pvAllocRbrush( _In_ BRUSHOBJ *pbo, _In_ ULONG cj); -WIN32KAPI +ENGAPI PVOID APIENTRY BRUSHOBJ_pvGetRbrush( _In_ BRUSHOBJ *pbo); -WIN32KAPI +ENGAPI ULONG APIENTRY BRUSHOBJ_ulGetBrushColor( _In_ BRUSHOBJ *pbo); -WIN32KAPI +ENGAPI BOOL APIENTRY CLIPOBJ_bEnum( @@ -1203,7 +1205,7 @@ #define CD_LEFTUP 0x00000003 #define CD_ANY 0x00000004 -WIN32KAPI +ENGAPI ULONG APIENTRY CLIPOBJ_cEnumStart( @@ -1213,21 +1215,21 @@ _In_ ULONG iDirection, _In_ ULONG cLimit); -WIN32KAPI +ENGAPI PATHOBJ* APIENTRY CLIPOBJ_ppoGetPath( _In_ CLIPOBJ *pco); #if (NTDDI_VERSION >= NTDDI_VISTA) -WIN32KAPI +ENGAPI HANDLE APIENTRY CLIPOBJ_GetRgn( _In_ CLIPOBJ* pco); #endif -WIN32KAPI +ENGAPI VOID APIENTRY EngAcquireSemaphore( @@ -1247,7 +1249,7 @@ _Must_inspect_result_ _When_(fl & FL_ZERO_MEMORY, _Ret_opt_bytecount_(cjMemSize)) _When_(!(fl & FL_ZERO_MEMORY), _Ret_opt_bytecap_(cjMemSize)) -WIN32KAPI +ENGAPI PVOID APIENTRY EngAllocMem( @@ -1257,7 +1259,7 @@ _Must_inspect_result_ _Ret_opt_bytecount_(cjMemSize) -WIN32KAPI +ENGAPI PVOID APIENTRY EngAllocPrivateUserMem( @@ -1267,7 +1269,7 @@ _Must_inspect_result_ _Ret_opt_bytecount_(cjMemSize) -WIN32KAPI +ENGAPI PVOID APIENTRY EngAllocUserMem( @@ -1276,7 +1278,7 @@ #endif /* USERMODE_DRIVER */ -WIN32KAPI +ENGAPI BOOL APIENTRY EngAlphaBlend( @@ -1312,7 +1314,7 @@ #define HOOK_FLAGS 0x0003b5ff #endif -WIN32KAPI +ENGAPI BOOL APIENTRY EngAssociateSurface( @@ -1320,11 +1322,11 @@ _In_ HDEV hdev, _In_ FLONG flHooks); -WIN32KAPI +ENGAPI BOOL APIENTRY EngBitBlt( - _In_ SURFOBJ *psoTrg, + _Inout_ SURFOBJ *psoTrg, _In_opt_ SURFOBJ *psoSrc, _In_opt_ SURFOBJ *psoMask, _In_opt_ CLIPOBJ *pco, @@ -1336,19 +1338,19 @@ _In_opt_ POINTL *pptlBrush, _In_ ROP4 rop4); -WIN32KAPI +ENGAPI BOOL APIENTRY EngCheckAbort( _In_ SURFOBJ *pso); -WIN32KAPI +ENGAPI VOID APIENTRY EngClearEvent( _In_ PEVENT pEvent); -WIN32KAPI +ENGAPI FD_GLYPHSET* APIENTRY EngComputeGlyphSet( @@ -1360,14 +1362,14 @@ #define ECS_TEARDOWN 0x00000001 #define ECS_REDRAW 0x00000002 -WIN32KAPI +ENGAPI BOOL APIENTRY EngControlSprites( _Inout_ WNDOBJ *pwo, _In_ FLONG fl); -WIN32KAPI +ENGAPI BOOL APIENTRY EngCopyBits( @@ -1378,7 +1380,7 @@ _In_ RECTL *prclDest, _In_ POINTL *pptlSrc); -WIN32KAPI +ENGAPI HBITMAP APIENTRY EngCreateBitmap( @@ -1388,13 +1390,13 @@ _In_ FLONG fl, _In_opt_ PVOID pvBits); -WIN32KAPI +ENGAPI CLIPOBJ* APIENTRY EngCreateClip(VOID); _Must_inspect_result_ -WIN32KAPI +ENGAPI HBITMAP APIENTRY EngCreateDeviceBitmap( @@ -1403,7 +1405,7 @@ _In_ ULONG iFormatCompat); _Must_inspect_result_ -WIN32KAPI +ENGAPI HSURF APIENTRY EngCreateDeviceSurface( @@ -1412,7 +1414,7 @@ _In_ ULONG iFormatCompat); _Must_inspect_result_ -WIN32KAPI +ENGAPI HDRVOBJ APIENTRY EngCreateDriverObj( @@ -1422,11 +1424,11 @@ _Must_inspect_result_ _Success_(return != FALSE) -WIN32KAPI +ENGAPI BOOL APIENTRY EngCreateEvent( - _When_(return != FALSE, _Outptr_) PEVENT *ppEvent); + _Outptr_ PEVENT *ppEvent); /* EngCreatePalette.iMode constants */ #define PAL_INDEXED 0x00000001 @@ -1436,7 +1438,7 @@ #define PAL_CMYK 0x00000010 _Must_inspect_result_ -WIN32KAPI +ENGAPI HPALETTE APIENTRY EngCreatePalette( @@ -1447,12 +1449,12 @@ _In_ FLONG flGreen, _In_ FLONG flBlue); -WIN32KAPI +ENGAPI PATHOBJ* APIENTRY EngCreatePath(VOID); -WIN32KAPI +ENGAPI HSEMAPHORE APIENTRY EngCreateSemaphore(VOID); @@ -1472,7 +1474,7 @@ #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ _Must_inspect_result_ -WIN32KAPI +ENGAPI WNDOBJ* APIENTRY EngCreateWnd( @@ -1483,12 +1485,12 @@ _In_ INT iPixelFormat); _Analysis_noreturn_ -WIN32KAPI +ENGAPI VOID APIENTRY EngDebugBreak(VOID); -WIN32KAPI +ENGAPI VOID APIENTRY EngDebugPrint( @@ -1496,13 +1498,13 @@ _In_z_ PCHAR DebugMessage, _In_ va_list ap); -WIN32KAPI +ENGAPI VOID APIENTRY EngDeleteClip( _In_ _Post_ptr_invalid_ CLIPOBJ *pco); -WIN32KAPI +ENGAPI BOOL APIENTRY EngDeleteDriverObj( @@ -1510,56 +1512,56 @@ _In_ BOOL bCallBack, _In_ BOOL bLocked); -WIN32KAPI +ENGAPI BOOL APIENTRY EngDeleteEvent( _In_ _Post_ptr_invalid_ PEVENT pEvent); -WIN32KAPI +ENGAPI BOOL APIENTRY EngDeleteFile( _In_ LPWSTR pwszFileName); -WIN32KAPI +ENGAPI BOOL APIENTRY EngDeletePalette( _In_ _Post_ptr_invalid_ HPALETTE hpal); -WIN32KAPI +ENGAPI VOID APIENTRY EngDeletePath( _In_ _Post_ptr_invalid_ PATHOBJ *ppo); -WIN32KAPI +ENGAPI VOID APIENTRY EngDeleteSafeSemaphore( _Inout_ ENGSAFESEMAPHORE *pssem); -WIN32KAPI +ENGAPI VOID APIENTRY EngDeleteSemaphore( _In_ _Post_ptr_invalid_ HSEMAPHORE hsem); -WIN32KAPI +ENGAPI BOOL APIENTRY EngDeleteSurface( _In_ _Post_ptr_invalid_ HSURF hsurf); -WIN32KAPI +ENGAPI VOID APIENTRY EngDeleteWnd( _In_ _Post_ptr_invalid_ WNDOBJ *pwo); _Success_(return==0) -WIN32KAPI +ENGAPI DWORD APIENTRY EngDeviceIoControl( @@ -1574,7 +1576,7 @@ #define DM_DEFAULT 0x00000001 #define DM_MONOCHROME 0x00000002 -WIN32KAPI +ENGAPI ULONG APIENTRY EngDitherColor( @@ -1585,7 +1587,7 @@ _When_(iMode == DM_MONOCHROME, _Out_writes_bytes_(8)) ULONG *pul); -WIN32KAPI +ENGAPI BOOL APIENTRY EngEnumForms( @@ -1596,7 +1598,7 @@ _Out_ LPDWORD pcbNeeded, _Out_ LPDWORD pcReturned); -WIN32KAPI +ENGAPI BOOL APIENTRY EngEraseSurface( @@ -1604,7 +1606,7 @@ _In_ RECTL *prcl, _In_ ULONG iColor); -WIN32KAPI +ENGAPI BOOL APIENTRY EngFillPath( @@ -1616,14 +1618,14 @@ _In_ MIX mix, _In_ FLONG flOptions); -WIN32KAPI +ENGAPI PVOID APIENTRY EngFindImageProcAddress( _In_ HANDLE hModule, _In_ LPSTR lpProcName); -WIN32KAPI +ENGAPI PVOID APIENTRY EngFindResource( @@ -1634,7 +1636,7 @@ _Must_inspect_result_ _Ret_opt_bytecap_(cjSize) -WIN32KAPI +ENGAPI PVOID APIENTRY EngFntCacheAlloc( @@ -1645,14 +1647,14 @@ #define ENG_FNT_CACHE_READ_FAULT 0x00000001 #define ENG_FNT_CACHE_WRITE_FAULT 0x00000002 -WIN32KAPI +ENGAPI VOID APIENTRY EngFntCacheFault( _In_ ULONG ulFastCheckSum, _In_ ULONG iFaultMode); -WIN32KAPI +ENGAPI PVOID APIENTRY EngFntCacheLookUp( @@ -1667,20 +1669,20 @@ #else /* !USERMODE_DRIVER */ -WIN32KAPI +ENGAPI VOID APIENTRY EngFreeMem( _In_ _Post_ptr_invalid_ PVOID pv); -WIN32KAPI +ENGAPI VOID APIENTRY EngFreePrivateUserMem( _In_ PDD_SURFACE_LOCAL psl, _In_ _Post_ptr_invalid_ PVOID pv); -WIN32KAPI +ENGAPI VOID APIENTRY EngFreeUserMem( @@ -1688,52 +1690,52 @@ #endif /* !USERMODE_DRIVER */ -WIN32KAPI +ENGAPI VOID APIENTRY EngFreeModule( _In_ HANDLE h); -WIN32KAPI +ENGAPI VOID APIENTRY EngGetCurrentCodePage( _Out_ PUSHORT OemCodePage, _Out_ PUSHORT AnsiCodePage); -WIN32KAPI +ENGAPI HANDLE APIENTRY EngGetCurrentProcessId(VOID); -WIN32KAPI +ENGAPI HANDLE APIENTRY EngGetCurrentThreadId(VOID); _Must_inspect_result_ _Ret_z_ -WIN32KAPI +ENGAPI LPWSTR APIENTRY EngGetDriverName( _In_ HDEV hdev); -WIN32KAPI +ENGAPI BOOL APIENTRY EngGetFileChangeTime( _In_ HANDLE h, _Out_ LARGE_INTEGER *pChangeTime); -WIN32KAPI +ENGAPI BOOL APIENTRY EngGetFilePath( _In_ HANDLE h, _Out_ WCHAR (*pDest)[MAX_PATH+1]); -WIN32KAPI +ENGAPI BOOL APIENTRY EngGetForm( @@ -1747,13 +1749,13 @@ #ifdef USERMODE_DRIVER #define EngGetLastError GetLastError #else -WIN32KAPI +ENGAPI ULONG APIENTRY EngGetLastError(VOID); #endif -WIN32KAPI +ENGAPI BOOL APIENTRY EngGetPrinter( @@ -1763,7 +1765,7 @@ _In_ DWORD cbBuf, _Out_ LPDWORD pcbNeeded); -WIN32KAPI +ENGAPI DWORD APIENTRY EngGetPrinterData( @@ -1774,13 +1776,13 @@ _In_ DWORD cjSize, _Out_ LPDWORD pcjNeeded); -WIN32KAPI +ENGAPI LPWSTR APIENTRY EngGetPrinterDataFileName( _In_ HDEV hdev); -WIN32KAPI +ENGAPI BOOL APIENTRY EngGetPrinterDriver( @@ -1791,12 +1793,12 @@ _In_ DWORD cjBufSize, _Out_ DWORD *pcjNeeded); -WIN32KAPI +ENGAPI HANDLE APIENTRY EngGetProcessHandle(VOID); -WIN32KAPI +ENGAPI BOOL APIENTRY EngGetType1FontList( @@ -1807,7 +1809,7 @@ _Out_ PULONG pulRemoteFonts, _Out_ LARGE_INTEGER *pLastModified); -WIN32KAPI +ENGAPI BOOL APIENTRY EngGradientFill( @@ -1826,32 +1828,32 @@ #define EHN_RESTORED 0x00000000 #define EHN_ERROR 0x00000001 -WIN32KAPI +ENGAPI ULONG APIENTRY EngHangNotification( _In_ HDEV hDev, _Reserved_ PVOID Reserved); -WIN32KAPI +ENGAPI BOOL APIENTRY EngInitializeSafeSemaphore( _Out_ ENGSAFESEMAPHORE *pssem); -WIN32KAPI +ENGAPI BOOL APIENTRY EngIsSemaphoreOwned( _In_ HSEMAPHORE hsem); -WIN32KAPI +ENGAPI BOOL APIENTRY EngIsSemaphoreOwnedByCurrentThread( _In_ HSEMAPHORE hsem); -WIN32KAPI +ENGAPI BOOL APIENTRY EngLineTo( @@ -1865,49 +1867,49 @@ _In_opt_ RECTL *prclBounds, _In_ MIX mix); -WIN32KAPI +ENGAPI HANDLE APIENTRY EngLoadImage( _In_ LPWSTR pwszDriver); -WIN32KAPI +ENGAPI HANDLE APIENTRY EngLoadModule( _In_ LPWSTR pwsz); -WIN32KAPI +ENGAPI HANDLE APIENTRY EngLoadModuleForWrite( _In_ LPWSTR pwsz, _In_ ULONG cjSizeOfModule); -WIN32KAPI +ENGAPI PDD_SURFACE_LOCAL APIENTRY EngLockDirectDrawSurface( _In_ HANDLE hSurface); -WIN32KAPI +ENGAPI DRIVEROBJ* APIENTRY EngLockDriverObj( _In_ HDRVOBJ hdo); -WIN32KAPI +ENGAPI SURFOBJ* APIENTRY EngLockSurface( _In_ HSURF hsurf); -WIN32KAPI +ENGAPI BOOL APIENTRY EngLpkInstalled(VOID); -WIN32KAPI +ENGAPI PEVENT APIENTRY EngMapEvent( @@ -1919,7 +1921,7 @@ _Success_(return != 0) _When_(cjSize != 0, _At_(return, _Out_writes_bytes_(cjSize))) -WIN32KAPI +ENGAPI PVOID APIENTRY EngMapFile( @@ -1927,7 +1929,7 @@ _In_ ULONG cjSize, _Out_ ULONG_PTR *piFile); -WIN32KAPI +ENGAPI BOOL APIENTRY EngMapFontFile( @@ -1935,7 +1937,7 @@ _Outptr_result_bytebuffer_(*pcjBuf) PULONG *ppjBuf, _Out_ ULONG *pcjBuf); -WIN32KAPI +ENGAPI BOOL APIENTRY EngMapFontFileFD( @@ -1943,14 +1945,14 @@ _Outptr_result_bytebuffer_(*pcjBuf) PULONG *ppjBuf, _Out_ ULONG *pcjBuf); -WIN32KAPI +ENGAPI PVOID APIENTRY EngMapModule( _In_ HANDLE h, _Out_ PULONG pSize); -WIN32KAPI +ENGAPI BOOL APIENTRY EngMarkBandingSurface( @@ -1960,7 +1962,7 @@ #define MS_NOTSYSTEMMEMORY 0x00000001 #define MS_SHAREDACCESS 0x00000002 -WIN32KAPI +ENGAPI BOOL APIENTRY EngModifySurface( @@ -1973,7 +1975,7 @@ _In_ LONG lDelta, _Reserved_ PVOID pvReserved); -WIN32KAPI +ENGAPI VOID APIENTRY EngMovePointer( @@ -1985,7 +1987,7 @@ #ifdef USERMODE_DRIVER #define EngMulDiv MulDiv #else /* !USERMODE_DRIVER */ -WIN32KAPI +ENGAPI INT APIENTRY EngMulDiv( @@ -1994,7 +1996,7 @@ _In_ INT c); #endif /* !USERMODE_DRIVER */ -WIN32KAPI +ENGAPI VOID APIENTRY EngMultiByteToUnicodeN( @@ -2004,7 +2006,7 @@ _In_reads_bytes_(BytesInMultiByteString) PCHAR MultiByteString, _In_ ULONG BytesInMultiByteString); -WIN32KAPI +ENGAPI INT APIENTRY EngMultiByteToWideChar( @@ -2014,7 +2016,7 @@ _In_reads_bytes_opt_(cjMultiByteString) LPSTR MultiByteString, _In_ INT cjMultiByteString); -WIN32KAPI +ENGAPI BOOL APIENTRY EngPaint( @@ -2024,7 +2026,7 @@ _In_ POINTL *pptlBrushOrg, _In_ MIX mix); -WIN32KAPI +ENGAPI BOOL APIENTRY EngPlgBlt( @@ -2040,7 +2042,7 @@ _When_(psoMsk, _In_) POINTL *pptl, _In_ ULONG iMode); -WIN32KAPI +ENGAPI VOID APIENTRY EngProbeForRead( @@ -2052,7 +2054,7 @@ #endif _In_ ULONG Alignment); -WIN32KAPI +ENGAPI VOID APIENTRY EngProbeForReadAndWrite( @@ -2069,7 +2071,7 @@ QDA_ACCELERATION_LEVEL } ENG_DEVICE_ATTRIBUTE; -WIN32KAPI +ENGAPI BOOL APIENTRY EngQueryDeviceAttribute( @@ -2080,19 +2082,19 @@ _Out_writes_bytes_(cjOutSize) PVOID pvOut, _In_ ULONG cjOutSize); -WIN32KAPI +ENGAPI LARGE_INTEGER APIENTRY EngQueryFileTimeStamp( _In_ LPWSTR pwsz); -WIN32KAPI +ENGAPI VOID APIENTRY EngQueryLocalTime( _Out_ PENG_TIME_FIELDS ptf); -WIN32KAPI +ENGAPI ULONG APIENTRY EngQueryPalette( @@ -2101,13 +2103,13 @@ _In_ ULONG cColors, _Out_writes_opt_(cColors) ULONG *pulColors); -WIN32KAPI +ENGAPI VOID APIENTRY EngQueryPerformanceCounter( _Out_ LONGLONG *pPerformanceCount); -WIN32KAPI +ENGAPI VOID APIENTRY EngQueryPerformanceFrequency( @@ -2124,46 +2126,61 @@ #define QSA_SSE 0x00002000 #define QSA_3DNOW 0x00004000 -WIN32KAPI +_Check_return_ +_Success_(return) +ENGAPI BOOL APIENTRY EngQuerySystemAttribute( _In_ ENG_SYSTEM_ATTRIBUTE CapNum, - _When_(return != FALSE, _Out_) PDWORD pCapability); - -WIN32KAPI + _Out_ PDWORD pCapability); + +ENGAPI LONG APIENTRY EngReadStateEvent( _In_ PEVENT pEvent); -WIN32KAPI +ENGAPI VOID APIENTRY EngReleaseSemaphore( _In_ HSEMAPHORE hsem); -WIN32KAPI +_Check_return_ +_Success_(return) +_Kernel_float_restored_ +_At_(*pBuffer, _Kernel_requires_resource_held_(EngFloatState) + _Kernel_releases_resource_(EngFloatState)) +ENGAPI BOOL APIENTRY EngRestoreFloatingPointState( - _In_ VOID *pBuffer); - -WIN32KAPI + _In_reads_(_Inexpressible_(statesize)) + PVOID pBuffer); + +_Check_return_ +_Success_(((pBuffer != NULL && cjBufferSize != 0) && return == 1) || + ((pBuffer == NULL || cjBufferSize == 0) && return > 0)) +_When_(pBuffer != NULL && cjBufferSize != 0 && return == 1, _Kernel_float_saved_ + _At_(*pBuffer, _Post_valid_ _Kernel_acquires_resource_(EngFloatState))) +_On_failure_(_Post_satisfies_(return == 0)) +ENGAPI ULONG APIENTRY EngSaveFloatingPointState( - _Inout_ VOID *pBuffer, - _In_ ULONG cjBufferSize); - -WIN32KAPI + _At_(*pBuffer, _Kernel_requires_resource_not_held_(EngFloatState)) + _Out_writes_bytes_opt_(cjBufferSize) PVOID pBuffer, + _Inout_ ULONG cjBufferSize); + +ENGAPI HANDLE APIENTRY EngSecureMem( _In_reads_bytes_(cjLength) PVOID Address, _In_ ULONG cjLength); -WIN32KAPI +ENGAPI LONG APIENTRY EngSetEvent( @@ -2172,14 +2189,14 @@ #ifdef USERMODE_DRIVER #define EngSetLastError SetLastError #else -WIN32KAPI +ENGAPI VOID APIENTRY EngSetLastError( _In_ ULONG iError); #endif -WIN32KAPI +ENGAPI ULONG APIENTRY EngSetPointerShape( @@ -2194,7 +2211,7 @@ _In_ RECTL *prcl, _In_ FLONG fl); -WIN32KAPI +ENGAPI BOOL APIENTRY EngSetPointerTag( @@ -2204,7 +2221,7 @@ _Reserved_ XLATEOBJ *pxlo, _In_ FLONG fl); -WIN32KAPI +ENGAPI DWORD APIENTRY EngSetPrinterData( @@ -2216,7 +2233,7 @@ typedef int (CDECL *SORTCOMP)(const void *pv1, const void *pv2); -WIN32KAPI +ENGAPI VOID APIENTRY EngSort( @@ -2225,7 +2242,7 @@ _In_ ULONG cjElem, _In_ SORTCOMP pfnComp); -WIN32KAPI +ENGAPI BOOL APIENTRY EngStretchBlt( @@ -2241,7 +2258,7 @@ _When_(psoMask, _In_) POINTL *pptlMask, _In_ ULONG iMode); -WIN32KAPI +ENGAPI BOOL APIENTRY EngStretchBltROP( @@ -2259,7 +2276,7 @@ _In_opt_ BRUSHOBJ *pbo, _In_ DWORD rop4); -WIN32KAPI +ENGAPI BOOL APIENTRY EngStrokeAndFillPath( @@ -2274,7 +2291,7 @@ _In_ MIX mixFill, _In_ FLONG flOptions); -WIN32KAPI +ENGAPI BOOL APIENTRY EngStrokePath( @@ -2287,7 +2304,7 @@ _In_ LINEATTRS *plineattrs, _In_ MIX mix); -WIN32KAPI +ENGAPI BOOL APIENTRY EngTextOut( @@ -2302,7 +2319,7 @@ _In_ POINTL *pptlOrg, _In_ MIX mix); -WIN32KAPI +ENGAPI BOOL APIENTRY EngTransparentBlt( @@ -2315,7 +2332,7 @@ _In_ ULONG iTransColor, _In_ ULONG ulReserved); -WIN32KAPI +ENGAPI VOID APIENTRY EngUnicodeToMultiByteN( @@ -2325,68 +2342,68 @@ _In_reads_bytes_(cjUnicodeString) PWSTR pwszUnicodeString, _In_ ULONG cjUnicodeString); -WIN32KAPI +ENGAPI VOID APIENTRY EngUnloadImage( _In_ HANDLE hModule); -WIN32KAPI +ENGAPI BOOL APIENTRY EngUnlockDirectDrawSurface( _In_ PDD_SURFACE_LOCAL pSurface); -WIN32KAPI +ENGAPI BOOL APIENTRY EngUnlockDriverObj( _In_ _Post_ptr_invalid_ HDRVOBJ hdo); -WIN32KAPI +ENGAPI VOID APIENTRY EngUnlockSurface( _In_ _Post_ptr_invalid_ SURFOBJ *pso); -WIN32KAPI +ENGAPI BOOL APIENTRY EngUnmapEvent( _In_ PEVENT pEvent); -WIN32KAPI +ENGAPI BOOL APIENTRY EngUnmapFile( _In_ ULONG_PTR iFile); -WIN32KAPI +ENGAPI VOID APIENTRY EngUnmapFontFile( _In_ ULONG_PTR iFile); -WIN32KAPI +ENGAPI VOID APIENTRY EngUnmapFontFileFD( _In_ ULONG_PTR iFile); -WIN32KAPI +ENGAPI VOID APIENTRY EngUnsecureMem( _In_ HANDLE hSecure); -WIN32KAPI +ENGAPI BOOL APIENTRY EngWaitForSingleObject( _In_ PEVENT pEvent, _In_opt_ PLARGE_INTEGER pTimeOut); -WIN32KAPI +ENGAPI INT APIENTRY EngWideCharToMultiByte( @@ -2396,7 +2413,7 @@ _Out_z_bytecap_(cjMultiByteString) LPSTR pszMultiByteString, _In_ INT cjMultiByteString); -WIN32KAPI +ENGAPI BOOL APIENTRY EngWritePrinter( @@ -2406,158 +2423,158 @@ _Out_ LPDWORD pcWritten); #if defined(_X86_) && !defined(USERMODE_DRIVER) -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_Add( _Inout_ PFLOATOBJ pf, _In_ PFLOATOBJ pf1); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_AddFloat( _Inout_ PFLOATOBJ pf, _In_ FLOATL f); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_AddLong( _Inout_ PFLOATOBJ pf, _In_ LONG l); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_Div( _Inout_ PFLOATOBJ pf, _In_ PFLOATOBJ pf1); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_DivFloat( _Inout_ PFLOATOBJ pf, _In_ FLOATL f); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_DivLong( _Inout_ PFLOATOBJ pf, _In_ LONG l); -WIN32KAPI +ENGAPI BOOL APIENTRY FLOATOBJ_Equal( _In_ PFLOATOBJ pf, _In_ PFLOATOBJ pf1); -WIN32KAPI +ENGAPI BOOL APIENTRY FLOATOBJ_EqualLong( _In_ PFLOATOBJ pf, _In_ LONG l); -WIN32KAPI +ENGAPI LONG APIENTRY FLOATOBJ_GetFloat( _In_ PFLOATOBJ pf); -WIN32KAPI +ENGAPI LONG APIENTRY FLOATOBJ_GetLong( _In_ PFLOATOBJ pf); -WIN32KAPI +ENGAPI BOOL APIENTRY FLOATOBJ_GreaterThan( _In_ PFLOATOBJ pf, _In_ PFLOATOBJ pf1); -WIN32KAPI +ENGAPI BOOL APIENTRY FLOATOBJ_GreaterThanLong( _In_ PFLOATOBJ pf, _In_ LONG l); -WIN32KAPI +ENGAPI BOOL APIENTRY FLOATOBJ_LessThan( _In_ PFLOATOBJ pf, _In_ PFLOATOBJ pf1); -WIN32KAPI +ENGAPI BOOL APIENTRY FLOATOBJ_LessThanLong( _In_ PFLOATOBJ pf, _In_ LONG l); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_Mul( _Inout_ PFLOATOBJ pf, _In_ PFLOATOBJ pf1); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_MulFloat( _Inout_ PFLOATOBJ pf, _In_ FLOATL f); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_MulLong( _Inout_ PFLOATOBJ pf, _In_ LONG l); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_Neg( _Inout_ PFLOATOBJ pf); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_SetFloat( _Out_ PFLOATOBJ pf, _In_ FLOATL f); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_SetLong( _Out_ PFLOATOBJ pf, _In_ LONG l); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_Sub( _Inout_ PFLOATOBJ pf, _In_ PFLOATOBJ pf1); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_SubFloat( _Inout_ PFLOATOBJ pf, _In_ FLOATL f); -WIN32KAPI +ENGAPI VOID APIENTRY FLOATOBJ_SubLong( @@ -2592,14 +2609,14 @@ #endif -WIN32KAPI +ENGAPI ULONG APIENTRY FONTOBJ_cGetAllGlyphHandles( _In_ FONTOBJ *pfo, _Out_opt_ HGLYPH *phg); -WIN32KAPI +ENGAPI ULONG APIENTRY FONTOBJ_cGetGlyphs( @@ -2609,20 +2626,20 @@ _In_count_(cGlyph) HGLYPH *phg, _Out_ PVOID *ppvGlyph); -WIN32KAPI +ENGAPI FD_GLYPHSET* APIENTRY FONTOBJ_pfdg( _In_ FONTOBJ *pfo); -WIN32KAPI +ENGAPI IFIMETRICS* APIENTRY FONTOBJ_pifi( _In_ FONTOBJ *pfo); _Ret_opt_bytecount_(*pcjTable) -WIN32KAPI +ENGAPI PBYTE APIENTRY FONTOBJ_pjOpenTypeTablePointer( @@ -2630,7 +2647,7 @@ _In_ ULONG ulTag, _Out_ ULONG *pcjTable); -WIN32KAPI +ENGAPI PFD_GLYPHATTR APIENTRY FONTOBJ_pQueryGlyphAttrs( @@ -2638,27 +2655,27 @@ _In_ ULONG iMode); _Ret_opt_bytecount_(*pcjFile) -WIN32KAPI +ENGAPI PVOID APIENTRY FONTOBJ_pvTrueTypeFontFile( _In_ FONTOBJ *pfo, _Out_ ULONG *pcjFile); -WIN32KAPI +ENGAPI LPWSTR APIENTRY FONTOBJ_pwszFontFilePaths( _In_ FONTOBJ *pfo, _Out_ ULONG *pcwc); -WIN32KAPI +ENGAPI XFORMOBJ* APIENTRY FONTOBJ_pxoGetXform( _In_ FONTOBJ *pfo); -WIN32KAPI +ENGAPI VOID APIENTRY FONTOBJ_vGetInfo( @@ -2673,7 +2690,7 @@ _In_ FONTOBJ *pfo); #endif -WIN32KAPI +ENGAPI LONG APIENTRY HT_ComputeRGBGammaTable( @@ -2684,7 +2701,7 @@ _In_ USHORT BlueGamma, _Out_writes_bytes_(GammaTableEntries * 3) LPBYTE pGammaTable); -WIN32KAPI +ENGAPI LONG APIENTRY HT_Get8BPPFormatPalette( @@ -2693,7 +2710,7 @@ _In_ USHORT GreenGamma, _In_ USHORT BlueGamma); -WIN32KAPI +ENGAPI LONG APIENTRY HT_Get8BPPMaskPalette( @@ -2704,14 +2721,14 @@ _In_ USHORT GreenGamma, _In_ USHORT BlueGamma); -WIN32KAPI +ENGAPI LONG APIENTRY HTUI_DeviceColorAdjustment( _In_ LPSTR pDeviceName, _Out_ PDEVHTADJDATA pDevHTAdjData); -WIN32KAPI +ENGAPI ULONG APIENTRY PALOBJ_cGetColors( @@ -2720,20 +2737,20 @@ _In_ ULONG cColors, _Out_writes_(cColors) ULONG *pulColors); -WIN32KAPI +ENGAPI BOOL APIENTRY PATHOBJ_bCloseFigure( _In_ PATHOBJ *ppo); -WIN32KAPI +ENGAPI BOOL APIENTRY PATHOBJ_bEnum( _In_ PATHOBJ *ppo, _Out_ PATHDATA *ppd); -WIN32KAPI +ENGAPI BOOL APIENTRY PATHOBJ_bEnumClipLines( @@ -2741,14 +2758,14 @@ _In_ ULONG cj, _Out_bytecap_(cj) CLIPLINE *pcl); -WIN32KAPI +ENGAPI BOOL APIENTRY PATHOBJ_bMoveTo( _In_ PATHOBJ *ppo, _In_ POINTFIX ptfx); -WIN32KAPI +ENGAPI BOOL APIENTRY PATHOBJ_bPolyBezierTo( @@ -2756,7 +2773,7 @@ _In_count_(cptfx) POINTFIX *pptfx, _In_ ULONG cptfx); -WIN32KAPI +ENGAPI BOOL APIENTRY PATHOBJ_bPolyLineTo( @@ -2764,13 +2781,13 @@ _In_count_(cptfx) POINTFIX *pptfx, _In_ ULONG cptfx); -WIN32KAPI +ENGAPI VOID APIENTRY PATHOBJ_vEnumStart( _Inout_ PATHOBJ *ppo); -WIN32KAPI +ENGAPI VOID APIENTRY PATHOBJ_vEnumStartClipLines( @@ -2779,14 +2796,14 @@ _In_ SURFOBJ *pso, _In_ LINEATTRS *pla); -WIN32KAPI +ENGAPI VOID APIENTRY PATHOBJ_vGetBounds( _In_ PATHOBJ *ppo, _Out_ PRECTFX prectfx); -WIN32KAPI +ENGAPI BOOL APIENTRY STROBJ_bEnum( @@ -2794,7 +2811,7 @@ _Out_ ULONG *pc, _Out_ PGLYPHPOS *ppgpos); // FIXME_ size? -WIN32KAPI +ENGAPI BOOL APIENTRY STROBJ_bEnumPositionsOnly( @@ -2802,7 +2819,7 @@ _Out_ ULONG *pc, _Out_ PGLYPHPOS *ppgpos); // FIXME_ size? -WIN32KAPI +ENGAPI BOOL APIENTRY STROBJ_bGetAdvanceWidths( @@ -2811,31 +2828,31 @@ _In_ ULONG c, _Out_cap_(c) POINTQF *pptqD); -WIN32KAPI +ENGAPI DWORD APIENTRY STROBJ_dwGetCodePage( _In_ STROBJ *pstro); -WIN32KAPI +ENGAPI FIX APIENTRY STROBJ_fxBreakExtra( _In_ STROBJ *pstro); -WIN32KAPI +ENGAPI FIX APIENTRY STROBJ_fxCharacterExtra( _In_ STROBJ *pstro); -WIN32KAPI +ENGAPI VOID APIENTRY STROBJ_vEnumStart( _Inout_ STROBJ *pstro); -WIN32KAPI +ENGAPI BOOL APIENTRY WNDOBJ_bEnum( @@ -2843,7 +2860,7 @@ _In_ ULONG cj, _Out_bytecap_(cj) ULONG *pul); -WIN32KAPI +ENGAPI ULONG APIENTRY WNDOBJ_cEnumStart( @@ -2852,7 +2869,7 @@ _In_ ULONG iDirection, _In_ ULONG cLimit); -WIN32KAPI +ENGAPI VOID APIENTRY WNDOBJ_vSetConsumer( @@ -2865,7 +2882,7 @@ #define XF_LTOFX 2L #define XF_INV_FXTOL 3L -WIN32KAPI +ENGAPI BOOL APIENTRY XFORMOBJ_bApplyXform( @@ -2876,7 +2893,7 @@ _Out_writes_bytes_(cPoints * sizeof(POINTL)) PVOID pvOut); #if !defined(USERMODE_DRIVER) -WIN32KAPI +ENGAPI ULONG APIENTRY XFORMOBJ_iGetFloatObjXform( @@ -2886,7 +2903,7 @@ #define XFORMOBJ_iGetFloatObjXform XFORMOBJ_iGetXform #endif -WIN32KAPI +ENGAPI ULONG APIENTRY XFORMOBJ_iGetXform( @@ -2900,7 +2917,7 @@ #define XO_SRCBITFIELDS 4 #define XO_DESTBITFIELDS 5 -WIN32KAPI +ENGAPI ULONG APIENTRY XLATEOBJ_cGetPalette( @@ -2909,20 +2926,20 @@ _In_ ULONG cPal, _Out_cap_(cPal) ULONG *pPal); -WIN32KAPI +ENGAPI HANDLE APIENTRY XLATEOBJ_hGetColorTransform( _In_ XLATEOBJ *pxlo); -WIN32KAPI +ENGAPI ULONG APIENTRY XLATEOBJ_iXlate( _In_ XLATEOBJ *pxlo, _In_ ULONG iColor); -WIN32KAPI +ENGAPI ULONG* APIENTRY XLATEOBJ_piVector(

11 years, 6 months

[akhaldi] 58396: [LIBTIFF] * Sync to v4.0.3. CORE-6898 #resolve

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 2 14:45:37 2013 New Revision: 58396 URL: http://svn.reactos.org/svn/reactos?rev=58396&view=rev Log: [LIBTIFF] * Sync to v4.0.3. CORE-6898 #resolve Added: trunk/reactos/dll/3rdparty/libtiff/tif_jpeg_12.c (with props) trunk/reactos/dll/3rdparty/libtiff/tif_lzma.c (with props) trunk/reactos/dll/3rdparty/libtiff/tif_unix.c (with props) trunk/reactos/include/reactos/libs/libtiff/tif_config.wince.h (with props) trunk/reactos/include/reactos/libs/libtiff/tiffconf.wince.h (with props) Modified: trunk/reactos/dll/3rdparty/libtiff/mkg3states.c trunk/reactos/dll/3rdparty/libtiff/tif_aux.c trunk/reactos/dll/3rdparty/libtiff/tif_close.c trunk/reactos/dll/3rdparty/libtiff/tif_codec.c trunk/reactos/dll/3rdparty/libtiff/tif_color.c trunk/reactos/dll/3rdparty/libtiff/tif_compress.c trunk/reactos/dll/3rdparty/libtiff/tif_dir.c trunk/reactos/dll/3rdparty/libtiff/tif_dirinfo.c trunk/reactos/dll/3rdparty/libtiff/tif_dirread.c trunk/reactos/dll/3rdparty/libtiff/tif_dirwrite.c trunk/reactos/dll/3rdparty/libtiff/tif_dumpmode.c trunk/reactos/dll/3rdparty/libtiff/tif_error.c trunk/reactos/dll/3rdparty/libtiff/tif_extension.c trunk/reactos/dll/3rdparty/libtiff/tif_fax3.c trunk/reactos/dll/3rdparty/libtiff/tif_flush.c trunk/reactos/dll/3rdparty/libtiff/tif_getimage.c trunk/reactos/dll/3rdparty/libtiff/tif_jbig.c trunk/reactos/dll/3rdparty/libtiff/tif_jpeg.c trunk/reactos/dll/3rdparty/libtiff/tif_luv.c trunk/reactos/dll/3rdparty/libtiff/tif_lzw.c trunk/reactos/dll/3rdparty/libtiff/tif_next.c trunk/reactos/dll/3rdparty/libtiff/tif_ojpeg.c trunk/reactos/dll/3rdparty/libtiff/tif_open.c trunk/reactos/dll/3rdparty/libtiff/tif_packbits.c trunk/reactos/dll/3rdparty/libtiff/tif_pixarlog.c trunk/reactos/dll/3rdparty/libtiff/tif_predict.c trunk/reactos/dll/3rdparty/libtiff/tif_print.c trunk/reactos/dll/3rdparty/libtiff/tif_read.c trunk/reactos/dll/3rdparty/libtiff/tif_strip.c trunk/reactos/dll/3rdparty/libtiff/tif_swab.c trunk/reactos/dll/3rdparty/libtiff/tif_thunder.c trunk/reactos/dll/3rdparty/libtiff/tif_tile.c trunk/reactos/dll/3rdparty/libtiff/tif_version.c trunk/reactos/dll/3rdparty/libtiff/tif_warning.c trunk/reactos/dll/3rdparty/libtiff/tif_win32.c trunk/reactos/dll/3rdparty/libtiff/tif_write.c trunk/reactos/dll/3rdparty/libtiff/tif_zip.c trunk/reactos/include/reactos/libs/libtiff/t4.h trunk/reactos/include/reactos/libs/libtiff/tif_config.h trunk/reactos/include/reactos/libs/libtiff/tif_config.vc.h trunk/reactos/include/reactos/libs/libtiff/tif_dir.h trunk/reactos/include/reactos/libs/libtiff/tif_fax3.h trunk/reactos/include/reactos/libs/libtiff/tif_predict.h trunk/reactos/include/reactos/libs/libtiff/tiff.h trunk/reactos/include/reactos/libs/libtiff/tiffconf.h trunk/reactos/include/reactos/libs/libtiff/tiffconf.vc.h trunk/reactos/include/reactos/libs/libtiff/tiffio.h trunk/reactos/include/reactos/libs/libtiff/tiffio.hxx trunk/reactos/include/reactos/libs/libtiff/tiffiop.h trunk/reactos/include/reactos/libs/libtiff/tiffvers.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/libtiff/mkg3states.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/mkg3s… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_aux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_a… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_c… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_codec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_c… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_c… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_c… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dirinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dirread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dirwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_dumpmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_d… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_e… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_extension.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_e… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_fax3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_f… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_f… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_getimage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_g… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_jbig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_j… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_jpeg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_j… Added: trunk/reactos/dll/3rdparty/libtiff/tif_jpeg_12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_j… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_luv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_l… Added: trunk/reactos/dll/3rdparty/libtiff/tif_lzma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_l… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_lzw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_l… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_next.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_n… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_ojpeg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_o… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_open.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_o… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_packbits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_pixarlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_predict.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_p… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_r… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_strip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_s… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_swab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_s… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_thunder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_t… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_tile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_t… Added: trunk/reactos/dll/3rdparty/libtiff/tif_unix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_u… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_v… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_warning.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_w… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_w… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_w… Modified: trunk/reactos/dll/3rdparty/libtiff/tif_zip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_z… Modified: trunk/reactos/include/reactos/libs/libtiff/t4.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tif_config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tif_config.vc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Added: trunk/reactos/include/reactos/libs/libtiff/tif_config.wince.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tif_dir.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tif_fax3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tif_predict.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tiff.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tiffconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tiffconf.vc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Added: trunk/reactos/include/reactos/libs/libtiff/tiffconf.wince.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tiffio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tiffio.hxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tiffiop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti… Modified: trunk/reactos/include/reactos/libs/libtiff/tiffvers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libti…

11 years, 6 months

[akhaldi] 58395: [TASKKILL] * Import from Wine.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 2 13:10:25 2013 New Revision: 58395 URL: http://svn.reactos.org/svn/reactos?rev=58395&view=rev Log: [TASKKILL] * Import from Wine. Added: trunk/reactos/base/applications/cmdutils/taskkill/ (with props) trunk/reactos/base/applications/cmdutils/taskkill/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/taskkill/taskkill.c (with props) trunk/reactos/base/applications/cmdutils/taskkill/taskkill.h (with props) trunk/reactos/base/applications/cmdutils/taskkill/taskkill.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sat Mar 2 13:10:25 2013 @@ -5,4 +5,5 @@ add_subdirectory(lodctr) add_subdirectory(more) add_subdirectory(reg) +add_subdirectory(taskkill) add_subdirectory(xcopy) Propchange: trunk/reactos/base/applications/cmdutils/taskkill/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Mar 2 13:10:25 2013 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/cmdutils/taskkill/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/taskkill/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/taskkill/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/taskkill/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/taskkill/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/taskkill/CMakeLists.txt [iso-8859-1] Sat Mar 2 13:10:25 2013 @@ -1,0 +1,6 @@ + +add_executable(taskkill taskkill.c taskkill.rc) +target_link_libraries(taskkill wine) +set_module_type(taskkill win32cui UNICODE) +add_importlibs(taskkill psapi user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET taskkill DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/taskkill/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/taskkill/taskkill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/taskkill/taskkill.c (added) +++ trunk/reactos/base/applications/cmdutils/taskkill/taskkill.c [iso-8859-1] Sat Mar 2 13:10:25 2013 @@ -1,0 +1,540 @@ +/* + * Task termination utility + * + * Copyright 2008 Andrew Riedi + * Copyright 2010 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <wincon.h> +#include <winuser.h> +#include <psapi.h> +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "taskkill.h" + +WINE_DEFAULT_DEBUG_CHANNEL(taskkill); + +static int force_termination; + +static WCHAR **task_list; +static unsigned int task_count; + +struct pid_close_info +{ + DWORD pid; + BOOL found; +}; + +static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) +{ + int wlen; + DWORD count, ret; + WCHAR msg_buffer[8192]; + + wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer, + sizeof(msg_buffer)/sizeof(*msg_buffer), &va_args); + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); + if (!ret) + { + DWORD len; + char *msgA; + + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, + NULL, 0, NULL, NULL); + msgA = HeapAlloc(GetProcessHeap(), 0, len); + if (!msgA) + return 0; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len, + NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); + HeapFree(GetProcessHeap(), 0, msgA); + } + + return count; +} + +static int CDECL taskkill_printfW(const WCHAR *msg, ...) +{ + __ms_va_list va_args; + int len; + + __ms_va_start(va_args, msg); + len = taskkill_vprintfW(msg, va_args); + __ms_va_end(va_args); + + return len; +} + +static int CDECL taskkill_message_printfW(int msg, ...) +{ + __ms_va_list va_args; + WCHAR msg_buffer[8192]; + int len; + + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, + sizeof(msg_buffer)/sizeof(WCHAR)); + + __ms_va_start(va_args, msg); + len = taskkill_vprintfW(msg_buffer, va_args); + __ms_va_end(va_args); + + return len; +} + +static int taskkill_message(int msg) +{ + static const WCHAR formatW[] = {'%','1',0}; + WCHAR msg_buffer[8192]; + + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, + sizeof(msg_buffer)/sizeof(WCHAR)); + + return taskkill_printfW(formatW, msg_buffer); +} + +/* Post WM_CLOSE to all top-level windows belonging to the process with specified PID. */ +static BOOL CALLBACK pid_enum_proc(HWND hwnd, LPARAM lParam) +{ + struct pid_close_info *info = (struct pid_close_info *)lParam; + DWORD hwnd_pid; + + GetWindowThreadProcessId(hwnd, &hwnd_pid); + + if (hwnd_pid == info->pid) + { + PostMessageW(hwnd, WM_CLOSE, 0, 0); + info->found = TRUE; + } + + return TRUE; +} + +static DWORD *enumerate_processes(DWORD *list_count) +{ + DWORD *pid_list, alloc_bytes = 1024 * sizeof(*pid_list), needed_bytes; + + pid_list = HeapAlloc(GetProcessHeap(), 0, alloc_bytes); + if (!pid_list) + return NULL; + + for (;;) + { + DWORD *realloc_list; + + if (!EnumProcesses(pid_list, alloc_bytes, &needed_bytes)) + { + HeapFree(GetProcessHeap(), 0, pid_list); + return NULL; + } + + /* EnumProcesses can't signal an insufficient buffer condition, so the + * only way to possibly determine whether a larger buffer is required + * is to see whether the written number of bytes is the same as the + * buffer size. If so, the buffer will be reallocated to twice the + * size. */ + if (alloc_bytes != needed_bytes) + break; + + alloc_bytes *= 2; + realloc_list = HeapReAlloc(GetProcessHeap(), 0, pid_list, alloc_bytes); + if (!realloc_list) + { + HeapFree(GetProcessHeap(), 0, pid_list); + return NULL; + } + pid_list = realloc_list; + } + + *list_count = needed_bytes / sizeof(*pid_list); + return pid_list; +} + +static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) +{ + HANDLE process; + HMODULE module; + DWORD required_size; + + process = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid); + if (!process) + return FALSE; + + if (!EnumProcessModules(process, &module, sizeof(module), &required_size)) + { + CloseHandle(process); + return FALSE; + } + + if (!GetModuleBaseNameW(process, module, buf, chars)) + { + CloseHandle(process); + return FALSE; + } + + CloseHandle(process); + return TRUE; +} + +/* The implemented task enumeration and termination behavior does not + * exactly match native behavior. On Windows: + * + * In the case of terminating by process name, specifying a particular + * process name more times than the number of running instances causes + * all instances to be terminated, but termination failure messages to + * be printed as many times as the difference between the specification + * quantity and the number of running instances. + * + * Successful terminations are all listed first in order, with failing + * terminations being listed at the end. + * + * A PID of zero causes taskkill to warn about the inability to terminate + * system processes. */ +static int send_close_messages(void) +{ + DWORD *pid_list, pid_list_size; + DWORD self_pid = GetCurrentProcessId(); + unsigned int i; + int status_code = 0; + + pid_list = enumerate_processes(&pid_list_size); + if (!pid_list) + { + taskkill_message(STRING_ENUM_FAILED); + return 1; + } + + for (i = 0; i < task_count; i++) + { + WCHAR *p = task_list[i]; + BOOL is_numeric = TRUE; + + /* Determine whether the string is not numeric. */ + while (*p) + { + if (!isdigitW(*p++)) + { + is_numeric = FALSE; + break; + } + } + + if (is_numeric) + { + DWORD pid = atoiW(task_list[i]); + struct pid_close_info info = { pid }; + + if (pid == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + + EnumWindows(pid_enum_proc, (LPARAM)&info); + if (info.found) + taskkill_message_printfW(STRING_CLOSE_PID_SEARCH, pid); + else + { + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + } + } + else + { + DWORD index; + BOOL found_process = FALSE; + + for (index = 0; index < pid_list_size; index++) + { + WCHAR process_name[MAX_PATH]; + + if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) && + !strcmpiW(process_name, task_list[i])) + { + struct pid_close_info info = { pid_list[index] }; + + found_process = TRUE; + if (pid_list[index] == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + + EnumWindows(pid_enum_proc, (LPARAM)&info); + taskkill_message_printfW(STRING_CLOSE_PROC_SRCH, process_name, pid_list[index]); + } + } + + if (!found_process) + { + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + } + } + } + + HeapFree(GetProcessHeap(), 0, pid_list); + return status_code; +} + +static int terminate_processes(void) +{ + DWORD *pid_list, pid_list_size; + DWORD self_pid = GetCurrentProcessId(); + unsigned int i; + int status_code = 0; + + pid_list = enumerate_processes(&pid_list_size); + if (!pid_list) + { + taskkill_message(STRING_ENUM_FAILED); + return 1; + } + + for (i = 0; i < task_count; i++) + { + WCHAR *p = task_list[i]; + BOOL is_numeric = TRUE; + + /* Determine whether the string is not numeric. */ + while (*p) + { + if (!isdigitW(*p++)) + { + is_numeric = FALSE; + break; + } + } + + if (is_numeric) + { + DWORD pid = atoiW(task_list[i]); + HANDLE process; + + if (pid == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + + process = OpenProcess(PROCESS_TERMINATE, FALSE, pid); + if (!process) + { + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + continue; + } + + if (!TerminateProcess(process, 0)) + { + taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); + status_code = 1; + CloseHandle(process); + continue; + } + + taskkill_message_printfW(STRING_TERM_PID_SEARCH, pid); + CloseHandle(process); + } + else + { + DWORD index; + BOOL found_process = FALSE; + + for (index = 0; index < pid_list_size; index++) + { + WCHAR process_name[MAX_PATH]; + + if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) && + !strcmpiW(process_name, task_list[i])) + { + HANDLE process; + + if (pid_list[index] == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + status_code = 1; + continue; + } + + process = OpenProcess(PROCESS_TERMINATE, FALSE, pid_list[index]); + if (!process) + { + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + continue; + } + + if (!TerminateProcess(process, 0)) + { + taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); + status_code = 1; + CloseHandle(process); + continue; + } + + found_process = TRUE; + taskkill_message_printfW(STRING_TERM_PROC_SEARCH, task_list[i], pid_list[index]); + CloseHandle(process); + } + } + + if (!found_process) + { + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + } + } + } + + HeapFree(GetProcessHeap(), 0, pid_list); + return status_code; +} + +static BOOL add_to_task_list(WCHAR *name) +{ + static unsigned int list_size = 16; + + if (!task_list) + { + task_list = HeapAlloc(GetProcessHeap(), 0, + list_size * sizeof(*task_list)); + if (!task_list) + return FALSE; + } + else if (task_count == list_size) + { + void *realloc_list; + + list_size *= 2; + realloc_list = HeapReAlloc(GetProcessHeap(), 0, task_list, + list_size * sizeof(*task_list)); + if (!realloc_list) + return FALSE; + + task_list = realloc_list; + } + + task_list[task_count++] = name; + return TRUE; +} + +/* FIXME Argument processing does not match behavior observed on Windows. + * Stringent argument counting and processing is performed, and unrecognized + * options are detected as parameters when placed after options that accept one. */ +static BOOL process_arguments(int argc, WCHAR *argv[]) +{ + static const WCHAR slashForceTerminate[] = {'/','f',0}; + static const WCHAR slashImage[] = {'/','i','m',0}; + static const WCHAR slashPID[] = {'/','p','i','d',0}; + static const WCHAR slashHelp[] = {'/','?',0}; + static const WCHAR slashTerminateChildren[] = {'/','t',0}; + + if (argc > 1) + { + int i; + BOOL has_im = 0, has_pid = 0; + + /* Only the lone help option is recognized. */ + if (argc == 2 && !strcmpW(slashHelp, argv[1])) + { + taskkill_message(STRING_USAGE); + exit(0); + } + + for (i = 1; i < argc; i++) + { + int got_im = 0, got_pid = 0; + + if (!strcmpiW(slashTerminateChildren, argv[i])) + WINE_FIXME("/T not supported\n"); + if (!strcmpiW(slashForceTerminate, argv[i])) + force_termination = 1; + /* Options /IM and /PID appear to behave identically, except for + * the fact that they cannot be specified at the same time. */ + else if ((got_im = !strcmpiW(slashImage, argv[i])) || + (got_pid = !strcmpiW(slashPID, argv[i]))) + { + if (!argv[i + 1]) + { + taskkill_message_printfW(STRING_MISSING_PARAM, argv[i]); + taskkill_message(STRING_USAGE); + return FALSE; + } + + if (got_im) has_im = 1; + if (got_pid) has_pid = 1; + + if (has_im && has_pid) + { + taskkill_message(STRING_MUTUAL_EXCLUSIVE); + taskkill_message(STRING_USAGE); + return FALSE; + } + + if (!add_to_task_list(argv[i + 1])) + return FALSE; + i++; + } + else + { + taskkill_message(STRING_INVALID_OPTION); + taskkill_message(STRING_USAGE); + return FALSE; + } + } + } + else + { + taskkill_message(STRING_MISSING_OPTION); + taskkill_message(STRING_USAGE); + return FALSE; + } + + return TRUE; +} + +int wmain(int argc, WCHAR *argv[]) +{ + int status_code = 0; + + if (!process_arguments(argc, argv)) + { + HeapFree(GetProcessHeap(), 0, task_list); + return 1; + } + + if (force_termination) + status_code = terminate_processes(); + else + status_code = send_close_messages(); + + HeapFree(GetProcessHeap(), 0, task_list); + return status_code; +} Propchange: trunk/reactos/base/applications/cmdutils/taskkill/taskkill.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/taskkill/taskkill.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/taskkill/taskkill.h (added) +++ trunk/reactos/base/applications/cmdutils/taskkill/taskkill.h [iso-8859-1] Sat Mar 2 13:10:25 2013 @@ -1,0 +1,37 @@ +/* + * Task termination utility private definitions + * + * Copyright 2010 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +/* Translation IDs. */ +#define STRING_USAGE 101 +#define STRING_INVALID_OPTION 102 +#define STRING_INVALID_PARAM 103 +#define STRING_MISSING_OPTION 104 +#define STRING_MISSING_PARAM 105 +#define STRING_MUTUAL_EXCLUSIVE 106 +#define STRING_CLOSE_PID_SEARCH 107 +#define STRING_CLOSE_PROC_SRCH 108 +#define STRING_TERM_PID_SEARCH 109 +#define STRING_TERM_PROC_SEARCH 110 +#define STRING_SEARCH_FAILED 111 +#define STRING_ENUM_FAILED 112 +#define STRING_TERMINATE_FAILED 113 +#define STRING_SELF_TERMINATION 114 Propchange: trunk/reactos/base/applications/cmdutils/taskkill/taskkill.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/taskkill/taskkill.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/taskkill/taskkill.rc (added) +++ trunk/reactos/base/applications/cmdutils/taskkill/taskkill.rc [iso-8859-1] Sat Mar 2 13:10:25 2013 @@ -1,0 +1,41 @@ +/* + * Task termination utility + * + * Copyright 2010 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "taskkill.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" + STRING_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + STRING_INVALID_PARAM, "Error: Invalid command line parameter specified.\n" + STRING_MISSING_OPTION, "Error: One of options /im or /pid must be specified.\n" + STRING_MISSING_PARAM, "Error: Option %1 expects a command line parameter.\n" + STRING_MUTUAL_EXCLUSIVE, "Error: Options /im and /pid are mutually exclusive.\n" + STRING_CLOSE_PID_SEARCH, "Close message sent to top-level windows of process with PID %1!u!.\n" + STRING_CLOSE_PROC_SRCH, "Close message sent to top-level windows of process ""%1"" with PID %2!u!.\n" + STRING_TERM_PID_SEARCH, "Process with PID %1!u! was forcibly terminated.\n" + STRING_TERM_PROC_SEARCH, "Process ""%1"" with PID %2!u! was forcibly terminated.\n" + STRING_SEARCH_FAILED, "Error: Could not find process ""%1"".\n" + STRING_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" + STRING_TERMINATE_FAILED, "Error: Unable to terminate process ""%1"".\n" + STRING_SELF_TERMINATION, "Error: Process self-termination is not permitted.\n" +} Propchange: trunk/reactos/base/applications/cmdutils/taskkill/taskkill.rc ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 6 months

[tkreuzer] 58394: [SAL] Fix definition of _Prepost_bytecount_

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 2 12:32:01 2013 New Revision: 58394 URL: http://svn.reactos.org/svn/reactos?rev=58394&view=rev Log: [SAL] Fix definition of _Prepost_bytecount_ 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=583… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sat Mar 2 12:32:01 2013 @@ -960,7 +960,7 @@ //#define _Pre_z_cap_(size) //#define _Pre_z_cap_c_(size) //#define _Pre_z_cap_x_(size) -#define _Prepost_bytecount_(size) _SAL11_NAME(_Deref_prepost_bytecount_) _Group_(_Deref_pre_bytecount_(size) _Deref_post_bytecount_(size)) +#define _Prepost_bytecount_(size) _SAL11_NAME(_Prepost_bytecount_) _Group_(_Pre_bytecount_(size) _Post_bytecount_(size)) //#define _Prepost_bytecount_c_(size) //#define _Prepost_bytecount_x_(size) //#define _Prepost_count_(size)

11 years, 6 months

[hbelusca] 58393: [WINLOGON] Correct mistypings in the excellent explanation of the different states of Winlogon. Thanks Eric !

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 2 12:28:51 2013 New Revision: 58393 URL: http://svn.reactos.org/svn/reactos?rev=58393&view=rev Log: [WINLOGON] Correct mistypings in the excellent explanation of the different states of Winlogon. Thanks Eric ! Modified: trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sat Mar 2 12:28:51 2013 @@ -121,8 +121,8 @@ /* - * The picture Microfoft is trying to paint here - * (http://msdn.microsoft.com/en-us/library/windows/desktop/aa380547%28v=vs.85%…) + * The picture Microsoft is trying to paint here + * (http://msdn.microsoft.com/en-us/library/windows/desktop/aa380547%28v=vs.85%…) * about the Winlogon states is a little too simple. * * The real picture should look more like this: @@ -132,14 +132,14 @@ * the state will automatically change to STATE_LOGGED_OFF. * * STATE_LOGGED_OFF - * User is logged of. Winlogon shows the "Press Ctrl-Alt-Del for logon" + * User is logged off. Winlogon shows the "Press Ctrl-Alt-Del for logon" * dialog. The state changes to STATE_LOGGED_OFF_SAS when the user presses * "Ctrl-Alt-Del". If DisableCAD is true, the state will automatically * change to STATE_LOGGED_OFF_SAS without showing the dialog. * * STATE_LOGGED_OFF_SAS - * State shows the logon dialog. Entering the right credentials an pressing - * "OK" changes the state to STATE_LOGGED_ON. Pressing "Cancel" or a Timeout + * State shows the logon dialog. Entering the right credentials and pressing + * "OK" changes the state to STATE_LOGGED_ON. Pressing "Cancel" or a timeout * changes the state back to STATE_LOGGED_OFF. * * STATE_LOGGED_ON @@ -149,12 +149,12 @@ * * STATE_LOGGED_ON_SAS * Winlogon shows the security dialog. Pressing "Cancel" or "Task Manager" - * or a Timeout change the state back to STATE_LOGGED_ON. Pressing "Change + * or a timeout change the state back to STATE_LOGGED_ON. Pressing "Change * Password" does not change the state, because the security dialog is still * visible behind the change password dialog. Pressing "Log off" changes the * state to STATE_LOGGING_OFF. Pressing "Lock Computer" changes the state to * STATE_LOCKED. Pressing "Shutdown" changes the state to - * STATE_SUUTTING_DOWN. + * STATE_SHUTTING_DOWN. * * STATE_SCREENSAVER * Winlogon runs the screen saver. Upon user activity, the screensaver @@ -184,7 +184,7 @@ * the state to STATE_SHUT_DOWN. * * STATE_SHUT_DOWN - * Terminates winlogon and initiates shut-down. + * Terminates Winlogon and initiates shut-down. */ typedef enum _LOGON_STATE {

11 years, 6 months

[akhaldi] 58392: [SAL] * Add _Inout_updates_bytes_to_, _Inout_updates_bytes_to_opt_, _Inout_updates_opt_z_, _Out_writes_z_, _Post_readable_byte_size_, _Post_readable_size_ and _Scanf_format_string_...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 2 12:01:27 2013 New Revision: 58392 URL: http://svn.reactos.org/svn/reactos?rev=58392&view=rev Log: [SAL] * Add _Inout_updates_bytes_to_, _Inout_updates_bytes_to_opt_, _Inout_updates_opt_z_, _Out_writes_z_, _Post_readable_byte_size_, _Post_readable_size_ and _Scanf_format_string_ 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=583… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sat Mar 2 12:01:27 2013 @@ -700,10 +700,10 @@ //#define _Inout_updates_bytes_all_(size) //#define _Inout_updates_bytes_all_opt_(size) #define _Inout_updates_bytes_opt_(size) _SAL2_NAME(_Inout_updates_bytes_opt_) _Group_(_Pre_opt_bytecap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)]) -#define _Inout_updates_bytes_to_(size,count) _SAL2_NAME(_Inout_updates_bytes_to_) _Group_(_Out_writes_bytes_to_(size,count) [SA_Pre(Valid=SA_Yes)] [SA_Pre(ValidBytes="\n" _SA_SPECSTRIZE(count))] ) -#define _Inout_updates_bytes_to_opt_(size,count) _SAL2_NAME(_Inout_updates_bytes_to_opt_) _Group_(_Out_writes_bytes_to_opt_(size,count) [SA_Pre(Valid=SA_Yes)] [SA_Pre(ValidBytes="\n" _SA_SPECSTRIZE(count))] ) +#define _Inout_updates_bytes_to_(size,count) _SAL2_NAME(_Inout_updates_bytes_to_) _Group_(_Out_writes_bytes_to_(size,count) [SA_Pre(Valid=SA_Yes)] [SA_Pre(ValidBytes="\n" _SA_SPECSTRIZE(count))]) +#define _Inout_updates_bytes_to_opt_(size,count) _SAL2_NAME(_Inout_updates_bytes_to_opt_) _Group_(_Out_writes_bytes_to_opt_(size,count) [SA_Pre(Valid=SA_Yes)] [SA_Pre(ValidBytes="\n" _SA_SPECSTRIZE(count))]) #define _Inout_updates_opt_(size) _SAL2_NAME(_Inout_updates_opt_) _Group_(_Pre_opt_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)]) -//#define _Inout_updates_opt_z_(size) +#define _Inout_updates_opt_z_(size) _SAL2_NAME(_Inout_updates_opt_z_) _Group_(_Pre_opt_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)] [SA_Pre(NullTerminated=SA_Yes)] [SA_Post(NullTerminated=SA_Yes)]) //#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)]) @@ -793,7 +793,7 @@ //#define _Out_writes_to_ptr_opt_(ptr) //#define _Out_writes_to_ptr_opt_z_(ptr) //#define _Out_writes_to_ptr_z_(ptr) -//#define _Out_writes_z_(size) +#define _Out_writes_z_(size) _SAL2_NAME(_Out_writes_z_) _Group_(_Pre_cap_(size) [SA_Post(Valid=SA_Yes)] _Post_z_) #define _Out_z_bytecap_(size) _SAL11_NAME(_Out_z_bytecap_) _Group_(_Pre_bytecap_(size) [SA_Post(Valid=SA_Yes)] _Post_z_) //#define _Out_z_bytecap_c_(size) #define _Out_z_bytecap_post_bytecount_(cap,count) _SAL11_NAME(_Out_z_bytecap_post_bytecount_) _Group_(_Pre_bytecap_(cap) [SA_Post(Valid=SA_Yes)] _Post_z_bytecount_(count)) @@ -871,8 +871,8 @@ #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)]) -#define _Post_readable_byte_size_(size) _SAL2_NAME(_Post_readable_byte_size_) _Group_([SA_Post(ValidBytes="\n" _SA_SPECSTRIZE(size))] [SA_Post(Valid=SA_Yes)] ) -//#define _Post_readable_size_(size) +#define _Post_readable_byte_size_(size) _SAL2_NAME(_Post_readable_byte_size_) _Group_([SA_Post(ValidBytes="\n" _SA_SPECSTRIZE(size))] [SA_Post(Valid=SA_Yes)]) +#define _Post_readable_size_(size) _SAL2_NAME(_Post_readable_size_) _Group_([SA_Post(ValidElements="\n" _SA_SPECSTRIZE(size))] [SA_Post(Valid=SA_Yes)]) #define _Post_satisfies_(cond) _SAL2_NAME(_Post_satisfies_) _Group_([SAL_post] [SAL_annotes(Name="SAL_satisfies", p1=_SA_SPECSTRIZE(cond))]) #define _Post_valid_ _SAL2_NAME(_Post_valid_) _Group_([SA_Post(Valid=SA_Yes)]) #define _Post_writable_byte_size_(size) _SAL2_NAME(_Post_writable_byte_size_) _Group_([SA_Post(WritableBytes="\n" _SA_SPECSTRIZE(size))] ) @@ -1040,7 +1040,7 @@ //#define _Ret_z_cap_(size) //#define _Ret_z_count_(size) #define _Return_type_success_(expr) _SAL2_NAME(_Return_type_success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) -//#define _Scanf_format_string_ +#define _Scanf_format_string_ _SAL2_NAME(_Scanf_format_string_) _Group_([SA_FormatString(Style="scanf")]) //#define _Scanf_s_format_string_ #define _Struct_size_bytes_(size) _SAL2_NAME(_Struct_size_bytes_) _Group_(_Writable_bytes_(byteCount(size))) #define _Success_(expr) _SAL2_NAME(_Success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))])

11 years, 6 months

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