wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 9415667cdfbb4c94cdfe03a1e80a87482bee98c1.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-07-17 11:26:22 +10:00
parent c3c5d48b18
commit 914f67c020
7 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/advapi32-CreateRestrictedToken/0001-ntdll-Implement-NtFilterToken.patch
View File

@@ -1,4 +1,4 @@
From 5a8cf4ee45f472a7b455aba19fa0c2a0b0b87473 Mon Sep 17 00:00:00 2001
From 8acdf6bd71522ed36ccc9406b27f9ddb4866752a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 4 Aug 2017 02:33:14 +0200
Subject: [PATCH] ntdll: Implement NtFilterToken.
@@ -16,7 +16,7 @@ Subject: [PATCH] ntdll: Implement NtFilterToken.
9 files changed, 163 insertions(+), 6 deletions(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 2d2d9a7e3d8..ce6904dbcfb 100644
index f23f18ed494..eeaf3e41b92 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -90,6 +90,65 @@ NTSTATUS WINAPI NtDuplicateToken(
@@ -86,7 +86,7 @@ index 2d2d9a7e3d8..ce6904dbcfb 100644
* NtOpenProcessToken [NTDLL.@]
* ZwOpenProcessToken [NTDLL.@]
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index bd41da37af4..c65902a2adf 100644
index 4c8a1f6165a..42ce9815489 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -208,7 +208,7 @@
@@ -96,13 +96,13 @@ index bd41da37af4..c65902a2adf 100644
-# @ stub NtFilterToken
+@ stdcall NtFilterToken(long long ptr ptr ptr ptr)
@ stdcall NtFindAtom(ptr long ptr)
@ stdcall NtFlushBuffersFile(long ptr)
@ stdcall NtFlushInstructionCache(long ptr long)
@ stdcall -syscall NtFlushBuffersFile(long ptr)
@ stdcall -syscall NtFlushInstructionCache(long ptr long)
diff --git a/include/winnt.h b/include/winnt.h
index e1cf78420a6..da17fe3e330 100644
index 798a1dd248c..312c78ca7b5 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -4221,6 +4221,11 @@ typedef enum _TOKEN_INFORMATION_CLASS {
@@ -4227,6 +4227,11 @@ typedef enum _TOKEN_INFORMATION_CLASS {
TOKEN_ADJUST_SESSIONID | \
TOKEN_ADJUST_DEFAULT )
@@ -115,7 +115,7 @@ index e1cf78420a6..da17fe3e330 100644
#define _SECURITY_DEFINED
diff --git a/include/winternl.h b/include/winternl.h
index 10d109fede1..d2cf7d89ab5 100644
index b3fbb90feff..4687a410ca4 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -2749,6 +2749,7 @@ NTSYSAPI NTSTATUS WINAPI NtDuplicateToken(HANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES
@@ -153,10 +153,10 @@ index 5e587b28cbe..406167e825b 100644
}
if (!process->handles || !process->token) goto error;
diff --git a/server/protocol.def b/server/protocol.def
index 19dd9afb24d..43e0862433a 100644
index 4a59c327287..93a16c68f33 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3293,6 +3293,16 @@ enum caret_state
@@ -3265,6 +3265,16 @@ enum caret_state
obj_handle_t new_handle; /* duplicated handle */
@END