August 2018 - Wine-commits - list.winehq.org

Zhiyi Zhang : iphlpapi: Don't use the client buffer in IcmpSendEcho().
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 417e996e97ebc3ff47d986e322dbaf3b3a83b91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=417e996e97ebc3ff47d986e3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Aug 5 11:04:43 2018 +0800 iphlpapi: Don't use the client buffer in IcmpSendEcho(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43252 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 48 +++++++++++++++++++++++++----------------- dlls/iphlpapi/tests/iphlpapi.c | 21 ++++++++++++++---- 2 files changed, 46 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index ebc2f2b..0d80248 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -113,6 +113,9 @@ typedef struct { #define IP_OPTS_DEFAULT 1 #define IP_OPTS_CUSTOM 2 +#define MAXIPLEN 60 +#define MAXICMPLEN 76 + /* The sequence number is unique process wide, so that all threads * have a distinct sequence number. */ @@ -268,15 +271,14 @@ DWORD WINAPI IcmpSendEcho( ) { icmp_t* icp=(icmp_t*)IcmpHandle; - unsigned char* reqbuf; - int reqsize; + unsigned char *buffer; + int reqsize, repsize; struct icmp_echo_reply* ier; struct ip* ip_header; struct icmp* icmp_header; char* endbuf; int ip_header_len; - int maxlen; struct pollfd fdr; DWORD send_time,recv_time; struct sockaddr_in addr; @@ -306,20 +308,23 @@ DWORD WINAPI IcmpSendEcho( seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; reqsize=ICMP_MINLEN+RequestSize; - reqbuf=HeapAlloc(GetProcessHeap(), 0, reqsize); - if (reqbuf==NULL) { + /* max ip header + max icmp header and error data + reply size(max 65535 on Windows) */ + /* FIXME: request size of 65535 is not supported yet because max buffer size of raw socket on linux is 32767 */ + repsize = MAXIPLEN + MAXICMPLEN + min( 65535, ReplySize ); + buffer = HeapAlloc(GetProcessHeap(), 0, max( repsize, reqsize )); + if (buffer == NULL) { SetLastError(ERROR_OUTOFMEMORY); return 0; } - icmp_header=(struct icmp*)reqbuf; + icmp_header=(struct icmp*)buffer; icmp_header->icmp_type=ICMP_ECHO; icmp_header->icmp_code=0; icmp_header->icmp_cksum=0; icmp_header->icmp_id=id; icmp_header->icmp_seq=seq; - memcpy(reqbuf+ICMP_MINLEN, RequestData, RequestSize); - icmp_header->icmp_cksum=cksum=in_cksum((u_short*)reqbuf,reqsize); + memcpy(buffer+ICMP_MINLEN, RequestData, RequestSize); + icmp_header->icmp_cksum=cksum=in_cksum((u_short*)buffer,reqsize); addr.sin_family=AF_INET; addr.sin_addr.s_addr=DestinationAddress; @@ -367,26 +372,22 @@ DWORD WINAPI IcmpSendEcho( fdr.events = POLLIN; addrlen=sizeof(addr); ier=ReplyBuffer; - ip_header=(struct ip *) ((char *) ReplyBuffer+sizeof(ICMP_ECHO_REPLY)); endbuf=(char *) ReplyBuffer+ReplySize; - maxlen=ReplySize-sizeof(ICMP_ECHO_REPLY); /* Send the packet */ TRACE("Sending %d bytes (RequestSize=%d) to %s\n", reqsize, RequestSize, inet_ntoa(addr.sin_addr)); #if 0 if (TRACE_ON(icmp)){ - unsigned char* buf=(unsigned char*)reqbuf; int i; printf("Output buffer:\n"); for (i=0;i<reqsize;i++) - printf("%2x,", buf[i]); + printf("%2x,", buffer[i]); printf("\n"); } #endif send_time = GetTickCount(); - res=sendto(icp->sid, reqbuf, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); - HeapFree(GetProcessHeap (), 0, reqbuf); + res=sendto(icp->sid, buffer, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)); if (res<0) { if (errno==EMSGSIZE) SetLastError(IP_PACKET_TOO_BIG); @@ -403,14 +404,16 @@ DWORD WINAPI IcmpSendEcho( SetLastError(IP_GENERAL_FAILURE); } } + HeapFree(GetProcessHeap(), 0, buffer); return 0; } /* Get the reply */ + ip_header=(struct ip*)buffer; ip_header_len=0; /* because gcc was complaining */ while (poll(&fdr,1,Timeout)>0) { recv_time = GetTickCount(); - res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen); + res=recvfrom(icp->sid, buffer, repsize, 0, (struct sockaddr*)&addr, &addrlen); TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); ier->Status=IP_REQ_TIMED_OUT; @@ -508,6 +511,12 @@ DWORD WINAPI IcmpSendEcho( else Timeout = 0; continue; } else { + /* Check free space, should be large enough for an ICMP_ECHO_REPLY and remainning icmp data */ + if (endbuf-(char *)ier < sizeof(struct icmp_echo_reply)+(res-ip_header_len-ICMP_MINLEN)) { + res=ier-(ICMP_ECHO_REPLY *)ReplyBuffer; + SetLastError(IP_GENERAL_FAILURE); + goto done; + } /* This is a reply to our packet */ memcpy(&ier->Address,&ip_header->ip_src,sizeof(IPAddr)); /* Status is already set */ @@ -515,7 +524,7 @@ DWORD WINAPI IcmpSendEcho( ier->DataSize=res-ip_header_len-ICMP_MINLEN; ier->Reserved=0; ier->Data=endbuf-ier->DataSize; - memmove(ier->Data,((char*)ip_header)+ip_header_len+ICMP_MINLEN,ier->DataSize); + memcpy(ier->Data, ((char *)ip_header)+ip_header_len+ICMP_MINLEN, ier->DataSize); ier->Options.Ttl=ip_header->ip_ttl; ier->Options.Tos=ip_header->ip_tos; ier->Options.Flags=ip_header->ip_off >> 13; @@ -523,7 +532,7 @@ DWORD WINAPI IcmpSendEcho( if (ier->Options.OptionsSize!=0) { ier->Options.OptionsData=(unsigned char *) ier->Data-ier->Options.OptionsSize; /* FIXME: We are supposed to rearrange the option's 'source route' data */ - memmove(ier->Options.OptionsData,((char*)ip_header)+ip_header_len,ier->Options.OptionsSize); + memcpy(ier->Options.OptionsData, ((char *)ip_header)+ip_header_len, ier->Options.OptionsSize); endbuf=(char*)ier->Options.OptionsData; } else { ier->Options.OptionsData=NULL; @@ -531,9 +540,8 @@ DWORD WINAPI IcmpSendEcho( } /* Prepare for the next packet */ + endbuf-=ier->DataSize; ier++; - ip_header=(struct ip*)(((char*)ip_header)+sizeof(ICMP_ECHO_REPLY)); - maxlen=endbuf-(char*)ip_header; /* Check out whether there is more but don't wait this time */ Timeout=0; @@ -542,6 +550,8 @@ DWORD WINAPI IcmpSendEcho( res=ier-(ICMP_ECHO_REPLY*)ReplyBuffer; if (res==0) SetLastError(IP_REQ_TIMED_OUT); +done: + HeapFree(GetProcessHeap(), 0, buffer); TRACE("received %d replies\n",res); return res; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d5613d7..8d71c74 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -951,6 +951,8 @@ static void testIcmpSendEcho(void) char senddata[32], replydata[sizeof(senddata) + sizeof(ICMP_ECHO_REPLY)]; DWORD ret, error, replysz = sizeof(replydata); IPAddr address; + ICMP_ECHO_REPLY *reply; + INT i; if (!pIcmpSendEcho || !pIcmpCreateFile) { @@ -1038,12 +1040,10 @@ todo_wine replysz = sizeof(replydata) - 1; ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); - todo_wine { ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); - } SetLastError(0xdeadbeef); replysz = sizeof(ICMP_ECHO_REPLY); @@ -1056,7 +1056,6 @@ todo_wine replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); error = GetLastError(); -todo_wine ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); @@ -1064,7 +1063,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); @@ -1111,6 +1109,21 @@ todo_wine { skip ("Failed to ping with error %d, is lo interface down?.\n", error); } + + /* check reply data */ + SetLastError(0xdeadbeef); + address = htonl(INADDR_LOOPBACK); + for (i = 0; i < ARRAY_SIZE(senddata); i++) senddata[i] = i & 0xff; + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + reply = (ICMP_ECHO_REPLY *)replydata; + ok(ret, "IcmpSendEcho failed unexpectedly\n"); + todo_wine ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); + ok(INADDR_LOOPBACK == ntohl(reply->Address), "Address mismatch, expect:%s, got: %s\n", ntoa(INADDR_LOOPBACK), + ntoa(reply->Address)); + ok(reply->Status == IP_SUCCESS, "Expect status:0x%08x, got:0x%08x\n", IP_SUCCESS, reply->Status); + ok(reply->DataSize == sizeof(senddata), "Got size:%d\n", reply->DataSize); + ok(!memcmp(senddata, reply->Data, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); } /*

1 0

Zhiyi Zhang : iphlpapi: Report NO_ERROR when IcmpSendEcho() succeeded.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 3825be96f30a9916a81ddf63d664ec84bfe08606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3825be96f30a9916a81ddf63… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Aug 5 11:05:00 2018 +0800 iphlpapi: Report NO_ERROR when IcmpSendEcho() succeeded. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 3 +++ dlls/iphlpapi/tests/iphlpapi.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 0d80248..496ad2a 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -424,7 +424,10 @@ DWORD WINAPI IcmpSendEcho( TRACE("received an ICMP packet of type,code=%d,%d\n",icmp_header->icmp_type,icmp_header->icmp_code); if (icmp_header->icmp_type==ICMP_ECHOREPLY) { if ((icmp_header->icmp_id==id) && (icmp_header->icmp_seq==seq)) + { ier->Status=IP_SUCCESS; + SetLastError(NO_ERROR); + } } else { switch (icmp_header->icmp_type) { case ICMP_UNREACH: diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 8d71c74..609abb3 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1118,7 +1118,7 @@ todo_wine error = GetLastError(); reply = (ICMP_ECHO_REPLY *)replydata; ok(ret, "IcmpSendEcho failed unexpectedly\n"); - todo_wine ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); + ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); ok(INADDR_LOOPBACK == ntohl(reply->Address), "Address mismatch, expect:%s, got: %s\n", ntoa(INADDR_LOOPBACK), ntoa(reply->Address)); ok(reply->Status == IP_SUCCESS, "Expect status:0x%08x, got:0x%08x\n", IP_SUCCESS, reply->Status);

1 0

Zhiyi Zhang : iphlpapi: Improve parameter checking for IcmpSendEcho().
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 6ec5b57a1fc8302a2f44c15541fc9499c21cf193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ec5b57a1fc8302a2f44c155… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Aug 5 11:05:16 2018 +0800 iphlpapi: Improve parameter checking for IcmpSendEcho(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 9 +++++++-- dlls/iphlpapi/tests/iphlpapi.c | 8 -------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 496ad2a..0dc2f12 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -288,11 +288,16 @@ DWORD WINAPI IcmpSendEcho( if (IcmpHandle==INVALID_HANDLE_VALUE) { /* FIXME: in fact win98 seems to ignore the handle value !!! */ - SetLastError(ERROR_INVALID_HANDLE); + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!ReplyBuffer||!ReplySize) { + SetLastError(ERROR_INVALID_PARAMETER); return 0; } - if (ReplySize<sizeof(ICMP_ECHO_REPLY)+ICMP_MINLEN) { + if (ReplySize<sizeof(ICMP_ECHO_REPLY)) { SetLastError(IP_BUF_TOO_SMALL); return 0; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 609abb3..0d35c26 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -966,7 +966,6 @@ static void testIcmpSendEcho(void) ret = pIcmpSendEcho(INVALID_HANDLE_VALUE, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1009,20 +1008,16 @@ todo_wine error = GetLastError(); ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); - if (0) /* crashes in wine, remove IF when fixed */ - { SetLastError(0xdeadbeef); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); - } SetLastError(0xdeadbeef); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, 0, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1031,7 +1026,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1049,7 +1043,6 @@ todo_wine replysz = sizeof(ICMP_ECHO_REPLY); ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); error = GetLastError(); -todo_wine ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); @@ -1071,7 +1064,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz - 1, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error);

