diff --git a/patches/server-Realtime_Priority/0001-wineserver-Draft-to-implement-priority-levels-throug.patch b/patches/server-Realtime_Priority/0001-wineserver-Draft-to-implement-priority-levels-throug.patch index 9a5ec21f..b4b6f458 100644 --- a/patches/server-Realtime_Priority/0001-wineserver-Draft-to-implement-priority-levels-throug.patch +++ b/patches/server-Realtime_Priority/0001-wineserver-Draft-to-implement-priority-levels-throug.patch @@ -1,4 +1,4 @@ -From fd64d5f62d71dbae71f696af972b2d2b1fde804e Mon Sep 17 00:00:00 2001 +From 1bc2f932ec013b83fdc798ce42dd8f50ea9a2b3c Mon Sep 17 00:00:00 2001 From: Joakim Hernberg Date: Tue, 31 Mar 2015 20:58:20 +0200 Subject: [PATCH] wineserver: Draft to implement priority levels through POSIX @@ -19,7 +19,7 @@ Changes by Sebastian Lackner : create mode 100644 server/scheduler.c diff --git a/server/Makefile.in b/server/Makefile.in -index 4264e3db108..b58ce1e3002 100644 +index c62edbdb892..3b9446fe224 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -30,6 +30,7 @@ C_SRCS = \ @@ -31,17 +31,17 @@ index 4264e3db108..b58ce1e3002 100644 serial.c \ signal.c \ diff --git a/server/main.c b/server/main.c -index d7aed0da199..dae08339874 100644 +index 1248b92f24d..ddda5f4e86e 100644 --- a/server/main.c +++ b/server/main.c -@@ -143,6 +143,7 @@ int main( int argc, char *argv[] ) +@@ -231,6 +231,7 @@ int main( int argc, char *argv[] ) if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() ); set_current_time(); + init_scheduler(); init_signals(); + init_memory(); init_directories( load_intl_file() ); - init_registry(); diff --git a/server/scheduler.c b/server/scheduler.c new file mode 100644 index 00000000000..4a5d82b208d @@ -215,10 +215,10 @@ index 00000000000..4a5d82b208d + +#endif diff --git a/server/thread.c b/server/thread.c -index 942a8ff8389..6da77ad17a3 100644 +index 83ae381d5c5..f2de29a2852 100644 --- a/server/thread.c +++ b/server/thread.c -@@ -611,7 +611,10 @@ static void set_thread_info( struct thread *thread, +@@ -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) @@ -230,10 +230,10 @@ index 942a8ff8389..6da77ad17a3 100644 set_error( STATUS_INVALID_PARAMETER ); } diff --git a/server/thread.h b/server/thread.h -index 650bc44628d..2599f7629c3 100644 +index 8dcf966a90a..18b2d0a8bb8 100644 --- a/server/thread.h +++ b/server/thread.h -@@ -144,4 +144,9 @@ static inline void set_win32_error( unsigned int err ) { set_error( 0xc0010000 | +@@ -142,4 +142,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 +244,5 @@ index 650bc44628d..2599f7629c3 100644 + #endif /* __WINE_SERVER_THREAD_H */ -- -2.29.2 +2.42.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 9e5cf0c1..8dcd5232 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -3f4f116dc52c2d37b98e62c3d9bdd8a79e44ccc1 +41ab207c71cfaa82ef95c83b291654aba023a45c