Rebase against 4c06d354b8093a8979316186474213bbc1c68904.

patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch

@@ -1,4 +1,4 @@
-From 9b9b36ccc66866ba142ce1f0d12190025ac2e7f7 Mon Sep 17 00:00:00 2001
+From 21bb952ef0c654659a5bdada0d092e6579b3fe18 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Thu, 7 Jun 2018 20:09:59 -0500
 Subject: [PATCH] server: Create server objects for eventfd-based
@@ -9,13 +9,13 @@ Subject: [PATCH] server: Create server objects for eventfd-based
  server/esync.c      | 318 ++++++++++++++++++++++++++++++++++++++++++++
  server/esync.h      |  24 ++++
  server/main.c       |   4 +
- server/protocol.def |  25 +++-
- 5 files changed, 371 insertions(+), 1 deletion(-)
+ server/protocol.def |  24 ++++
+ 5 files changed, 371 insertions(+)
  create mode 100644 server/esync.c
  create mode 100644 server/esync.h
 
 diff --git a/server/Makefile.in b/server/Makefile.in
-index ae502dbf17d..b164193ef20 100644
+index 4468ff018c4..87103cb2002 100644
 --- a/server/Makefile.in
 +++ b/server/Makefile.in
 @@ -11,6 +11,7 @@ SOURCES = \
@@ -381,7 +381,7 @@ index 00000000000..00f9e638d83
 +extern int do_esync(void);
 +void esync_init(void);
 diff --git a/server/main.c b/server/main.c
-index ddda5f4e86e..5062d0999fa 100644
+index e556bea3a4b..5a0f0da155b 100644
 --- a/server/main.c
 +++ b/server/main.c
 @@ -34,6 +34,7 @@
@@ -403,18 +403,10 @@ index ddda5f4e86e..5062d0999fa 100644
      set_current_time();
      init_scheduler();
 diff --git a/server/protocol.def b/server/protocol.def
-index e86d3414247..03bc0aeb11e 100644
+index fa4ca4aaa9e..a9ee996a8ab 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3867,7 +3867,6 @@ struct handle_info
-     obj_handle_t handle;       /* process handle */
- @END
- 
--
- /* Iterate thread list for process */
- @REQ(get_next_thread)
-     obj_handle_t process;      /* process handle */
-@@ -3879,6 +3878,29 @@ struct handle_info
+@@ -4080,6 +4080,29 @@ struct handle_info
      obj_handle_t handle;       /* next thread handle */
  @END
  
@@ -444,11 +436,11 @@ index e86d3414247..03bc0aeb11e 100644
  
  /* Setup keyboard auto-repeat */
  @REQ(set_keyboard_repeat)
-@@ -3888,3 +3910,4 @@ struct handle_info
+@@ -4089,3 +4112,4 @@ struct handle_info
  @REPLY
      int enable;                /* previous state of auto-repeat enable */
  @END
 +
 -- 
-2.43.0
+2.47.2
 

patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch

@@ -1,4 +1,4 @@
-From 7b9165576a8ba0e317c280c9bedd2137fb745149 Mon Sep 17 00:00:00 2001
+From 7a8f477fc1ceaa548dd8f4deef4225472e6bb749 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 16 Jan 2014 20:56:49 -0700
 Subject: [PATCH] ntdll: Add support for creating reparse points.
@@ -13,10 +13,10 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  5 files changed, 451 insertions(+), 19 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 0368b661e61..eb7f8223b51 100644
+index 0ad1393b34a..18933198d12 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2082,6 +2082,8 @@ AC_CHECK_FUNCS(\
+@@ -2079,6 +2079,8 @@ AC_CHECK_FUNCS(\
  	prctl \
  	sched_getcpu \
  	sched_yield \
@@ -26,12 +26,12 @@ index 0368b661e61..eb7f8223b51 100644
  	setprogname \
  	sigprocmask \
 diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
-index 37bd6c86e31..f9a15d28ed2 100644
+index de525ea29e3..72c89f92e3e 100644
 --- a/dlls/ntdll/Makefile.in
 +++ b/dlls/ntdll/Makefile.in
-@@ -4,7 +4,7 @@ UNIXLIB   = ntdll.so
- IMPORTLIB = ntdll
- IMPORTS   = $(MUSL_PE_LIBS) winecrt0
+@@ -5,7 +5,7 @@ IMPORTLIB = ntdll
+ IMPORTS   = $(TOMCRYPT_PE_LIBS) $(MUSL_PE_LIBS) winecrt0
+ EXTRAINCL = $(TOMCRYPT_PE_CFLAGS)
  UNIX_CFLAGS  = $(UNWIND_CFLAGS)
 -UNIX_LIBS    = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS)
 +UNIX_LIBS    = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) -lm
@@ -39,7 +39,7 @@ index 37bd6c86e31..f9a15d28ed2 100644
  EXTRADLLFLAGS = -nodefaultlibs
  i386_EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index 02bdf67796d..63b5ebcab54 100644
+index cc0afdbdb64..00f90552e84 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
 @@ -38,6 +38,7 @@
