wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against ad03df1222c2bb22e991641dcc0d9e4ed684158b.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-06-24 11:10:07 +10:00
parent 9bf50b7e1f
commit 0dd44a250f
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/ws2_32-getsockopt/0001-ws2_32-Divide-values-returned-by-SO_RCVBUF-and-SO_SN.patch
View File

@@ -1,4 +1,4 @@
From 8b906a7da1bd6311293a53bc62b03be5633ec049 Mon Sep 17 00:00:00 2001
From 34d03cc739e932b56597eb3b07a56be6bacfe101 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 8 Feb 2016 02:31:00 +0100
Subject: [PATCH] ws2_32: Divide values returned by SO_RCVBUF and SO_SNDBUF
@@ -10,10 +10,10 @@ Subject: [PATCH] ws2_32: Divide values returned by SO_RCVBUF and SO_SNDBUF
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index cf824f8d..7a272d6 100644
index ab111f726a9..cb78fa6a218 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3874,6 +3874,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
@@ -2116,6 +2116,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
SetLastError(wsaErrno());
ret = SOCKET_ERROR;
}
@@ -27,12 +27,12 @@ index cf824f8d..7a272d6 100644
+ #endif
release_sock_fd( s, fd );
return ret;
case WS_SO_ACCEPTCONN:
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 1acf784..b5d4a76 100644
index 7534e75edb3..9d328226e71 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1462,7 +1462,7 @@ static void test_set_getsockopt(void)
@@ -1214,7 +1214,7 @@ static void test_set_getsockopt(void)
value = 0xdeadbeef;
err = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&value, &size);
ok( !err, "getsockopt(SO_SNDBUF) failed error: %u\n", WSAGetLastError() );
@@ -41,7 +41,7 @@ index 1acf784..b5d4a76 100644
/* SO_RCVBUF */
value = 4096;
@@ -1472,7 +1472,7 @@ static void test_set_getsockopt(void)
@@ -1224,7 +1224,7 @@ static void test_set_getsockopt(void)
value = 0xdeadbeef;
err = getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&value, &size);
ok( !err, "getsockopt(SO_RCVBUF) failed error: %u\n", WSAGetLastError() );
@@ -51,5 +51,5 @@ index 1acf784..b5d4a76 100644
/* SO_LINGER */
for( i = 0; i < ARRAY_SIZE(linger_testvals);i++) {
--
1.9.1
2.30.2