Commit 163dfad5 authored by Andrew Nguyen's avatar Andrew Nguyen Committed by Alexandre Julliard

advapi32/tests: Use a matching enumeration value for the trustee form member.

parent 9d5ef071
...@@ -2782,7 +2782,7 @@ static void test_SetEntriesInAclW(void) ...@@ -2782,7 +2782,7 @@ static void test_SetEntriesInAclW(void)
} }
else else
{ {
ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszEveryone; ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszEveryone;
res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl);
ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res);
...@@ -2798,7 +2798,7 @@ static void test_SetEntriesInAclW(void) ...@@ -2798,7 +2798,7 @@ static void test_SetEntriesInAclW(void)
broken(NewAcl != NULL), /* NT4 */ broken(NewAcl != NULL), /* NT4 */
"returned acl wasn't NULL: %p\n", NewAcl); "returned acl wasn't NULL: %p\n", NewAcl);
ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE;
res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl);
ok(res == ERROR_INVALID_PARAMETER || ok(res == ERROR_INVALID_PARAMETER ||
...@@ -2816,7 +2816,7 @@ static void test_SetEntriesInAclW(void) ...@@ -2816,7 +2816,7 @@ static void test_SetEntriesInAclW(void)
LocalFree(NewAcl); LocalFree(NewAcl);
} }
ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszCurrentUser; ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszCurrentUser;
res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl);
ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res);
...@@ -2913,7 +2913,7 @@ static void test_SetEntriesInAclA(void) ...@@ -2913,7 +2913,7 @@ static void test_SetEntriesInAclA(void)
} }
else else
{ {
ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
ExplicitAccess.Trustee.ptstrName = (LPSTR)szEveryone; ExplicitAccess.Trustee.ptstrName = (LPSTR)szEveryone;
res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl); res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl);
ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %u\n", res); ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %u\n", res);
...@@ -2929,7 +2929,7 @@ static void test_SetEntriesInAclA(void) ...@@ -2929,7 +2929,7 @@ static void test_SetEntriesInAclA(void)
broken(NewAcl != NULL), /* NT4 */ broken(NewAcl != NULL), /* NT4 */
"returned acl wasn't NULL: %p\n", NewAcl); "returned acl wasn't NULL: %p\n", NewAcl);
ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE;
res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl); res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl);
ok(res == ERROR_INVALID_PARAMETER || ok(res == ERROR_INVALID_PARAMETER ||
...@@ -2947,7 +2947,7 @@ static void test_SetEntriesInAclA(void) ...@@ -2947,7 +2947,7 @@ static void test_SetEntriesInAclA(void)
LocalFree(NewAcl); LocalFree(NewAcl);
} }
ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
ExplicitAccess.Trustee.ptstrName = (LPSTR)szCurrentUser; ExplicitAccess.Trustee.ptstrName = (LPSTR)szCurrentUser;
res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl); res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl);
ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %u\n", res); ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %u\n", res);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment