wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase agaisnt 7f469b689a2dccc0863952cd73e592df391dc607

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2019-11-06 10:16:40 +11:00
parent ded2e22686
commit 8c5d374d5a
4 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
patches/advapi32-Token_Integrity_Level/0006-ntdll-Add-function-to-create-new-tokens-for-elevatio.patch
View File

@ -1,4 +1,4 @@
From f94296129eb249a04ccb012a10f50b79fb0a631a Mon Sep 17 00:00:00 2001
From 80c382e0127e0fbd3fe57005e2ed552f19d917c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 5 Aug 2017 01:45:29 +0200
Subject: [PATCH] ntdll: Add function to create new tokens for elevation
@ -7,17 +7,17 @@ Subject: [PATCH] ntdll: Add function to create new tokens for elevation
---
dlls/ntdll/ntdll.spec | 3 ++
dlls/ntdll/ntdll_misc.h | 3 ++
dlls/ntdll/process.c | 18 +++++++++++
server/protocol.def | 8 +++++
dlls/ntdll/process.c | 18 +++++++++
server/protocol.def | 8 ++++
server/security.h | 1 +
server/token.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
server/token.c | 84 +++++++++++++++++++++++++++++++++++++++++
6 files changed, 117 insertions(+)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 969cee7..008abb7 100644
index d626e0bf2e1..5057e2b07fc 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1508,6 +1508,9 @@
@@ -1556,6 +1556,9 @@
# Virtual memory
@ cdecl __wine_locked_recvmsg(long ptr long)
@ -28,12 +28,12 @@ index 969cee7..008abb7 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 5a93ede..cb02bd1 100644
index e2280dea84a..0f2d93f944c 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -83,6 +83,9 @@ extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN;
@@ -87,6 +87,9 @@ extern void fill_cpu_info(void) DECLSPEC_HIDDEN;
extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN;
extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN;
extern void update_user_process_params( const UNICODE_STRING *image ) DECLSPEC_HIDDEN;
+/* token */
+extern HANDLE CDECL __wine_create_default_token(BOOL admin);
@ -42,10 +42,10 @@ index 5a93ede..cb02bd1 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 2ff8610..bb4a171 100644
index 7c108f28962..4f5f63d986c 100644
--- a/dlls/ntdll/process.c
+++ b/dlls/ntdll/process.c
@@ -118,6 +118,24 @@ HANDLE CDECL __wine_make_process_system(void)
@@ -121,6 +121,24 @@ HANDLE CDECL __wine_make_process_system(void)
return ret;
}
@ -71,10 +71,10 @@ index 2ff8610..bb4a171 100644
#define UNIMPLEMENTED_INFO_CLASS(c) \
diff --git a/server/protocol.def b/server/protocol.def
index 493100b..071f740 100644
index 208f0540b5e..72fab786a03 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3666,6 +3666,14 @@ struct handle_info
@@ -3735,6 +3735,14 @@ struct handle_info
@END
@ -90,7 +90,7 @@ index 493100b..071f740 100644
@REQ(create_completion)
unsigned int access; /* desired access to a port */
diff --git a/server/security.h b/server/security.h
index 6c33714..21e90cc 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,7 +102,7 @@ index 6c33714..21e90cc 100644
/* token functions */
diff --git a/server/token.c b/server/token.c
index 4c37c67..e449e61 100644
index 381ae6871aa..fcab799557c 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
@ -121,7 +121,7 @@ index 4c37c67..e449e61 100644
static luid_t prev_luid_value = { 1000, 0 };
@@ -908,6 +910,64 @@ struct token *token_create_admin( void )
@@ -917,6 +919,64 @@ struct token *token_create_admin( void )
return token;
}
@ -186,7 +186,7 @@ index 4c37c67..e449e61 100644
static struct privilege *token_find_privilege( struct token *token, const LUID *luid, int enabled_only )
{
struct privilege *privilege;
@@ -1713,3 +1773,27 @@ DECL_HANDLER(set_token_default_dacl)
@@ -1722,3 +1782,27 @@ DECL_HANDLER(set_token_default_dacl)
release_object( token );
}
}
@ -215,5 +215,5 @@ index 4c37c67..e449e61 100644
+ }
+}
--
1.9.1
2.17.1

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