1 0

Jacek Caban : ntdll/tests: Add pipe state tests.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 5efd706c22051fd2d33fd71e4b7cce319f5407fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5efd706c22051fd2d33fd71e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:18 2018 +0200 ntdll/tests: Add pipe state tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 300 ++++++++++++++++++++++++++++++++++++++++++++++-- include/winternl.h | 5 + 2 files changed, 295 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5efd706c22051fd2d33f…

1 0

Jacek Caban : server: Store pipe state in pipe_end struct and return it in FSCTL_PIPE_PEEK.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 8e5bc0daf730e4ee9fa1d43fb35d0a342d826548 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e5bc0daf730e4ee9fa1d43f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:32 2018 +0200 server: Store pipe state in pipe_end struct and return it in FSCTL_PIPE_PEEK. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 1 - server/named_pipe.c | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 7a722fe..816ec3e 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1290,7 +1290,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (!status) - todo_wine ok(peek_buf.NamedPipeState == state, "NamedPipeState = %u, expected %u\n", peek_buf.NamedPipeState, state); diff --git a/server/named_pipe.c b/server/named_pipe.c index a1f3723..1ee17b6 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -66,6 +66,7 @@ struct pipe_end struct object obj; /* object header */ struct fd *fd; /* pipe file descriptor */ unsigned int flags; /* pipe flags */ + unsigned int state; /* pipe state */ struct pipe_end *connection; /* the other end of the pipe */ process_id_t client_pid; /* process that created the client */ process_id_t server_pid; /* process that created the server */ @@ -394,6 +395,8 @@ static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status pipe_end->connection = NULL; + pipe_end->state = status == STATUS_PIPE_DISCONNECTED + ? FILE_PIPE_DISCONNECTED_STATE : FILE_PIPE_CLOSING_STATE; fd_async_wake_up( pipe_end->fd, ASYNC_TYPE_WAIT, status ); async_wake_up( &pipe_end->read_q, status ); LIST_FOR_EACH_ENTRY_SAFE( message, next, &pipe_end->message_queue, struct pipe_message, entry ) @@ -883,7 +886,7 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) } if (!(buffer = set_reply_data_size( offsetof( FILE_PIPE_PEEK_BUFFER, Data[reply_size] )))) return 0; - buffer->NamedPipeState = 0; /* FIXME */ + buffer->NamedPipeState = pipe_end->state; buffer->ReadDataAvailable = avail; buffer->NumberOfMessages = 0; /* FIXME */ buffer->MessageLength = message_length; @@ -1005,6 +1008,7 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as case ps_idle_server: case ps_wait_connect: fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT ); + server->pipe_end.state = FILE_PIPE_LISTENING_STATE; set_server_state( server, ps_wait_open ); async_wake_up( &server->pipe->waiters, STATUS_SUCCESS ); set_error( STATUS_PENDING ); @@ -1100,6 +1104,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->client = NULL; server->options = options; init_pipe_end( &server->pipe_end, pipe_flags, pipe->insize ); + server->pipe_end.state = FILE_PIPE_LISTENING_STATE; server->pipe_end.server_pid = get_process_id( current->process ); list_add_head( &pipe->servers, &server->entry ); @@ -1126,6 +1131,7 @@ static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int client->server = NULL; client->flags = flags; init_pipe_end( &client->pipe_end, pipe_flags, buffer_size ); + client->pipe_end.state = FILE_PIPE_CONNECTED_STATE; client->pipe_end.client_pid = get_process_id( current->process ); client->pipe_end.fd = alloc_pseudo_fd( &pipe_client_fd_ops, &client->pipe_end.obj, options ); @@ -1204,6 +1210,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc allow_fd_caching( server->pipe_end.fd ); if (server->state == ps_wait_open) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + server->pipe_end.state = FILE_PIPE_CONNECTED_STATE; set_server_state( server, ps_connected_server ); server->client = client; client->server = server;

