Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 58477: [PSDK] * Annotate batclass.h.
by akhaldi＠svn.reactos.org 12 Mar '13

12 Mar '13

Author: akhaldi Date: Tue Mar 12 21:16:25 2013 New Revision: 58477 URL: http://svn.reactos.org/svn/reactos?rev=58477&view=rev Log: [PSDK] * Annotate batclass.h. Modified: trunk/reactos/include/psdk/batclass.h Modified: trunk/reactos/include/psdk/batclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/batclass.h?re… ============================================================================== --- trunk/reactos/include/psdk/batclass.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/batclass.h [iso-8859-1] Tue Mar 12 21:16:25 2013 @@ -163,28 +163,40 @@ #define BATTERY_CLASS_MAJOR_VERSION 0x0001 #define BATTERY_CLASS_MINOR_VERSION 0x0000 +_Function_class_(BCLASS_QUERY_TAG_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_QUERY_TAG_CALLBACK)( - IN PVOID Context, - OUT PULONG BatteryTag); + _In_ PVOID Context, + _Out_ PULONG BatteryTag); typedef BCLASS_QUERY_TAG_CALLBACK *PBCLASS_QUERY_TAG_CALLBACK; +_Function_class_(BCLASS_QUERY_INFORMATION_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_QUERY_INFORMATION_CALLBACK)( - IN PVOID Context, - IN ULONG BatteryTag, - IN BATTERY_QUERY_INFORMATION_LEVEL Level, - IN LONG AtRate, - OUT PVOID Buffer, - IN ULONG BufferLength, - OUT PULONG ReturnedLength); + _In_ PVOID Context, + _In_ ULONG BatteryTag, + _In_ BATTERY_QUERY_INFORMATION_LEVEL Level, + _In_ LONG AtRate, + _Out_writes_bytes_to_(BufferLength, *ReturnedLength) PVOID Buffer, + _In_ ULONG BufferLength, + _Out_ PULONG ReturnedLength); typedef BCLASS_QUERY_INFORMATION_CALLBACK *PBCLASS_QUERY_INFORMATION_CALLBACK; +_Function_class_(BCLASS_QUERY_STATUS_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_QUERY_STATUS_CALLBACK)( - IN PVOID Context, - IN ULONG BatteryTag, - OUT PBATTERY_STATUS BatteryStatus); + _In_ PVOID Context, + _In_ ULONG BatteryTag, + _Out_ PBATTERY_STATUS BatteryStatus); typedef BCLASS_QUERY_STATUS_CALLBACK *PBCLASS_QUERY_STATUS_CALLBACK; typedef struct _BATTERY_NOTIFY { @@ -193,24 +205,36 @@ ULONG HighCapacity; } BATTERY_NOTIFY, *PBATTERY_NOTIFY; +_Function_class_(BCLASS_SET_STATUS_NOTIFY_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_SET_STATUS_NOTIFY_CALLBACK)( - IN PVOID Context, - IN ULONG BatteryTag, - IN PBATTERY_NOTIFY BatteryNotify); + _In_ PVOID Context, + _In_ ULONG BatteryTag, + _In_ PBATTERY_NOTIFY BatteryNotify); typedef BCLASS_SET_STATUS_NOTIFY_CALLBACK *PBCLASS_SET_STATUS_NOTIFY_CALLBACK; +_Function_class_(BCLASS_SET_INFORMATION_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_SET_INFORMATION_CALLBACK)( - IN PVOID Context, - IN ULONG BatteryTag, - IN BATTERY_SET_INFORMATION_LEVEL Level, - IN PVOID Buffer OPTIONAL); + _In_ PVOID Context, + _In_ ULONG BatteryTag, + _In_ BATTERY_SET_INFORMATION_LEVEL Level, + _In_opt_ PVOID Buffer); typedef BCLASS_SET_INFORMATION_CALLBACK *PBCLASS_SET_INFORMATION_CALLBACK; +_Function_class_(BCLASS_DISABLE_STATUS_NOTIFY_CALLBACK) +_IRQL_requires_same_ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ typedef NTSTATUS (NTAPI BCLASS_DISABLE_STATUS_NOTIFY_CALLBACK)( - IN PVOID Context); + _In_ PVOID Context); typedef BCLASS_DISABLE_STATUS_NOTIFY_CALLBACK *PBCLASS_DISABLE_STATUS_NOTIFY_CALLBACK; typedef PBCLASS_QUERY_TAG_CALLBACK BCLASS_QUERY_TAG; @@ -302,57 +326,67 @@ #define BCLASSAPI DECLSPEC_IMPORT #endif +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ BCLASSAPI NTSTATUS NTAPI BatteryClassInitializeDevice( - IN PBATTERY_MINIPORT_INFO MiniportInfo, - IN PVOID *ClassData); - + _In_ PBATTERY_MINIPORT_INFO MiniportInfo, + _Out_ PVOID *ClassData); + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ BCLASSAPI NTSTATUS NTAPI BatteryClassIoctl( - IN PVOID ClassData, - IN OUT PIRP Irp); - + _In_ PVOID ClassData, + _Inout_ PIRP Irp); + +_IRQL_requires_max_(DISPATCH_LEVEL) BCLASSAPI NTSTATUS NTAPI BatteryClassStatusNotify( - IN PVOID ClassData); + _In_ PVOID ClassData); #if (NTDDI_VERSION >= NTDDI_WINXP) +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ BCLASSAPI NTSTATUS NTAPI BatteryClassQueryWmiDataBlock( - IN PVOID ClassData, - IN OUT PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp, - IN ULONG GuidIndex, - OUT PULONG InstanceLengthArray, - IN ULONG OutBufferSize, - OUT PUCHAR Buffer OPTIONAL); - + _In_ PVOID ClassData, + _Inout_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp, + _In_ ULONG GuidIndex, + _Out_writes_(1) PULONG InstanceLengthArray, + _In_ ULONG OutBufferSize, + _Out_writes_bytes_opt_(OutBufferSize) PUCHAR Buffer); + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Check_return_ BCLASSAPI NTSTATUS NTAPI BatteryClassSystemControl( - IN PVOID ClassData, - IN PVOID WmiLibContext, /* PWMILIB_CONTEXT */ - IN PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp, - OUT PVOID Disposition); /* PSYSCTL_IRP_DISPOSITION */ + _In_ PVOID ClassData, + _In_ PVOID WmiLibContext, /* PWMILIB_CONTEXT */ + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp, + _Out_ PVOID Disposition); /* PSYSCTL_IRP_DISPOSITION */ #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ +_IRQL_requires_max_(PASSIVE_LEVEL) BCLASSAPI NTSTATUS NTAPI BatteryClassUnload( - IN PVOID ClassData); + _In_ PVOID ClassData); #endif /* _WINDOWS_H */

