Rebase against abaddc871842ba4ec0156f4bfed9939b44052ee4.

This commit is contained in:
Sebastian Lackner
2017-06-20 13:55:21 +02:00
parent 0a16521c7e
commit 83a65ef99b
20 changed files with 171 additions and 1088 deletions

View File

@@ -1,4 +1,4 @@
From cd5f99efd824965d92bd8491afd0c6e6d7bdc118 Mon Sep 17 00:00:00 2001
From 510d9f43f441bc3a9723aabfd2c1cdc8737d6dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 28 Aug 2016 21:56:41 +0200
Subject: advapi32: Implement GetExplicitEntriesFromAclW.
@@ -101,7 +101,7 @@ index e36792cff4..b305947347 100644
/******************************************************************************
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 09c6a721cc..286d236e4b 100644
index 3c68205922..ca5edffae5 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -134,6 +134,7 @@ static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*);
@@ -120,8 +120,8 @@ index 09c6a721cc..286d236e4b 100644
myARGC = winetest_get_mainargs( &myARGV );
}
@@ -6795,6 +6797,145 @@ static void test_token_security_descriptor(void)
CloseHandle(token);
@@ -7076,6 +7078,145 @@ static void test_child_token_sd(void)
HeapFree(GetProcessHeap(), 0, sd);
}
+static void test_GetExplicitEntriesFromAclW(void)
@@ -266,12 +266,14 @@ index 09c6a721cc..286d236e4b 100644
START_TEST(security)
{
init();
@@ -6845,4 +6986,5 @@ START_TEST(security)
@@ -7129,6 +7270,7 @@ START_TEST(security)
test_pseudo_tokens();
test_maximum_allowed();
test_token_security_descriptor();
test_token_label();
+ test_GetExplicitEntriesFromAclW();
}
/* Must be the last test, modifies process token */
test_token_security_descriptor();
--
2.13.1