Rebase against 17915f730267b2b50550636fb6928a6ace247ccd.

patches/ntdll-Hide_Wine_Exports/0001-ntdll-Add-support-for-hiding-wine-version-informatio.patch

@@ -1,4 +1,4 @@
-From e93243e7863c239a1e4b2d91cb12dcd2cb373b36 Mon Sep 17 00:00:00 2001
+From 15c10643fa18d1159af85df3132ae3c2228d4488 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 30 May 2015 02:23:15 +0200
 Subject: [PATCH] ntdll: Add support for hiding wine version information from
@@ -10,7 +10,7 @@ Subject: [PATCH] ntdll: Add support for hiding wine version information from
  2 files changed, 103 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 9dcb475c148..9e61c38d773 100644
+index a292ba30774..60c72ffbb89 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
 @@ -88,6 +88,9 @@ const WCHAR system_dir[] = L"C:\\windows\\system32\\";
@@ -32,7 +32,7 @@ index 9dcb475c148..9e61c38d773 100644
  struct ldr_notification
  {
      struct list                    entry;
-@@ -2022,6 +2027,96 @@ NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG_PTR magic )
+@@ -2012,6 +2017,96 @@ NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG_PTR magic )
  }
  
  
@@ -129,16 +129,16 @@ index 9dcb475c148..9e61c38d773 100644
  /******************************************************************
   *		LdrGetProcedureAddress  (NTDLL.@)
   */
-@@ -2042,7 +2137,7 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name,
+@@ -2032,7 +2127,7 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name,
      {
-         void *proc = name ? find_named_export( module, exports, exp_size, name->Buffer, -1, NULL )
-                           : find_ordinal_export( module, exports, exp_size, ord - exports->Base, NULL );
+         void *proc = name ? find_named_export( module, exports, exp_size, name->Buffer, -1, NULL, NULL )
+                           : find_ordinal_export( module, exports, exp_size, ord - exports->Base, NULL, NULL );
 -        if (proc)
 +        if (proc && !is_hidden_export( proc ))
          {
              *address = proc;
              ret = STATUS_SUCCESS;
-@@ -2304,6 +2399,8 @@ static void build_ntdll_module(void)
+@@ -2294,6 +2389,8 @@ static void build_ntdll_module(void)
      wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS;
      node_ntdll = wm->ldr.DdagNode;
      if (TRACE_ON(relay)) RELAY_SetupDLL( module );
@@ -164,5 +164,5 @@ index fb5fb311646..a342cbf7d26 100644
  static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len )
  {
 -- 
-2.45.2
+2.47.2
 

patches/server-Realtime_Priority/0001-wineserver-Draft-to-implement-priority-levels-throug.patch

@@ -1,4 +1,4 @@
-From cec945f2849da0cc40b6301885cb02e23f5c364e Mon Sep 17 00:00:00 2001
+From fdb30f0d27c1cad5bde71bc6c8f8d89333a982ef Mon Sep 17 00:00:00 2001
 From: Joakim Hernberg <jhernberg@alchemy.lu>
 Date: Tue, 31 Mar 2015 20:58:20 +0200
 Subject: [PATCH] wineserver: Draft to implement priority levels through POSIX
@@ -215,17 +215,17 @@ index 00000000000..4a5d82b208d
 +
 +#endif
 diff --git a/server/thread.c b/server/thread.c
-index 88b953709ef..2cbaa69ee7d 100644
+index 3c7e4541a09..d0d23b32d67 100644
 --- a/server/thread.c
 +++ b/server/thread.c
-@@ -686,6 +686,7 @@ unsigned int set_thread_priority( struct thread *thread, int priority_class, int
-         return STATUS_THREAD_IS_TERMINATING;
+@@ -683,6 +683,7 @@ unsigned int set_thread_priority( struct thread *thread, int priority_class, int
+         return STATUS_INVALID_PARAMETER;
  
      thread->priority = priority;
 +    set_scheduler_priority( thread );
  
      /* if thread is gone or hasn't started yet, this will be called again from init_thread with a unix_tid */
-     if (thread->unix_tid != -1) apply_thread_priority( thread, get_base_priority( priority_class, priority ));
+     if (thread->state == RUNNING && thread->unix_tid != -1)
 diff --git a/server/thread.h b/server/thread.h
 index 2b256be322f..972d98b6520 100644
 --- a/server/thread.h

staging/upstream-commit

@@ -1 +1 @@
-7b8663e465e92fb2c1052fd8ad47f0dcbf37a83c
+17915f730267b2b50550636fb6928a6ace247ccd