1 0

[ekohl] 58476: [SAMSRV] Add helper functions SampOpenAliasObject, SampOpenGroupObject and SampRemoveUserFromAllGroups.
by ekohl＠svn.reactos.org 12 Mar '13

12 Mar '13

Author: ekohl Date: Tue Mar 12 20:07:56 2013 New Revision: 58476 URL: http://svn.reactos.org/svn/reactos?rev=58476&view=rev Log: [SAMSRV] Add helper functions SampOpenAliasObject, SampOpenGroupObject and SampRemoveUserFromAllGroups. Added: trunk/reactos/dll/win32/samsrv/alias.c (with props) Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/samsrv/group.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/user.c Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Tue Mar 12 20:07:56 2013 @@ -8,6 +8,7 @@ spec2def(samsrv.dll samsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE + alias.c database.c domain.c group.c Added: trunk/reactos/dll/win32/samsrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/alias.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/alias.c (added) +++ trunk/reactos/dll/win32/samsrv/alias.c [iso-8859-1] Tue Mar 12 20:07:56 2013 @@ -1,0 +1,42 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/samsrv/alias.c + * PURPOSE: Alias specific helper functions + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + + +/* FUNCTIONS ***************************************************************/ + +NTSTATUS +SampOpenAliasObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG AliasId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *AliasObject) +{ + WCHAR szRid[9]; + + TRACE("(%p %lu %lx %p)\n", + DomainObject, AliasId, DesiredAccess, AliasObject); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", AliasId); + + /* Create the user object */ + return SampOpenDbObject(DomainObject, + L"Aliases", + szRid, + AliasId, + SamDbAliasObject, + DesiredAccess, + AliasObject); +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/samsrv/alias.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/samsrv/alias.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/samsrv/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/group.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/group.c [iso-8859-1] Tue Mar 12 20:07:56 2013 @@ -14,6 +14,30 @@ /* FUNCTIONS ***************************************************************/ + +NTSTATUS +SampOpenGroupObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG GroupId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *GroupObject) +{ + WCHAR szRid[9]; + + TRACE("(%p %lu %lx %p)\n", + DomainObject, GroupId, DesiredAccess, GroupObject); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", GroupId); + + /* Create the user object */ + return SampOpenDbObject(DomainObject, + L"Groups", + szRid, + GroupId, + SamDbGroupObject, + DesiredAccess, + GroupObject); +} NTSTATUS Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Tue Mar 12 20:07:56 2013 @@ -117,6 +117,15 @@ extern PGENERIC_MAPPING pServerMapping; +/* alias.c */ + +NTSTATUS +SampOpenAliasObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG AliasId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *AliasObject); + + /* database.c */ NTSTATUS @@ -193,6 +202,12 @@ /* group.h */ NTSTATUS +SampOpenGroupObject(IN PSAM_DB_OBJECT DomainObject, + IN ULONG GroupId, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_DB_OBJECT *GroupObject); + +NTSTATUS SampAddMemberToGroup(IN PSAM_DB_OBJECT GroupObject, IN ULONG MemberId); @@ -302,6 +317,9 @@ IN ULONG GroupAttributes); NTSTATUS +SampRemoveUserFromAllGroups(IN PSAM_DB_OBJECT UserObject); + +NTSTATUS SampSetUserPassword(IN PSAM_DB_OBJECT UserObject, IN PENCRYPTED_NT_OWF_PASSWORD NtPassword, IN BOOLEAN NtPasswordPresent, Modified: trunk/reactos/dll/win32/samsrv/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/user.c?re… ============================================================================== --- trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/user.c [iso-8859-1] Tue Mar 12 20:07:56 2013 @@ -321,6 +321,69 @@ NTSTATUS +SampRemoveUserFromAllGroups(IN PSAM_DB_OBJECT UserObject) +{ + PGROUP_MEMBERSHIP GroupsBuffer = NULL; + PSAM_DB_OBJECT GroupObject; + ULONG Length = 0; + ULONG i; + NTSTATUS Status; + + SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + NULL, + &Length); + + if (Length == 0) + return STATUS_SUCCESS; + + GroupsBuffer = midl_user_allocate(Length); + if (GroupsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(UserObject, + L"Groups", + NULL, + GroupsBuffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + for (i = 0; i < (Length / sizeof(GROUP_MEMBERSHIP)); i++) + { + Status = SampOpenGroupObject(UserObject->ParentObject, + GroupsBuffer[i].RelativeId, + 0, + &GroupObject); + if (!NT_SUCCESS(Status)) + { + goto done; + } + + Status = SampRemoveMemberFromGroup(GroupObject, + UserObject->RelativeId); + + SampCloseDbObject(GroupObject); + + if (!NT_SUCCESS(Status)) + { + goto done; + } + } + +done: + if (GroupsBuffer != NULL) + midl_user_free(GroupsBuffer); + + return Status; +} + + +NTSTATUS SampSetUserPassword(IN PSAM_DB_OBJECT UserObject, IN PENCRYPTED_NT_OWF_PASSWORD NtPassword, IN BOOLEAN NtPasswordPresent,