1 0

Jacek Caban : server: Improve FSCTL_PIPE_PEEK error handling.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 0973b8d2c39e03ab2660b1509af687aa0a74e7db URL: https://source.winehq.org/git/wine.git/?a=commit;h=0973b8d2c39e03ab2660b150… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:41 2018 +0200 server: Improve FSCTL_PIPE_PEEK error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 -- dlls/ntdll/tests/pipe.c | 4 ++-- server/named_pipe.c | 9 ++++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 0e6c7a3..7187b3c 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -214,7 +214,6 @@ static void test_CreateNamedPipe(int pipemode) 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()); @@ -1463,7 +1462,6 @@ static int test_DisconnectNamedPipe(void) 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"); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 816ec3e..67141f1 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1286,7 +1286,7 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) expected_status = STATUS_PIPE_BROKEN; break; } - todo_wine_if(expected_status && expected_status != STATUS_PIPE_BROKEN) + todo_wine_if(expected_status == STATUS_BUFFER_OVERFLOW || expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (!status) @@ -1397,7 +1397,7 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) expected_status = STATUS_BUFFER_OVERFLOW; break; } - todo_wine + todo_wine_if(expected_status == STATUS_BUFFER_OVERFLOW || expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "status = %x, expected %x in %s state %u\n", status, expected_status, is_server ? "server" : "client", state); if (status == STATUS_BUFFER_OVERFLOW) diff --git a/server/named_pipe.c b/server/named_pipe.c index 1ee17b6..cb74051 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -868,10 +868,17 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) } reply_size -= offsetof( FILE_PIPE_PEEK_BUFFER, Data ); - if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) + switch (pipe_end->state) { + case FILE_PIPE_CONNECTED_STATE: + break; + case FILE_PIPE_CLOSING_STATE: + if (!list_empty( &pipe_end->message_queue )) break; set_error( STATUS_PIPE_BROKEN ); return 0; + default: + set_error( STATUS_INVALID_PIPE_STATE ); + return 0; } LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry )

