Author: tkreuzer
Date: Sun Mar 15 00:05:50 2015
New Revision: 66720
URL: http://svn.reactos.org/svn/reactos?rev=66720&view=rev
Log:
[DDK/PSDK/NDK/XDK]
- Improve annotations for some functions
- Sync winnt.h with XDK
Modified:
trunk/reactos/include/ddk/ntddk.h
trunk/reactos/include/ndk/cmfuncs.h
trunk/reactos/include/ndk/exfuncs.h
trunk/reactos/include/ndk/obfuncs.h
trunk/reactos/include/ndk/psfuncs.h
trunk/reactos/include/psdk/winnt.h
trunk/reactos/include/xdk/psfuncs.h
trunk/reactos/include/xdk/winnt_old.h
Modified: trunk/reactos/include/ddk/ntddk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=66720&r1=66719&r2=66720&view=diff
==============================================================================
--- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Sun Mar 15 00:05:50 2015
@@ -4706,15 +4706,16 @@
_In_ POBJECT_ATTRIBUTES ObjectAttributes,
_In_opt_ PCLIENT_ID ClientId);
+__kernel_entry
NTSYSCALLAPI
NTSTATUS
NTAPI
NtQueryInformationProcess(
- IN HANDLE ProcessHandle,
- IN PROCESSINFOCLASS ProcessInformationClass,
- OUT PVOID ProcessInformation OPTIONAL,
- IN ULONG ProcessInformationLength,
- OUT PULONG ReturnLength OPTIONAL);
+ _In_ HANDLE ProcessHandle,
+ _In_ PROCESSINFOCLASS ProcessInformationClass,
+ _Out_ PVOID ProcessInformation,
+ _In_ ULONG ProcessInformationLength,
+ _Out_opt_ PULONG ReturnLength);
#if (NTDDI_VERSION >= NTDDI_WIN2K)
Modified: trunk/reactos/include/ndk/cmfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmfuncs.h?rev=66720&r1=66719&r2=66720&view=diff
==============================================================================
--- trunk/reactos/include/ndk/cmfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/cmfuncs.h [iso-8859-1] Sun Mar 15 00:05:50 2015
@@ -176,20 +176,22 @@
_In_ BOOLEAN WatchSubtree
);
+__kernel_entry
+NTSYSCALLAPI
NTSTATUS
NTAPI
NtNotifyChangeMultipleKeys(
_In_ HANDLE MasterKeyHandle,
- _In_ ULONG Count,
- _In_ POBJECT_ATTRIBUTES SlaveObjects,
- _In_ HANDLE Event,
+ _In_opt_ ULONG Count,
+ _In_reads_opt_(Count) OBJECT_ATTRIBUTES SubordinateObjects[],
+ _In_opt_ HANDLE Event,
_In_opt_ PIO_APC_ROUTINE ApcRoutine,
_In_opt_ PVOID ApcContext,
_Out_ PIO_STATUS_BLOCK IoStatusBlock,
_In_ ULONG CompletionFilter,
_In_ BOOLEAN WatchTree,
- _Out_bytecap_(Length) PVOID Buffer,
- _In_ ULONG Length,
+ _Out_writes_bytes_opt_(BufferSize) PVOID Buffer,
+ _In_ ULONG BufferSize,
_In_ BOOLEAN Asynchronous
);
@@ -222,16 +224,17 @@
_Out_ PULONG ResultLength
);
+__kernel_entry
NTSYSCALLAPI
NTSTATUS
NTAPI
NtQueryMultipleValueKey(
_In_ HANDLE KeyHandle,
- _Inout_ PKEY_VALUE_ENTRY ValueList,
- _In_ ULONG NumberOfValues,
- _Out_bytecap_(*Length) PVOID Buffer,
- _Inout_ PULONG Length,
- _Out_ PULONG ReturnLength
+ _Inout_updates_(EntryCount) PKEY_VALUE_ENTRY ValueEntries,
+ _In_ ULONG EntryCount,
+ _Out_writes_bytes_(*BufferLength) PVOID ValueBuffer,
+ _Inout_ PULONG BufferLength,
+ _Out_opt_ PULONG RequiredBufferLength
);
NTSTATUS
@@ -270,7 +273,7 @@
NTAPI
NtRenameKey(
_In_ HANDLE KeyHandle,
- _In_ PUNICODE_STRING ReplacementName
+ _In_ PUNICODE_STRING NewName
);
NTSYSCALLAPI
@@ -317,14 +320,16 @@
_In_ HANDLE FileHandle
);
+__kernel_entry
NTSYSCALLAPI
NTSTATUS
NTAPI
NtSetInformationKey(
_In_ HANDLE KeyHandle,
- _In_ KEY_SET_INFORMATION_CLASS KeyInformationClass,
- _In_ PVOID KeyInformation,
- _In_ ULONG KeyInformationLength
+ _In_ _Strict_type_match_
+ KEY_SET_INFORMATION_CLASS KeySetInformationClass,
+ _In_reads_bytes_(KeySetInformationLength) PVOID KeySetInformation,
+ _In_ ULONG KeySetInformationLength
);
NTSYSCALLAPI
Modified: trunk/reactos/include/ndk/exfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=66720&r1=66719&r2=66720&view=diff
==============================================================================
--- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Sun Mar 15 00:05:50 2015
@@ -401,13 +401,14 @@
_Inout_ PULONG Attributes
);
+__kernel_entry
NTSYSCALLAPI
NTSTATUS
NTAPI
NtQuerySystemInformation(
_In_ SYSTEM_INFORMATION_CLASS SystemInformationClass,
_Out_ PVOID SystemInformation,
- _In_ ULONG Length,
+ _In_ ULONG InformationLength,
_Out_opt_ PULONG ResultLength
);
Modified: trunk/reactos/include/ndk/obfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=66720&r1=66719&r2=66720&view=diff
==============================================================================
--- trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] Sun Mar 15 00:05:50 2015
@@ -373,7 +373,7 @@
NtWaitForSingleObject(
_In_ HANDLE Object,
_In_ BOOLEAN Alertable,
- _In_opt_ PLARGE_INTEGER Time
+ _In_opt_ PLARGE_INTEGER Timeout
);
NTSYSAPI
Modified: trunk/reactos/include/ndk/psfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=66720&r1=66719&r2=66720&view=diff
==============================================================================
--- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Sun Mar 15 00:05:50 2015
@@ -507,6 +507,7 @@
);
#ifndef _NTDDK_
+__kernel_entry
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -515,7 +516,7 @@
_In_ PROCESSINFOCLASS ProcessInformationClass,
_Out_ PVOID ProcessInformation,
_In_ ULONG ProcessInformationLength,
- _Out_opt_ PULONG ReturnLength OPTIONAL
+ _Out_opt_ PULONG ReturnLength
);
#endif
Modified: trunk/reactos/include/psdk/winnt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=66720&r1=66719&r2=66720&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Mar 15 00:05:50 2015
@@ -4323,6 +4323,9 @@
RtlQueryDepthSList(
_In_ PSLIST_HEADER ListHead);
+#ifndef _RTL_RUN_ONCE_DEF
+#define _RTL_RUN_ONCE_DEF
+
#define RTL_RUN_ONCE_CHECK_ONLY 0x00000001UL
#define RTL_RUN_ONCE_ASYNC 0x00000002UL
#define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL
@@ -4343,6 +4346,8 @@
PRTL_RUN_ONCE,
DWORD,
PVOID);
+
+#endif
#define RTL_CONDITION_VARIABLE_INIT {0}
#define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 0x1
Modified: trunk/reactos/include/xdk/psfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/psfuncs.h?rev=66720&r1=66719&r2=66720&view=diff
==============================================================================
--- trunk/reactos/include/xdk/psfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/psfuncs.h [iso-8859-1] Sun Mar 15 00:05:50 2015
@@ -41,15 +41,16 @@
_In_ POBJECT_ATTRIBUTES ObjectAttributes,
_In_opt_ PCLIENT_ID ClientId);
+__kernel_entry
NTSYSCALLAPI
NTSTATUS
NTAPI
NtQueryInformationProcess(
- IN HANDLE ProcessHandle,
- IN PROCESSINFOCLASS ProcessInformationClass,
- OUT PVOID ProcessInformation OPTIONAL,
- IN ULONG ProcessInformationLength,
- OUT PULONG ReturnLength OPTIONAL);
+ _In_ HANDLE ProcessHandle,
+ _In_ PROCESSINFOCLASS ProcessInformationClass,
+ _Out_ PVOID ProcessInformation,
+ _In_ ULONG ProcessInformationLength,
+ _Out_opt_ PULONG ReturnLength);
$endif (_NTDDK_)
$if (_NTIFS_)
Modified: trunk/reactos/include/xdk/winnt_old.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?rev=66720&r1=66719&r2=66720&view=diff
==============================================================================
--- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original)
+++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Sun Mar 15
00:05:50 2015
@@ -672,6 +672,8 @@
#define PF_RDTSC_INSTRUCTION_AVAILABLE 8
#define PF_PAE_ENABLED 9
#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10
+#define PF_NX_ENABLED 12
+
/* also in ddk/ntifs.h */
#define FILE_ACTION_ADDED 0x00000001
#define FILE_ACTION_REMOVED 0x00000002
@@ -4351,6 +4353,7 @@
PCWSTR lpAssemblyManifestPath;
PCWSTR lpAssemblyPolicyPath;
PCWSTR lpAssemblyDirectoryName;
+ DWORD ulFileCount;
} ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION,
*PACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION;
typedef const ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION
*PCACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION;
