diff --git a/patches/ntdll-NtSetInformationToken/0001-ntdll-Return-success-for-TokenSessionId-in-NtSetInfo.patch b/patches/ntdll-NtSetInformationToken/0001-ntdll-Return-success-for-TokenSessionId-in-NtSetInfo.patch deleted file mode 100644 index 75180b02..00000000 --- a/patches/ntdll-NtSetInformationToken/0001-ntdll-Return-success-for-TokenSessionId-in-NtSetInfo.patch +++ /dev/null @@ -1,37 +0,0 @@ -From de7c25e765a81c348ee0df60f9cb311cf5feeb18 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Fri, 13 Jan 2017 22:49:13 +0100 -Subject: ntdll: Return success for TokenSessionId in NtSetInformationToken. - ---- - dlls/ntdll/nt.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c -index 7660ea8ce74..9347170a593 100644 ---- a/dlls/ntdll/nt.c -+++ b/dlls/ntdll/nt.c -@@ -602,6 +602,20 @@ NTSTATUS WINAPI NtSetInformationToken( - } - SERVER_END_REQ; - break; -+ case TokenSessionId: -+ if (TokenInformationLength < sizeof(DWORD)) -+ { -+ ret = STATUS_INFO_LENGTH_MISMATCH; -+ break; -+ } -+ if (!TokenInformation) -+ { -+ ret = STATUS_ACCESS_VIOLATION; -+ break; -+ } -+ FIXME("handling of TokenSessionId not implemented\n"); -+ ret = STATUS_SUCCESS; -+ break; - default: - FIXME("unimplemented class %u\n", TokenInformationClass); - break; --- -2.11.0 - diff --git a/patches/ntdll-NtSetInformationToken/0002-ntdll-TokenIntegrityLevel-stub-in-NtSetInformationTo.patch b/patches/ntdll-NtSetInformationToken/0002-ntdll-TokenIntegrityLevel-stub-in-NtSetInformationTo.patch deleted file mode 100644 index ea5848bb..00000000 --- a/patches/ntdll-NtSetInformationToken/0002-ntdll-TokenIntegrityLevel-stub-in-NtSetInformationTo.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 01043db0fa1893a26c59f7bc2972aba437aeb063 Mon Sep 17 00:00:00 2001 -From: Andrew Wesie -Date: Wed, 3 May 2017 15:00:16 -0500 -Subject: ntdll: TokenIntegrityLevel stub in NtSetInformationToken. - -Signed-off-by: Andrew Wesie ---- - dlls/ntdll/nt.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c -index b0473a5ffd9..93554e929be 100644 ---- a/dlls/ntdll/nt.c -+++ b/dlls/ntdll/nt.c -@@ -660,6 +660,10 @@ NTSTATUS WINAPI NtSetInformationToken( - FIXME("handling of TokenSessionId not implemented\n"); - ret = STATUS_SUCCESS; - break; -+ case TokenIntegrityLevel: -+ FIXME("TokenIntegrityLevel stub!\n"); -+ ret = STATUS_SUCCESS; -+ break; - default: - FIXME("unimplemented class %u\n", TokenInformationClass); - break; --- -2.12.2 - diff --git a/patches/ntdll-NtSetInformationToken/definition b/patches/ntdll-NtSetInformationToken/definition deleted file mode 100644 index bee8b6d4..00000000 --- a/patches/ntdll-NtSetInformationToken/definition +++ /dev/null @@ -1,2 +0,0 @@ -Fixes: [32907] Return success for TokenSessionId in NtSetInformationToken -Fixes: Implement TokenIntegrityLevel stub in NtSetInformationToken diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 6e4f1c20..0ba33ed3 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "48aeef69fc99ff1460da934f4933f0499ff33b13" + echo "8e9ea7a8a163147012908bad696a539454654d8f" } # Show version information @@ -229,7 +229,6 @@ patch_enable_all () enable_ntdll_NtQueryEaFile="$1" enable_ntdll_NtQuerySection="$1" enable_ntdll_NtQueryVirtualMemory="$1" - enable_ntdll_NtSetInformationToken="$1" enable_ntdll_NtSetLdtEntries="$1" enable_ntdll_NtSuspendProcess="$1" enable_ntdll_Pipe_SpecialCharacters="$1" @@ -864,9 +863,6 @@ patch_enable () ntdll-NtQueryVirtualMemory) enable_ntdll_NtQueryVirtualMemory="$2" ;; - ntdll-NtSetInformationToken) - enable_ntdll_NtSetInformationToken="$2" - ;; ntdll-NtSetLdtEntries) enable_ntdll_NtSetLdtEntries="$2" ;; @@ -5259,23 +5255,6 @@ if test "$enable_ntdll_NtQueryVirtualMemory" -eq 1; then ) >> "$patchlist" fi -# Patchset ntdll-NtSetInformationToken -# | -# | This patchset fixes the following Wine bugs: -# | * [#32907] Return success for TokenSessionId in NtSetInformationToken -# | -# | Modified files: -# | * dlls/ntdll/nt.c -# | -if test "$enable_ntdll_NtSetInformationToken" -eq 1; then - patch_apply ntdll-NtSetInformationToken/0001-ntdll-Return-success-for-TokenSessionId-in-NtSetInfo.patch - patch_apply ntdll-NtSetInformationToken/0002-ntdll-TokenIntegrityLevel-stub-in-NtSetInformationTo.patch - ( - printf '%s\n' '+ { "Michael Müller", "ntdll: Return success for TokenSessionId in NtSetInformationToken.", 1 },'; - printf '%s\n' '+ { "Andrew Wesie", "ntdll: TokenIntegrityLevel stub in NtSetInformationToken.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-NtSetLdtEntries # | # | Modified files: