Andrey Turkin : server: I/ O completion ports can only be used with overlapped I/O.
Alexandre Julliard
julliard at winehq.org
Mon Dec 17 06:42:03 CST 2007
Module: wine
Branch: master
Commit: f1dcf4bf3aef126e0fadb192c091fd390dc6c4e2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1dcf4bf3aef126e0fadb192c091fd390dc6c4e2
Author: Andrey Turkin <andrey.turkin at gmail.com>
Date: Mon Dec 17 02:02:12 2007 +0300
server: I/O completion ports can only be used with overlapped I/O.
---
dlls/ntdll/tests/file.c | 34 ++++++++++++++++++++++++++++------
server/fd.c | 2 +-
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 846448e..4e1833c 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -498,17 +498,39 @@ static void test_iocp_fileio(HANDLE h)
{
static const char pipe_name[] = "\\\\.\\pipe\\iocompletiontestnamedpipe";
- HANDLE hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL );
- HANDLE hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL );
- ok( hPipeSrv != INVALID_HANDLE_VALUE && hPipeClt != INVALID_HANDLE_VALUE, "Cannot create or connect to pipe\n" );
- if (hPipeSrv != INVALID_HANDLE_VALUE && hPipeClt != INVALID_HANDLE_VALUE)
+ IO_STATUS_BLOCK iosb;
+ FILE_COMPLETION_INFORMATION fci = {h, CKEY_SECOND};
+ HANDLE hPipeSrv, hPipeClt;
+ NTSTATUS res;
+
+ hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL );
+ ok( hPipeSrv != INVALID_HANDLE_VALUE, "Cannot create named pipe\n" );
+ if (hPipeSrv != INVALID_HANDLE_VALUE )
+ {
+ hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL );
+ ok( hPipeClt != INVALID_HANDLE_VALUE, "Cannot connect to pipe\n" );
+ if (hPipeClt != INVALID_HANDLE_VALUE)
+ {
+ res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation );
+ ok( res == STATUS_INVALID_PARAMETER, "Unexpected NtSetInformationFile on non-overlapped handle: %x\n", res );
+ CloseHandle(hPipeClt);
+ }
+ CloseHandle( hPipeSrv );
+ }
+
+ hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL );
+ ok( hPipeSrv != INVALID_HANDLE_VALUE, "Cannot create named pipe\n" );
+ if (hPipeSrv == INVALID_HANDLE_VALUE )
+ return;
+
+ hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL );
+ ok( hPipeClt != INVALID_HANDLE_VALUE, "Cannot connect to pipe\n" );
+ if (hPipeClt != INVALID_HANDLE_VALUE)
{
OVERLAPPED o = {0,};
BYTE buf[3];
DWORD read;
long count;
- FILE_COMPLETION_INFORMATION fci = {h, CKEY_SECOND};
- IO_STATUS_BLOCK iosb;
NTSTATUS res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation );
ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res );
diff --git a/server/fd.c b/server/fd.c
index efa575d..95a0520 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -2050,7 +2050,7 @@ DECL_HANDLER(set_completion_info)
if (fd)
{
- if (!fd->completion)
+ if (!(fd->options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !fd->completion)
{
fd->completion = get_completion_obj( current->process, req->chandle, IO_COMPLETION_MODIFY_STATE );
fd->comp_key = req->ckey;
More information about the wine-cvs
mailing list