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
98cdd828
Commit
98cdd828
authored
May 26, 2023
by
Paul Gofman
Committed by
Alexandre Julliard
Jun 02, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ws2_32: Make wait in WSAPoll() alertable.
parent
36d7bf95
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
socket.c
dlls/ws2_32/socket.c
+1
-1
sock.c
dlls/ws2_32/tests/sock.c
+4
-0
No files found.
dlls/ws2_32/socket.c
View file @
98cdd828
...
@@ -2994,7 +2994,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout )
...
@@ -2994,7 +2994,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout )
params
,
params_size
,
params
,
params_size
);
params
,
params_size
,
params
,
params_size
);
if
(
status
==
STATUS_PENDING
)
if
(
status
==
STATUS_PENDING
)
{
{
if
(
WaitForSingleObject
(
sync_event
,
INFINITE
)
==
WAIT_FAILED
)
if
(
wait_event_alertable
(
sync_event
)
==
WAIT_FAILED
)
{
{
free
(
params
);
free
(
params
);
return
-
1
;
return
-
1
;
...
...
dlls/ws2_32/tests/sock.c
View file @
98cdd828
...
@@ -8122,7 +8122,11 @@ static void test_WSAPoll(void)
...
@@ -8122,7 +8122,11 @@ static void test_WSAPoll(void)
fds
[
0
].
fd
=
client
;
fds
[
0
].
fd
=
client
;
fds
[
0
].
events
=
POLLRDNORM
|
POLLRDBAND
;
fds
[
0
].
events
=
POLLRDNORM
|
POLLRDBAND
;
fds
[
0
].
revents
=
0xdead
;
fds
[
0
].
revents
=
0xdead
;
apc_count
=
0
;
ret
=
QueueUserAPC
(
apc_func
,
GetCurrentThread
(),
(
ULONG_PTR
)
&
apc_count
);
ok
(
ret
,
"QueueUserAPC returned %d
\n
"
,
ret
);
ret
=
pWSAPoll
(
fds
,
1
,
2000
);
ret
=
pWSAPoll
(
fds
,
1
,
2000
);
ok
(
apc_count
==
1
,
"APC was called %u times
\n
"
,
apc_count
);
ok
(
ret
==
1
,
"got %d
\n
"
,
ret
);
ok
(
ret
==
1
,
"got %d
\n
"
,
ret
);
ok
(
fds
[
0
].
revents
==
POLLNVAL
,
"got events %#x
\n
"
,
fds
[
0
].
revents
);
ok
(
fds
[
0
].
revents
==
POLLNVAL
,
"got events %#x
\n
"
,
fds
[
0
].
revents
);
ret
=
WaitForSingleObject
(
thread_handle
,
1000
);
ret
=
WaitForSingleObject
(
thread_handle
,
1000
);
...
...
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