1 0

[akhaldi] 58475: [PSDK] * Annotate evntprov.h.
by akhaldi＠svn.reactos.org 12 Mar '13

12 Mar '13

Author: akhaldi Date: Tue Mar 12 11:40:11 2013 New Revision: 58475 URL: http://svn.reactos.org/svn/reactos?rev=58475&view=rev Log: [PSDK] * Annotate evntprov.h. Modified: trunk/reactos/include/psdk/evntprov.h Modified: trunk/reactos/include/psdk/evntprov.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntprov.h?re… ============================================================================== --- trunk/reactos/include/psdk/evntprov.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/evntprov.h [iso-8859-1] Tue Mar 12 11:40:11 2013 @@ -90,72 +90,72 @@ typedef VOID (NTAPI *PENABLECALLBACK)( - IN LPCGUID SourceId, - IN ULONG IsEnabled, - IN UCHAR Level, - IN ULONGLONG MatchAnyKeyword, - IN ULONGLONG MatchAllKeyword, - IN PEVENT_FILTER_DESCRIPTOR FilterData OPTIONAL, - IN OUT PVOID CallbackContext OPTIONAL); + _In_ LPCGUID SourceId, + _In_ ULONG IsEnabled, + _In_ UCHAR Level, + _In_ ULONGLONG MatchAnyKeyword, + _In_ ULONGLONG MatchAllKeyword, + _In_opt_ PEVENT_FILTER_DESCRIPTOR FilterData, + _Inout_opt_ PVOID CallbackContext); #if (WINVER >= _WIN32_WINNT_VISTA) ULONG EVNTAPI EventRegister( - IN LPCGUID ProviderId, - IN PENABLECALLBACK EnableCallback OPTIONAL, - IN PVOID CallbackContext OPTIONAL, - OUT PREGHANDLE RegHandle); + _In_ LPCGUID ProviderId, + _In_opt_ PENABLECALLBACK EnableCallback, + _In_opt_ PVOID CallbackContext, + _Out_ PREGHANDLE RegHandle); ULONG EVNTAPI EventUnregister( - IN REGHANDLE RegHandle); + _In_ REGHANDLE RegHandle); BOOLEAN EVNTAPI EventEnabled( - IN REGHANDLE RegHandle, - IN PCEVENT_DESCRIPTOR EventDescriptor); + _In_ REGHANDLE RegHandle, + _In_ PCEVENT_DESCRIPTOR EventDescriptor); BOOLEAN EVNTAPI EventProviderEnabled( - IN REGHANDLE RegHandle, - IN UCHAR Level, - IN ULONGLONG Keyword); + _In_ REGHANDLE RegHandle, + _In_ UCHAR Level, + _In_ ULONGLONG Keyword); ULONG EVNTAPI EventWrite( - IN REGHANDLE RegHandle, - IN PCEVENT_DESCRIPTOR EventDescriptor, - IN ULONG UserDataCount, - IN PEVENT_DATA_DESCRIPTOR UserData); + _In_ REGHANDLE RegHandle, + _In_ PCEVENT_DESCRIPTOR EventDescriptor, + _In_ ULONG UserDataCount, + _In_reads_opt_(UserDataCount) PEVENT_DATA_DESCRIPTOR UserData); ULONG EVNTAPI EventWriteTransfer( - IN REGHANDLE RegHandle, - IN PCEVENT_DESCRIPTOR EventDescriptor, - IN LPCGUID ActivityId OPTIONAL, - IN LPCGUID RelatedActivityId OPTIONAL, - IN ULONG UserDataCount, - IN PEVENT_DATA_DESCRIPTOR UserData OPTIONAL); + _In_ REGHANDLE RegHandle, + _In_ PCEVENT_DESCRIPTOR EventDescriptor, + _In_opt_ LPCGUID ActivityId, + _In_opt_ LPCGUID RelatedActivityId, + _In_ ULONG UserDataCount, + _In_reads_opt_(UserDataCount) PEVENT_DATA_DESCRIPTOR UserData); ULONG EVNTAPI EventWriteString( - IN REGHANDLE RegHandle, - IN UCHAR Level, - IN ULONGLONG Keyword, - IN PCWSTR String); + _In_ REGHANDLE RegHandle, + _In_ UCHAR Level, + _In_ ULONGLONG Keyword, + _In_ PCWSTR String); ULONG EVNTAPI EventActivityIdControl( - IN ULONG ControlCode, - IN OUT LPGUID ActivityId); + _In_ ULONG ControlCode, + _Inout_ LPGUID ActivityId); #endif /* (WINVER >= _WIN32_WINNT_VISTA) */ @@ -163,14 +163,14 @@ ULONG EVNTAPI EventWriteEx( - IN REGHANDLE RegHandle, - IN PCEVENT_DESCRIPTOR EventDescriptor, - IN ULONG64 Filter, - IN ULONG Flags, - IN LPCGUID ActivityId OPTIONAL, - IN LPCGUID RelatedActivityId OPTIONAL, - IN ULONG UserDataCount, - IN PEVENT_DATA_DESCRIPTOR UserData OPTIONAL); + _In_ REGHANDLE RegHandle, + _In_ PCEVENT_DESCRIPTOR EventDescriptor, + _In_ ULONG64 Filter, + _In_ ULONG Flags, + _In_opt_ LPCGUID ActivityId, + _In_opt_ LPCGUID RelatedActivityId, + _In_ ULONG UserDataCount, + _In_reads_opt_(UserDataCount) PEVENT_DATA_DESCRIPTOR UserData); #endif #endif // _ETW_KM_ @@ -178,9 +178,9 @@ FORCEINLINE VOID EventDataDescCreate( - OUT PEVENT_DATA_DESCRIPTOR EventDataDescriptor, - IN const VOID* DataPtr, - IN ULONG DataSize) + _Out_ PEVENT_DATA_DESCRIPTOR EventDataDescriptor, + _In_reads_bytes_(DataSize) const VOID* DataPtr, + _In_ ULONG DataSize) { EventDataDescriptor->Ptr = (ULONGLONG)(ULONG_PTR)DataPtr; EventDataDescriptor->Size = DataSize; @@ -190,14 +190,14 @@ FORCEINLINE VOID EventDescCreate( - OUT PEVENT_DESCRIPTOR EventDescriptor, - IN USHORT Id, - IN UCHAR Version, - IN UCHAR Channel, - IN UCHAR Level, - IN USHORT Task, - IN UCHAR Opcode, - IN ULONGLONG Keyword) + _Out_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ USHORT Id, + _In_ UCHAR Version, + _In_ UCHAR Channel, + _In_ UCHAR Level, + _In_ USHORT Task, + _In_ UCHAR Opcode, + _In_ ULONGLONG Keyword) { EventDescriptor->Id = Id; EventDescriptor->Version = Version; @@ -211,7 +211,7 @@ FORCEINLINE VOID EventDescZero( - OUT PEVENT_DESCRIPTOR EventDescriptor) + _Out_ PEVENT_DESCRIPTOR EventDescriptor) { memset(EventDescriptor, 0, sizeof(EVENT_DESCRIPTOR)); } @@ -219,7 +219,7 @@ FORCEINLINE USHORT EventDescGetId( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Id); } @@ -227,7 +227,7 @@ FORCEINLINE UCHAR EventDescGetVersion( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Version); } @@ -235,7 +235,7 @@ FORCEINLINE USHORT EventDescGetTask( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Task); } @@ -243,7 +243,7 @@ FORCEINLINE UCHAR EventDescGetOpcode( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Opcode); } @@ -251,7 +251,7 @@ FORCEINLINE UCHAR EventDescGetChannel( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Channel); } @@ -259,7 +259,7 @@ FORCEINLINE UCHAR EventDescGetLevel( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Level); } @@ -267,7 +267,7 @@ FORCEINLINE ULONGLONG EventDescGetKeyword( - IN PCEVENT_DESCRIPTOR EventDescriptor) + _In_ PCEVENT_DESCRIPTOR EventDescriptor) { return (EventDescriptor->Keyword); } @@ -275,8 +275,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetId( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN USHORT Id) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ USHORT Id) { EventDescriptor->Id = Id; return (EventDescriptor); @@ -285,8 +285,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetVersion( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN UCHAR Version) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ UCHAR Version) { EventDescriptor->Version = Version; return (EventDescriptor); @@ -295,8 +295,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetTask( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN USHORT Task) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ USHORT Task) { EventDescriptor->Task = Task; return (EventDescriptor); @@ -305,8 +305,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetOpcode( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN UCHAR Opcode) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ UCHAR Opcode) { EventDescriptor->Opcode = Opcode; return (EventDescriptor); @@ -315,8 +315,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetLevel( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN UCHAR Level) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ UCHAR Level) { EventDescriptor->Level = Level; return (EventDescriptor); @@ -325,8 +325,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetChannel( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN UCHAR Channel) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ UCHAR Channel) { EventDescriptor->Channel = Channel; return (EventDescriptor); @@ -335,8 +335,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescSetKeyword( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN ULONGLONG Keyword) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ ULONGLONG Keyword) { EventDescriptor->Keyword = Keyword; return (EventDescriptor); @@ -346,8 +346,8 @@ FORCEINLINE PEVENT_DESCRIPTOR EventDescOrKeyword( - IN PEVENT_DESCRIPTOR EventDescriptor, - IN ULONGLONG Keyword) + _In_ PEVENT_DESCRIPTOR EventDescriptor, + _In_ ULONGLONG Keyword) { EventDescriptor->Keyword |= Keyword; return (EventDescriptor); @@ -356,4 +356,3 @@ #ifdef __cplusplus } #endif -

