| Index: chrome/installer/setup/setup_util.cc
|
| diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
|
| index a190862da4f39e1fbbd7e8aafdd2ef01eacf13bc..41072423847c0225ffffdf0e49d37d2c91eb908d 100644
|
| --- a/chrome/installer/setup/setup_util.cc
|
| +++ b/chrome/installer/setup/setup_util.cc
|
| @@ -4,6 +4,8 @@
|
| //
|
| // This file declares util functions for setup project.
|
|
|
| +//Pickup file for readability review.
|
| +
|
| #include "chrome/installer/setup/setup_util.h"
|
|
|
| #include <windows.h>
|
| @@ -88,8 +90,8 @@ bool DeleteFileFromTempProcess(const FilePath& path,
|
| static const wchar_t kRunDll32Path[] =
|
| L"%SystemRoot%\\System32\\rundll32.exe";
|
| wchar_t rundll32[MAX_PATH];
|
| - DWORD size = ExpandEnvironmentStrings(kRunDll32Path, rundll32,
|
| - arraysize(rundll32));
|
| + DWORD size =
|
| + ExpandEnvironmentStrings(kRunDll32Path, rundll32, arraysize(rundll32));
|
| if (!size || size >= MAX_PATH)
|
| return false;
|
|
|
| @@ -110,7 +112,8 @@ bool DeleteFileFromTempProcess(const FilePath& path,
|
| PAGE_READWRITE);
|
| if (mem) {
|
| SIZE_T written = 0;
|
| - ::WriteProcessMemory(pi.hProcess, mem, path.value().c_str(),
|
| + ::WriteProcessMemory(
|
| + pi.hProcess, mem, path.value().c_str(),
|
| (path.value().size() + 1) * sizeof(path.value()[0]), &written);
|
| HMODULE kernel32 = ::GetModuleHandle(L"kernel32.dll");
|
| PAPCFUNC sleep = reinterpret_cast<PAPCFUNC>(
|
| @@ -149,7 +152,8 @@ string16 GetActiveSetupPath(BrowserDistribution* dist) {
|
| ScopedTokenPrivilege::ScopedTokenPrivilege(const wchar_t* privilege_name)
|
| : is_enabled_(false) {
|
| if (!::OpenProcessToken(::GetCurrentProcess(),
|
| - TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, token_.Receive())) {
|
| + TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
|
| + token_.Receive())) {
|
| return;
|
| }
|
|
|
| @@ -167,11 +171,11 @@ ScopedTokenPrivilege::ScopedTokenPrivilege(const wchar_t* privilege_name)
|
| tp.Privileges[0].Luid = privilege_luid;
|
| tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
|
| DWORD return_length;
|
| - if (!::AdjustTokenPrivileges(token_, FALSE, &tp, sizeof(TOKEN_PRIVILEGES),
|
| - &previous_privileges_, &return_length)) {
|
| - token_.Close();
|
| - } else {
|
| + if (::AdjustTokenPrivileges(token_, FALSE, &tp, sizeof(TOKEN_PRIVILEGES),
|
| + &previous_privileges_, &return_length)) {
|
| is_enabled_ = true;
|
| + } else {
|
| + token_.Close();
|
| }
|
| }
|
|
|
|
|