From f8c3c9a6f840c35a2a6fb9996001dbbafccc899f Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 9 Apr 2020 20:55:11 -0500 Subject: [PATCH] Rebase against 2b0977fc711e1faadfef69e3a46c2d1848b4826b. --- ...on-to-create-new-tokens-for-elevatio.patch | 36 +++++++-------- ...ys-check-for-debug-symbols-in-BINDIR.patch | 8 ++-- ...reate-eventfd-descriptors-for-timers.patch | 20 ++++---- ...shared-memory-segments-for-semaphore.patch | 20 ++++---- patches/patchinstall.sh | 6 +-- ...-to-implement-priority-levels-throug.patch | 36 ++++++--------- ...001-winecfg-Add-staging-tab-for-CSMT.patch | 46 +++++++------------ 7 files changed, 75 insertions(+), 97 deletions(-) diff --git a/patches/advapi32-Token_Integrity_Level/0006-ntdll-Add-function-to-create-new-tokens-for-elevatio.patch b/patches/advapi32-Token_Integrity_Level/0006-ntdll-Add-function-to-create-new-tokens-for-elevatio.patch index 4fa2200f..173b519f 100644 --- a/patches/advapi32-Token_Integrity_Level/0006-ntdll-Add-function-to-create-new-tokens-for-elevatio.patch +++ b/patches/advapi32-Token_Integrity_Level/0006-ntdll-Add-function-to-create-new-tokens-for-elevatio.patch @@ -1,4 +1,4 @@ -From 8959c13f2be7e2a31f27c8483ee2202692f00710 Mon Sep 17 00:00:00 2001 +From 8fe522dadc480b57415a7b63e0752de113851231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 5 Aug 2017 01:45:29 +0200 Subject: [PATCH] ntdll: Add function to create new tokens for elevation @@ -14,10 +14,10 @@ Subject: [PATCH] ntdll: Add function to create new tokens for elevation 6 files changed, 117 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index d626e0bf2..5057e2b07 100644 +index 853da5c3fcf..33c1355c8b5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -1556,6 +1556,9 @@ +@@ -1569,6 +1569,9 @@ # Virtual memory @ cdecl __wine_locked_recvmsg(long ptr long) @@ -28,12 +28,12 @@ index d626e0bf2..5057e2b07 100644 @ cdecl wine_get_version() NTDLL_wine_get_version @ cdecl wine_get_patches() NTDLL_wine_get_patches diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index ac1469412..6c2345c6c 100644 +index b62239de5b4..d494dc71263 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -89,6 +89,9 @@ extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN; - extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; - extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN; +@@ -96,6 +96,9 @@ extern int __wine_main_argc; + extern char **__wine_main_argv; + extern WCHAR **__wine_main_wargv; +/* token */ +extern HANDLE CDECL __wine_create_default_token(BOOL admin); @@ -42,10 +42,10 @@ index ac1469412..6c2345c6c 100644 extern timeout_t server_start_time DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c -index 52d7ea429..e24691b8a 100644 +index 6d506c85306..9940e6cf7c9 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c -@@ -125,6 +125,24 @@ HANDLE CDECL __wine_make_process_system(void) +@@ -124,6 +124,24 @@ HANDLE CDECL __wine_make_process_system(void) return ret; } @@ -71,10 +71,10 @@ index 52d7ea429..e24691b8a 100644 #define UNIMPLEMENTED_INFO_CLASS(c) \ diff --git a/server/protocol.def b/server/protocol.def -index e908f2131..0177cb579 100644 +index efacadac42b..434cd11baf0 100644 --- a/server/protocol.def +++ b/server/protocol.def -@@ -3734,6 +3734,14 @@ struct handle_info +@@ -3749,6 +3749,14 @@ struct handle_info @END @@ -90,7 +90,7 @@ index e908f2131..0177cb579 100644 @REQ(create_completion) unsigned int access; /* desired access to a port */ diff --git a/server/security.h b/server/security.h -index 6c337143c..21e90ccf2 100644 +index 6c337143c3d..21e90ccf23f 100644 --- a/server/security.h +++ b/server/security.h @@ -49,6 +49,7 @@ extern const PSID security_builtin_users_sid; @@ -102,10 +102,10 @@ index 6c337143c..21e90ccf2 100644 /* token functions */ diff --git a/server/token.c b/server/token.c -index 381ae6871..fcab79955 100644 +index c4f1cd943c2..970ed1838da 100644 --- a/server/token.c +++ b/server/token.c -@@ -79,6 +79,7 @@ static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORIT +@@ -77,6 +77,7 @@ static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORIT static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } }; static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } }; static const SID high_label_sid = { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY }, { SECURITY_MANDATORY_HIGH_RID } }; @@ -113,7 +113,7 @@ index 381ae6871..fcab79955 100644 static const SID_N(5) local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } }; static const SID_N(2) builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; static const SID_N(2) builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; -@@ -95,6 +96,7 @@ const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; +@@ -93,6 +94,7 @@ const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; const PSID security_builtin_users_sid = (PSID)&builtin_users_sid; const PSID security_domain_users_sid = (PSID)&domain_users_sid; const PSID security_high_label_sid = (PSID)&high_label_sid; @@ -121,7 +121,7 @@ index 381ae6871..fcab79955 100644 static luid_t prev_luid_value = { 1000, 0 }; -@@ -917,6 +919,64 @@ struct token *token_create_admin( void ) +@@ -915,6 +917,64 @@ struct token *token_create_admin( void ) return token; } @@ -186,7 +186,7 @@ index 381ae6871..fcab79955 100644 static struct privilege *token_find_privilege( struct token *token, const LUID *luid, int enabled_only ) { struct privilege *privilege; -@@ -1722,3 +1782,27 @@ DECL_HANDLER(set_token_default_dacl) +@@ -1720,3 +1780,27 @@ DECL_HANDLER(set_token_default_dacl) release_object( token ); } } @@ -215,5 +215,5 @@ index 381ae6871..fcab79955 100644 + } +} -- -2.23.0 +2.26.0 diff --git a/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch b/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch index efda51d0..51d333b5 100644 --- a/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch +++ b/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch @@ -1,4 +1,4 @@ -From 8a9fa77db1c92c62dc870727a19083400e8475ed Mon Sep 17 00:00:00 2001 +From b17741a716e2633c02c2237eb424f126860a0c39 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 6 Oct 2014 05:06:06 +0200 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR. @@ -21,7 +21,7 @@ index 076c50323dd..ddb69c96dd4 100644 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c -index 5f92432d0e8..770fb051431 100644 +index ab2a693ecaf..2add1025e39 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1436,6 +1436,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, @@ -29,9 +29,9 @@ index 5f92432d0e8..770fb051431 100644 ret = search_unix_path(filename, getenv("LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf) + || search_unix_path(filename, BINDIR, elf_load_file_cb, &load_elf) - || search_dll_path(filename, elf_load_file_cb, &load_elf); + || search_dll_path(pcs, filename, elf_load_file_cb, &load_elf); } -- -2.25.1 +2.26.0 diff --git a/patches/eventfd_synchronization/0040-server-Create-eventfd-descriptors-for-timers.patch b/patches/eventfd_synchronization/0040-server-Create-eventfd-descriptors-for-timers.patch index 7cc3df62..c600d22f 100644 --- a/patches/eventfd_synchronization/0040-server-Create-eventfd-descriptors-for-timers.patch +++ b/patches/eventfd_synchronization/0040-server-Create-eventfd-descriptors-for-timers.patch @@ -1,7 +1,7 @@ -From 034af084be3e4867cdf1243148ce5c6be80703ec Mon Sep 17 00:00:00 2001 +From 6c3029fe763d6c94016a038d016eb810ad8e38ef Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 15 Jun 2018 11:01:44 -0500 -Subject: [PATCH 40/83] server: Create eventfd descriptors for timers. +Subject: [PATCH] server: Create eventfd descriptors for timers. --- dlls/ntdll/esync.c | 1 + @@ -10,7 +10,7 @@ Subject: [PATCH 40/83] server: Create eventfd descriptors for timers. 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c -index 4adf01a11..9d9d767c4 100644 +index 17890f9e1f0..c1d8882d817 100644 --- a/dlls/ntdll/esync.c +++ b/dlls/ntdll/esync.c @@ -241,6 +241,7 @@ static NTSTATUS get_waitable_object( HANDLE handle, struct esync **obj ) @@ -22,10 +22,10 @@ index 4adf01a11..9d9d767c4 100644 case ESYNC_QUEUE: esync = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*esync) ); diff --git a/server/protocol.def b/server/protocol.def -index 7dbd0a6db..d14fdb607 100644 +index 0ab32aaca64..eb80c81d6e6 100644 --- a/server/protocol.def +++ b/server/protocol.def -@@ -4079,6 +4079,7 @@ enum esync_type +@@ -4080,6 +4080,7 @@ enum esync_type ESYNC_AUTO_EVENT, ESYNC_MANUAL_EVENT, ESYNC_MUTEX, @@ -34,7 +34,7 @@ index 7dbd0a6db..d14fdb607 100644 ESYNC_QUEUE, }; diff --git a/server/timer.c b/server/timer.c -index 109aa0ff9..e0760ba11 100644 +index 2614e145c40..c3ebd3f52d3 100644 --- a/server/timer.c +++ b/server/timer.c @@ -36,6 +36,7 @@ @@ -78,7 +78,7 @@ index 109aa0ff9..e0760ba11 100644 } } return timer; -@@ -171,6 +177,9 @@ static int set_timer( struct timer *timer, timeout_t expire, unsigned int period +@@ -172,6 +178,9 @@ static int set_timer( struct timer *timer, timeout_t expire, unsigned int period { period = 0; /* period doesn't make any sense for a manual timer */ timer->signaled = 0; @@ -86,9 +86,9 @@ index 109aa0ff9..e0760ba11 100644 + if (do_esync()) + esync_clear( timer->esync_fd ); } - timer->when = (expire <= 0) ? current_time - expire : max( expire, current_time ); + timer->when = (expire <= 0) ? expire - monotonic_time : max( expire, current_time ); timer->period = period; -@@ -202,6 +211,13 @@ static int timer_signaled( struct object *obj, struct wait_queue_entry *entry ) +@@ -205,6 +214,13 @@ static int timer_signaled( struct object *obj, struct wait_queue_entry *entry ) return timer->signaled; } @@ -103,5 +103,5 @@ index 109aa0ff9..e0760ba11 100644 { struct timer *timer = (struct timer *)obj; -- -2.20.1 +2.26.0 diff --git a/patches/eventfd_synchronization/0041-server-Allocate-shared-memory-segments-for-semaphore.patch b/patches/eventfd_synchronization/0041-server-Allocate-shared-memory-segments-for-semaphore.patch index 8ed4fdb3..fac90112 100644 --- a/patches/eventfd_synchronization/0041-server-Allocate-shared-memory-segments-for-semaphore.patch +++ b/patches/eventfd_synchronization/0041-server-Allocate-shared-memory-segments-for-semaphore.patch @@ -1,4 +1,4 @@ -From 31b8b93cd83da65ee4439f0f06fb673257f1850c Mon Sep 17 00:00:00 2001 +From 525b78c2da9801372ef32849871859ad4cd16db0 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sun, 10 Jun 2018 23:12:16 -0500 Subject: [PATCH] server: Allocate shared memory segments for semaphores and @@ -23,7 +23,7 @@ init_server_dir()). 4 files changed, 71 insertions(+) diff --git a/server/esync.c b/server/esync.c -index 5dd38c42a..fb9d02fc7 100644 +index 5dd38c42a4f..fb9d02fc7d2 100644 --- a/server/esync.c +++ b/server/esync.c @@ -21,12 +21,20 @@ @@ -137,7 +137,7 @@ index 5dd38c42a..fb9d02fc7 100644 send_client_fd( current->process, esync->fd, reply->handle ); release_object( esync ); diff --git a/server/esync.h b/server/esync.h -index 2687c72e4..aeb58c546 100644 +index 2687c72e419..aeb58c5469c 100644 --- a/server/esync.h +++ b/server/esync.h @@ -19,6 +19,7 @@ @@ -149,7 +149,7 @@ index 2687c72e4..aeb58c546 100644 void esync_wake_up( struct object *obj ); void esync_clear( int fd ); diff --git a/server/main.c b/server/main.c -index 57463aecc..2f4b3411b 100644 +index 483a0c85580..ef4d3d7d835 100644 --- a/server/main.c +++ b/server/main.c @@ -36,6 +36,7 @@ @@ -160,7 +160,7 @@ index 57463aecc..2f4b3411b 100644 /* command-line options */ int debug_level = 0; -@@ -141,6 +142,9 @@ int main( int argc, char *argv[] ) +@@ -140,6 +141,9 @@ int main( int argc, char *argv[] ) sock_init(); open_master_socket(); @@ -168,13 +168,13 @@ index 57463aecc..2f4b3411b 100644 + esync_init(); + if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() ); + set_current_time(); init_scheduler(); - init_signals(); diff --git a/server/protocol.def b/server/protocol.def -index f0dc0d24d..88a443de4 100644 +index eb80c81d6e6..dde81a3ebcf 100644 --- a/server/protocol.def +++ b/server/protocol.def -@@ -4040,6 +4040,7 @@ struct handle_info +@@ -4053,6 +4053,7 @@ struct handle_info @REPLY obj_handle_t handle; /* handle to the object */ int type; /* type of esync object (see below) */ @@ -182,7 +182,7 @@ index f0dc0d24d..88a443de4 100644 @END /* Open an esync object */ -@@ -4052,6 +4053,7 @@ struct handle_info +@@ -4065,6 +4066,7 @@ struct handle_info @REPLY obj_handle_t handle; /* handle to the event */ int type; /* type of esync object (above) */ @@ -191,5 +191,5 @@ index f0dc0d24d..88a443de4 100644 /* Retrieve the esync fd for an object. */ -- -2.23.0 +2.26.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 10700721..bb067830 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "38e95ed2227dd3f0fc3d1394c884265d43e3b283" + echo "2b0977fc711e1faadfef69e3a46c2d1848b4826b" } # Show version information @@ -6524,8 +6524,8 @@ fi # Patchset winecfg-Staging # | # | Modified files: -# | * programs/winecfg/Makefile.in, programs/winecfg/about.c, programs/winecfg/main.c, programs/winecfg/resource.h, -# | programs/winecfg/staging.c, programs/winecfg/winecfg.h, programs/winecfg/winecfg.rc +# | * programs/winecfg/Makefile.in, programs/winecfg/main.c, programs/winecfg/resource.h, programs/winecfg/staging.c, +# | programs/winecfg/winecfg.h, programs/winecfg/winecfg.rc # | if test "$enable_winecfg_Staging" -eq 1; then patch_apply winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch 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 7b28cacc..4691e814 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 a63e92672f972f19fd90d0fafb9b293de24348bf Mon Sep 17 00:00:00 2001 +From c85f5ea67bddac0afecdf6d0cd54bf3c6c4df42d 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 @@ -11,15 +11,15 @@ Changes by Sebastian Lackner : * Clean up error messages. --- server/Makefile.in | 1 + - server/main.c | 2 + - server/scheduler.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + server/main.c | 1 + + server/scheduler.c | 166 +++++++++++++++++++++++++++++++++++++++++++++ server/thread.c | 3 + server/thread.h | 5 ++ - 5 files changed, 177 insertions(+) + 5 files changed, 176 insertions(+) create mode 100644 server/scheduler.c diff --git a/server/Makefile.in b/server/Makefile.in -index aaaa8d34d5..99e4fd0a26 100644 +index 3f3761faab6..89c1d8a4cdb 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -30,6 +30,7 @@ C_SRCS = \ @@ -31,28 +31,20 @@ index aaaa8d34d5..99e4fd0a26 100644 serial.c \ signal.c \ diff --git a/server/main.c b/server/main.c -index 7aed338e96..ee8cadde5d 100644 +index efb205f5292..2b5065e1852 100644 --- a/server/main.c +++ b/server/main.c -@@ -44,6 +44,7 @@ int foreground = 0; - timeout_t master_socket_timeout = 3 * -TICKS_PER_SEC; /* master socket timeout, default is 3 seconds */ - const char *server_argv0; - -+ - /* parse-line args */ - - static void usage( FILE *fh ) -@@ -142,6 +143,7 @@ int main( int argc, char *argv[] ) - open_master_socket(); +@@ -142,6 +142,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_directories(); init_registry(); diff --git a/server/scheduler.c b/server/scheduler.c new file mode 100644 -index 0000000000..4a5d82b208 +index 00000000000..4a5d82b208d --- /dev/null +++ b/server/scheduler.c @@ -0,0 +1,166 @@ @@ -223,10 +215,10 @@ index 0000000000..4a5d82b208 + +#endif diff --git a/server/thread.c b/server/thread.c -index 46fc9a7850..94a626dea3 100644 +index d6d80a9a864..f161c8f3e24 100644 --- a/server/thread.c +++ b/server/thread.c -@@ -491,7 +491,10 @@ static void set_thread_info( struct thread *thread, +@@ -539,7 +539,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) @@ -238,10 +230,10 @@ index 46fc9a7850..94a626dea3 100644 set_error( STATUS_INVALID_PARAMETER ); } diff --git a/server/thread.h b/server/thread.h -index c1478da7fa..71b31bde02 100644 +index 26dbc494f3c..7957557b6cc 100644 --- a/server/thread.h +++ b/server/thread.h -@@ -151,4 +151,9 @@ static inline thread_id_t get_thread_id( struct thread *thread ) { return thread +@@ -154,4 +154,9 @@ static inline thread_id_t get_thread_id( struct thread *thread ) { return thread static inline int get_thread_unix_tid( struct thread *thread ) { return thread->unix_tid; } static inline timeout_t get_thread_creation_time( struct thread *thread ) { return thread->creation_time; } @@ -252,5 +244,5 @@ index c1478da7fa..71b31bde02 100644 + #endif /* __WINE_SERVER_THREAD_H */ -- -2.13.6 +2.26.0 diff --git a/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch b/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch index 563f423c..907d81c9 100644 --- a/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch +++ b/patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch @@ -1,21 +1,20 @@ -From 3b8bf542a9775e4fdb0b1b1ecc6772d9749fed4c Mon Sep 17 00:00:00 2001 +From c4de4777e66d9fbe7a21e8e68c2839ef8db07bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 14 Dec 2014 20:42:45 +0100 -Subject: winecfg: Add staging tab for CSMT. +Subject: [PATCH] winecfg: Add staging tab for CSMT. --- programs/winecfg/Makefile.in | 1 + - programs/winecfg/about.c | 2 +- - programs/winecfg/main.c | 12 ++++++- + programs/winecfg/main.c | 12 ++++- programs/winecfg/resource.h | 5 +++ - programs/winecfg/staging.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ + programs/winecfg/staging.c | 85 ++++++++++++++++++++++++++++++++++++ programs/winecfg/winecfg.h | 1 + - programs/winecfg/winecfg.rc | 10 ++++++ - 7 files changed, 114 insertions(+), 2 deletions(-) + programs/winecfg/winecfg.rc | 10 +++++ + 6 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 programs/winecfg/staging.c diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in -index d516778..dd84730 100644 +index 4e66e04e31a..1cf70310d57 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ @@ -26,21 +25,8 @@ index d516778..dd84730 100644 theme.c \ winecfg.c \ x11drvdlg.c -diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c -index a2b4022..a706db7 100644 ---- a/programs/winecfg/about.c -+++ b/programs/winecfg/about.c -@@ -118,7 +118,7 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) - SendMessageW(hWnd, WM_SETFONT, (WPARAM)titleFont, TRUE); - SetWindowTextA(hWnd, PACKAGE_NAME); - } -- SetDlgItemTextA(hDlg, IDC_ABT_PANEL_TEXT, PACKAGE_VERSION); -+ SetDlgItemTextA(hDlg, IDC_ABT_PANEL_TEXT, PACKAGE_VERSION " (Staging)"); - - /* prepare the web link */ - SetDlgItemTextA(hDlg, IDC_ABT_WEB_LINK, "" PACKAGE_URL ""); diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c -index b8a85fe..de209a9 100644 +index b8a85fe7175..de209a925cc 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam) @@ -70,7 +56,7 @@ index b8a85fe..de209a9 100644 * Fill out the (General) PROPSHEETPAGE data structure * for the property sheet diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 0c0b038..54c67c2 100644 +index 2760e92c000..fe98287e241 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -45,6 +45,7 @@ @@ -89,7 +75,7 @@ index 0c0b038..54c67c2 100644 #define IDC_WINVER 1012 #define IDC_DESKTOP_WIDTH 1023 #define IDC_DESKTOP_HEIGHT 1024 -@@ -210,6 +212,9 @@ +@@ -211,6 +213,9 @@ #define IDC_SYSPARAMS_MENU_HIGHLIGHT 8430 #define IDC_SYSPARAMS_MENUBAR 8431 @@ -101,7 +87,7 @@ index 0c0b038..54c67c2 100644 #define IDC_ABT_ORG 8433 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c new file mode 100644 -index 0000000..f5ab259 +index 00000000000..f5ab2594a22 --- /dev/null +++ b/programs/winecfg/staging.c @@ -0,0 +1,85 @@ @@ -191,7 +177,7 @@ index 0000000..f5ab259 + return FALSE; +} diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h -index 110856a..a949474 100644 +index 110856a5365..a94947439c3 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -87,6 +87,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -203,10 +189,10 @@ index 110856a..a949474 100644 /* Drive management */ diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 5908b49..420f127 100644 +index f2f795f5278..ecf6fa432c2 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc -@@ -39,6 +39,7 @@ BEGIN +@@ -38,6 +38,7 @@ BEGIN IDS_TAB_GRAPHICS "Graphics" IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "Audio" @@ -214,7 +200,7 @@ index 5908b49..420f127 100644 IDS_TAB_ABOUT "About" IDS_WINECFG_TITLE "Wine configuration" IDS_WINECFG_TITLE_APP "Wine configuration for %s" -@@ -308,6 +309,15 @@ BEGIN +@@ -311,6 +312,15 @@ BEGIN PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED END @@ -231,5 +217,5 @@ index 5908b49..420f127 100644 /* @makedep: winecfg.ico */ -- -2.7.4 +2.26.0