1 0

[akhaldi] 58474: [CRT] * Annotate malloc.h.
by akhaldi＠svn.reactos.org 11 Mar '13

11 Mar '13

Author: akhaldi Date: Mon Mar 11 22:06:16 2013 New Revision: 58474 URL: http://svn.reactos.org/svn/reactos?rev=58474&view=rev Log: [CRT] * Annotate malloc.h. Modified: trunk/reactos/include/crt/malloc.h Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/malloc.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/malloc.h [iso-8859-1] Mon Mar 11 22:06:16 2013 @@ -69,23 +69,129 @@ #ifndef _CRT_ALLOCATION_DEFINED #define _CRT_ALLOCATION_DEFINED - void *__cdecl calloc(size_t _NumOfElements,size_t _SizeOfElements); - void __cdecl free(void *_Memory); - void *__cdecl malloc(size_t _Size); - void *__cdecl realloc(void *_Memory,size_t _NewSize); - _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_NumOfElements * _SizeOfElements) + void* + __cdecl + calloc( + _In_ size_t _NumOfElements, + _In_ size_t _SizeOfElements); + + void + __cdecl + free( + _Pre_maybenull_ _Post_invalid_ void *_Memory); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + void* + __cdecl + malloc( + _In_ size_t _Size); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_NewSize) + void* + __cdecl + realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _NewSize); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size); #ifdef __DO_ALIGN_DEFINES - _CRTIMP void __cdecl _aligned_free(void *_Memory); - _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); -#endif - - _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset); - _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment); - _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment); - _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset); - _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset); -#endif + + _CRTIMP + void + __cdecl + _aligned_free( + _Pre_maybenull_ _Post_invalid_ void *_Memory); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_malloc( + _In_ size_t _Size, + _In_ size_t _Alignment); + +#endif /* __DO_ALIGN_DEFINES */ + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_offset_malloc( + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Size, + _In_ size_t _Alignment); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _aligned_recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size, + _In_ size_t _Alignment); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Size) + _CRTIMP + void* + __cdecl + _aligned_offset_realloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_Count * _Size) + _CRTIMP + void* + __cdecl + _aligned_offset_recalloc( + _Pre_maybenull_ _Post_invalid_ void *_Memory, + _In_ size_t _Count, + _In_ size_t _Size, + _In_ size_t _Alignment, + _In_ size_t _Offset); + +#endif /* _CRT_ALLOCATION_DEFINED */ #ifdef __DO_ALIGN_DEFINES #undef __DO_ALIGN_DEFINES @@ -98,27 +204,109 @@ #define _MAX_WAIT_MALLOC_CRT 60000 _CRTIMP int __cdecl _resetstkoflw (void); - _CRTIMP unsigned long __cdecl _set_malloc_crt_max_wait(unsigned long _NewValue); - - _CRTIMP void *__cdecl _expand(void *_Memory,size_t _NewSize); - _CRTIMP size_t __cdecl _msize(void *_Memory); + + _CRTIMP + unsigned long + __cdecl + _set_malloc_crt_max_wait( + _In_ unsigned long _NewValue); + + _Check_return_ + _Ret_maybenull_ + _Post_writable_byte_size_(_NewSize) + _CRTIMP + void* + __cdecl + _expand( + _In_opt_ void *_Memory, + _In_ size_t _NewSize); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _msize( + _In_ void *_Memory); + #ifdef __GNUC__ #undef _alloca #define _alloca(x) __builtin_alloca((x)) #else - void *__cdecl _alloca(size_t _Size); -#endif - _CRTIMP size_t __cdecl _get_sbh_threshold(void); - _CRTIMP int __cdecl _set_sbh_threshold(size_t _NewValue); - _CRTIMP errno_t __cdecl _set_amblksiz(size_t _Value); - _CRTIMP errno_t __cdecl _get_amblksiz(size_t *_Value); - _CRTIMP int __cdecl _heapadd(void *_Memory,size_t _Size); - _CRTIMP int __cdecl _heapchk(void); - _CRTIMP int __cdecl _heapmin(void); - _CRTIMP int __cdecl _heapset(unsigned int _Fill); - _CRTIMP int __cdecl _heapwalk(_HEAPINFO *_EntryInfo); - _CRTIMP size_t __cdecl _heapused(size_t *_Used,size_t *_Commit); - _CRTIMP intptr_t __cdecl _get_heap_handle(void); + _Ret_notnull_ + _Post_writable_byte_size_(_Size) + void* + __cdecl + _alloca( + _In_ size_t _Size); +#endif + + _Check_return_ + _CRTIMP + size_t + __cdecl + _get_sbh_threshold(void); + + _CRTIMP + int + __cdecl + _set_sbh_threshold( + _In_ size_t _NewValue); + + _CRTIMP + errno_t + __cdecl + _set_amblksiz( + _In_ size_t _Value); + + _CRTIMP + errno_t + __cdecl + _get_amblksiz( + _Out_ size_t *_Value); + + _Check_return_ + _CRTIMP + int + __cdecl + _heapadd( + _In_ void *_Memory, + _In_ size_t _Size); + + _Check_return_ + _CRTIMP + int + __cdecl + _heapchk(void); + + _Check_return_ + _CRTIMP + int + __cdecl + _heapmin(void); + + _CRTIMP + int + __cdecl + _heapset( + _In_ unsigned int _Fill); + + _CRTIMP + int + __cdecl + _heapwalk( + _Inout_ _HEAPINFO *_EntryInfo); + + _CRTIMP + size_t + __cdecl + _heapused( + size_t *_Used, + size_t *_Commit); + + _CRTIMP + intptr_t + __cdecl + _get_heap_handle(void); #define _ALLOCA_S_THRESHOLD 1024 #define _ALLOCA_S_STACK_MARKER 0xCCCC @@ -179,14 +367,18 @@ typedef int (__cdecl *_HEAPHOOK)(int,size_t,void *,void **); #endif - _CRTIMP _HEAPHOOK __cdecl _setheaphook(_HEAPHOOK _NewHook); - -#define _HEAP_MALLOC 1 -#define _HEAP_CALLOC 2 -#define _HEAP_FREE 3 + _CRTIMP + _HEAPHOOK + __cdecl + _setheaphook( + _In_opt_ _HEAPHOOK _NewHook); + +#define _HEAP_MALLOC 1 +#define _HEAP_CALLOC 2 +#define _HEAP_FREE 3 #define _HEAP_REALLOC 4 -#define _HEAP_MSIZE 5 -#define _HEAP_EXPAND 6 +#define _HEAP_MSIZE 5 +#define _HEAP_EXPAND 6 #endif #ifdef __cplusplus

