Rebase against 3ba2b5898cf9c78f81afc1fd620e5046a3392be0.

patches/kernel32-Named_Pipe/0020-ntdll-Pre-cache-file-descriptors-after-opening-a-fil.patch

@@ -1,18 +1,27 @@
-From 92c0e065d3247f3a63bbf0f22d5621955779d60f Mon Sep 17 00:00:00 2001
+From 91fcadbc95667961575d55cad728f7151a8766d7 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 6 Jun 2015 01:21:05 +0200
 Subject: ntdll: Pre-cache file descriptors after opening a file.
 
 ---
- dlls/kernel32/tests/pipe.c |  4 ++--
+ dlls/kernel32/tests/pipe.c |  6 +++---
  dlls/ntdll/file.c          | 12 +++++++++++-
- 2 files changed, 13 insertions(+), 3 deletions(-)
+ 2 files changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
-index 9986337..fddb459 100644
+index 16a0aab928a..f0e2180ec83 100644
 --- a/dlls/kernel32/tests/pipe.c
 +++ b/dlls/kernel32/tests/pipe.c
-@@ -1944,12 +1944,12 @@ static void test_CloseHandle(void)
+@@ -1946,7 +1946,7 @@ static void test_CloseHandle(void)
+     SetLastError(0xdeadbeef);
+     ret = ReadFile(hfile, buffer, 0, &numbytes, NULL);
+     ok(!ret, "ReadFile unexpectedly succeeded\n");
+-    todo_wine ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError());
++    ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError());
+
+     ret = GetNamedPipeHandleStateA(hfile, &state, NULL, NULL, NULL, NULL, 0);
+     ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError());
+@@ -1957,12 +1957,12 @@ static void test_CloseHandle(void)
      SetLastError(0xdeadbeef);
      ret = ReadFile(hfile, buffer, 0, &numbytes, NULL);
      ok(!ret, "ReadFile unexpectedly succeeded\n");
@@ -28,10 +37,10 @@ index 9986337..fddb459 100644
      CloseHandle(hfile);
 
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index 3bb2905..15500b9 100644
+index e9efa92d60a..3b30c741433 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
-@@ -209,7 +209,17 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT
+@@ -214,7 +214,17 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT
              *handle = wine_server_ptr_handle( reply->handle );
          }
          SERVER_END_REQ;
@@ -51,5 +60,5 @@ index 3bb2905..15500b9 100644
      }
 
 -- 
-2.6.2
+2.11.0
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "274a82b33c2907a2d28a50ba6919711cfabf1b20"
+	echo "3ba2b5898cf9c78f81afc1fd620e5046a3392be0"
 }
 
 # Show version information