ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Zebediah Figura 2022-02-01 00:20:48 -06:00 committed by Alexandre Julliard
parent 864bef4f8d
commit e078f69881
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ws2_32/socket.c
View File

@ -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" );

3
dlls/ws2_32/tests/protocol.c
View File

@ -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);