1 0

Jacek Caban : server: Improve named pipe read error handling.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 91852564dc7f51ac8f18be600905d4aff4b156de URL: https://source.winehq.org/git/wine.git/?a=commit;h=91852564dc7f51ac8f18be60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:48 2018 +0200 server: Improve named pipe read error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 -- server/named_pipe.c | 12 +++++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 67141f1..a2ef008 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1338,7 +1338,6 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) break; } status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL); - todo_wine_if(state == FILE_PIPE_DISCONNECTED_STATE && !is_server) ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); } @@ -1427,7 +1426,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) if (state == FILE_PIPE_CLOSING_STATE) expected_status = STATUS_SUCCESS; status = NtReadFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL); - todo_wine_if(state == FILE_PIPE_DISCONNECTED_STATE && status != STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "NtReadFile failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); } diff --git a/server/named_pipe.c b/server/named_pipe.c index cb74051..425a369 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -798,8 +798,18 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct pipe_end *pipe_end = get_fd_user( fd ); - if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) + switch (pipe_end->state) { + case FILE_PIPE_CONNECTED_STATE: + break; + case FILE_PIPE_DISCONNECTED_STATE: + set_error( STATUS_PIPE_DISCONNECTED ); + return 0; + case FILE_PIPE_LISTENING_STATE: + set_error( STATUS_PIPE_LISTENING ); + return 0; + case FILE_PIPE_CLOSING_STATE: + if (!list_empty( &pipe_end->message_queue )) break; set_error( STATUS_PIPE_BROKEN ); return 0; }