@ -1,4 +1,4 @@
From f13c148654c044ac15de82d43febf6469340e922 Mon Sep 17 00:00:00 2001
From 7bc6d780c8449926854c8f69f501fc60722a379f 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 4400b7ecbe8..9cb5ed420bf 100644
index bc4579b6ace..e1fa510647d 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -70,6 +70,7 @@ const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s','\\',
@ -146,19 +146,19 @@ index 4400b7ecbe8..9cb5ed420bf 100644
{
*address = proc;
ret = STATUS_SUCCESS;
@@ -4291,6 +4387,7 @@ void __wine_process_init(void)
@@ -4295,6 +4391,7 @@ void __wine_process_init(void)
NtCurrentTeb()->Peb->LoaderLock = &loader_section;
update_user_process_params( &wm->ldr.FullDllName );
version_init( wm->ldr.FullDllName.Buffer );
+ hidden_exports_init( wm->ldr.FullDllName.Buffer );
virtual_set_large_address_space();
LdrQueryImageFileExecutionOptions( &wm->ldr.FullDllName, globalflagW, REG_DWORD,
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 88fed7ebcff..c7b821cbf30 100644
index 976b8715680..010a195f0d2 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -270,6 +270,11 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN;
@@ -269,6 +269,11 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN;
NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*);
void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR);
@ -171,5 +171,5 @@ index 88fed7ebcff..c7b821cbf30 100644
extern BOOL read_process_time(int unix_pid, int unix_tid, unsigned long clk_tck,
LARGE_INTEGER *kernel, LARGE_INTEGER *user) DECLSPEC_HIDDEN;
--
2.23.0
2.17.1

28
patches/ntdll-User_Shared_Data/0003-ntdll-Create-thread-to-update-user_shared_data-time-.patch
View File

@ -1,4 +1,4 @@
From daa8c43bfa8584ef006f324f8009759bd4ce6d70 Mon Sep 17 00:00:00 2001
From c554bd89905e60fb42459dc021b5502fe57944e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 5 May 2017 05:40:50 +0200
Subject: [PATCH] ntdll: Create thread to update user_shared_data time values
@ -12,10 +12,10 @@ Subject: [PATCH] ntdll: Create thread to update user_shared_data time values
4 files changed, 114 insertions(+), 8 deletions(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 9cb5ed420bf..39e122d9933 100644
index e1fa510647d..6a6900ec434 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -3815,6 +3815,36 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule)
@@ -3820,6 +3820,36 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule)
}
@ -52,19 +52,19 @@ index 9cb5ed420bf..39e122d9933 100644
/******************************************************************
* LdrInitializeThunk (NTDLL.@)
*
@@ -4387,6 +4417,7 @@ void __wine_process_init(void)
@@ -4391,6 +4421,7 @@ void __wine_process_init(void)
NtCurrentTeb()->Peb->LoaderLock = &loader_section;
update_user_process_params( &wm->ldr.FullDllName );
version_init( wm->ldr.FullDllName.Buffer );
+ user_shared_data_init();
hidden_exports_init( wm->ldr.FullDllName.Buffer );
virtual_set_large_address_space();
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index c7b821cbf30..6d6cccab6b5 100644
index 010a195f0d2..17a6f1af468 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -197,6 +197,9 @@ extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN;
@@ -196,6 +196,9 @@ extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN;
extern void virtual_fill_image_information( const pe_image_info_t *pe_info,
SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN;
extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN;
@ -75,7 +75,7 @@ index c7b821cbf30..6d6cccab6b5 100644
/* completion */
extern NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue,
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 90d49f2d92e..14f355cebb5 100644
index e8c99ae090d..1fbe0afae63 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -47,6 +47,7 @@
@ -97,7 +97,7 @@ index 90d49f2d92e..14f355cebb5 100644
static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0};
void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL;
@@ -227,7 +230,7 @@ void thread_init(void)
@@ -291,7 +294,7 @@ void thread_init(void)
MESSAGE( "wine: failed to map the shared user data: %08x\n", status );
exit(1);
}
@ -106,7 +106,7 @@ index 90d49f2d92e..14f355cebb5 100644
memcpy( user_shared_data->NtSystemRoot, default_windirW, sizeof(default_windirW) );
/* allocate and initialize the PEB */
@@ -315,17 +318,69 @@ void thread_init(void)
@@ -379,17 +382,69 @@ void thread_init(void)
*/
BYTE* CDECL __wine_user_shared_data(void)
{
@ -183,10 +183,10 @@ index 90d49f2d92e..14f355cebb5 100644
{
BOOL ret = FALSE;
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index d15b49f6fdf..186d7335bfc 100644
index 68249de902e..54eb6c7ffe8 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -2088,6 +2088,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
@@ -2102,6 +2102,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
{
NTSTATUS ret = STATUS_ACCESS_VIOLATION;
void *page = ROUND_ADDR( addr, page_mask );
@ -194,7 +194,7 @@ index d15b49f6fdf..186d7335bfc 100644
sigset_t sigset;
BYTE vprot;
@@ -2113,7 +2114,23 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
@@ -2127,7 +2128,23 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
ret = STATUS_SUCCESS;
}
}
@ -219,5 +219,5 @@ index d15b49f6fdf..186d7335bfc 100644
}
--
2.23.0
2.17.1

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "2b29d02aa5ba65465b4adc017cdca9a8932b0dbe"
echo "7f469b689a2dccc0863952cd73e592df391dc607"
}
# Show version information