ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ws2_32: Fix false-positive write fds on select().

This commit is contained in:
Bruno Jesus 2011-08-05 01:04:06 -03:00 committed by Alexandre Julliard
parent 6ee95c7738
commit bebc425bb5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ws2_32/socket.c
View File

@ -3661,7 +3661,8 @@ static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set
if (writefds) if (writefds)
{ {
for (i = k = 0; i < writefds->fd_count; i++, j++) for (i = k = 0; i < writefds->fd_count; i++, j++)
if (fds[j].revents) writefds->fd_array[k++] = writefds->fd_array[i]; if ((fds[j].revents & POLLOUT) && !(fds[j].revents & POLLHUP))
writefds->fd_array[k++] = writefds->fd_array[i];
writefds->fd_count = k; writefds->fd_count = k;
total += k; total += k;
} }

4
dlls/ws2_32/tests/sock.c
View File

@ -2311,7 +2311,7 @@ static void test_errors(void)
timeval.tv_usec = 50000; timeval.tv_usec = 50000;
ret = select(1, NULL, &set, NULL, &timeval); ret = select(1, NULL, &set, NULL, &timeval);
todo_wine ok( (ret == 0), "expected 0 (timeout), got: %d\n", ret ); ok( (ret == 0), "expected 0 (timeout), got: %d\n", ret );
} }
ret = closesocket(sock); ret = closesocket(sock);
@ -2353,8 +2353,8 @@ static void test_select(void)
ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout);
ok ( (ret == 0), "select should not return any socket handles\n"); ok ( (ret == 0), "select should not return any socket handles\n");
ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n");
ok ( !FD_ISSET(fdWrite, &writefds), "FD should not be set\n");
} }
ok ( !FD_ISSET(fdWrite, &writefds), "FD should not be set\n");
ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n");
ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n");