@@ -50,7 +50,7 @@ index 02bdf67796d..63b5ebcab54 100644
  
  #ifndef IO_COMPLETION_ALL_ACCESS
  #define IO_COMPLETION_ALL_ACCESS 0x001F0003
-@@ -5952,32 +5953,154 @@ static void test_mailslot_name(void)
+@@ -6028,32 +6029,154 @@ static void test_mailslot_name(void)
      CloseHandle( device );
  }
  
@@ -222,7 +222,7 @@ index 02bdf67796d..63b5ebcab54 100644
  }
  
  static void test_set_io_completion_ex(void)
-@@ -6117,6 +6240,6 @@ START_TEST(file)
+@@ -6193,6 +6316,6 @@ START_TEST(file)
      test_ioctl();
      test_query_ea();
      test_flush_buffers_file();
@@ -231,7 +231,7 @@ index 02bdf67796d..63b5ebcab54 100644
 +    test_mailslot_name();
  }
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index 8bc69557057..00ac7377dd4 100644
+index faef06ae084..a47c3d90df4 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
 @@ -36,6 +36,8 @@
@@ -389,7 +389,7 @@ index 8bc69557057..00ac7377dd4 100644
  static BOOL fd_is_mount_point( int fd, const struct stat *st )
  {
      struct stat parent;
-@@ -3416,6 +3536,181 @@ done:
+@@ -3441,6 +3561,181 @@ done:
  }
  
  
@@ -571,7 +571,7 @@ index 8bc69557057..00ac7377dd4 100644
  /******************************************************************************
   *           lookup_unix_name
   *
-@@ -6246,6 +6541,13 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
+@@ -6271,6 +6566,13 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
          break;
      }
  
@@ -602,5 +602,5 @@ index 980235abdc9..90248b4897c 100644
          {
              UCHAR DataBuffer[1];
 -- 
-2.45.2
+2.47.2
 

patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch

@@ -1,4 +1,4 @@
-From db45e866f5d465e7da2e283e0fa97594fff7d6e8 Mon Sep 17 00:00:00 2001
+From 8b9d023ce5ef1a063fe1db248255c7d774976890 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 00:50:50 +0100
 Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
@@ -20,7 +20,7 @@ index 3742968c415..084469a2820 100644
  SOURCES = \
  	atom.c \
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index eaee2768c6a..544744dd8e6 100644
+index e3f3efa5bfc..1066bfdbdec 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -38,6 +38,9 @@
@@ -33,7 +33,7 @@ index eaee2768c6a..544744dd8e6 100644
  
  #ifndef __WINE_WINTERNL_H
  
-@@ -118,6 +121,9 @@ static void *    (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char *);
+@@ -121,6 +124,9 @@ static void *    (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char *);
  static void *    (WINAPI *pRtlLookupElementGenericTable)(PRTL_GENERIC_TABLE, void *);
  static ULONG     (WINAPI *pRtlNumberGenericTableElements)(PRTL_GENERIC_TABLE);
  static NTSTATUS  (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *);
@@ -43,7 +43,7 @@ index eaee2768c6a..544744dd8e6 100644
  static NTSTATUS  (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **);
  static NTSTATUS  (WINAPI *pLdrUnregisterDllNotification)(void *);
  static VOID      (WINAPI *pRtlGetDeviceFamilyInfoEnum)(ULONGLONG *,DWORD *,DWORD *);
-@@ -185,6 +191,9 @@ static void InitFunctionPtrs(void)
+@@ -192,6 +198,9 @@ static void InitFunctionPtrs(void)
          pRtlLookupElementGenericTable = (void *)GetProcAddress(hntdll, "RtlLookupElementGenericTable");
          pRtlNumberGenericTableElements = (void *)GetProcAddress(hntdll, "RtlNumberGenericTableElements");
          pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules");
@@ -52,8 +52,8 @@ index eaee2768c6a..544744dd8e6 100644
 +        pRtlAbsoluteToSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlAbsoluteToSelfRelativeSD");
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
-         pRtlGetDeviceFamilyInfoEnum = (void *)GetProcAddress(hntdll, "RtlGetDeviceFamilyInfoEnum");
-@@ -3756,6 +3765,76 @@ static void test_RtlFirstFreeAce(void)
+         pRtlDeriveCapabilitySidsFromName = (void *)GetProcAddress(hntdll, "RtlDeriveCapabilitySidsFromName");
+@@ -3764,6 +3773,76 @@ static void test_RtlFirstFreeAce(void)
      HeapFree(GetProcessHeap(), 0, acl);
  }
  
@@ -130,7 +130,7 @@ index eaee2768c6a..544744dd8e6 100644
  static void test_RtlInitializeSid(void)
  {
      SID_IDENTIFIER_AUTHORITY sid_ident = { SECURITY_NT_AUTHORITY };
-@@ -5189,6 +5268,7 @@ START_TEST(rtl)
+@@ -5487,6 +5566,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();

staging/upstream-commit

@@ -1 +1 @@
-e1b8e7f6ec755afd251a3b7af0e632c6e4d74a64
+4c06d354b8093a8979316186474213bbc1c68904