1 0

Jacek Caban : server: Improve named pipe write error handling.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 7038b9ef151c7946a376adff584e002b0eb2b039 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7038b9ef151c7946a376adff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:00:55 2018 +0200 server: Improve named pipe write error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 10 +++++----- dlls/ntdll/tests/pipe.c | 1 - server/named_pipe.c | 11 ++++++++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 7187b3c..d724e00 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1149,7 +1149,7 @@ static DWORD CALLBACK serverThreadMain4(LPVOID arg) SetLastError(ERROR_SUCCESS); success = WriteFile(hnp, buf, readden, &written, &oWrite); err = GetLastError(); - todo_wine_if (!success && err == ERROR_PIPE_NOT_CONNECTED) ok(!success && err == ERROR_NO_DATA, + ok(!success && err == ERROR_NO_DATA, "overlapped WriteFile on disconnected pipe returned %u, err=%i\n", success, err); /* No completion status is queued on immediate error. */ @@ -1605,7 +1605,7 @@ static void test_CloseHandle(void) SetLastError(0xdeadbeef); ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL); ok(!ret, "WriteFile unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); CloseHandle(hfile); @@ -1650,7 +1650,7 @@ static void test_CloseHandle(void) SetLastError(0xdeadbeef); ret = WriteFile(hfile, testdata, sizeof(testdata), &numbytes, NULL); ok(!ret, "WriteFile unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); CloseHandle(hfile); @@ -1715,7 +1715,7 @@ static void test_CloseHandle(void) SetLastError(0xdeadbeef); ret = WriteFile(hpipe, testdata, sizeof(testdata), &numbytes, NULL); ok(!ret, "WriteFile unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); CloseHandle(hpipe); @@ -1760,7 +1760,7 @@ static void test_CloseHandle(void) SetLastError(0xdeadbeef); ret = WriteFile(hpipe, testdata, sizeof(testdata), &numbytes, NULL); ok(!ret, "WriteFile unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_NO_DATA, "expected ERROR_NO_DATA, got %u\n", GetLastError()); CloseHandle(hpipe); } diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index a2ef008..d8ccdd1 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1419,7 +1419,6 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) break; } status = NtWriteFile(pipe, NULL, NULL, NULL, &io, buf, 1, NULL, NULL); - todo_wine_if(expected_status == STATUS_PIPE_CLOSING) ok(status == expected_status, "NtWriteFile failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); diff --git a/server/named_pipe.c b/server/named_pipe.c index 425a369..0806d99 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -826,10 +826,19 @@ static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) struct pipe_message *message; struct iosb *iosb; - if (!pipe_end->connection) + switch (pipe_end->state) { + case FILE_PIPE_CONNECTED_STATE: + break; + case FILE_PIPE_DISCONNECTED_STATE: set_error( STATUS_PIPE_DISCONNECTED ); return 0; + case FILE_PIPE_LISTENING_STATE: + set_error( STATUS_PIPE_LISTENING ); + return 0; + case FILE_PIPE_CLOSING_STATE: + set_error( STATUS_PIPE_CLOSING ); + return 0; } if (!(pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && !get_req_data_size()) return 1;

1 0

Jacek Caban : server: Improve FSCTL_PIPE_TRANSCEIVE error handling.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 41e39c6a634c78f08eee0deb2ef4b754381d6f03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e39c6a634c78f08eee0deb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:01:02 2018 +0200 server: Improve FSCTL_PIPE_TRANSCEIVE error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 +- server/named_pipe.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index d8ccdd1..b312831 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1301,7 +1301,7 @@ static void test_pipe_state(HANDLE pipe, BOOL is_server, DWORD state) buf, 1, buf+1, 1); if (!status || status == STATUS_PENDING) status = io.Status; - todo_wine + todo_wine_if(expected_status == STATUS_PIPE_DISCONNECTED) ok(status == expected_status, "NtFsControlFile(FSCTL_PIPE_TRANSCEIVE) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); diff --git a/server/named_pipe.c b/server/named_pipe.c index 0806d99..f7b8b54 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -937,16 +937,16 @@ static int pipe_end_transceive( struct pipe_end *pipe_end, struct async *async ) struct pipe_message *message; struct iosb *iosb; - if ((pipe_end->flags & (NAMED_PIPE_MESSAGE_STREAM_WRITE | NAMED_PIPE_MESSAGE_STREAM_READ)) - != (NAMED_PIPE_MESSAGE_STREAM_WRITE | NAMED_PIPE_MESSAGE_STREAM_READ)) + if (!pipe_end->connection) { - set_error( STATUS_INVALID_READ_MODE ); + set_error( STATUS_INVALID_PIPE_STATE ); return 0; } - if (!pipe_end->connection) + if ((pipe_end->flags & (NAMED_PIPE_MESSAGE_STREAM_WRITE | NAMED_PIPE_MESSAGE_STREAM_READ)) + != (NAMED_PIPE_MESSAGE_STREAM_WRITE | NAMED_PIPE_MESSAGE_STREAM_READ)) { - set_error( STATUS_PIPE_BROKEN ); + set_error( STATUS_INVALID_READ_MODE ); return 0; }

1 0

Jacek Caban : server: Don' t use set_no_fd_status for error handling in pipe objects.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 584ffc23418a5611cef1a38c4532001f0e518960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=584ffc23418a5611cef1a38c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:01:11 2018 +0200 server: Don't use set_no_fd_status for error handling in pipe objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 -- server/fd.c | 6 ------ server/file.h | 1 - server/named_pipe.c | 15 --------------- 4 files changed, 24 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index b312831..cb31956 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1481,14 +1481,12 @@ static void pipe_for_each_state(HANDLE (*create_server)(void), ok(ret, "DisconnectNamedPipe failed: %u\n", GetLastError()); test(server, TRUE, FILE_PIPE_DISCONNECTED_STATE); - if(broken(1)) { /* FIXME: Remove once Wine can handle this case */ status = listen_pipe(server, event, &iosb, FALSE); ok(status == STATUS_PENDING, "listen_pipe returned %x\n", status); client = connect_client(server); test(server, TRUE, FILE_PIPE_CONNECTED_STATE); test(client, FALSE, FILE_PIPE_CONNECTED_STATE); CloseHandle(client); - } CloseHandle(server); CloseHandle(event); diff --git a/server/fd.c b/server/fd.c index 4fa5758..6118f52 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1713,12 +1713,6 @@ struct fd *get_fd_object_for_mapping( struct fd *fd, unsigned int access, unsign return NULL; } -/* set the status to return when the fd has no associated unix fd */ -void set_no_fd_status( struct fd *fd, unsigned int status ) -{ - fd->no_fd_status = status; -} - /* sets the user of an fd that previously had no user */ void set_fd_user( struct fd *fd, const struct fd_ops *user_ops, struct object *user ) { diff --git a/server/file.h b/server/file.h index 1d25961..8609db0 100644 --- a/server/file.h +++ b/server/file.h @@ -78,7 +78,6 @@ struct fd_ops extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user, unsigned int options ); -extern void set_no_fd_status( struct fd *fd, unsigned int status ); extern struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, unsigned int access, unsigned int sharing, unsigned int options ); extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, diff --git a/server/named_pipe.c b/server/named_pipe.c index f7b8b54..66e3607 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -338,20 +338,6 @@ static struct fd *pipe_end_get_fd( struct object *obj ) static void set_server_state( struct pipe_server *server, enum pipe_state state ) { server->state = state; - - switch(state) - { - case ps_connected_server: - case ps_wait_disconnect: - break; - case ps_wait_open: - case ps_idle_server: - set_no_fd_status( server->pipe_end.fd, STATUS_PIPE_LISTENING ); - break; - case ps_wait_connect: - set_no_fd_status( server->pipe_end.fd, STATUS_PIPE_DISCONNECTED ); - break; - } } @@ -1232,7 +1218,6 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if ((client = create_pipe_client( options, pipe->flags, pipe->outsize, options ))) { - set_no_fd_status( server->pipe_end.fd, STATUS_BAD_DEVICE_TYPE ); allow_fd_caching( server->pipe_end.fd ); if (server->state == ps_wait_open) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS );

1 0