1 0

[ekohl] 58473: [SAMSRV] Implement SamrShutdownSamServer.
by ekohl＠svn.reactos.org 11 Mar '13

11 Mar '13

Author: ekohl Date: Mon Mar 11 21:49:11 2013 New Revision: 58473 URL: http://svn.reactos.org/svn/reactos?rev=58473&view=rev Log: [SAMSRV] Implement SamrShutdownSamServer. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Mon Mar 11 21:49:11 2013 @@ -205,8 +205,23 @@ NTAPI SamrShutdownSamServer(IN SAMPR_HANDLE ServerHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT ServerObject; + NTSTATUS Status; + + TRACE("(%p)\n", ServerHandle); + + /* Validate the server handle */ + Status = SampValidateDbObject(ServerHandle, + SamDbServerObject, + SAM_SERVER_SHUTDOWN, + &ServerObject); + if (!NT_SUCCESS(Status)) + return Status; + + /* Shut the server down */ + RpcMgmtStopServerListening(0); + + return STATUS_SUCCESS; }

1 0

[ekohl] 58472: [SAMSRV] - Implement SamIConnect. - Add a trusted caller flag to the database object type and inherit it to opened or created sub objects. - Restrict access to SamrQueryInformationUs...
by ekohl＠svn.reactos.org 11 Mar '13

