Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 02 Mar '13

02 Mar '13

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(

1 0

[akhaldi] 58396: [LIBTIFF] * Sync to v4.0.3. CORE-6898 #resolve
by akhaldi＠svn.reactos.org 02 Mar '13

02 Mar '13

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…

1 0

[akhaldi] 58395: [TASKKILL] * Import from Wine.
by akhaldi＠svn.reactos.org 02 Mar '13

02 Mar '13

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

1 0

[tkreuzer] 58394: [SAL] Fix definition of _Prepost_bytecount_
by tkreuzer＠svn.reactos.org 02 Mar '13

02 Mar '13

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)

1 0

[hbelusca] 58393: [WINLOGON] Correct mistypings in the excellent explanation of the different states of Winlogon. Thanks Eric !
by hbelusca＠svn.reactos.org 02 Mar '13

02 Mar '13

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 {

1 0

[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 02 Mar '13

02 Mar '13

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

1 0

[ekohl] 58391: [WINLOGON] - Replace the old LogonStatus variable by a LOGON_STATE enum type. - Declare and document all new states and their transitions.
by ekohl＠svn.reactos.org 02 Mar '13

02 Mar '13

Author: ekohl Date: Sat Mar 2 11:58:26 2013 New Revision: 58391 URL: http://svn.reactos.org/svn/reactos?rev=58391&view=rev Log: [WINLOGON] - Replace the old LogonStatus variable by a LOGON_STATE enum type. - Declare and document all new states and their transitions. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat Mar 2 11:58:26 2013 @@ -700,7 +700,7 @@ UnloadUserProfile(Session->UserToken, Session->hProfileInfo); CloseHandle(Session->UserToken); UpdatePerUserSystemParameters(0, FALSE); - Session->LogonStatus = WKSTA_IS_LOGGED_OFF; + Session->LogonState = STATE_LOGGED_OFF; Session->UserToken = NULL; return STATUS_SUCCESS; } @@ -828,7 +828,7 @@ if (HandleLogon(Session)) { SwitchDesktop(Session->ApplicationDesktop); - Session->LogonStatus = WKSTA_IS_LOGGED_ON; + Session->LogonState = STATE_LOGGED_ON; } else Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); @@ -839,7 +839,7 @@ if (Session->Gina.Functions.WlxIsLockOk(Session->Gina.Context)) { SwitchDesktop(WLSession->WinlogonDesktop); - Session->LogonStatus = WKSTA_IS_LOCKED; + Session->LogonState = STATE_LOCKED; Session->Gina.Functions.WlxDisplayLockedNotice(Session->Gina.Context); } break; @@ -847,7 +847,7 @@ case WLX_SAS_ACTION_SHUTDOWN: /* 0x05 */ case WLX_SAS_ACTION_SHUTDOWN_POWER_OFF: /* 0x0a */ case WLX_SAS_ACTION_SHUTDOWN_REBOOT: /* 0x0b */ - if (Session->LogonStatus != WKSTA_IS_LOGGED_OFF) + if (Session->LogonState != STATE_LOGGED_OFF) { if (!Session->Gina.Functions.WlxIsLogoffOk(Session->Gina.Context)) break; @@ -880,7 +880,7 @@ break; case WLX_SAS_ACTION_UNLOCK_WKSTA: /* 0x08 */ SwitchDesktop(WLSession->ApplicationDesktop); - Session->LogonStatus = WKSTA_IS_LOGGED_ON; + Session->LogonState = STATE_LOGGED_ON; break; default: WARN("Unknown SAS action 0x%lx\n", wlxAction); @@ -894,9 +894,9 @@ { DWORD wlxAction = WLX_SAS_ACTION_NONE; - if (Session->LogonStatus == WKSTA_IS_LOGGED_ON) + if (Session->LogonState == STATE_LOGGED_ON) wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); - else if (Session->LogonStatus == WKSTA_IS_LOCKED) + else if (Session->LogonState == STATE_LOCKED) wlxAction = (DWORD)Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); else { Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sat Mar 2 11:58:26 2013 @@ -412,7 +412,7 @@ //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGCOMPUTERSETTINGS); /* Display logged out screen */ - WLSession->LogonStatus = WKSTA_IS_LOGGED_OFF; + WLSession->LogonState = STATE_LOGGED_OFF; RemoveStatusMessage(WLSession); /* Check for pending setup */ 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 11:58:26 2013 @@ -119,11 +119,87 @@ BOOL UseCtrlAltDelete; } GINAINSTANCE, *PGINAINSTANCE; -/* FIXME: put in an enum */ -/* See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/secauthn/s… */ -#define WKSTA_IS_LOGGED_OFF 0 -#define WKSTA_IS_LOGGED_ON 1 -#define WKSTA_IS_LOCKED 2 + +/* + * The picture Microfoft 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: + * + * STATE_INIT + * Initial state. Required for session initialization. After intialization, + * 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" + * 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 + * changes the state back to STATE_LOGGED_OFF. + * + * STATE_LOGGED_ON + * User is logged on. Winlogon does not show any dialog. Pressing + * "Ctrl-Alt-Del" changes the state to STATE_LOGGED_ON_SAS and user + * inactivity changes the state to STATE_SCREENSAVER. + * + * 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 + * 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_SCREENSAVER + * Winlogon runs the screen saver. Upon user activity, the screensaver + * terminates and the state changes back to STATE_LOGGED_ON if the secure + * screen saver option is off. Otherwise, the state changes to STATE_LOCKED. + * + * STATE_LOGGING_OFF + * Winlogon shows the logoff dialog. Pressing "Cancel" or a timeout changes + * the state back to STATE_LOGGED_ON_SAS. Pressing "OK" logs off the user + * and changes the state to STATE_LOGGED_OFF. + * + * STATE_LOCKED + * Winlogon shows the locked message dialog. When the user presses "Ctrl- + * Alt-Del" the state changes to STATE_LOCKED_SAS. If DisableCAD is true, + * the state will automatically change to STATE_LOCKED_SAS without showing + * the dialog. + * + * STATE_LOCKED_SAS + * Winlogon shows the unlock dialog. Presing "Cancel" or a timeout will + * change the state back to STATE_LOCKED. Entering the right credentials and + * pressing "OK" unlocks the computer and changes the state to + * STATE_LOGGED_ON. + * + * STATE_SHUTTING_DOWN + * Winlogon shows the shutdown dialog. Presing "Cancel" or a timeout will + * change the state back to STATE_LOGGED_ON_SAS. Pressing "OK" will change + * the state to STATE_SHUT_DOWN. + * + * STATE_SHUT_DOWN + * Terminates winlogon and initiates shut-down. + */ +typedef enum _LOGON_STATE +{ + STATE_INIT, // not user yet + STATE_LOGGED_OFF, + STATE_LOGGED_OFF_SAS, // not user yet + STATE_LOGGED_ON, + STATE_LOGGED_ON_SAS, // not user yet + STATE_SCREENSAVER, // not user yet + STATE_LOCKED, + STATE_LOCKED_SAS, // not user yet + STATE_LOGGING_OFF, // not user yet + STATE_SHUTTING_DOWN, // not user yet + STATE_SHUT_DOWN // not user yet +} LOGON_STATE, *PLOGON_STATE; #define LockWorkstation(Session) #define UnlockWorkstation(Session) @@ -143,7 +219,7 @@ LUID LogonId; HANDLE UserToken; HANDLE hProfileInfo; - DWORD LogonStatus; + LOGON_STATE LogonState; DWORD DialogTimeout; /* Timeout for dialog boxes, in seconds */ /* Screen-saver informations */

1 0

[akhaldi] 58390: [PSDK] * Annotate winsvc.h.
by akhaldi＠svn.reactos.org 01 Mar '13

01 Mar '13

Author: akhaldi Date: Fri Mar 1 21:50:20 2013 New Revision: 58390 URL: http://svn.reactos.org/svn/reactos?rev=58390&view=rev Log: [PSDK] * Annotate winsvc.h. Modified: trunk/reactos/include/psdk/winsvc.h Modified: trunk/reactos/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsvc.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winsvc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsvc.h [iso-8859-1] Fri Mar 1 21:50:20 2013 @@ -205,51 +205,253 @@ SC_ACTION * lpsaActions; } SERVICE_FAILURE_ACTIONSW,*LPSERVICE_FAILURE_ACTIONSW; -BOOL WINAPI ChangeServiceConfigA(SC_HANDLE,DWORD,DWORD,DWORD,LPCSTR,LPCSTR,LPDWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR); -BOOL WINAPI ChangeServiceConfigW(SC_HANDLE,DWORD,DWORD,DWORD,LPCWSTR,LPCWSTR,LPDWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); -BOOL WINAPI ChangeServiceConfig2A(SC_HANDLE,DWORD,LPVOID); -BOOL WINAPI ChangeServiceConfig2W(SC_HANDLE,DWORD,LPVOID); -BOOL WINAPI CloseServiceHandle(SC_HANDLE); -BOOL WINAPI ControlService(SC_HANDLE,DWORD,LPSERVICE_STATUS); -SC_HANDLE WINAPI CreateServiceA(SC_HANDLE,LPCSTR,LPCSTR,DWORD,DWORD,DWORD,DWORD,LPCSTR,LPCSTR,PDWORD,LPCSTR,LPCSTR,LPCSTR); -SC_HANDLE WINAPI CreateServiceW(SC_HANDLE,LPCWSTR,LPCWSTR,DWORD,DWORD,DWORD,DWORD,LPCWSTR,LPCWSTR,PDWORD,LPCWSTR,LPCWSTR,LPCWSTR); -BOOL WINAPI DeleteService(SC_HANDLE); -BOOL WINAPI EnumDependentServicesA(SC_HANDLE,DWORD,LPENUM_SERVICE_STATUSA,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumDependentServicesW(SC_HANDLE,DWORD,LPENUM_SERVICE_STATUSW,DWORD,PDWORD,PDWORD); -BOOL WINAPI EnumServicesStatusA(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STATUSA,DWORD,PDWORD,PDWORD,PDWORD); -BOOL WINAPI EnumServicesStatusW(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STATUSW,DWORD,PDWORD,PDWORD,PDWORD); -BOOL WINAPI EnumServicesStatusExA(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD,LPDWORD,LPCSTR); -BOOL WINAPI EnumServicesStatusExW(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD,LPDWORD,LPCWSTR); -BOOL WINAPI GetServiceDisplayNameA(SC_HANDLE,LPCSTR,LPSTR,PDWORD); -BOOL WINAPI GetServiceDisplayNameW(SC_HANDLE,LPCWSTR,LPWSTR,PDWORD); -BOOL WINAPI GetServiceKeyNameA(SC_HANDLE,LPCSTR,LPSTR,PDWORD); -BOOL WINAPI GetServiceKeyNameW(SC_HANDLE,LPCWSTR,LPWSTR,PDWORD); -SC_LOCK WINAPI LockServiceDatabase(SC_HANDLE); -BOOL WINAPI NotifyBootConfigStatus(BOOL); -SC_HANDLE WINAPI OpenSCManagerA(LPCSTR,LPCSTR,DWORD); -SC_HANDLE WINAPI OpenSCManagerW(LPCWSTR,LPCWSTR,DWORD); -SC_HANDLE WINAPI OpenServiceA(SC_HANDLE,LPCSTR,DWORD); -SC_HANDLE WINAPI OpenServiceW(SC_HANDLE,LPCWSTR,DWORD); -BOOL WINAPI QueryServiceConfigA(SC_HANDLE,LPQUERY_SERVICE_CONFIGA,DWORD,PDWORD); -BOOL WINAPI QueryServiceConfigW(SC_HANDLE,LPQUERY_SERVICE_CONFIGW,DWORD,PDWORD); -BOOL WINAPI QueryServiceConfig2A(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI QueryServiceConfig2W(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); -BOOL WINAPI QueryServiceLockStatusA(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSA,DWORD,PDWORD); -BOOL WINAPI QueryServiceLockStatusW(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSW,DWORD,PDWORD); -BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD); -BOOL WINAPI QueryServiceStatus(SC_HANDLE,LPSERVICE_STATUS); -BOOL WINAPI QueryServiceStatusEx(SC_HANDLE,SC_STATUS_TYPE,LPBYTE,DWORD,LPDWORD); -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerA(LPCSTR,LPHANDLER_FUNCTION); -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW(LPCWSTR,LPHANDLER_FUNCTION); -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); -SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW(LPCWSTR,LPHANDLER_FUNCTION_EX,LPVOID); -BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); -BOOL WINAPI SetServiceStatus(SERVICE_STATUS_HANDLE,LPSERVICE_STATUS); -BOOL WINAPI StartServiceA(SC_HANDLE,DWORD,LPCSTR*); -BOOL WINAPI StartServiceCtrlDispatcherA(const SERVICE_TABLE_ENTRYA*); -BOOL WINAPI StartServiceCtrlDispatcherW(const SERVICE_TABLE_ENTRYW*); -BOOL WINAPI StartServiceW(SC_HANDLE,DWORD,LPCWSTR*); -BOOL WINAPI UnlockServiceDatabase(SC_LOCK); +typedef struct _SERVICE_REQUIRED_PRIVILEGES_INFOA { + LPSTR pmszRequiredPrivileges; +} SERVICE_REQUIRED_PRIVILEGES_INFOA, *LPSERVICE_REQUIRED_PRIVILEGES_INFOA; + +typedef struct _SERVICE_REQUIRED_PRIVILEGES_INFOW { + LPWSTR pmszRequiredPrivileges; +} SERVICE_REQUIRED_PRIVILEGES_INFOW, *LPSERVICE_REQUIRED_PRIVILEGES_INFOW; + +BOOL WINAPI ChangeServiceConfigA(_In_ SC_HANDLE, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _Out_opt_ LPDWORD, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR); +BOOL WINAPI ChangeServiceConfigW(_In_ SC_HANDLE, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _Out_opt_ LPDWORD, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR); +BOOL WINAPI ChangeServiceConfig2A(_In_ SC_HANDLE, _In_ DWORD, _In_opt_ LPVOID); +BOOL WINAPI ChangeServiceConfig2W(_In_ SC_HANDLE, _In_ DWORD, _In_opt_ LPVOID); +BOOL WINAPI CloseServiceHandle(_In_ SC_HANDLE); +BOOL WINAPI ControlService(_In_ SC_HANDLE, _In_ DWORD, _Out_ LPSERVICE_STATUS); +_Must_inspect_result_ SC_HANDLE WINAPI CreateServiceA(_In_ SC_HANDLE, _In_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _Out_opt_ PDWORD, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR); +_Must_inspect_result_ SC_HANDLE WINAPI CreateServiceW(_In_ SC_HANDLE, _In_ LPCWSTR, _In_opt_ LPCWSTR, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _Out_opt_ PDWORD, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR); +BOOL WINAPI DeleteService(_In_ SC_HANDLE); + +_Must_inspect_result_ +BOOL +WINAPI +EnumDependentServicesA( + _In_ SC_HANDLE hService, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPENUM_SERVICE_STATUSA lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned); + +_Must_inspect_result_ +BOOL +WINAPI +EnumDependentServicesW( + _In_ SC_HANDLE hService, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPENUM_SERVICE_STATUSW lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned); + +_Must_inspect_result_ +BOOL +WINAPI +EnumServicesStatusA( + _In_ SC_HANDLE hSCManager, + _In_ DWORD dwServiceType, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPENUM_SERVICE_STATUSA lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned, + _Inout_opt_ LPDWORD lpResumeHandle); + +_Must_inspect_result_ +BOOL +WINAPI +EnumServicesStatusW( + _In_ SC_HANDLE hSCManager, + _In_ DWORD dwServiceType, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPENUM_SERVICE_STATUSW lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned, + _Inout_opt_ LPDWORD lpResumeHandle); + +_Must_inspect_result_ +BOOL +WINAPI +EnumServicesStatusExA( + _In_ SC_HANDLE hSCManager, + _In_ SC_ENUM_TYPE InfoLevel, + _In_ DWORD dwServiceType, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPBYTE lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned, + _Inout_opt_ LPDWORD lpResumeHandle, + _In_opt_ LPCSTR pszGroupName); + +_Must_inspect_result_ +BOOL +WINAPI +EnumServicesStatusExW( + _In_ SC_HANDLE hSCManager, + _In_ SC_ENUM_TYPE InfoLevel, + _In_ DWORD dwServiceType, + _In_ DWORD dwServiceState, + _Out_writes_bytes_opt_(cbBufSize) LPBYTE lpServices, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded, + _Out_ LPDWORD lpServicesReturned, + _Inout_opt_ LPDWORD lpResumeHandle, + _In_opt_ LPCWSTR pszGroupName); + +_Must_inspect_result_ +BOOL +WINAPI +GetServiceDisplayNameA( + _In_ SC_HANDLE hSCManager, + _In_ LPCSTR lpServiceName, + _Out_writes_opt_(*lpcchBuffer) LPSTR lpDisplayName, + _Inout_ LPDWORD lpcchBuffer); + +_Must_inspect_result_ +BOOL +WINAPI +GetServiceDisplayNameW( + _In_ SC_HANDLE hSCManager, + _In_ LPCWSTR lpServiceName, + _Out_writes_opt_(*lpcchBuffer) LPWSTR lpDisplayName, + _Inout_ LPDWORD lpcchBuffer); + +_Must_inspect_result_ +BOOL +WINAPI +GetServiceKeyNameA( + _In_ SC_HANDLE hSCManager, + _In_ LPCSTR lpDisplayName, + _Out_writes_opt_(*lpcchBuffer) LPSTR lpServiceName, + _Inout_ LPDWORD lpcchBuffer); + +_Must_inspect_result_ +BOOL +WINAPI +GetServiceKeyNameW( + _In_ SC_HANDLE hSCManager, + _In_ LPCWSTR lpDisplayName, + _Out_writes_opt_(*lpcchBuffer) LPWSTR lpServiceName, + _Inout_ LPDWORD lpcchBuffer); + +SC_LOCK WINAPI LockServiceDatabase(_In_ SC_HANDLE); +BOOL WINAPI NotifyBootConfigStatus(_In_ BOOL); +_Must_inspect_result_ SC_HANDLE WINAPI OpenSCManagerA(_In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD); +_Must_inspect_result_ SC_HANDLE WINAPI OpenSCManagerW(_In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_ DWORD); +_Must_inspect_result_ SC_HANDLE WINAPI OpenServiceA(_In_ SC_HANDLE, _In_ LPCSTR, _In_ DWORD); +_Must_inspect_result_ SC_HANDLE WINAPI OpenServiceW(_In_ SC_HANDLE, _In_ LPCWSTR, _In_ DWORD); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceConfigA( + _In_ SC_HANDLE hService, + _Out_writes_bytes_opt_(cbBufSize) LPQUERY_SERVICE_CONFIGA lpServiceConfig, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceConfigW( + _In_ SC_HANDLE hService, + _Out_writes_bytes_opt_(cbBufSize) LPQUERY_SERVICE_CONFIGW lpServiceConfig, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_When_(dwInfoLevel == SERVICE_CONFIG_DESCRIPTION, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_DESCRIPTIONA)))) +_When_(dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_FAILURE_ACTIONSA)))) +_When_(dwInfoLevel == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_REQUIRED_PRIVILEGES_INFOA)))) +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceConfig2A( + _In_ SC_HANDLE hService, + _In_ DWORD dwInfoLevel, + _Out_writes_bytes_opt_(cbBufSize) LPBYTE lpBuffer, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_When_(dwInfoLevel == SERVICE_CONFIG_DESCRIPTION, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_DESCRIPTIONW)))) +_When_(dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_FAILURE_ACTIONSW)))) +_When_(dwInfoLevel == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO, _At_(cbBufSize, _In_range_(>=, sizeof(LPSERVICE_REQUIRED_PRIVILEGES_INFOW)))) +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceConfig2W( + _In_ SC_HANDLE hService, + _In_ DWORD dwInfoLevel, + _Out_writes_bytes_opt_(cbBufSize) LPBYTE lpBuffer, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceLockStatusA( + _In_ SC_HANDLE hSCManager, + _Out_writes_bytes_opt_(cbBufSize) LPQUERY_SERVICE_LOCK_STATUSA lpLockStatus, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceLockStatusW( + _In_ SC_HANDLE hSCManager, + _Out_writes_bytes_opt_(cbBufSize) LPQUERY_SERVICE_LOCK_STATUSW lpLockStatus, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceObjectSecurity( + _In_ SC_HANDLE hService, + _In_ SECURITY_INFORMATION dwSecurityInformation, + _Out_writes_bytes_opt_(cbBufSize) PSECURITY_DESCRIPTOR lpSecurityDescriptor, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ BOOL WINAPI QueryServiceStatus(_In_ SC_HANDLE, _Out_ LPSERVICE_STATUS); + +_Must_inspect_result_ +BOOL +WINAPI +QueryServiceStatusEx( + _In_ SC_HANDLE hService, + _In_ SC_STATUS_TYPE InfoLevel, + _Out_writes_bytes_opt_(cbBufSize) LPBYTE lpBuffer, + _In_ DWORD cbBufSize, + _Out_ LPDWORD pcbBytesNeeded); + +_Must_inspect_result_ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerA(_In_ LPCSTR, _In_ LPHANDLER_FUNCTION); +_Must_inspect_result_ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW(_In_ LPCWSTR, _In_ LPHANDLER_FUNCTION); +_Must_inspect_result_ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA(_In_ LPCSTR, _In_ LPHANDLER_FUNCTION_EX, _In_opt_ LPVOID); +_Must_inspect_result_ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW(_In_ LPCWSTR, _In_ LPHANDLER_FUNCTION_EX, _In_opt_ LPVOID); +BOOL WINAPI SetServiceObjectSecurity(_In_ SC_HANDLE, _In_ SECURITY_INFORMATION, _In_ PSECURITY_DESCRIPTOR); +BOOL WINAPI SetServiceStatus(_In_ SERVICE_STATUS_HANDLE, _In_ LPSERVICE_STATUS); + +BOOL +WINAPI +StartServiceA( + _In_ SC_HANDLE hService, + _In_ DWORD dwNumServiceArgs, + _In_reads_opt_(dwNumServiceArgs) LPCSTR *lpServiceArgVectors); + +BOOL +WINAPI +StartServiceW( + _In_ SC_HANDLE hService, + _In_ DWORD dwNumServiceArgs, + _In_reads_opt_(dwNumServiceArgs) LPCWSTR *lpServiceArgVectors); + +BOOL WINAPI StartServiceCtrlDispatcherA(_In_ const SERVICE_TABLE_ENTRYA*); +BOOL WINAPI StartServiceCtrlDispatcherW(_In_ const SERVICE_TABLE_ENTRYW*); +BOOL WINAPI UnlockServiceDatabase(_In_ SC_LOCK); #ifdef UNICODE typedef ENUM_SERVICE_STATUSW ENUM_SERVICE_STATUS,*LPENUM_SERVICE_STATUS; @@ -263,6 +465,8 @@ typedef LPSERVICE_DESCRIPTIONW LPSERVICE_DESCRIPTION; typedef SERVICE_FAILURE_ACTIONSW SERVICE_FAILURE_ACTIONS; typedef LPSERVICE_FAILURE_ACTIONSW LPSERVICE_FAILURE_ACTIONS; +typedef SERVICE_REQUIRED_PRIVILEGES_INFOW SERVICE_REQUIRED_PRIVILEGES_INFO; +typedef LPSERVICE_REQUIRED_PRIVILEGES_INFOW LPSERVICE_REQUIRED_PRIVILEGES_INFO; #define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEW #define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEW #define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERW @@ -295,6 +499,8 @@ typedef LPSERVICE_DESCRIPTIONA LPSERVICE_DESCRIPTION; typedef SERVICE_FAILURE_ACTIONSA SERVICE_FAILURE_ACTIONS; typedef LPSERVICE_FAILURE_ACTIONSA LPSERVICE_FAILURE_ACTIONS; +typedef SERVICE_REQUIRED_PRIVILEGES_INFOA SERVICE_REQUIRED_PRIVILEGES_INFO; +typedef LPSERVICE_REQUIRED_PRIVILEGES_INFOA LPSERVICE_REQUIRED_PRIVILEGES_INFO; #define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEA #define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEA #define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERA

1 0

[akhaldi] 58389: [DDK] * Add some annotations in acpiioct.h.
by akhaldi＠svn.reactos.org 01 Mar '13

01 Mar '13

Author: akhaldi Date: Fri Mar 1 21:47:38 2013 New Revision: 58389 URL: http://svn.reactos.org/svn/reactos?rev=58389&view=rev Log: [DDK] * Add some annotations in acpiioct.h. Modified: trunk/reactos/include/ddk/acpiioct.h Modified: trunk/reactos/include/ddk/acpiioct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/acpiioct.h?rev… ============================================================================== --- trunk/reactos/include/ddk/acpiioct.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/acpiioct.h [iso-8859-1] Fri Mar 1 21:47:38 2013 @@ -57,7 +57,7 @@ ULONG MethodNameAsUlong; } DUMMYUNIONNAME; ULONG StringLength; - UCHAR String[ANYSIZE_ARRAY]; + _Field_size_bytes_(StringLength) _Null_terminated_ UCHAR String[ANYSIZE_ARRAY]; } ACPI_EVAL_INPUT_BUFFER_SIMPLE_STRING, *PACPI_EVAL_INPUT_BUFFER_SIMPLE_STRING; typedef struct _ACPI_METHOD_ARGUMENT { @@ -65,7 +65,7 @@ USHORT DataLength; _ANONYMOUS_UNION union { ULONG Argument; - UCHAR Data[ANYSIZE_ARRAY]; + _Field_size_bytes_(DataLength) UCHAR Data[ANYSIZE_ARRAY]; } DUMMYUNIONNAME; } ACPI_METHOD_ARGUMENT; typedef ACPI_METHOD_ARGUMENT UNALIGNED *PACPI_METHOD_ARGUMENT; @@ -85,7 +85,7 @@ ULONG Signature; ULONG Length; ULONG Count; - ACPI_METHOD_ARGUMENT Argument[ANYSIZE_ARRAY]; + _Field_size_bytes_(Length) ACPI_METHOD_ARGUMENT Argument[ANYSIZE_ARRAY]; } ACPI_EVAL_OUTPUT_BUFFER; typedef ACPI_EVAL_OUTPUT_BUFFER UNALIGNED *PACPI_EVAL_OUTPUT_BUFFER; @@ -96,12 +96,12 @@ typedef struct _ACPI_EVAL_INPUT_BUFFER_EX { ULONG Signature; - CHAR MethodName[256]; + _Null_terminated_ CHAR MethodName[256]; } ACPI_EVAL_INPUT_BUFFER_EX, *PACPI_EVAL_INPUT_BUFFER_EX; typedef struct _ACPI_EVAL_INPUT_BUFFER_SIMPLE_INTEGER_EX { ULONG Signature; - CHAR MethodName[256]; + _Null_terminated_ CHAR MethodName[256]; ULONG64 IntegerArgument; } ACPI_EVAL_INPUT_BUFFER_SIMPLE_INTEGER_EX, *PACPI_EVAL_INPUT_BUFFER_SIMPLE_INTEGER_EX; @@ -109,7 +109,7 @@ ULONG Signature; CHAR MethodName[256]; ULONG StringLength; - UCHAR String[ANYSIZE_ARRAY]; + _Field_size_(StringLength) _Null_terminated_ UCHAR String[ANYSIZE_ARRAY]; } ACPI_EVAL_INPUT_BUFFER_SIMPLE_STRING_EX, *PACPI_EVAL_INPUT_BUFFER_SIMPLE_STRING_EX; typedef struct _ACPI_EVAL_INPUT_BUFFER_COMPLEX_EX { @@ -117,20 +117,20 @@ CHAR MethodName[256]; ULONG Size; ULONG ArgumentCount; - ACPI_METHOD_ARGUMENT Argument[ANYSIZE_ARRAY]; + _Field_size_(ArgumentCount) ACPI_METHOD_ARGUMENT Argument[ANYSIZE_ARRAY]; } ACPI_EVAL_INPUT_BUFFER_COMPLEX_EX, *PACPI_EVAL_INPUT_BUFFER_COMPLEX_EX; typedef struct _ACPI_ENUM_CHILDREN_INPUT_BUFFER { ULONG Signature; ULONG Flags; ULONG NameLength; - CHAR Name[ANYSIZE_ARRAY]; + _Field_size_bytes_(NameLength) _Null_terminated_ CHAR Name[ANYSIZE_ARRAY]; } ACPI_ENUM_CHILDREN_INPUT_BUFFER, *PACPI_ENUM_CHILDREN_INPUT_BUFFER; typedef struct _ACPI_ENUM_CHILD { ULONG Flags; ULONG NameLength; - CHAR Name[ANYSIZE_ARRAY]; + _Field_size_bytes_(NameLength) _Null_terminated_ CHAR Name[ANYSIZE_ARRAY]; } ACPI_ENUM_CHILD; typedef ACPI_ENUM_CHILD UNALIGNED *PACPI_ENUM_CHILD;

1 0

[akhaldi] 58388: [PSDK] * Annotate winreg.h.
by akhaldi＠svn.reactos.org 01 Mar '13

01 Mar '13

Author: akhaldi Date: Fri Mar 1 18:18:36 2013 New Revision: 58388 URL: http://svn.reactos.org/svn/reactos?rev=58388&view=rev Log: [PSDK] * Annotate winreg.h. Modified: trunk/reactos/include/psdk/winreg.h Modified: trunk/reactos/include/psdk/winreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winreg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winreg.h [iso-8859-1] Fri Mar 1 18:18:36 2013 @@ -62,7 +62,7 @@ #ifndef RC_INVOKED typedef ACCESS_MASK REGSAM; -typedef LONG LSTATUS; +typedef _Return_type_success_(return==ERROR_SUCCESS) LONG LSTATUS; typedef struct value_entA { LPSTR ve_valuename; DWORD ve_valuelen; @@ -75,103 +75,367 @@ DWORD ve_valueptr; DWORD ve_type; } VALENTW,*PVALENTW; -BOOL WINAPI AbortSystemShutdownA(LPCSTR); -BOOL WINAPI AbortSystemShutdownW(LPCWSTR); -#if (_WIN32_WINNT >= 0x0600) -DWORD WINAPI InitiateShutdownA(LPSTR, LPSTR, DWORD, DWORD, DWORD); -DWORD WINAPI InitiateShutdownW(LPWSTR, LPWSTR, DWORD, DWORD, DWORD); -#endif -BOOL WINAPI InitiateSystemShutdownA(LPSTR,LPSTR,DWORD,BOOL,BOOL); -BOOL WINAPI InitiateSystemShutdownW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL); -BOOL WINAPI InitiateSystemShutdownExA(LPSTR,LPSTR,DWORD,BOOL,BOOL,DWORD); -BOOL WINAPI InitiateSystemShutdownExW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL,DWORD); -LONG WINAPI RegCloseKey(HKEY); -LONG WINAPI RegConnectRegistryA(LPCSTR,HKEY,PHKEY); -LONG WINAPI RegConnectRegistryW(LPCWSTR,HKEY,PHKEY); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegCopyTreeA(HKEY,LPCSTR,HKEY); -LONG WINAPI RegCopyTreeW(HKEY,LPCWSTR,HKEY); -#endif -LONG WINAPI RegCreateKeyA(HKEY,LPCSTR,PHKEY); -LONG WINAPI RegCreateKeyExA(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,PDWORD); -LONG WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,PDWORD); -LONG WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY); -LONG WINAPI RegDeleteKeyA(HKEY,LPCSTR); -LONG WINAPI RegDeleteKeyExA (HKEY,LPCSTR,REGSAM,DWORD); -LONG WINAPI RegDeleteKeyExW (HKEY,LPCWSTR,REGSAM,DWORD); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegDeleteKeyValueA(HKEY,LPCSTR,LPCSTR); -LONG WINAPI RegDeleteKeyValueW(HKEY,LPCWSTR,LPCWSTR); -#endif -LONG WINAPI RegDeleteKeyW(HKEY,LPCWSTR); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegDeleteTreeA(HKEY,LPCSTR); -LONG WINAPI RegDeleteTreeW(HKEY,LPCWSTR); -#endif -LONG WINAPI RegDeleteValueA(HKEY,LPCSTR); -LONG WINAPI RegDeleteValueW(HKEY,LPCWSTR); + +BOOL WINAPI AbortSystemShutdownA(_In_opt_ LPCSTR); +BOOL WINAPI AbortSystemShutdownW(_In_opt_ LPCWSTR); + +#if (_WIN32_WINNT >= 0x0600) +DWORD WINAPI InitiateShutdownA(_In_opt_ LPSTR, _In_opt_ LPSTR, _In_ DWORD, _In_ DWORD, _In_ DWORD); +DWORD WINAPI InitiateShutdownW(_In_opt_ LPWSTR, _In_opt_ LPWSTR, _In_ DWORD, _In_ DWORD, _In_ DWORD); +#endif + +BOOL WINAPI InitiateSystemShutdownA(_In_opt_ LPSTR, _In_opt_ LPSTR, _In_ DWORD, _In_ BOOL, _In_ BOOL); +BOOL WINAPI InitiateSystemShutdownW(_In_opt_ LPWSTR, _In_opt_ LPWSTR, _In_ DWORD, _In_ BOOL, _In_ BOOL); +BOOL WINAPI InitiateSystemShutdownExA(_In_opt_ LPSTR, _In_opt_ LPSTR, _In_ DWORD, _In_ BOOL, _In_ BOOL, _In_ DWORD); +BOOL WINAPI InitiateSystemShutdownExW(_In_opt_ LPWSTR, _In_opt_ LPWSTR, _In_ DWORD, _In_ BOOL, _In_ BOOL, _In_ DWORD); +LSTATUS WINAPI RegCloseKey(_In_ HKEY); +LSTATUS WINAPI RegConnectRegistryA(_In_opt_ LPCSTR, _In_ HKEY, _Out_ PHKEY); +LSTATUS WINAPI RegConnectRegistryW(_In_opt_ LPCWSTR,_In_ HKEY, _Out_ PHKEY); + +#if (_WIN32_WINNT >= 0x0600) +LSTATUS WINAPI RegCopyTreeA(_In_ HKEY, _In_opt_ LPCSTR, _In_ HKEY); +LSTATUS WINAPI RegCopyTreeW(_In_ HKEY, _In_opt_ LPCWSTR, _In_ HKEY); +#endif + +LSTATUS WINAPI RegCreateKeyA(_In_ HKEY, _In_opt_ LPCSTR, _Out_ PHKEY); +LSTATUS WINAPI RegCreateKeyW(_In_ HKEY, _In_opt_ LPCWSTR, _Out_ PHKEY); +LSTATUS WINAPI RegCreateKeyExA(_In_ HKEY, _In_ LPCSTR, _Reserved_ DWORD, _In_opt_ LPSTR, _In_ DWORD, _In_ REGSAM, _In_opt_ LPSECURITY_ATTRIBUTES, _Out_ PHKEY, _Out_opt_ PDWORD); +LSTATUS WINAPI RegCreateKeyExW(_In_ HKEY, _In_ LPCWSTR, _Reserved_ DWORD, _In_opt_ LPWSTR, _In_ DWORD, _In_ REGSAM, _In_opt_ LPSECURITY_ATTRIBUTES, _Out_ PHKEY, _Out_opt_ PDWORD); +LSTATUS WINAPI RegDeleteKeyA(_In_ HKEY, _In_ LPCSTR); +LSTATUS WINAPI RegDeleteKeyW(_In_ HKEY, _In_ LPCWSTR); +LSTATUS WINAPI RegDeleteKeyExA(_In_ HKEY, _In_ LPCSTR, _In_ REGSAM, _Reserved_ DWORD); +LSTATUS WINAPI RegDeleteKeyExW(_In_ HKEY, _In_ LPCWSTR, _In_ REGSAM, _Reserved_ DWORD); + +#if (_WIN32_WINNT >= 0x0600) +LSTATUS WINAPI RegDeleteKeyValueA(_In_ HKEY, _In_opt_ LPCSTR, _In_opt_ LPCSTR); +LSTATUS WINAPI RegDeleteKeyValueW(_In_ HKEY, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR); +LSTATUS WINAPI RegDeleteTreeA(_In_ HKEY, _In_opt_ LPCSTR); +LSTATUS WINAPI RegDeleteTreeW(_In_ HKEY, _In_opt_ LPCWSTR); +#endif + +LSTATUS WINAPI RegDeleteValueA(_In_ HKEY, _In_opt_ LPCSTR); +LSTATUS WINAPI RegDeleteValueW(_In_ HKEY, _In_opt_ LPCWSTR); + #if (_WIN32_WINNT >= 0x0500) LONG WINAPI RegDisablePredefinedCache(VOID); -LONG WINAPI RegSaveKeyExA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES,DWORD); -LONG WINAPI RegSaveKeyExW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES,DWORD); -#endif +LSTATUS WINAPI RegSaveKeyExA(_In_ HKEY, _In_ LPCSTR, _In_opt_ LPSECURITY_ATTRIBUTES, _In_ DWORD); +LSTATUS WINAPI RegSaveKeyExW(_In_ HKEY, _In_ LPCWSTR, _In_opt_ LPSECURITY_ATTRIBUTES, _In_ DWORD); +#endif + #if (_WIN32_WINNT >= 0x0600) LONG WINAPI RegDisablePredefinedCacheEx(VOID); -LONG WINAPI RegDisableReflectionKey(HKEY); -LONG WINAPI RegEnableReflectionKey(HKEY); -#endif -LONG WINAPI RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD); -LONG WINAPI RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD); -LONG WINAPI RegEnumKeyExA(HKEY,DWORD,LPSTR,PDWORD,PDWORD,LPSTR,PDWORD,PFILETIME); -LONG WINAPI RegEnumKeyExW(HKEY,DWORD,LPWSTR,PDWORD,PDWORD,LPWSTR,PDWORD,PFILETIME); -LONG WINAPI RegEnumValueA(HKEY,DWORD,LPSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD); -LONG WINAPI RegEnumValueW(HKEY,DWORD,LPWSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegGetValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); -LONG WINAPI RegGetValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPDWORD,PVOID,LPDWORD); -#endif -LONG WINAPI RegFlushKey(HKEY); -LONG WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PDWORD); -LONG WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR); -LONG WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegLoadMUIStringA(HKEY,LPCSTR,LPSTR,DWORD,LPDWORD,DWORD,LPCSTR); -LONG WINAPI RegLoadMUIStringW(HKEY,LPCWSTR,LPWSTR,DWORD,LPDWORD,DWORD,LPCWSTR); -#endif -LONG WINAPI RegNotifyChangeKeyValue(HKEY,BOOL,DWORD,HANDLE,BOOL); -LONG WINAPI RegOpenCurrentUser(REGSAM,PHKEY); -LONG WINAPI RegOpenKeyA(HKEY,LPCSTR,PHKEY); -LONG WINAPI RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,PHKEY); -LONG WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,PHKEY); -LONG WINAPI RegOpenKeyW(HKEY,LPCWSTR,PHKEY); -LONG WINAPI RegQueryInfoKeyA(HKEY,LPSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PFILETIME); -LONG WINAPI RegQueryInfoKeyW(HKEY,LPWSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PFILETIME); -LONG WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD); -LONG WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegQueryReflectionKey(HKEY,BOOL*); -#endif -LONG WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,PLONG); -LONG WINAPI RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); -LONG WINAPI RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); -LONG WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,PLONG); -LONG WINAPI RegReplaceKeyA(HKEY,LPCSTR,LPCSTR,LPCSTR); -LONG WINAPI RegReplaceKeyW(HKEY,LPCWSTR,LPCWSTR,LPCWSTR); -LONG WINAPI RegRestoreKeyA(HKEY,LPCSTR,DWORD); -LONG WINAPI RegRestoreKeyW(HKEY,LPCWSTR,DWORD); -LONG WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES); -LONG WINAPI RegSaveKeyW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES); -LONG WINAPI RegSetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); -#if (_WIN32_WINNT >= 0x0600) -LONG WINAPI RegSetKeyValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPCVOID,DWORD); -LONG WINAPI RegSetKeyValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPCVOID,DWORD); -#endif -LONG WINAPI RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD); -LONG WINAPI RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,const BYTE*,DWORD); -LONG WINAPI RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,const BYTE*,DWORD); -LONG WINAPI RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD); -LONG WINAPI RegUnLoadKeyA(HKEY,LPCSTR); -LONG WINAPI RegUnLoadKeyW(HKEY,LPCWSTR); +LONG WINAPI RegDisableReflectionKey(_In_ HKEY); +LONG WINAPI RegEnableReflectionKey(_In_ HKEY); +#endif + +LSTATUS +WINAPI +RegEnumKeyA( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_opt_(cchName) LPSTR lpName, + _In_ DWORD cchName); + +LSTATUS +WINAPI +RegEnumKeyW( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_opt_(cchName) LPWSTR lpName, + _In_ DWORD cchName); + +LSTATUS +WINAPI +RegEnumKeyExA( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_to_opt_(*lpcchName, *lpcchName + 1) LPSTR lpName, + _Inout_ LPDWORD lpcchName, + _Reserved_ LPDWORD lpReserved, + _Out_writes_to_opt_(*lpcchClass,*lpcchClass + 1) LPSTR lpClass, + _Inout_opt_ LPDWORD lpcchClass, + _Out_opt_ PFILETIME lpftLastWriteTime); + +LSTATUS +WINAPI +RegEnumKeyExW( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_to_opt_(*lpcchName, *lpcchName + 1) LPWSTR lpName, + _Inout_ LPDWORD lpcchName, + _Reserved_ LPDWORD lpReserved, + _Out_writes_to_opt_(*lpcchClass,*lpcchClass + 1) LPWSTR lpClass, + _Inout_opt_ LPDWORD lpcchClass, + _Out_opt_ PFILETIME lpftLastWriteTime); + +LSTATUS +WINAPI +RegEnumValueA( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_to_opt_(*lpcchValueName, *lpcchValueName + 1) LPSTR lpValueName, + _Inout_ LPDWORD lpcchValueName, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpType, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPBYTE lpData, + _Inout_opt_ LPDWORD lpcbData); + +LSTATUS +WINAPI +RegEnumValueW( + _In_ HKEY hKey, + _In_ DWORD dwIndex, + _Out_writes_to_opt_(*lpcchValueName, *lpcchValueName + 1) LPWSTR lpValueName, + _Inout_ LPDWORD lpcchValueName, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpType, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPBYTE lpData, + _Inout_opt_ LPDWORD lpcbData); + +#if (_WIN32_WINNT >= 0x0600) + +LSTATUS +WINAPI +RegGetValueA( + _In_ HKEY hkey, + _In_opt_ LPCSTR lpSubKey, + _In_opt_ LPCSTR lpValue, + _In_ DWORD dwFlags, + _Out_opt_ LPDWORD pdwType, + _When_((dwFlags & 0x7F) == RRF_RT_REG_SZ || (dwFlags & 0x7F) == RRF_RT_REG_EXPAND_SZ || + (dwFlags & 0x7F) == (RRF_RT_REG_SZ | RRF_RT_REG_EXPAND_SZ) || *pdwType == REG_SZ || + *pdwType == REG_EXPAND_SZ, _Post_z_) + _When_((dwFlags & 0x7F) == RRF_RT_REG_MULTI_SZ || *pdwType == REG_MULTI_SZ, _Post_ _NullNull_terminated_) + _Out_writes_bytes_to_opt_(*pcbData,*pcbData) PVOID pvData, + _Inout_opt_ LPDWORD pcbData); + +LSTATUS +WINAPI +RegGetValueW( + _In_ HKEY hkey, + _In_opt_ LPCWSTR lpSubKey, + _In_opt_ LPCWSTR lpValue, + _In_ DWORD dwFlags, + _Out_opt_ LPDWORD pdwType, + _When_((dwFlags & 0x7F) == RRF_RT_REG_SZ || (dwFlags & 0x7F) == RRF_RT_REG_EXPAND_SZ || + (dwFlags & 0x7F) == (RRF_RT_REG_SZ | RRF_RT_REG_EXPAND_SZ) || *pdwType == REG_SZ || + *pdwType == REG_EXPAND_SZ, _Post_z_) + _When_((dwFlags & 0x7F) == RRF_RT_REG_MULTI_SZ || *pdwType == REG_MULTI_SZ, _Post_ _NullNull_terminated_) + _Out_writes_bytes_to_opt_(*pcbData,*pcbData) PVOID pvData, + _Inout_opt_ LPDWORD pcbData); + +#endif + +LSTATUS WINAPI RegFlushKey(_In_ HKEY); + +LSTATUS +WINAPI +RegGetKeySecurity( + _In_ HKEY hKey, + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_writes_bytes_opt_(*lpcbSecurityDescriptor) PSECURITY_DESCRIPTOR pSecurityDescriptor, + _Inout_ LPDWORD lpcbSecurityDescriptor); + +LSTATUS WINAPI RegLoadKeyA(_In_ HKEY, _In_opt_ LPCSTR, _In_ LPCSTR); +LSTATUS WINAPI RegLoadKeyW(_In_ HKEY, _In_opt_ LPCWSTR, _In_ LPCWSTR); + +#if (_WIN32_WINNT >= 0x0600) + +LSTATUS +WINAPI +RegLoadMUIStringA( + _In_ HKEY hKey, + _In_opt_ LPCSTR pszValue, + _Out_writes_bytes_opt_(cbOutBuf) LPSTR pszOutBuf, + _In_ DWORD cbOutBuf, + _Out_opt_ LPDWORD pcbData, + _In_ DWORD Flags, + _In_opt_ LPCSTR pszDirectory); + +LSTATUS +WINAPI +RegLoadMUIStringW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR pszValue, + _Out_writes_bytes_opt_(cbOutBuf) LPWSTR pszOutBuf, + _In_ DWORD cbOutBuf, + _Out_opt_ LPDWORD pcbData, + _In_ DWORD Flags, + _In_opt_ LPCWSTR pszDirectory); + +#endif + +LSTATUS WINAPI RegNotifyChangeKeyValue(_In_ HKEY, _In_ BOOL, _In_ DWORD, _In_opt_ HANDLE, _In_ BOOL); +LSTATUS WINAPI RegOpenCurrentUser(_In_ REGSAM, _Out_ PHKEY); +LSTATUS WINAPI RegOpenKeyA(_In_ HKEY, _In_opt_ LPCSTR, _Out_ PHKEY); +LSTATUS WINAPI RegOpenKeyW(_In_ HKEY, _In_opt_ LPCWSTR, _Out_ PHKEY); +LSTATUS WINAPI RegOpenKeyExA(_In_ HKEY, _In_opt_ LPCSTR, _In_opt_ DWORD, _In_ REGSAM, _Out_ PHKEY); +LSTATUS WINAPI RegOpenKeyExW(_In_ HKEY, _In_opt_ LPCWSTR, _In_opt_ DWORD, _In_ REGSAM, _Out_ PHKEY); + +LSTATUS +WINAPI +RegQueryInfoKeyA( + _In_ HKEY hKey, + _Out_writes_to_opt_(*lpcchClass, *lpcchClass + 1) LPSTR lpClass, + _Inout_opt_ LPDWORD lpcchClass, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpcSubKeys, + _Out_opt_ LPDWORD lpcbMaxSubKeyLen, + _Out_opt_ LPDWORD lpcbMaxClassLen, + _Out_opt_ LPDWORD lpcValues, + _Out_opt_ LPDWORD lpcbMaxValueNameLen, + _Out_opt_ LPDWORD lpcbMaxValueLen, + _Out_opt_ LPDWORD lpcbSecurityDescriptor, + _Out_opt_ PFILETIME lpftLastWriteTime); + +LSTATUS +WINAPI +RegQueryInfoKeyW( + _In_ HKEY hKey, + _Out_writes_to_opt_(*lpcchClass, *lpcchClass + 1) LPWSTR lpClass, + _Inout_opt_ LPDWORD lpcchClass, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpcSubKeys, + _Out_opt_ LPDWORD lpcbMaxSubKeyLen, + _Out_opt_ LPDWORD lpcbMaxClassLen, + _Out_opt_ LPDWORD lpcValues, + _Out_opt_ LPDWORD lpcbMaxValueNameLen, + _Out_opt_ LPDWORD lpcbMaxValueLen, + _Out_opt_ LPDWORD lpcbSecurityDescriptor, + _Out_opt_ PFILETIME lpftLastWriteTime); + +LSTATUS +WINAPI +RegQueryMultipleValuesA( + _In_ HKEY hKey, + _Out_writes_(num_vals) PVALENTA val_list, + _In_ DWORD num_vals, + _Out_writes_bytes_to_opt_(*ldwTotsize, *ldwTotsize) __out_data_source(REGISTRY) LPSTR lpValueBuf, + _Inout_opt_ LPDWORD ldwTotsize); + +LSTATUS +WINAPI +RegQueryMultipleValuesW( + _In_ HKEY hKey, + _Out_writes_(num_vals) PVALENTW val_list, + _In_ DWORD num_vals, + _Out_writes_bytes_to_opt_(*ldwTotsize, *ldwTotsize) __out_data_source(REGISTRY) LPWSTR lpValueBuf, + _Inout_opt_ LPDWORD ldwTotsize); + +#if (_WIN32_WINNT >= 0x0600) +LONG WINAPI RegQueryReflectionKey(_In_ HKEY, _Out_ BOOL*); +#endif + +LSTATUS +WINAPI +RegQueryValueA( + _In_ HKEY hKey, + _In_opt_ LPCSTR lpSubKey, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPSTR lpData, + _Inout_opt_ PLONG lpcbData); + +LSTATUS +WINAPI +RegQueryValueW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR lpSubKey, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPWSTR lpData, + _Inout_opt_ PLONG lpcbData); + +LSTATUS +WINAPI +RegQueryValueExA( + _In_ HKEY hKey, + _In_opt_ LPCSTR lpValueName, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpType, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPBYTE lpData, + _When_(lpData == NULL, _Out_opt_) + _When_(lpData != NULL, _Inout_opt_) LPDWORD lpcbData); + +LSTATUS +WINAPI +RegQueryValueExW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR lpValueName, + _Reserved_ LPDWORD lpReserved, + _Out_opt_ LPDWORD lpType, + _Out_writes_bytes_to_opt_(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPBYTE lpData, + _When_(lpData == NULL, _Out_opt_) + _When_(lpData != NULL, _Inout_opt_) LPDWORD lpcbData); + +LSTATUS WINAPI RegReplaceKeyA(_In_ HKEY, _In_opt_ LPCSTR, _In_ LPCSTR, _In_ LPCSTR); +LSTATUS WINAPI RegReplaceKeyW(_In_ HKEY, _In_opt_ LPCWSTR, _In_ LPCWSTR, _In_ LPCWSTR); +LSTATUS WINAPI RegRestoreKeyA(_In_ HKEY, _In_ LPCSTR, _In_ DWORD); +LSTATUS WINAPI RegRestoreKeyW(_In_ HKEY, _In_ LPCWSTR, _In_ DWORD); +LSTATUS WINAPI RegSaveKeyA(_In_ HKEY, _In_ LPCSTR, _In_opt_ LPSECURITY_ATTRIBUTES); +LSTATUS WINAPI RegSaveKeyW(_In_ HKEY, _In_ LPCWSTR, _In_opt_ LPSECURITY_ATTRIBUTES); +LSTATUS WINAPI RegSetKeySecurity(_In_ HKEY, _In_ SECURITY_INFORMATION, _In_ PSECURITY_DESCRIPTOR); + +#if (_WIN32_WINNT >= 0x0600) + +LSTATUS +WINAPI +RegSetKeyValueA( + _In_ HKEY hKey, + _In_opt_ LPCSTR lpSubKey, + _In_opt_ LPCSTR lpValueName, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) LPCVOID lpData, + _In_ DWORD cbData); + +LSTATUS +WINAPI +RegSetKeyValueW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR lpSubKey, + _In_opt_ LPCWSTR lpValueName, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) LPCVOID lpData, + _In_ DWORD cbData); + +#endif + +LSTATUS +WINAPI +RegSetValueA( + _In_ HKEY hKey, + _In_opt_ LPCSTR lpSubKey, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) LPCSTR lpData, + _In_ DWORD cbData); + +LSTATUS +WINAPI +RegSetValueW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR lpSubKey, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) LPCWSTR lpData, + _In_ DWORD cbData); + +LSTATUS +WINAPI +RegSetValueExA( + _In_ HKEY hKey, + _In_opt_ LPCSTR lpValueName, + _Reserved_ DWORD Reserved, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) const BYTE *lpData, + _In_ DWORD cbData); + +LSTATUS +WINAPI +RegSetValueExW( + _In_ HKEY hKey, + _In_opt_ LPCWSTR lpValueName, + _Reserved_ DWORD Reserved, + _In_ DWORD dwType, + _In_reads_bytes_opt_(cbData) const BYTE *lpData, + _In_ DWORD cbData); + +LSTATUS WINAPI RegUnLoadKeyA(_In_ HKEY, _In_opt_ LPCSTR); +LSTATUS WINAPI RegUnLoadKeyW(_In_ HKEY, _In_opt_ LPCWSTR); #ifdef UNICODE typedef VALENTW VALENT,*PVALENT;

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