Rebase against b548f8c4a7b5bb82d6e1206939f638153aedce36.

patches/ntoskrnl-DriverTest/0002-ntoskrnl.exe-tests-Add-kernel-compliant-test-functio.patch

@@ -1,4 +1,4 @@
-From 56879d100853d341a322ab082dbbd91e50ec72cd Mon Sep 17 00:00:00 2001
+From f928d6182289fb703fff3bd549b9df9b6a6558c6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 20 Jan 2015 18:39:36 +0100
 Subject: ntoskrnl.exe/tests: Add kernel compliant test functions.
@@ -19,7 +19,7 @@ Subject: ntoskrnl.exe/tests: Add kernel compliant test functions.
  create mode 100644 dlls/ntoskrnl.exe/tests/driver.sys/util.h
 
 diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-index b824250..c104002 100644
+index 1319ada..06794ba 100644
 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
 +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
 @@ -1423,7 +1423,7 @@
@@ -43,7 +43,7 @@ index bc040e4..b3a6839 100644
 +	driver.c \
 +	test.c
 diff --git a/dlls/ntoskrnl.exe/tests/driver.sys/driver.c b/dlls/ntoskrnl.exe/tests/driver.sys/driver.c
-index 5756090..3da7ba1 100644
+index 35f78d1..f39aa37 100644
 --- a/dlls/ntoskrnl.exe/tests/driver.sys/driver.c
 +++ b/dlls/ntoskrnl.exe/tests/driver.sys/driver.c
 @@ -30,6 +30,9 @@
@@ -90,7 +90,7 @@ index 5756090..3da7ba1 100644
      return STATUS_SUCCESS;
  }
  
-@@ -70,16 +66,20 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
+@@ -72,16 +68,20 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
      NTSTATUS status = STATUS_NOT_SUPPORTED;
      ULONG_PTR information = 0;
  
@@ -672,11 +672,11 @@ index 9b8a6a7..64e9d97 100644
      unload_driver(service, filename);
  }
 diff --git a/include/wine/test.h b/include/wine/test.h
-index f8b608f..b7ef81a 100644
+index 0d81a24..63e2cfa 100644
 --- a/include/wine/test.h
 +++ b/include/wine/test.h
 @@ -61,7 +61,13 @@ extern int winetest_loop_todo(void);
- extern void winetest_end_todo( const char* platform );
+ extern void winetest_end_todo(void);
  extern int winetest_get_mainargs( char*** pargv );
  extern LONG winetest_get_failures(void);
 +extern int winetest_get_report_success(void);
@@ -689,7 +689,7 @@ index f8b608f..b7ef81a 100644
  extern void winetest_wait_child_process( HANDLE process );
  
  extern const char *wine_dbgstr_wn( const WCHAR *str, int n );
-@@ -436,10 +442,39 @@ LONG winetest_get_failures(void)
+@@ -428,10 +434,39 @@ LONG winetest_get_failures(void)
      return failures;
  }
  
@@ -732,5 +732,5 @@ index f8b608f..b7ef81a 100644
  
  void winetest_wait_child_process( HANDLE process )
 -- 
-2.2.1
+2.7.0
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "b278bb8f5670a123b25d51fd8c927cb4f896a574"
+	echo "b548f8c4a7b5bb82d6e1206939f638153aedce36"
 }
 
 # Show version information

patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch

@@ -1,4 +1,4 @@
-From 04bdbb48453d5575e42d6dc5b9caa89a141167c1 Mon Sep 17 00:00:00 2001
+From eb62198f629e008a4f24c0aaf05cc61d413685d6 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 30 Mar 2015 12:50:21 +0200
 Subject: server: Temporarily store the full security descriptor for file
@@ -70,10 +70,10 @@ index f34831d..b149ea4 100644
      LocalFree(pSD);
      CloseHandle(obj);
 diff --git a/server/change.c b/server/change.c
-index b3ee681..a631925 100644
+index 3d5bae0..4c663c3 100644
 --- a/server/change.c
 +++ b/server/change.c
-@@ -1030,7 +1030,8 @@ static int dir_add_to_existing_notify( struct dir *dir )
+@@ -1032,7 +1032,8 @@ static int dir_add_to_existing_notify( struct dir *dir )
  
  #endif  /* USE_INOTIFY */
  
@@ -83,7 +83,7 @@ index b3ee681..a631925 100644
  {
      struct dir *dir;
  
-@@ -1049,6 +1050,11 @@ struct object *create_dir_obj( struct fd *fd, unsigned int access, mode_t mode )
+@@ -1051,6 +1052,11 @@ struct object *create_dir_obj( struct fd *fd, unsigned int access, mode_t mode )
      dir->uid  = ~(uid_t)0;
      set_fd_user( fd, &dir_fd_ops, &dir->obj );
  
@@ -96,10 +96,10 @@ index b3ee681..a631925 100644
  
      return &dir->obj;
 diff --git a/server/file.c b/server/file.c
-index a684a77..fb78559 100644
+index 81a7496..be98fa1 100644
 --- a/server/file.c
 +++ b/server/file.c
-@@ -173,7 +173,8 @@ struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigne
+@@ -176,7 +176,8 @@ struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigne
      return file;
  }
  
@@ -109,7 +109,7 @@ index a684a77..fb78559 100644
  {
      struct file *file = alloc_object( &file_ops );
  
-@@ -184,6 +185,12 @@ static struct object *create_file_obj( struct fd *fd, unsigned int access, mode_
+@@ -187,6 +188,12 @@ static struct object *create_file_obj( struct fd *fd, unsigned int access, mode_
      file->fd      = fd;
      grab_object( fd );
      set_fd_user( fd, &file_fd_ops, &file->obj );
@@ -122,7 +122,7 @@ index a684a77..fb78559 100644
      return &file->obj;
  }
  
-@@ -250,11 +257,11 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si
+@@ -253,11 +260,11 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si
      if (!fd) goto done;
  
      if (S_ISDIR(mode))
@@ -136,7 +136,7 @@ index a684a77..fb78559 100644
  
      release_object( fd );
  
-@@ -570,46 +577,66 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner )
+@@ -573,46 +580,66 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner )
  int set_file_sd( struct object *obj, struct fd *fd, mode_t *mode, uid_t *uid,
                   const struct security_descriptor *sd, unsigned int set_info )
  {
@@ -227,8 +227,8 @@ index a684a77..fb78559 100644
 +    return 0;
  }
  
- static struct object *file_open_file( struct object *obj, unsigned int access,
-@@ -737,7 +764,10 @@ DECL_HANDLER(create_file)
+ static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr )
+@@ -748,7 +775,10 @@ DECL_HANDLER(create_file)
      if ((file = create_file( root_fd, name, name_len, req->access, req->sharing,
                               req->create, req->options, req->attrs, sd )))
      {