11 Mar '13

Author: ekohl Date: Mon Mar 11 21:01:30 2013 New Revision: 58472 URL: http://svn.reactos.org/svn/reactos?rev=58472&view=rev Log: [SAMSRV] - Implement SamIConnect. - Add a trusted caller flag to the database object type and inherit it to opened or created sub objects. - Restrict access to SamrQueryInformationUser.UserInternal1Information for non-trusted callers. Modified: trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Mon Mar 11 21:01:30 2013 @@ -210,7 +210,7 @@ } NewObject = RtlAllocateHeap(RtlGetProcessHeap(), - 0, + HEAP_ZERO_MEMORY, sizeof(SAM_DB_OBJECT)); if (NewObject == NULL) { @@ -243,6 +243,9 @@ NewObject->RelativeId = RelativeId; NewObject->ParentObject = ParentObject; + if (ParentObject != NULL) + NewObject->Trusted = ParentObject->Trusted; + *DbObject = NewObject; return STATUS_SUCCESS; @@ -359,7 +362,7 @@ } NewObject = RtlAllocateHeap(RtlGetProcessHeap(), - 0, + HEAP_ZERO_MEMORY, sizeof(SAM_DB_OBJECT)); if (NewObject == NULL) { @@ -391,6 +394,9 @@ NewObject->RelativeId = RelativeId; NewObject->ParentObject = ParentObject; + if (ParentObject != NULL) + NewObject->Trusted = ParentObject->Trusted; + *DbObject = NewObject; return STATUS_SUCCESS; Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Mon Mar 11 21:01:30 2013 @@ -56,6 +56,8 @@ USER_EXECUTE, USER_ALL_ACCESS }; + +PGENERIC_MAPPING pServerMapping = &ServerMapping; /* FUNCTIONS *****************************************************************/ @@ -6043,13 +6045,18 @@ } -static NTSTATUS +static +NTSTATUS SampQueryUserInternal1(PSAM_DB_OBJECT UserObject, - PSAMPR_USER_INFO_BUFFER *Buffer) + PSAMPR_USER_INFO_BUFFER *Buffer) { PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; ULONG Length = 0; NTSTATUS Status = STATUS_SUCCESS; + + /* Fail, if the caller is not a trusted caller */ + if (UserObject->Trusted == FALSE) + return STATUS_INVALID_INFO_CLASS; *Buffer = NULL; Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Mon Mar 11 21:01:30 2013 @@ -24,6 +24,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(samsrv); /* FUNCTIONS ****************************************************************/ + +NTSTATUS +NTAPI +SamIConnect(IN PSAMPR_SERVER_NAME ServerName, + OUT SAMPR_HANDLE *ServerHandle, + IN ACCESS_MASK DesiredAccess, + IN BOOLEAN Trusted) +{ + PSAM_DB_OBJECT ServerObject; + NTSTATUS Status; + + TRACE("SamIConnect(%p %p %lx %ld)\n", + ServerName, ServerHandle, DesiredAccess, Trusted); + + /* Map generic access rights */ + RtlMapGenericMask(&DesiredAccess, + pServerMapping); + + /* Open the Server Object */ + Status = SampOpenDbObject(NULL, + NULL, + L"SAM", + 0, + SamDbServerObject, + DesiredAccess, + &ServerObject); + if (NT_SUCCESS(Status)) + { + ServerObject->Trusted = Trusted; + *ServerHandle = (SAMPR_HANDLE)ServerObject; + } + + TRACE("SamIConnect done (Status 0x%08lx)\n", Status); + + return Status; +} + NTSTATUS NTAPI Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Mon Mar 11 21:01:30 2013 @@ -50,6 +50,7 @@ HANDLE KeyHandle; HANDLE MembersKeyHandle; // only used by Aliases ULONG RelativeId; + BOOLEAN Trusted; struct _SAM_DB_OBJECT *ParentObject; } SAM_DB_OBJECT, *PSAM_DB_OBJECT; @@ -113,6 +114,9 @@ } SAM_USER_FIXED_DATA, *PSAM_USER_FIXED_DATA; +extern PGENERIC_MAPPING pServerMapping; + + /* database.c */ NTSTATUS Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Mon Mar 11 21:01:30 2013 @@ -4,7 +4,7 @@ @ stub SamIAmIGC @ stub SamIChangePasswordForeignUser @ stub SamIChangePasswordForeignUser2 -@ stub SamIConnect +@ stdcall SamIConnect(ptr ptr long long) @ stub SamICreateAccountByRid @ stub SamIDemote @ stub SamIDemoteUndo @@ -156,4 +156,4 @@ @ stdcall SamrTestPrivateFunctionsDomain(ptr) @ stdcall SamrTestPrivateFunctionsUser(ptr) @ stdcall SamrUnicodeChangePasswordUser2(ptr ptr ptr ptr ptr long ptr ptr) -; EOF +; EOF

1 0

[spetreolle] 58471: [AUDIOSRV] Fix log message.
by spetreolle＠svn.reactos.org 11 Mar '13

11 Mar '13

