Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
fae0b6fa
Commit
fae0b6fa
authored
Jul 31, 2010
by
Mike Kaplinskiy
Committed by
Alexandre Julliard
Aug 03, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ws2_32: Don't set FD_READ/FD_WRITE before the connection is complete.
parent
5288a225
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
socket.c
dlls/ws2_32/socket.c
+1
-1
sock.c
server/sock.c
+9
-9
No files found.
dlls/ws2_32/socket.c
View file @
fae0b6fa
...
...
@@ -1844,7 +1844,7 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen)
{
/* tell wineserver that a connection is in progress */
_enable_event
(
SOCKET2HANDLE
(
s
),
FD_CONNECT
|
FD_READ
|
FD_WRITE
,
FD_CONNECT
|
FD_READ
|
FD_WRITE
,
FD_CONNECT
,
FD_WINE_CONNECTED
|
FD_WINE_LISTENING
);
if
(
_is_blocking
(
s
))
{
...
...
server/sock.c
View file @
fae0b6fa
...
...
@@ -524,6 +524,7 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd )
static
void
sock_queue_async
(
struct
fd
*
fd
,
const
async_data_t
*
data
,
int
type
,
int
count
)
{
struct
sock
*
sock
=
get_fd_user
(
fd
);
struct
async
*
async
;
struct
async_queue
*
queue
;
assert
(
sock
->
obj
.
ops
==
&
sock_ops
);
...
...
@@ -543,20 +544,19 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type,
return
;
}
if
(
(
!
(
sock
->
state
&
FD_READ
)
&&
type
==
ASYNC_TYPE_READ
)
||
(
!
(
sock
->
state
&
FD_WRITE
)
&&
type
==
ASYNC_TYPE_WRITE
)
)
if
(
(
!
(
sock
->
state
&
(
FD_READ
|
FD_CONNECT
)
)
&&
type
==
ASYNC_TYPE_READ
)
||
(
!
(
sock
->
state
&
(
FD_WRITE
|
FD_CONNECT
)
)
&&
type
==
ASYNC_TYPE_WRITE
)
)
{
set_error
(
STATUS_PIPE_DISCONNECTED
);
return
;
}
else
{
struct
async
*
async
;
if
(
!
(
async
=
create_async
(
current
,
queue
,
data
)))
return
;
release_object
(
async
);
set_error
(
STATUS_PENDING
);
}
if
(
!
(
async
=
create_async
(
current
,
queue
,
data
)))
return
;
release_object
(
async
);
sock_reselect
(
sock
);
set_error
(
STATUS_PENDING
);
}
static
void
sock_reselect_async
(
struct
fd
*
fd
,
struct
async_queue
*
queue
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment