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
e078f698
Commit
e078f698
authored
Feb 01, 2022
by
Zebediah Figura
Committed by
Alexandre Julliard
Feb 01, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ws2_32: Cap the negotiated winsock version to 1.1 or 2.2.
Signed-off-by:
Zebediah Figura
<
zfigura@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
864bef4f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
socket.c
dlls/ws2_32/socket.c
+7
-1
protocol.c
dlls/ws2_32/tests/protocol.c
+1
-2
No files found.
dlls/ws2_32/socket.c
View file @
e078f698
...
...
@@ -578,7 +578,13 @@ int WINAPI WSAStartup( WORD version, WSADATA *data )
if
(
data
)
{
data
->
wVersion
=
version
;
if
(
!
LOBYTE
(
version
)
||
LOBYTE
(
version
)
>
2
||
(
LOBYTE
(
version
)
==
2
&&
HIBYTE
(
version
)
>
2
))
data
->
wVersion
=
MAKEWORD
(
2
,
2
);
else
if
(
LOBYTE
(
version
)
==
1
&&
HIBYTE
(
version
)
>
1
)
data
->
wVersion
=
MAKEWORD
(
1
,
1
);
else
data
->
wVersion
=
version
;
data
->
wHighVersion
=
MAKEWORD
(
2
,
2
);
strcpy
(
data
->
szDescription
,
"WinSock 2.0"
);
strcpy
(
data
->
szSystemStatus
,
"Running"
);
...
...
dlls/ws2_32/tests/protocol.c
View file @
e078f698
...
...
@@ -2851,8 +2851,7 @@ static void test_startup(void)
data
.
lpVendorInfo
=
(
void
*
)
0xdeadbeef
;
ret
=
WSAStartup
(
tests
[
i
].
version
,
&
data
);
ok
(
ret
==
(
LOBYTE
(
tests
[
i
].
version
)
?
0
:
WSAVERNOTSUPPORTED
),
"got %d
\n
"
,
ret
);
todo_wine_if
(
tests
[
i
].
version
!=
tests
[
i
].
ret_version
)
ok
(
data
.
wVersion
==
tests
[
i
].
ret_version
,
"got version %#x
\n
"
,
data
.
wVersion
);
ok
(
data
.
wVersion
==
tests
[
i
].
ret_version
,
"got version %#x
\n
"
,
data
.
wVersion
);
if
(
!
ret
)
{
ret
=
WSAStartup
(
tests
[
i
].
version
,
&
data
);
...
...
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