Author: spetreolle Date: Mon Mar 11 20:59:01 2013 New Revision: 58471 URL: http://svn.reactos.org/svn/reactos?rev=58471&view=rev Log: [AUDIOSRV] Fix log message. Modified: trunk/reactos/base/services/audiosrv/main.c Modified: trunk/reactos/base/services/audiosrv/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/mai… ============================================================================== --- trunk/reactos/base/services/audiosrv/main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/main.c [iso-8859-1] Mon Mar 11 20:59:01 2013 @@ -149,7 +149,7 @@ return; } - logmsg("* Service started"); + logmsg("* Service started\n"); /* Tell SCM we are now running, and we may be stopped */ service_status.dwCurrentState = SERVICE_RUNNING; service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP;

1 0

[akhaldi] 58470: [DDK] * Annotate ntpoapi.h.
by akhaldi＠svn.reactos.org 11 Mar '13

11 Mar '13

Author: akhaldi Date: Mon Mar 11 19:49:26 2013 New Revision: 58470 URL: http://svn.reactos.org/svn/reactos?rev=58470&view=rev Log: [DDK] * Annotate ntpoapi.h. Modified: trunk/reactos/include/ddk/ntpoapi.h Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntpoapi.h [iso-8859-1] Mon Mar 11 19:49:26 2013 @@ -150,9 +150,11 @@ ULONG IdleHandlerReserved[4]; } PROCESSOR_IDLE_TIMES, *PPROCESSOR_IDLE_TIMES; -typedef BOOLEAN -(FASTCALL*PPROCESSOR_IDLE_HANDLER)( - IN OUT PPROCESSOR_IDLE_TIMES IdleTimes); +_Function_class_(PROCESSOR_IDLE_HANDLER) +typedef NTSTATUS +(FASTCALL *PPROCESSOR_IDLE_HANDLER)( + _In_ ULONG_PTR Context, + _Inout_ PPROCESSOR_IDLE_TIMES IdleTimes); typedef struct _PROCESSOR_IDLE_HANDLER_INFO { ULONG HardwareLatency; @@ -188,17 +190,21 @@ PowerStateMaximum } POWER_STATE_HANDLER_TYPE, *PPOWER_STATE_HANDLER_TYPE; +_Function_class_(ENTER_STATE_SYSTEM_HANDLER) +_IRQL_requires_same_ typedef NTSTATUS -(NTAPI*PENTER_STATE_SYSTEM_HANDLER)( - IN PVOID SystemContext); - +(NTAPI *PENTER_STATE_SYSTEM_HANDLER)( + _In_ PVOID SystemContext); + +_Function_class_(ENTER_STATE_HANDLER) +_IRQL_requires_same_ typedef NTSTATUS -(NTAPI*PENTER_STATE_HANDLER)( - IN PVOID Context, - IN PENTER_STATE_SYSTEM_HANDLER SystemHandler OPTIONAL, - IN PVOID SystemContext, - IN LONG NumberProcessors, - IN LONG volatile *Number); +(NTAPI *PENTER_STATE_HANDLER)( + _In_opt_ PVOID Context, + _In_opt_ PENTER_STATE_SYSTEM_HANDLER SystemHandler, + _In_opt_ PVOID SystemContext, + _In_ LONG NumberProcessors, + _In_opt_ LONG volatile *Number); typedef struct _POWER_STATE_HANDLER { POWER_STATE_HANDLER_TYPE Type; @@ -208,26 +214,30 @@ PVOID Context; } POWER_STATE_HANDLER, *PPOWER_STATE_HANDLER; +_Function_class_(ENTER_STATE_NOTIFY_HANDLER) +_IRQL_requires_same_ typedef NTSTATUS -(NTAPI*PENTER_STATE_NOTIFY_HANDLER)( - IN POWER_STATE_HANDLER_TYPE State, - IN PVOID Context, - IN BOOLEAN Entering); +(NTAPI *PENTER_STATE_NOTIFY_HANDLER)( + _In_ POWER_STATE_HANDLER_TYPE State, + _In_ PVOID Context, + _In_ BOOLEAN Entering); typedef struct _POWER_STATE_NOTIFY_HANDLER { PENTER_STATE_NOTIFY_HANDLER Handler; PVOID Context; } POWER_STATE_NOTIFY_HANDLER, *PPOWER_STATE_NOTIFY_HANDLER; +_IRQL_requires_max_(APC_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtPowerInformation( - IN POWER_INFORMATION_LEVEL InformationLevel, - IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, - OUT PVOID OutputBuffer OPTIONAL, - IN ULONG OutputBufferLength); + _In_ POWER_INFORMATION_LEVEL InformationLevel, + _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_opt_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength); #define PROCESSOR_STATE_TYPE_PERFORMANCE 1 #define PROCESSOR_STATE_TYPE_THROTTLE 2 @@ -261,49 +271,59 @@ PROCESSOR_PERF_LEVEL PerfLevel[1]; } PROCESSOR_STATE_HANDLER2, *PPROCESSOR_STATE_HANDLER2; +_IRQL_requires_max_(PASSIVE_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtSetThreadExecutionState( - IN EXECUTION_STATE esFlags, - OUT EXECUTION_STATE *PreviousFlags); + _In_ EXECUTION_STATE esFlags, + _Out_ EXECUTION_STATE *PreviousFlags); NTSYSCALLAPI NTSTATUS NTAPI NtRequestWakeupLatency( - IN LATENCY_TIME latency); - + _In_ LATENCY_TIME latency); + +_IRQL_requires_max_(APC_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtInitiatePowerAction( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags, - IN BOOLEAN Asynchronous); - + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags, + _In_ BOOLEAN Asynchronous); + +_IRQL_requires_max_(APC_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemPowerState( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags); - + _In_ POWER_ACTION SystemAction, + _In_ SYSTEM_POWER_STATE MinSystemState, + _In_ ULONG Flags); + +_IRQL_requires_max_(APC_LEVEL) +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtGetDevicePowerState( - IN HANDLE Device, - OUT DEVICE_POWER_STATE *State); + _In_ HANDLE Device, + _Out_ DEVICE_POWER_STATE *State); NTSYSCALLAPI NTSTATUS NTAPI NtCancelDeviceWakeupRequest( - IN HANDLE Device); - + _In_ HANDLE Device); + +_IRQL_requires_max_(APC_LEVEL) +__kernel_entry NTSYSCALLAPI BOOLEAN NTAPI @@ -313,7 +333,7 @@ NTSTATUS NTAPI NtRequestDeviceWakeup( - IN HANDLE Device); + _In_ HANDLE Device); #define WINLOGON_LOCK_ON_SLEEP 0x00000001

