diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b1658da5..f576888b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "279ac253e5aa7132ec4960af175115befcdfefd0" + echo "c4131f69d3b5fde9954cc11609e6f19196399d46" } # Show version information @@ -408,7 +408,6 @@ patch_enable_all () enable_wpcap_Dynamic_Linking="$1" enable_ws2_32_APC_Performance="$1" enable_ws2_32_Connect_Time="$1" - enable_ws2_32_Tests="$1" enable_ws2_32_TransmitFile="$1" enable_ws2_32_WSACleanup="$1" enable_ws2_32_getaddrinfo="$1" @@ -1402,9 +1401,6 @@ patch_enable () ws2_32-Connect_Time) enable_ws2_32_Connect_Time="$2" ;; - ws2_32-Tests) - enable_ws2_32_Tests="$2" - ;; ws2_32-TransmitFile) enable_ws2_32_TransmitFile="$2" ;; @@ -7734,7 +7730,7 @@ fi # | * configure.ac, dlls/dxgkrnl.sys/Makefile.in, dlls/dxgkrnl.sys/dxgkrnl.sys.spec, dlls/dxgkrnl.sys/main.c, # | dlls/dxgmms1.sys/Makefile.in, dlls/dxgmms1.sys/dxgmms1.sys.spec, dlls/dxgmms1.sys/main.c, # | dlls/ntoskrnl.exe/tests/driver.c, dlls/win32k.sys/Makefile.in, dlls/win32k.sys/main.c, dlls/win32k.sys/win32k.sys.spec, -# | include/ddk/ntddk.h, loader/wine.inf.in, programs/winedevice/device.c, tools/make_specfiles +# | loader/wine.inf.in, programs/winedevice/device.c, tools/make_specfiles # | if test "$enable_winedevice_Default_Drivers" -eq 1; then patch_apply winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch @@ -8227,18 +8223,6 @@ if test "$enable_ws2_32_Connect_Time" -eq 1; then ) >> "$patchlist" fi -# Patchset ws2_32-Tests -# | -# | Modified files: -# | * dlls/ws2_32/tests/sock.c -# | -if test "$enable_ws2_32_Tests" -eq 1; then - patch_apply ws2_32-Tests/0001-ws2_32-tests-Hide-random-test-failures-in-socket-tests.patch - ( - printf '%s\n' '+ { "Sebastian Lackner", "ws2_32/tests: Hide random test failures in socket tests.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ws2_32-TransmitFile # | # | This patchset has the following (direct or indirect) dependencies: diff --git a/patches/ws2_32-Tests/0001-ws2_32-tests-Hide-random-test-failures-in-socket-tests.patch b/patches/ws2_32-Tests/0001-ws2_32-tests-Hide-random-test-failures-in-socket-tests.patch deleted file mode 100644 index d44450e2..00000000 --- a/patches/ws2_32-Tests/0001-ws2_32-tests-Hide-random-test-failures-in-socket-tests.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 11fa3c3d26b860036633ca2e1437586d5bcb99d1 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sun, 15 May 2016 17:00:46 +0200 -Subject: ws2_32/tests: Hide random test failures in socket tests. - ---- - dlls/ws2_32/tests/sock.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c -index 9e0c2f9..0b9e245 100644 ---- a/dlls/ws2_32/tests/sock.c -+++ b/dlls/ws2_32/tests/sock.c -@@ -2530,6 +2530,7 @@ static void test_WSASocket(void) - if (sock == INVALID_SOCKET) - { - err = WSAGetLastError(); -+ todo_wine_if (err == WSAEPROTONOSUPPORT) - ok(err == WSAEAFNOSUPPORT || broken(err == WSAEPROTONOSUPPORT), "Expected 10047, received %d\n", err); - skip("IPX is not supported\n"); - } -@@ -2799,13 +2800,13 @@ static void test_WSAEnumNetworkEvents(void) - "Test[%d]: WSAEnumNetworkEvents failed\n", i); - if (i >= 1 && j == 0) /* FD_WRITE is SET on first try for UDP and connected TCP */ - { -- todo_wine_if (i == 0) /* Remove when fixed */ -+ todo_wine_if (i == 0 || net_events.lNetworkEvents == 0) - ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", - i, net_events.lNetworkEvents); - } - else - { -- todo_wine_if (i != 0) /* Remove when fixed */ -+ todo_wine_if (i != 0 && net_events.lNetworkEvents != 0) - ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", - i, net_events.lNetworkEvents); - } --- -2.8.0 -