Module: wine Branch: master Commit: 2f1d068abd32d1c96adadfab311b431e385b2144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1d068abd32d1c96adadfab31...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Nov 15 14:21:35 2016 -0600
ntdll: Added TokenIsAppContainer semi-stub implementation.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/advapi32/tests/security.c | 1 - dlls/ntdll/nt.c | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b28ffaf..18f4e04 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1925,7 +1925,6 @@ static void test_GetTokenInformation(void) is_app_container = 0xdeadbeef; ret = GetTokenInformation(token, TokenIsAppContainer, &is_app_container, sizeof(is_app_container), &size); - todo_wine ok(ret || broken(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_FUNCTION), /* pre-win8 */ "GetTokenInformation failed: %u\n", GetLastError()); diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index e0f6df0..7be2a07 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -280,7 +280,7 @@ NTSTATUS WINAPI NtQueryInformationToken( 0, /* TokenUIAccess */ 0, /* TokenMandatoryPolicy */ 0, /* TokenLogonSid */ - 0, /* TokenIsAppContainer */ + sizeof(DWORD), /* TokenIsAppContainer */ 0, /* TokenCapabilities */ sizeof(TOKEN_APPCONTAINER_INFORMATION) + sizeof(SID), /* TokenAppContainerSid */ 0, /* TokenAppContainerNumber */ @@ -541,6 +541,12 @@ NTSTATUS WINAPI NtQueryInformationToken( container->TokenAppContainer = NULL; } break; + case TokenIsAppContainer: + { + TRACE("TokenIsAppContainer semi-stub\n"); + *(DWORD*)tokeninfo = 0; + break; + } default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass);