diff options
author | thakis <thakis@chromium.org> | 2015-12-09 16:36:25 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-10 00:37:07 +0000 |
commit | 9230c1d2dc9af55c573c54b64780a75cf418d896 (patch) | |
tree | 42d7eaf8c2d6952b6fce4222988d99a382f92f58 /sandbox/win/src/restricted_token_unittest.cc | |
parent | defcc73ab06beb476b98403f8d5d4a4b065fd97b (diff) | |
download | chromium_src-9230c1d2dc9af55c573c54b64780a75cf418d896.zip chromium_src-9230c1d2dc9af55c573c54b64780a75cf418d896.tar.gz chromium_src-9230c1d2dc9af55c573c54b64780a75cf418d896.tar.bz2 |
clang/win: Let some chromium_code targets build with -Wextra.
To make warning flags between Windows and non-Windows clang consistent,
I'd like to build chromium_code targets with -Wextra enabled. This fixes
-Wextra warnings in about 14k of 31k build steps.
Most of the warnings were about signed/unsigned mismatches; some were about
"const"s that had no effect.
(This CL does not contain the change to actually turn on -Wextra, only
cleanups.)
BUG=567877
TBR=content/common/sandbox
Review URL: https://codereview.chromium.org/1507413003
Cr-Commit-Position: refs/heads/master@{#364232}
Diffstat (limited to 'sandbox/win/src/restricted_token_unittest.cc')
-rw-r--r-- | sandbox/win/src/restricted_token_unittest.cc | 173 |
1 files changed, 102 insertions, 71 deletions
diff --git a/sandbox/win/src/restricted_token_unittest.cc b/sandbox/win/src/restricted_token_unittest.cc index fca1a07..b11948e 100644 --- a/sandbox/win/src/restricted_token_unittest.cc +++ b/sandbox/win/src/restricted_token_unittest.cc @@ -19,7 +19,8 @@ namespace sandbox { // Tests the initializatioin with an invalid token handle. TEST(RestrictedTokenTest, InvalidHandle) { RestrictedToken token; - ASSERT_EQ(ERROR_INVALID_HANDLE, token.Init(reinterpret_cast<HANDLE>(0x5555))); + ASSERT_EQ(static_cast<DWORD>(ERROR_INVALID_HANDLE), + token.Init(reinterpret_cast<HANDLE>(0x5555))); } // Tests the initialization with NULL as parameter. @@ -36,13 +37,13 @@ TEST(RestrictedTokenTest, DefaultInit) { // Create the token using the current token. RestrictedToken token_default; - ASSERT_EQ(ERROR_SUCCESS, token_default.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token_default.Init(NULL)); // Get the handle to the restricted token. base::win::ScopedHandle restricted_token_handle; - ASSERT_EQ(ERROR_SUCCESS, - token_default.GetRestrictedToken(&restricted_token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token_default.GetRestrictedToken(&restricted_token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(restricted_token_handle.Take()); @@ -78,13 +79,14 @@ TEST(RestrictedTokenTest, CustomInit) { // Create the token using the current token. RestrictedToken token; - ASSERT_EQ(ERROR_SUCCESS, token.Init(access_token.GetHandle())); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.Init(access_token.GetHandle())); // Get the handle to the restricted token. base::win::ScopedHandle restricted_token_handle; - ASSERT_EQ(ERROR_SUCCESS, - token.GetRestrictedToken(&restricted_token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&restricted_token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(restricted_token_handle.Take()); @@ -101,13 +103,14 @@ TEST(RestrictedTokenTest, CustomInit) { // Verifies that the token created by the object are valid. TEST(RestrictedTokenTest, ResultToken) { RestrictedToken token; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.AddRestrictingSid(ATL::Sids::World().GetPSID())); base::win::ScopedHandle restricted_token; - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&restricted_token)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&restricted_token)); ASSERT_TRUE(::IsTokenRestricted(restricted_token.Get())); @@ -122,8 +125,8 @@ TEST(RestrictedTokenTest, ResultToken) { ASSERT_EQ(type, TokenPrimary); base::win::ScopedHandle impersonation_token; - ASSERT_EQ(ERROR_SUCCESS, - token.GetRestrictedTokenForImpersonation(&impersonation_token)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedTokenForImpersonation(&impersonation_token)); ASSERT_TRUE(::IsTokenRestricted(impersonation_token.Get())); @@ -139,13 +142,14 @@ TEST(RestrictedTokenTest, ResultToken) { // Verifies that the token created has "Restricted" in its default dacl. TEST(RestrictedTokenTest, DefaultDacl) { RestrictedToken token; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.AddRestrictingSid(ATL::Sids::World().GetPSID())); base::win::ScopedHandle handle; - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(handle.Take()); @@ -174,9 +178,11 @@ TEST(RestrictedTokenTest, DenySid) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.AddSidForDenyOnly(Sid(WinWorldSid))); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.AddSidForDenyOnly(Sid(WinWorldSid))); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -190,7 +196,7 @@ TEST(RestrictedTokenTest, DenySid) { for (unsigned int i = 0; i < sids.GetCount(); i++) { if (ATL::Sids::World() == sids[i]) { - ASSERT_EQ(SE_GROUP_USE_FOR_DENY_ONLY, + ASSERT_EQ(static_cast<DWORD>(SE_GROUP_USE_FOR_DENY_ONLY), attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY); } } @@ -201,9 +207,11 @@ TEST(RestrictedTokenTest, DenySids) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.AddAllSidsForDenyOnly(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.AddAllSidsForDenyOnly(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -219,7 +227,7 @@ TEST(RestrictedTokenTest, DenySids) { for (unsigned int i = 0; i < sids.GetCount(); i++) { if ((attributes[i] & SE_GROUP_LOGON_ID) == 0 && (attributes[i] & SE_GROUP_INTEGRITY) == 0) { - ASSERT_EQ(SE_GROUP_USE_FOR_DENY_ONLY, + ASSERT_EQ(static_cast<DWORD>(SE_GROUP_USE_FOR_DENY_ONLY), attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY); } } @@ -233,9 +241,11 @@ TEST(RestrictedTokenTest, DenySidsException) { std::vector<Sid> sids_exception; sids_exception.push_back(Sid(WinWorldSid)); - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.AddAllSidsForDenyOnly(&sids_exception)); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.AddAllSidsForDenyOnly(&sids_exception)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -252,9 +262,9 @@ TEST(RestrictedTokenTest, DenySidsException) { if ((attributes[i] & SE_GROUP_LOGON_ID) == 0 && (attributes[i] & SE_GROUP_INTEGRITY) == 0) { if (ATL::Sids::World() == sids[i]) { - ASSERT_EQ(NULL, attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY); + ASSERT_EQ(0u, attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY); } else { - ASSERT_EQ(SE_GROUP_USE_FOR_DENY_ONLY, + ASSERT_EQ(static_cast<DWORD>(SE_GROUP_USE_FOR_DENY_ONLY), attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY); } } @@ -266,9 +276,10 @@ TEST(RestrictedTokenTest, DenyOwnerSid) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.AddUserSidForDenyOnly()); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.AddUserSidForDenyOnly()); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -285,7 +296,7 @@ TEST(RestrictedTokenTest, DenyOwnerSid) { for (unsigned int i = 0; i < sids.GetCount(); ++i) { if (user_sid == sids[i]) { - ASSERT_EQ(SE_GROUP_USE_FOR_DENY_ONLY, + ASSERT_EQ(static_cast<DWORD>(SE_GROUP_USE_FOR_DENY_ONLY), attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY); } } @@ -305,9 +316,11 @@ TEST(RestrictedTokenTest, DenyOwnerSidCustom) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(access_token.GetHandle())); - ASSERT_EQ(ERROR_SUCCESS, token.AddUserSidForDenyOnly()); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.Init(access_token.GetHandle())); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.AddUserSidForDenyOnly()); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -324,7 +337,7 @@ TEST(RestrictedTokenTest, DenyOwnerSidCustom) { for (unsigned int i = 0; i < sids.GetCount(); ++i) { if (user_sid == sids[i]) { - ASSERT_EQ(SE_GROUP_USE_FOR_DENY_ONLY, + ASSERT_EQ(static_cast<DWORD>(SE_GROUP_USE_FOR_DENY_ONLY), attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY); } } @@ -335,9 +348,10 @@ TEST(RestrictedTokenTest, DeleteAllPrivileges) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.DeleteAllPrivileges(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.DeleteAllPrivileges(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -345,7 +359,7 @@ TEST(RestrictedTokenTest, DeleteAllPrivileges) { ATL::CTokenPrivileges privileges; ASSERT_TRUE(restricted_token.GetPrivileges(&privileges)); - ASSERT_EQ(0, privileges.GetCount()); + ASSERT_EQ(0u, privileges.GetCount()); } // Tests the method DeleteAllPrivileges with an exception list. @@ -356,9 +370,11 @@ TEST(RestrictedTokenTest, DeleteAllPrivilegesException) { std::vector<base::string16> exceptions; exceptions.push_back(SE_CHANGE_NOTIFY_NAME); - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.DeleteAllPrivileges(&exceptions)); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.DeleteAllPrivileges(&exceptions)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -371,7 +387,7 @@ TEST(RestrictedTokenTest, DeleteAllPrivilegesException) { privileges.GetNamesAndAttributes(&privilege_names, &privilege_name_attributes); - ASSERT_EQ(1, privileges.GetCount()); + ASSERT_EQ(1u, privileges.GetCount()); for (unsigned int i = 0; i < privileges.GetCount(); ++i) { ASSERT_EQ(privilege_names[i], SE_CHANGE_NOTIFY_NAME); @@ -383,9 +399,11 @@ TEST(RestrictedTokenTest, DeletePrivilege) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.DeletePrivilege(SE_CHANGE_NOTIFY_NAME)); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.DeletePrivilege(SE_CHANGE_NOTIFY_NAME)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -421,7 +439,7 @@ void CheckRestrictingSid(const ATL::CAccessToken &restricted_token, delete[] memory; if (count >= 0) - ASSERT_EQ(count, atl_groups.GetCount()); + ASSERT_EQ(static_cast<unsigned>(count), atl_groups.GetCount()); ATL::CSid::CSidArray sids; ATL::CAtlArray<DWORD> attributes; @@ -443,10 +461,11 @@ TEST(RestrictedTokenTest, AddRestrictingSid) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.AddRestrictingSid(ATL::Sids::World().GetPSID())); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -459,9 +478,11 @@ TEST(RestrictedTokenTest, AddRestrictingSidCurrentUser) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidCurrentUser()); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.AddRestrictingSidCurrentUser()); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -485,9 +506,12 @@ TEST(RestrictedTokenTest, AddRestrictingSidCurrentUserCustom) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(access_token.GetHandle())); - ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidCurrentUser()); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.Init(access_token.GetHandle())); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.AddRestrictingSidCurrentUser()); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -502,9 +526,11 @@ TEST(RestrictedTokenTest, AddRestrictingSidLogonSession) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidLogonSession()); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.AddRestrictingSidLogonSession()); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -519,12 +545,15 @@ TEST(RestrictedTokenTest, AddMultipleRestrictingSids) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidCurrentUser()); - ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidLogonSession()); - ASSERT_EQ(ERROR_SUCCESS, + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.AddRestrictingSidCurrentUser()); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.AddRestrictingSidLogonSession()); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.AddRestrictingSid(ATL::Sids::World().GetPSID())); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -543,7 +572,7 @@ TEST(RestrictedTokenTest, AddMultipleRestrictingSids) { ATL::CTokenGroups atl_groups(*groups); delete[] memory; - ASSERT_EQ(3, atl_groups.GetCount()); + ASSERT_EQ(3u, atl_groups.GetCount()); } // Tests the method "AddRestrictingSidAllSids". @@ -551,9 +580,11 @@ TEST(RestrictedTokenTest, AddAllSidToRestrictingSids) { RestrictedToken token; base::win::ScopedHandle token_handle; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); - ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidAllSids()); - ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.AddRestrictingSidAllSids()); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), + token.GetRestrictedToken(&token_handle)); ATL::CAccessToken restricted_token; restricted_token.Attach(token_handle.Take()); @@ -581,9 +612,9 @@ TEST(RestrictedTokenTest, AddAllSidToRestrictingSids) { // Checks the error code when the object is initialized twice. TEST(RestrictedTokenTest, DoubleInit) { RestrictedToken token; - ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), token.Init(NULL)); - ASSERT_EQ(ERROR_ALREADY_INITIALIZED, token.Init(NULL)); + ASSERT_EQ(static_cast<DWORD>(ERROR_ALREADY_INITIALIZED), token.Init(NULL)); } } // namespace sandbox |