system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 19:49:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

server: Return error for FSCTL_PIPE_PEEK calls on disconnected pipes.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2017-10-04 15:17:35 +02:00 committed by Alexandre Julliard
parent 6283f4ed96
commit 688c7a99d2
2 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dlls/kernel32/tests/pipe.c
View file

@ -209,6 +209,11 @@ static void test_CreateNamedPipe(int pipemode)
ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n");
test_signaled(hnp); test_signaled(hnp);
ret = PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL);
todo_wine
ok(!ret && GetLastError() == ERROR_BAD_PIPE, "PeekNamedPipe returned %x (%u)\n",
ret, GetLastError());
ret = WaitNamedPipeA(PIPENAME, 2000); ret = WaitNamedPipeA(PIPENAME, 2000);
ok(ret, "WaitNamedPipe failed (%d)\n", GetLastError()); ok(ret, "WaitNamedPipe failed (%d)\n", GetLastError());
@ -1387,10 +1392,20 @@ static int test_DisconnectNamedPipe(void)
ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL) == 0 ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL) == 0
&& GetLastError() == ERROR_PIPE_NOT_CONNECTED, && GetLastError() == ERROR_PIPE_NOT_CONNECTED,
"ReadFile from disconnected pipe with bytes waiting\n"); "ReadFile from disconnected pipe with bytes waiting\n");
ok(!DisconnectNamedPipe(hnp) && GetLastError() == ERROR_PIPE_NOT_CONNECTED, ok(!DisconnectNamedPipe(hnp) && GetLastError() == ERROR_PIPE_NOT_CONNECTED,
"DisconnectNamedPipe worked twice\n"); "DisconnectNamedPipe worked twice\n");
ret = WaitForSingleObject(hFile, 0); ret = WaitForSingleObject(hFile, 0);
ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %X\n", ret); ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %X\n", ret);
ret = PeekNamedPipe(hFile, NULL, 0, NULL, &readden, NULL);
todo_wine
ok(!ret && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "PeekNamedPipe returned %x (%u)\n",
ret, GetLastError());
ret = PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL);
todo_wine
ok(!ret && GetLastError() == ERROR_BAD_PIPE, "PeekNamedPipe returned %x (%u)\n",
ret, GetLastError());
ok(CloseHandle(hFile), "CloseHandle\n"); ok(CloseHandle(hFile), "CloseHandle\n");
} }
@ -1501,6 +1516,11 @@ static void test_CloseHandle(void)
ok(ret, "ReadFile failed with %u\n", GetLastError()); ok(ret, "ReadFile failed with %u\n", GetLastError());
ok(numbytes == 0, "expected 0, got %u\n", numbytes); ok(numbytes == 0, "expected 0, got %u\n", numbytes);
numbytes = 0xdeadbeef;
ret = PeekNamedPipe(hfile, NULL, 0, NULL, &numbytes, NULL);
ok(ret, "PeekNamedPipe failed with %u\n", GetLastError());
ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes);
numbytes = 0xdeadbeef; numbytes = 0xdeadbeef;
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
ret = ReadFile(hfile, buffer, sizeof(buffer), &numbytes, NULL); ret = ReadFile(hfile, buffer, sizeof(buffer), &numbytes, NULL);
@ -1518,6 +1538,12 @@ static void test_CloseHandle(void)
ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(!ret, "ReadFile unexpectedly succeeded\n");
ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError());
numbytes = 0xdeadbeef;
ret = PeekNamedPipe(hfile, NULL, 0, NULL, &numbytes, NULL);
ok(!ret && GetLastError() == ERROR_BROKEN_PIPE, "PeekNamedPipe returned %x (%u)\n",
ret, GetLastError());
ok(numbytes == 0xdeadbeef, "numbytes = %u\n", numbytes);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL); ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL);
ok(!ret, "WriteFile unexpectedly succeeded\n"); ok(!ret, "WriteFile unexpectedly succeeded\n");
@ -1600,6 +1626,11 @@ static void test_CloseHandle(void)
"ReadFile failed with %u\n", GetLastError()); "ReadFile failed with %u\n", GetLastError());
ok(numbytes == 0, "expected 0, got %u\n", numbytes); ok(numbytes == 0, "expected 0, got %u\n", numbytes);
numbytes = 0xdeadbeef;
ret = PeekNamedPipe(hpipe, NULL, 0, NULL, &numbytes, NULL);
ok(ret, "PeekNamedPipe failed with %u\n", GetLastError());
ok(numbytes == sizeof(testdata), "expected sizeof(testdata), got %u\n", numbytes);
numbytes = 0xdeadbeef; numbytes = 0xdeadbeef;
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
ret = ReadFile(hpipe, buffer, sizeof(buffer), &numbytes, NULL); ret = ReadFile(hpipe, buffer, sizeof(buffer), &numbytes, NULL);
@ -1617,6 +1648,12 @@ static void test_CloseHandle(void)
ok(!ret, "ReadFile unexpectedly succeeded\n"); ok(!ret, "ReadFile unexpectedly succeeded\n");
ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError());
numbytes = 0xdeadbeef;
ret = PeekNamedPipe(hpipe, NULL, 0, NULL, &numbytes, NULL);
ok(!ret && GetLastError() == ERROR_BROKEN_PIPE, "PeekNamedPipe returned %x (%u)\n",
ret, GetLastError());
ok(numbytes == 0xdeadbeef, "numbytes = %u\n", numbytes);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = WriteFile(hpipe, testdata, sizeof(testdata), &numbytes, NULL); ret = WriteFile(hpipe, testdata, sizeof(testdata), &numbytes, NULL);
ok(!ret, "WriteFile unexpectedly succeeded\n"); ok(!ret, "WriteFile unexpectedly succeeded\n");

6
server/named_pipe.c
View file

@ -922,6 +922,12 @@ static int pipe_end_peek( struct pipe_end *pipe_end )
} }
reply_size -= offsetof( FILE_PIPE_PEEK_BUFFER, Data ); reply_size -= offsetof( FILE_PIPE_PEEK_BUFFER, Data );
if (!pipe_end->connection && list_empty( &pipe_end->message_queue ))
{
set_error( STATUS_PIPE_BROKEN );
return 0;
}
LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry ) LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry )
avail += message->iosb->in_size - message->read_pos; avail += message->iosb->in_size - message->read_pos;