Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
3905af7c
Commit
3905af7c
authored
Sep 26, 2022
by
Zebediah Figura
Committed by
Alexandre Julliard
Oct 21, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Combine the "if (alerted)" blocks in sock_recv().
There is no need to release the async_fileio structure before calling set_async_direct_result().
parent
f994e0a6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
socket.c
dlls/ntdll/unix/socket.c
+5
-5
No files found.
dlls/ntdll/unix/socket.c
View file @
3905af7c
...
...
@@ -852,9 +852,8 @@ static BOOL is_icmp_over_dgram( int fd )
static
NTSTATUS
sock_recv
(
HANDLE
handle
,
HANDLE
event
,
PIO_APC_ROUTINE
apc
,
void
*
apc_user
,
IO_STATUS_BLOCK
*
io
,
int
fd
,
struct
async_recv_ioctl
*
async
,
int
force_async
)
{
BOOL
nonblocking
,
alerted
;
ULONG_PTR
information
;
HANDLE
wait_handle
;
BOOL
nonblocking
;
NTSTATUS
status
;
unsigned
int
i
;
ULONG
options
;
...
...
@@ -883,9 +882,10 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi
/* the server currently will never succeed immediately */
assert
(
status
==
STATUS_ALERTED
||
status
==
STATUS_PENDING
||
NT_ERROR
(
status
));
alerted
=
status
==
STATUS_ALERTED
;
if
(
alerted
)
if
(
status
==
STATUS_ALERTED
)
{
ULONG_PTR
information
;
status
=
try_recv
(
fd
,
async
,
&
information
);
if
(
status
==
STATUS_DEVICE_NOT_READY
&&
(
force_async
||
!
nonblocking
))
status
=
STATUS_PENDING
;
...
...
@@ -894,12 +894,12 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi
io
->
Status
=
status
;
io
->
Information
=
information
;
}
set_async_direct_result
(
&
wait_handle
,
status
,
information
,
FALSE
);
}
if
(
status
!=
STATUS_PENDING
)
release_fileio
(
&
async
->
io
);
if
(
alerted
)
set_async_direct_result
(
&
wait_handle
,
status
,
information
,
FALSE
);
if
(
wait_handle
)
status
=
wait_async
(
wait_handle
,
options
&
FILE_SYNCHRONOUS_IO_ALERT
);
return
status
;
}
...
...
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