Rebase against 9e96beefae97bb63845b1cac6f372de515465ada.

This commit is contained in:
Sebastian Lackner
2015-06-17 18:47:16 +02:00
parent 31bd06cb42
commit 69ae1f591a
3 changed files with 55 additions and 55 deletions

View File

@@ -1,4 +1,4 @@
From 4ba47dbc95a5a73ef646648a3ba8dd90a1089ee8 Mon Sep 17 00:00:00 2001
From 7d4405515ebce08332ad3502f125a9a41131aeaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 13 Jun 2015 20:45:09 +0200
Subject: advapi32: Implement GetWindowsAccountDomainSid.
@@ -81,7 +81,7 @@ index 028dcc6..1aae1e0 100644
###### ACL FUNCTIONS ######
##############################
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index b43f212..3cc149c 100644
index f141b3e..2023390 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -129,6 +129,7 @@ static NTSTATUS (WINAPI *pNtSetSecurityObject)(HANDLE,SECURITY_INFORMATION,PSECU
@@ -100,8 +100,8 @@ index b43f212..3cc149c 100644
myARGC = winetest_get_mainargs( &myARGV );
}
@@ -5835,6 +5837,81 @@ static void test_AddAce(void)
ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %d\n", GetLastError());
@@ -5921,6 +5923,81 @@ static void test_system_security_access(void)
CloseHandle( token );
}
+static void test_GetWindowsAccountDomainSid (void)
@@ -182,10 +182,10 @@ index b43f212..3cc149c 100644
START_TEST(security)
{
init();
@@ -5877,4 +5954,5 @@ START_TEST(security)
test_default_dacl_owner_sid();
@@ -5964,4 +6041,5 @@ START_TEST(security)
test_AdjustTokenPrivileges();
test_AddAce();
test_system_security_access();
+ test_GetWindowsAccountDomainSid();
}
diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec
@@ -215,5 +215,5 @@ index 3adef23..e19fe53 100644
@ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser
@ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf
--
2.4.2
2.4.3