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
e845bded
Commit
e845bded
authored
Mar 31, 2015
by
Bruno Jesus
Committed by
Alexandre Julliard
Mar 31, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ws2_32: Fix return value when receiving with MSG_OOB without data to read.
parent
45d64ce2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
socket.c
dlls/ws2_32/socket.c
+5
-0
sock.c
dlls/ws2_32/tests/sock.c
+0
-2
No files found.
dlls/ws2_32/socket.c
View file @
e845bded
...
...
@@ -6837,6 +6837,11 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
n
=
WS2_recv
(
fd
,
wsa
,
flags
);
if
(
n
==
-
1
)
{
/* Unix-like systems return EINVAL when attempting to read OOB data from
* an empty socket buffer, convert that to a Windows expected return. */
if
((
flags
&
MSG_OOB
)
&&
errno
==
EINVAL
)
errno
=
EWOULDBLOCK
;
if
(
errno
!=
EAGAIN
)
{
int
loc_errno
=
errno
;
...
...
dlls/ws2_32/tests/sock.c
View file @
e845bded
...
...
@@ -4712,14 +4712,12 @@ static void test_ioctlsocket(void)
ret
=
recv
(
dst
,
&
data
,
1
,
i
);
ok
(
ret
==
SOCKET_ERROR
,
"expected -1, got %d
\n
"
,
ret
);
ret
=
GetLastError
();
todo_wine
ok
(
ret
==
WSAEWOULDBLOCK
,
"expected 10035, got %d
\n
"
,
ret
);
bufs
.
len
=
sizeof
(
char
);
bufs
.
buf
=
&
data
;
ret
=
WSARecv
(
dst
,
&
bufs
,
1
,
&
bytes_rec
,
&
i
,
NULL
,
NULL
);
ok
(
ret
==
SOCKET_ERROR
,
"expected -1, got %d
\n
"
,
ret
);
ret
=
GetLastError
();
todo_wine
ok
(
ret
==
WSAEWOULDBLOCK
,
"expected 10035, got %d
\n
"
,
ret
);
optval
=
1
;
ret
=
setsockopt
(
dst
,
SOL_SOCKET
,
SO_OOBINLINE
,
(
void
*
)
&
optval
,
sizeof
(
optval
));
...
...
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