Mike Kaplinskiy : server: Don't cache sockets until they are pollable.
Alexandre Julliard
julliard at winehq.org
Tue Aug 31 11:16:02 CDT 2010
Module: wine
Branch: master
Commit: 92b83ddffb1bbd51a929003afe6c875f77be0bad
URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b83ddffb1bbd51a929003afe6c875f77be0bad
Author: Mike Kaplinskiy <mike.kaplinskiy at gmail.com>
Date: Sun Aug 29 18:09:49 2010 -0400
server: Don't cache sockets until they are pollable.
---
server/sock.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/server/sock.c b/server/sock.c
index 02f4a6d..7e1cd7e 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -248,6 +248,7 @@ static int sock_reselect( struct sock *sock )
if (!(sock->state & ~FD_WINE_NONBLOCKING)) return 0;
/* ok, it is, attach it to the wineserver's main poll loop */
sock->polling = 1;
+ allow_fd_caching( sock->fd );
}
/* update condition mask */
set_fd_events( sock->fd, ev );
@@ -646,7 +647,6 @@ static struct object *create_socket( int family, int type, int protocol, unsigne
release_object( sock );
return NULL;
}
- allow_fd_caching( sock->fd );
sock_reselect( sock );
clear_error();
return &sock->obj;
@@ -719,7 +719,6 @@ static struct sock *accept_socket( obj_handle_t handle )
release_object( sock );
return NULL;
}
- allow_fd_caching( acceptsock->fd );
}
clear_error();
sock->pmask &= ~FD_ACCEPT;
More information about the wine-cvs
mailing list