1 0

[akhaldi] 58469: [PSDK] * Annotate some structures in ntddstor.h.
by akhaldi＠svn.reactos.org 11 Mar '13

11 Mar '13

Author: akhaldi Date: Mon Mar 11 19:48:21 2013 New Revision: 58469 URL: http://svn.reactos.org/svn/reactos?rev=58469&view=rev Log: [PSDK] * Annotate some structures in ntddstor.h. Modified: trunk/reactos/include/psdk/ntddstor.h Modified: trunk/reactos/include/psdk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddstor.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddstor.h [iso-8859-1] Mon Mar 11 19:48:21 2013 @@ -435,12 +435,12 @@ UCHAR AdditionalParameters[1]; } STORAGE_PROPERTY_QUERY, *PSTORAGE_PROPERTY_QUERY; -typedef struct _STORAGE_DESCRIPTOR_HEADER { +typedef _Struct_size_bytes_(Size) struct _STORAGE_DESCRIPTOR_HEADER { ULONG Version; ULONG Size; } STORAGE_DESCRIPTOR_HEADER, *PSTORAGE_DESCRIPTOR_HEADER; -typedef struct _STORAGE_DEVICE_DESCRIPTOR { +typedef _Struct_size_bytes_(Size) struct _STORAGE_DEVICE_DESCRIPTOR { ULONG Version; ULONG Size; UCHAR DeviceType; @@ -456,7 +456,7 @@ UCHAR RawDeviceProperties[1]; } STORAGE_DEVICE_DESCRIPTOR, *PSTORAGE_DEVICE_DESCRIPTOR; -typedef struct _STORAGE_ADAPTER_DESCRIPTOR { +typedef _Struct_size_bytes_(Size) struct _STORAGE_ADAPTER_DESCRIPTOR { ULONG Version; ULONG Size; ULONG MaximumTransferLength; @@ -475,7 +475,7 @@ USHORT BusMinorVersion; } STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR; -typedef struct _STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR { +typedef _Struct_size_bytes_(Size) struct _STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR { ULONG Version; ULONG Size; ULONG BytesPerCacheLine; @@ -539,7 +539,7 @@ UCHAR Identifier[1]; } STORAGE_IDENTIFIER, *PSTORAGE_IDENTIFIER; -typedef struct _STORAGE_DEVICE_ID_DESCRIPTOR { +typedef _Struct_size_bytes_(Size) struct _STORAGE_DEVICE_ID_DESCRIPTOR { ULONG Version; ULONG Size; ULONG NumberOfIdentifiers; @@ -646,7 +646,7 @@ #endif /* defined(_MSC_EXTENSIONS) */ -typedef struct _STORAGE_READ_CAPACITY { +typedef _Struct_size_bytes_(Size) struct _STORAGE_READ_CAPACITY { ULONG Version; ULONG Size; ULONG BlockLength; @@ -679,7 +679,7 @@ WriteThroughSupported } WRITE_THROUGH; -typedef struct _STORAGE_WRITE_CACHE_PROPERTY { +typedef _Struct_size_bytes_(Size) struct _STORAGE_WRITE_CACHE_PROPERTY { ULONG Version; ULONG Size; WRITE_CACHE_TYPE WriteCacheType;

1 0

[akhaldi] 58468: [SAL] * Add _Outptr_opt_result_buffer_ and _Outptr_opt_result_bytebuffer_ annotations.
by akhaldi＠svn.reactos.org 11 Mar '13

11 Mar '13

Author: akhaldi Date: Mon Mar 11 19:31:40 2013 New Revision: 58468 URL: http://svn.reactos.org/svn/reactos?rev=58468&view=rev Log: [SAL] * Add _Outptr_opt_result_buffer_ and _Outptr_opt_result_bytebuffer_ annotations. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=584… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Mon Mar 11 19:31:40 2013 @@ -807,13 +807,13 @@ //#define _Out_z_capcount_(capcount) #define _Outptr_ _SAL2_NAME(_Outptr_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,ValidElements="\n""1")]) #define _Outptr_opt_ _SAL2_NAME(_Outptr_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,ValidElements="\n""1")]) -//#define _Outptr_opt_result_buffer_(size) +#define _Outptr_opt_result_buffer_(size) _SAL2_NAME(_Outptr_opt_result_buffer_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,WritableElements="\n" _SA_SPECSTRIZE(size))]) //#define _Outptr_opt_result_buffer_all_(size) //#define _Outptr_opt_result_buffer_all_maybenull_(size) //#define _Outptr_opt_result_buffer_maybenull_(size) //#define _Outptr_opt_result_buffer_to_(size, count) //#define _Outptr_opt_result_buffer_to_maybenull_(size, count) -//#define _Outptr_opt_result_bytebuffer_(size) +#define _Outptr_opt_result_bytebuffer_(size) _SAL2_NAME(_Outptr_opt_result_bytebuffer_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,WritableBytes="\n" _SA_SPECSTRIZE(size))]) //#define _Outptr_opt_result_bytebuffer_all_(size) #define _Outptr_opt_result_bytebuffer_all_maybenull_(size) _SAL2_NAME(_Outptr_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_Maybe,Notref=1,ValidBytes="\n" _SA_SPECSTRIZE(size))]) //#define _Outptr_opt_result_bytebuffer_maybenull_(size)

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