Rebase against a1dddd902f21e3a5057a40cb9848351f0cbcfd82.

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

@@ -1,4 +1,4 @@
-From 5a622f291c666fcc1e7f63d4be7e0db886806cb2 Mon Sep 17 00:00:00 2001
+From db45e866f5d465e7da2e283e0fa97594fff7d6e8 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 05a27ec6b2c..16cb8b240ed 100644
+index eaee2768c6a..544744dd8e6 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -38,6 +38,9 @@
@@ -33,8 +33,8 @@ index 05a27ec6b2c..16cb8b240ed 100644
  
  #ifndef __WINE_WINTERNL_H
  
-@@ -115,6 +118,9 @@ static void      (WINAPI *pRtlInitializeGenericTable)(RTL_GENERIC_TABLE *, PRTL_
- static void *    (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char *);
+@@ -118,6 +121,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 *);
 +static NTSTATUS  (WINAPI *pRtlQueryPackageIdentity)(HANDLE, WCHAR*, SIZE_T*, WCHAR*, SIZE_T*, BOOLEAN*);
@@ -43,8 +43,8 @@ index 05a27ec6b2c..16cb8b240ed 100644
  static NTSTATUS  (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **);
  static NTSTATUS  (WINAPI *pLdrUnregisterDllNotification)(void *);
  static VOID      (WINAPI *pRtlGetDeviceFamilyInfoEnum)(ULONGLONG *,DWORD *,DWORD *);
-@@ -179,6 +185,9 @@ static void InitFunctionPtrs(void)
-         pRtlFindExportedRoutineByName = (void *)GetProcAddress(hntdll, "RtlFindExportedRoutineByName");
+@@ -185,6 +191,9 @@ static void InitFunctionPtrs(void)
+         pRtlLookupElementGenericTable = (void *)GetProcAddress(hntdll, "RtlLookupElementGenericTable");
          pRtlNumberGenericTableElements = (void *)GetProcAddress(hntdll, "RtlNumberGenericTableElements");
          pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules");
 +        pRtlQueryPackageIdentity = (void *)GetProcAddress(hntdll, "RtlQueryPackageIdentity");
@@ -53,7 +53,7 @@ index 05a27ec6b2c..16cb8b240ed 100644
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
          pRtlGetDeviceFamilyInfoEnum = (void *)GetProcAddress(hntdll, "RtlGetDeviceFamilyInfoEnum");
-@@ -3750,6 +3759,76 @@ static void test_RtlFirstFreeAce(void)
+@@ -3756,6 +3765,76 @@ static void test_RtlFirstFreeAce(void)
      HeapFree(GetProcessHeap(), 0, acl);
  }
  
@@ -130,7 +130,7 @@ index 05a27ec6b2c..16cb8b240ed 100644
  static void test_RtlInitializeSid(void)
  {
      SID_IDENTIFIER_AUTHORITY sid_ident = { SECURITY_NT_AUTHORITY };
-@@ -4979,6 +5058,7 @@ START_TEST(rtl)
+@@ -5189,6 +5268,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();

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

@@ -1,4 +1,4 @@
-From 1bc2f932ec013b83fdc798ce42dd8f50ea9a2b3c Mon Sep 17 00:00:00 2001
+From cec945f2849da0cc40b6301885cb02e23f5c364e 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
@@ -13,16 +13,16 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
  server/Makefile.in |   1 +
  server/main.c      |   1 +
  server/scheduler.c | 166 +++++++++++++++++++++++++++++++++++++++++++++
- server/thread.c    |   3 +
+ server/thread.c    |   1 +
  server/thread.h    |   5 ++
- 5 files changed, 176 insertions(+)
+ 5 files changed, 174 insertions(+)
  create mode 100644 server/scheduler.c
 
 diff --git a/server/Makefile.in b/server/Makefile.in
-index c62edbdb892..3b9446fe224 100644
+index 7e571ac2ba6..4468ff018c4 100644
 --- a/server/Makefile.in
 +++ b/server/Makefile.in
-@@ -30,6 +30,7 @@ C_SRCS = \
+@@ -30,6 +30,7 @@ SOURCES = \
  	region.c \
  	registry.c \
  	request.c \
@@ -31,7 +31,7 @@ index c62edbdb892..3b9446fe224 100644
  	serial.c \
  	signal.c \
 diff --git a/server/main.c b/server/main.c
-index 1248b92f24d..ddda5f4e86e 100644
+index e014ec535ff..e556bea3a4b 100644
 --- a/server/main.c
 +++ b/server/main.c
 @@ -231,6 +231,7 @@ int main( int argc, char *argv[] )
@@ -215,25 +215,22 @@ index 00000000000..4a5d82b208d
 +
 +#endif
 diff --git a/server/thread.c b/server/thread.c
-index 83ae381d5c5..f2de29a2852 100644
+index 88b953709ef..2cbaa69ee7d 100644
 --- a/server/thread.c
 +++ b/server/thread.c
-@@ -622,7 +622,10 @@ static void set_thread_info( struct thread *thread,
-         if ((req->priority >= min && req->priority <= max) ||
-             req->priority == THREAD_PRIORITY_IDLE ||
-             req->priority == THREAD_PRIORITY_TIME_CRITICAL)
-+        {
-             thread->priority = req->priority;
-+            set_scheduler_priority( thread );
-+        }
-         else
-             set_error( STATUS_INVALID_PARAMETER );
-     }
+@@ -686,6 +686,7 @@ unsigned int set_thread_priority( struct thread *thread, int priority_class, int
+         return STATUS_THREAD_IS_TERMINATING;
+ 
+     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 ));
 diff --git a/server/thread.h b/server/thread.h
-index 8dcf966a90a..18b2d0a8bb8 100644
+index 2b256be322f..972d98b6520 100644
 --- a/server/thread.h
 +++ b/server/thread.h
-@@ -142,4 +142,9 @@ static inline void set_win32_error( unsigned int err ) { set_error( 0xc0010000 |
+@@ -146,4 +146,9 @@ static inline void set_win32_error( unsigned int err ) { set_error( 0xc0010000 |
  
  static inline thread_id_t get_thread_id( struct thread *thread ) { return thread->id; }
  
@@ -244,5 +241,5 @@ index 8dcf966a90a..18b2d0a8bb8 100644
 +
  #endif  /* __WINE_SERVER_THREAD_H */
 -- 
-2.42.0
+2.47.2
 

staging/upstream-commit

@@ -1 +1 @@
-a47a9f39d1e9d19a7931cdc254a9cd68c1ed6fef
+a1dddd902f21e3a5057a40cb9848351f0cbcfd82