From d4e01097b804f2eb65b8cb172a451e644ae3f11c Mon Sep 17 00:00:00 2001
From: wj32 <wj32@21ef857c-d57f-4fe0-8362-d861dc6d29cd>
Date: Sat, 8 Jan 2011 03:25:35 +0000
Subject: [PATCH] updated I/O system calls

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@3986 21ef857c-d57f-4fe0-8362-d861dc6d29cd
---
 2.x/trunk/phlib/include/ntioapi.h | 22 ++++++++++++++++++----
 2.x/trunk/phlib/include/ntzwapi.h | 16 ++++++++++++++--
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/2.x/trunk/phlib/include/ntioapi.h b/2.x/trunk/phlib/include/ntioapi.h
index 31cd7995c..a717d29ac 100644
--- a/2.x/trunk/phlib/include/ntioapi.h
+++ b/2.x/trunk/phlib/include/ntioapi.h
@@ -1023,7 +1023,7 @@ NTSTATUS
 NTAPI
 NtCancelIoFileEx(
     __in HANDLE FileHandle,
-    __in_opt PIO_STATUS_BLOCK UserIosb,
+    __in_opt PIO_STATUS_BLOCK IoRequestToCancel,
     __out PIO_STATUS_BLOCK IoStatusBlock
     );
 #endif
@@ -1035,7 +1035,7 @@ NTSTATUS
 NTAPI
 NtCancelSynchronousIoFile(
     __in HANDLE ThreadHandle,
-    __in_opt PIO_STATUS_BLOCK UserIosb,
+    __in_opt PIO_STATUS_BLOCK IoRequestToCancel,
     __out PIO_STATUS_BLOCK IoStatusBlock
     );
 #endif
@@ -1261,8 +1261,8 @@ NtSetIoCompletion(
     __in ULONG_PTR IoStatusInformation
     );
 
-// begin_rev
 #if (PHNT_VERSION >= PHNT_WIN7)
+// rev
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
@@ -1275,7 +1275,6 @@ NtSetIoCompletionEx(
     __in ULONG_PTR IoStatusInformation
     );
 #endif
-// end_rev
 
 NTSYSCALLAPI
 NTSTATUS
@@ -1288,6 +1287,21 @@ NtRemoveIoCompletion(
     __in_opt PLARGE_INTEGER Timeout
     );
 
+#if (PHNT_VERSION >= PHNT_VISTA)
+// private
+NTSYSCALLAPI
+NTSTATUS
+NTAPI
+NtRemoveIoCompletionEx(
+    __in HANDLE IoCompletionHandle,
+    __out_ecount(Count) PFILE_IO_COMPLETION_INFORMATION IoCompletionInformation,
+    __in ULONG Count,
+    __out PULONG NumEntriesRemoved,
+    __in_opt PLARGE_INTEGER Timeout,
+    __in BOOLEAN Alertable
+    );
+#endif
+
 // Control structures
 
 // Reparse structure for FSCTL_SET_REPARSE_POINT, FSCTL_GET_REPARSE_POINT, FSCTL_DELETE_REPARSE_POINT
diff --git a/2.x/trunk/phlib/include/ntzwapi.h b/2.x/trunk/phlib/include/ntzwapi.h
index 2fdf66cf4..b41bd9ba6 100644
--- a/2.x/trunk/phlib/include/ntzwapi.h
+++ b/2.x/trunk/phlib/include/ntzwapi.h
@@ -503,7 +503,7 @@ NTSTATUS
 NTAPI
 ZwCancelIoFileEx(
     __in HANDLE FileHandle,
-    __in_opt PIO_STATUS_BLOCK UserIosb,
+    __in_opt PIO_STATUS_BLOCK IoRequestToCancel,
     __out PIO_STATUS_BLOCK IoStatusBlock
     );
 
@@ -512,7 +512,7 @@ NTSTATUS
 NTAPI
 ZwCancelSynchronousIoFile(
     __in HANDLE ThreadHandle,
-    __in_opt PIO_STATUS_BLOCK UserIosb,
+    __in_opt PIO_STATUS_BLOCK IoRequestToCancel,
     __out PIO_STATUS_BLOCK IoStatusBlock
     );
 
@@ -2750,6 +2750,18 @@ ZwRemoveIoCompletion(
     __in_opt PLARGE_INTEGER Timeout
     );
 
+NTSYSCALLAPI
+NTSTATUS
+NTAPI
+ZwRemoveIoCompletionEx(
+    __in HANDLE IoCompletionHandle,
+    __out_ecount(Count) PFILE_IO_COMPLETION_INFORMATION IoCompletionInformation,
+    __in ULONG Count,
+    __out PULONG NumEntriesRemoved,
+    __in_opt PLARGE_INTEGER Timeout,
+    __in BOOLEAN Alertable
+    );
+
 NTSYSCALLAPI
 NTSTATUS
 NTAPI