diff --git a/patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch b/patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch index 5c148318..c812a976 100644 --- a/patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch +++ b/patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch @@ -1,49 +1,16 @@ -From 2c2c37e3c3ac90dbb1ee8a115835e240742431e3 Mon Sep 17 00:00:00 2001 +From 599c50c9e339fe04e96fdb665b3d7ccb1a7708b7 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 29 May 2014 23:43:45 +0200 Subject: [PATCH] loader: Add commandline option --patches to show the patch list. --- - dlls/ntdll/misc.c | 8 ++++++++ - dlls/ntdll/ntdll.spec | 1 + include/wine/library.h | 1 + libs/wine/config.c | 6 ++++++ libs/wine/wine.map | 1 + loader/main.c | 42 +++++++++++++++++++++++++++++++++++++++++- - 6 files changed, 58 insertions(+), 1 deletion(-) + 4 files changed, 49 insertions(+), 1 deletion(-) -diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c -index fd9ba491135..31fe31a1efc 100644 ---- a/dlls/ntdll/misc.c -+++ b/dlls/ntdll/misc.c -@@ -56,6 +56,14 @@ const char * CDECL NTDLL_wine_get_version(void) - return unix_funcs->get_version(); - } - -+/********************************************************************* -+ * wine_get_patches (NTDLL.@) -+ */ -+const void * CDECL NTDLL_wine_get_patches(void) -+{ -+ return wine_get_patches(); -+} -+ - /********************************************************************* - * wine_get_build_id (NTDLL.@) - */ -diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index e82fb6a2aa1..0f5682573c2 100644 ---- a/dlls/ntdll/ntdll.spec -+++ b/dlls/ntdll/ntdll.spec -@@ -1588,6 +1588,7 @@ - - # Version - @ cdecl wine_get_version() NTDLL_wine_get_version -+@ cdecl wine_get_patches() NTDLL_wine_get_patches - @ cdecl wine_get_build_id() NTDLL_wine_get_build_id - @ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version - diff --git a/include/wine/library.h b/include/wine/library.h index 090b8349559..b8a4a2df576 100644 --- a/include/wine/library.h 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 a5d0d0ba..08d0b495 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 bfd774b59dbfd3cc1f3b2d61d60797eb20654e96 Mon Sep 17 00:00:00 2001 +From 90474eb9f6583f2e8fe0314cfa0b0dc04797833b 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 fd60ec270ba..c50e83b5aa7 100644 +index 1ebe07fc08c..7a19674b2f3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -1573,6 +1573,9 @@ +@@ -1586,6 +1586,9 @@ # Virtual memory @ cdecl __wine_locked_recvmsg(long ptr long) @@ -26,12 +26,12 @@ index fd60ec270ba..c50e83b5aa7 100644 + # Version @ cdecl wine_get_version() NTDLL_wine_get_version - @ cdecl wine_get_patches() NTDLL_wine_get_patches + @ cdecl wine_get_build_id() NTDLL_wine_get_build_id diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 2e26d189a1e..6af681e5bde 100644 +index 27e7141bc65..4baf8a3967b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -104,6 +104,9 @@ extern int __wine_main_argc; +@@ -107,6 +107,9 @@ extern int __wine_main_argc; extern char **__wine_main_argv; extern WCHAR **__wine_main_wargv; @@ -42,10 +42,10 @@ index 2e26d189a1e..6af681e5bde 100644 extern const char *build_dir DECLSPEC_HIDDEN; extern const char *data_dir DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c -index d2a3421ac58..d360491e770 100644 +index 6c5f722b2a6..df81e061e7b 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c -@@ -124,6 +124,24 @@ HANDLE CDECL __wine_make_process_system(void) +@@ -119,6 +119,24 @@ HANDLE CDECL __wine_make_process_system(void) return ret; } @@ -71,10 +71,10 @@ index d2a3421ac58..d360491e770 100644 #define UNIMPLEMENTED_INFO_CLASS(c) \ diff --git a/server/protocol.def b/server/protocol.def -index f152afb97b6..68c66bc2fcb 100644 +index c53ceb50d50..947a3c971f5 100644 --- a/server/protocol.def +++ b/server/protocol.def -@@ -3754,6 +3754,14 @@ struct handle_info +@@ -3755,6 +3755,14 @@ struct handle_info @END