From 997c04f7f8fcb05d05deb7b6092c0449db6e9e9c Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Fri, 17 Jan 2014 12:41:40 -0700 Subject: [PATCH] Move the TransmitFile test so that the entire series of compholio patches can be applied with git-am. --- ...or-invalid-parameters-in-TransmitFile.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/patches/09-TransmitFile/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch b/patches/09-TransmitFile/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch index 5f958ebe..0cb70fdb 100644 --- a/patches/09-TransmitFile/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch +++ b/patches/09-TransmitFile/0002-ws2_32-Check-for-invalid-parameters-in-TransmitFile.patch @@ -1,6 +1,6 @@ -From 216a9bcfa322c6c7fe73bcb937d864c44ed7e021 Mon Sep 17 00:00:00 2001 +From 4ee238e8c4b76aba464025ba0d0d9c2f297c7300 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" -Date: Thu, 16 Jan 2014 17:53:31 -0700 +Date: Fri, 17 Jan 2014 12:35:57 -0700 Subject: ws2_32: Check for invalid parameters in TransmitFile. --- @@ -42,7 +42,7 @@ index c7f17c7..ae23dd6 100644 return FALSE; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c -index 0abf732..30c8bc1 100644 +index 0abf732..9b01dd5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6334,6 +6334,108 @@ end: @@ -154,14 +154,14 @@ index 0abf732..30c8bc1 100644 static void test_getpeername(void) { SOCKET sock; -@@ -7568,6 +7670,7 @@ START_TEST( sock ) +@@ -7564,6 +7666,7 @@ START_TEST( sock ) + test_events(1); + + test_ipv6only(); ++ test_TransmitFile(); + test_GetAddrInfoW(); test_getaddrinfo(); test_AcceptEx(); - test_ConnectEx(); -+ test_TransmitFile(); - - test_sioRoutingInterfaceQuery(); - -- 1.7.9.5