Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9481)

Unified Diff: chrome/installer/mini_installer/mini_installer.cc

Issue 1523163005: clang/win: Fix build after https://codereview.chromium.org/1496093002 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mini_installer/mini_installer.cc
diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc
index 06a3a84c333f6b2d00eb731f3f312ba59927c151..5f42ae9ae2358ed2a6ae6f9a9fa08828f9231e9b 100644
--- a/chrome/installer/mini_installer/mini_installer.cc
+++ b/chrome/installer/mini_installer/mini_installer.cc
@@ -566,13 +566,13 @@ bool GetCurrentOwnerSid(wchar_t** sid) {
return false;
DWORD size = 0;
- TOKEN_OWNER* owner = NULL;
bool result = false;
// We get the TokenOwner rather than the TokenUser because e.g. under UAC
// elevation we want the admin to own the directory rather than the user.
- ::GetTokenInformation(token, TokenOwner, &owner, 0, &size);
+ ::GetTokenInformation(token, TokenOwner, NULL, 0, &size);
if (size && GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
- if (owner = reinterpret_cast<TOKEN_OWNER*>(::LocalAlloc(LPTR, size))) {
+ if (TOKEN_OWNER* owner =
+ reinterpret_cast<TOKEN_OWNER*>(::LocalAlloc(LPTR, size))) {
if (::GetTokenInformation(token, TokenOwner, owner, size, &size))
result = ::ConvertSidToStringSid(owner->Owner, sid);
::LocalFree(owner);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698