Rebase against 8a92dd9a5720c4b6b334e4f13629c0b0f5a72e94.

patches/ntdll-FileDispositionInformation/0003-server-When-combining-root-and-name-make-sure-there-.patch

@@ -1,4 +1,4 @@
-From b4eabfd0a1eaca783c6a0fe35de8b1166412f078 Mon Sep 17 00:00:00 2001
+From d3eff4b920f4bc700046779cc44cea186b4cf28a Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 3 Jun 2015 01:37:34 +0200
 Subject: server: When combining root and name, make sure there is only one
@@ -12,25 +12,25 @@ Changes in v2:
  2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index 440cfaa..40c932b 100644
+index a24ce35..8b20966 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
-@@ -2111,8 +2111,8 @@ static void test_file_rename_information(void)
+@@ -2147,8 +2147,8 @@ static void test_file_rename_information(void)
      res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation );
      ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res );
      fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0;
--    todo_wine ok( !lstrcmpW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n",
+-    todo_wine ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n",
 -                  wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) );
-+    ok( !lstrcmpW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n",
++    ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n",
 +        wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) );
      HeapFree( GetProcessHeap(), 0, fni );
  
      CloseHandle( handle );
 diff --git a/server/fd.c b/server/fd.c
-index b30ae11..07e0fc5 100644
+index ea328d2..e6bd5e0 100644
 --- a/server/fd.c
 +++ b/server/fd.c
-@@ -1720,6 +1720,7 @@ void set_fd_user( struct fd *fd, const struct fd_ops *user_ops, struct object *u
+@@ -1730,6 +1730,7 @@ void set_fd_user( struct fd *fd, const struct fd_ops *user_ops, struct object *u
  char *dup_fd_name( struct fd *root, const char *name )
  {
      char *ret;
@@ -38,7 +38,7 @@ index b30ae11..07e0fc5 100644
  
      if (!root) return strdup( name );
      if (!root->unix_name) return NULL;
-@@ -1727,11 +1728,18 @@ char *dup_fd_name( struct fd *root, const char *name )
+@@ -1737,11 +1738,18 @@ char *dup_fd_name( struct fd *root, const char *name )
      /* skip . prefix */
      if (name[0] == '.' && (!name[1] || name[1] == '/')) name++;
  
@@ -62,5 +62,5 @@ index b30ae11..07e0fc5 100644
      return ret;
  }
 -- 
-2.5.0
+2.9.0
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "af37b187ad86191110b80bef814d25ce3ac350db"
+	echo "8a92dd9a5720c4b6b334e4f13629c0b0f5a72e94"
 }
 
 # Show version information