From 12fb928da80489674230b227300f29f62ace4a1a Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 14 Jun 2018 09:16:59 +1000 Subject: [PATCH] Rebase against 8c48c632fc66c8420331ed9c14f7fd3764aa8a0d --- patches/patchinstall.sh | 4 ++-- ...lues-returned-by-SO_RCVBUF-and-SO_SN.patch | 20 +++++++++---------- staging/VERSION | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 2459e686..900c0306 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,13 +52,13 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "e470221dcaaadf10f222551997ff837f1e7557de" + echo "8c48c632fc66c8420331ed9c14f7fd3764aa8a0d" } # Show version information version() { - echo "Wine Staging 3.10" + echo "Wine Staging 3.11 (Unreleased)" echo "Copyright (C) 2014-2018 the Wine Staging project authors." echo "Copyright (C) 2018 Alistair Leslie-Hughes" echo "" diff --git a/patches/ws2_32-getsockopt/0001-ws2_32-Divide-values-returned-by-SO_RCVBUF-and-SO_SN.patch b/patches/ws2_32-getsockopt/0001-ws2_32-Divide-values-returned-by-SO_RCVBUF-and-SO_SN.patch index 3e31cf55..fa01e2a7 100644 --- a/patches/ws2_32-getsockopt/0001-ws2_32-Divide-values-returned-by-SO_RCVBUF-and-SO_SN.patch +++ b/patches/ws2_32-getsockopt/0001-ws2_32-Divide-values-returned-by-SO_RCVBUF-and-SO_SN.patch @@ -1,8 +1,8 @@ -From 7bda5e47fc9a9eb8d92413c55c34d70ecf501300 Mon Sep 17 00:00:00 2001 +From 8b906a7da1bd6311293a53bc62b03be5633ec049 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 8 Feb 2016 02:31:00 +0100 -Subject: ws2_32: Divide values returned by SO_RCVBUF and SO_SNDBUF getsockopt - options by two. +Subject: [PATCH] ws2_32: Divide values returned by SO_RCVBUF and SO_SNDBUF + getsockopt options by two. --- dlls/ws2_32/socket.c | 8 ++++++++ @@ -10,10 +10,10 @@ Subject: ws2_32: Divide values returned by SO_RCVBUF and SO_SNDBUF getsockopt 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c -index f62c9cd..e17b163 100644 +index cf824f8d..7a272d6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c -@@ -3736,6 +3736,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, +@@ -3874,6 +3874,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, SetLastError(wsaErrno()); ret = SOCKET_ERROR; } @@ -29,10 +29,10 @@ index f62c9cd..e17b163 100644 return ret; case WS_SO_ACCEPTCONN: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c -index 4f11cce..a8ad6e6 100644 +index 1acf784..b5d4a76 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c -@@ -1381,7 +1381,7 @@ static void test_set_getsockopt(void) +@@ -1462,7 +1462,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 4f11cce..a8ad6e6 100644 /* SO_RCVBUF */ value = 4096; -@@ -1391,7 +1391,7 @@ static void test_set_getsockopt(void) +@@ -1472,7 +1472,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() ); @@ -49,7 +49,7 @@ index 4f11cce..a8ad6e6 100644 + ok( value == 4096, "expected 4096, got %u\n", value ); /* SO_LINGER */ - for( i = 0; i < sizeof(linger_testvals)/sizeof(LINGER);i++) { + for( i = 0; i < ARRAY_SIZE(linger_testvals);i++) { -- -2.7.1 +1.9.1 diff --git a/staging/VERSION b/staging/VERSION index 027e9c91..19cbfc00 100644 --- a/staging/VERSION +++ b/staging/VERSION @@ -1 +1 @@ -Wine Staging 3.10 +Wine Staging 3.11 (Unreleased)