From f09c718082535c0de7f066cb63f95809070f35a6 Mon Sep 17 00:00:00 2001 From: "maruel@google.com" Date: Tue, 10 Mar 2009 12:54:04 +0000 Subject: NO CODE CHANGE. Fix files with lines > 80 cols. Part 2. Review URL: http://codereview.chromium.org/40226 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11326 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/gcapi/gcapi.cc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'chrome/installer/gcapi') diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc index f0a27b4..75bae0c 100644 --- a/chrome/installer/gcapi/gcapi.cc +++ b/chrome/installer/gcapi/gcapi.cc @@ -16,12 +16,17 @@ namespace { -const wchar_t kChromeRegClientsKey[] = L"Software\\Google\\Update\\Clients\\{8A69D345-D564-463c-AFF1-A69D9E530F96}"; -const wchar_t kChromeRegClientStateKey[] = L"Software\\Google\\Update\\ClientState\\{8A69D345-D564-463c-AFF1-A69D9E530F96}"; +const wchar_t kChromeRegClientsKey[] = + L"Software\\Google\\Update\\Clients\\" + L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; +const wchar_t kChromeRegClientStateKey[] = + L"Software\\Google\\Update\\ClientState\\" + L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; const wchar_t kChromeRegLaunchCmd[] = L"InstallerSuccessLaunchCmdLine"; const wchar_t kChromeRegLastLaunchCmd[] = L"LastInstallerSuccessLaunchCmdLine"; const wchar_t kChromeRegVersion[] = L"pv"; -const wchar_t kNoChromeOfferUntil[] = L"SOFTWARE\\Google\\No Chrome Offer Until"; +const wchar_t kNoChromeOfferUntil[] = + L"SOFTWARE\\Google\\No Chrome Offer Until"; // Return the company name specified in the file version info resource. bool GetCompanyName(const wchar_t* filename, wchar_t* buffer, DWORD out_len) { @@ -95,7 +100,7 @@ bool CanReOfferChrome(BOOL set_flag) { SYSTEMTIME now; GetLocalTime(&now); DWORD today = now.wYear * 10000 + now.wMonth * 100 + now.wDay; - + // Cannot re-offer, if the timer already exists and is not expired yet. DWORD value_type = REG_DWORD; DWORD value_data = 0; @@ -120,7 +125,7 @@ bool CanReOfferChrome(BOOL set_flag) { timer.wYear = timer.wYear + 1; } DWORD value = timer.wYear * 10000 + timer.wMonth * 100 + timer.wDay; - ::RegSetValueEx(key, company, 0, REG_DWORD, (LPBYTE)&value, + ::RegSetValueEx(key, company, 0, REG_DWORD, (LPBYTE)&value, sizeof(DWORD)); } } @@ -278,7 +283,8 @@ bool GetUserIdForProcess(size_t pid, wchar_t** user_sid) { } // namespace #pragma comment(linker, "/EXPORT:GoogleChromeCompatibilityCheck=_GoogleChromeCompatibilityCheck@8,PRIVATE") -DLLEXPORT BOOL __stdcall GoogleChromeCompatibilityCheck(BOOL set_flag, DWORD *reasons) { +DLLEXPORT BOOL __stdcall GoogleChromeCompatibilityCheck(BOOL set_flag, + DWORD *reasons) { DWORD local_reasons = 0; bool is_vista_or_later = false; -- cgit v1.1