Skip to content

Commit

Permalink
Replace hard-coded company path names with PATH_COMPANY_NAME
Browse files Browse the repository at this point in the history 
google#327
  • Loading branch information
@sparist
sparist committed Dec 10, 2021
1 parent aba0fc6 commit 4c65834
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 80 deletions.
4 changes: 2 additions & 2 deletions omaha/base/path_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,11 @@ TEST(PathTest, EnclosePathIfExe) {
new_path = EnclosePathIfExe(original_path);
EXPECT_STREQ(_T("\"c:\\Windows\\notepad.exe\""), new_path);

original_path = _T("c:\\Program Files\\Google\\Update");
original_path = _T("c:\\Program Files\\") PATH_COMPANY_NAME _T("\\Update");
new_path = EnclosePathIfExe(original_path);
EXPECT_STREQ(original_path, new_path);

original_path = _T("c:\\Progra Files\\Google\\Update\\1.1.1.1\\goopdate.dll");
original_path = _T("c:\\Progra Files\\") PATH_COMPANY_NAME _T("\\Update\\1.1.1.1\\goopdate.dll");
new_path = EnclosePathIfExe(original_path);
EXPECT_STREQ(original_path, new_path);

Expand Down
130 changes: 65 additions & 65 deletions omaha/common/omaha_customization_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@ TEST(OmahaCustomizationTest, Constants_OmahaAppId_GUIDAndStringMatch) {

TEST(OmahaCustomizationTest, Constants_Directories) {
EXPECT_STREQ(_T("Offline"), OFFLINE_DIR_NAME);
EXPECT_GU_STREQ(_T("Google"), OMAHA_REL_COMPANY_DIR);
EXPECT_GU_STREQ(_T("Google\\CrashReports"), OMAHA_REL_CRASH_DIR);
EXPECT_GU_STREQ(_T("Google\\Update"), OMAHA_REL_GOOPDATE_INSTALL_DIR);
EXPECT_GU_STREQ(_T("Google\\Update\\Log"), OMAHA_REL_LOG_DIR);
EXPECT_GU_STREQ(_T("Google\\Update\\Offline"),
EXPECT_STREQ(PATH_COMPANY_NAME, OMAHA_REL_COMPANY_DIR);
EXPECT_STREQ(PATH_COMPANY_NAME _T("\\CrashReports"), OMAHA_REL_CRASH_DIR);
EXPECT_STREQ(PATH_COMPANY_NAME _T("\\Update"), OMAHA_REL_GOOPDATE_INSTALL_DIR);
EXPECT_STREQ(PATH_COMPANY_NAME _T("\\Update\\Log"), OMAHA_REL_LOG_DIR);
EXPECT_STREQ(PATH_COMPANY_NAME _T("\\Update\\Offline"),
OMAHA_REL_OFFLINE_STORAGE_DIR);
EXPECT_GU_STREQ(_T("Google\\Update\\Download"),
EXPECT_STREQ(PATH_COMPANY_NAME _T("\\Update\\Download"),
OMAHA_REL_DOWNLOAD_STORAGE_DIR);
EXPECT_GU_STREQ(_T("Google\\Update\\Install"),
EXPECT_STREQ(PATH_COMPANY_NAME _T("\\Update\\Install"),
OMAHA_REL_INSTALL_WORKING_DIR);
}

Expand All @@ -167,35 +167,35 @@ TEST(OmahaCustomizationTest, Constants_RegistryKeys_NotCustomized) {
}

TEST(OmahaCustomizationTest, Constants_RegistryKeys) {
EXPECT_GU_STREQ(_T("Software\\Google\\"), COMPANY_MAIN_KEY);
EXPECT_GU_STREQ(_T("Software\\Google\\Update\\"), GOOPDATE_MAIN_KEY);
EXPECT_GU_STREQ(_T("Software\\Google\\Update\\Clients\\"), GOOPDATE_REG_RELATIVE_CLIENTS); // NOLINT
EXPECT_GU_STREQ(_T("Software\\Google\\Update\\ClientState\\"), GOOPDATE_REG_RELATIVE_CLIENT_STATE); // NOLINT
EXPECT_GU_STREQ(_T("Software\\Google\\Update\\ClientStateMedium\\"), GOOPDATE_REG_RELATIVE_CLIENT_STATE_MEDIUM); // NOLINT
EXPECT_GU_STREQ(_T("Software\\Policies\\Google\\"), COMPANY_POLICIES_MAIN_KEY); // NOLINT
EXPECT_GU_STREQ(_T("Software\\Policies\\Google\\Update\\"), GOOPDATE_POLICIES_RELATIVE); // NOLINT

EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\"), USER_REG_GOOGLE);
EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\"), USER_REG_UPDATE);
EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\Clients\\"), USER_REG_CLIENTS); // NOLINT
EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), USER_REG_CLIENTS_GOOPDATE); // NOLINT
EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\ClientState\\"), USER_REG_CLIENT_STATE); // NOLINT
EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), USER_REG_CLIENT_STATE_GOOPDATE); // NOLINT

EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\"), MACHINE_REG_GOOGLE);
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\"), MACHINE_REG_UPDATE);
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\Clients\\"), MACHINE_REG_CLIENTS); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), MACHINE_REG_CLIENTS_GOOPDATE); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\ClientState\\"), MACHINE_REG_CLIENT_STATE); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), MACHINE_REG_CLIENT_STATE_GOOPDATE); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\ClientStateMedium\\"), MACHINE_REG_CLIENT_STATE_MEDIUM); // NOLINT

EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\UpdateDev\\"), MACHINE_REG_UPDATE_DEV); // NOLINT
EXPECT_STREQ(_T("Software\\") PATH_COMPANY_NAME _T("\\"), COMPANY_MAIN_KEY);
EXPECT_STREQ(_T("Software\\") PATH_COMPANY_NAME _T("\\Update\\"), GOOPDATE_MAIN_KEY);
EXPECT_STREQ(_T("Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\"), GOOPDATE_REG_RELATIVE_CLIENTS); // NOLINT
EXPECT_STREQ(_T("Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\"), GOOPDATE_REG_RELATIVE_CLIENT_STATE); // NOLINT
EXPECT_STREQ(_T("Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientStateMedium\\"), GOOPDATE_REG_RELATIVE_CLIENT_STATE_MEDIUM); // NOLINT
EXPECT_STREQ(_T("Software\\Policies\\") PATH_COMPANY_NAME _T("\\"), COMPANY_POLICIES_MAIN_KEY); // NOLINT
EXPECT_STREQ(_T("Software\\Policies\\") PATH_COMPANY_NAME _T("\\Update\\"), GOOPDATE_POLICIES_RELATIVE); // NOLINT

EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\"), USER_REG_GOOGLE);
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\"), USER_REG_UPDATE);
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\"), USER_REG_CLIENTS); // NOLINT
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), USER_REG_CLIENTS_GOOPDATE); // NOLINT
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\"), USER_REG_CLIENT_STATE); // NOLINT
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), USER_REG_CLIENT_STATE_GOOPDATE); // NOLINT

EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\"), MACHINE_REG_GOOGLE);
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\"), MACHINE_REG_UPDATE);
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\"), MACHINE_REG_CLIENTS); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), MACHINE_REG_CLIENTS_GOOPDATE); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\"), MACHINE_REG_CLIENT_STATE); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), MACHINE_REG_CLIENT_STATE_GOOPDATE); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientStateMedium\\"), MACHINE_REG_CLIENT_STATE_MEDIUM); // NOLINT

EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\UpdateDev\\"), MACHINE_REG_UPDATE_DEV); // NOLINT
}

TEST(OmahaCustomizationTest, Constants_RegistryKeys_GroupPolicy) {
EXPECT_GU_STREQ(_T("Software\\Policies\\Google\\Update\\"), GOOPDATE_POLICIES_RELATIVE); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Policies\\Google\\Update\\"), kRegKeyGoopdateGroupPolicy); // NOLINT
EXPECT_STREQ(_T("Software\\Policies\\") PATH_COMPANY_NAME _T("\\Update\\"), GOOPDATE_POLICIES_RELATIVE); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\Policies\\") PATH_COMPANY_NAME _T("\\Update\\"), kRegKeyGoopdateGroupPolicy); // NOLINT
}

TEST(OmahaCustomizationTest, Constants_RegistryValues) {
Expand Down Expand Up @@ -230,7 +230,7 @@ TEST(OmahaCustomizationTest, Constants_Addresses) {
}

TEST(OmahaCustomizationTest, Constants_Config) {
EXPECT_GU_STREQ(_T("Software\\Google\\Update\\Shared"), kCiRegKeyShared);
EXPECT_STREQ(_T("Software\\") PATH_COMPANY_NAME _T("\\Update\\Shared"), kCiRegKeyShared);
}

TEST(OmahaCustomizationTest, Constants_Debug) {
Expand Down Expand Up @@ -301,37 +301,37 @@ TEST(OmahaCustomizationTest, Constants_ScheduledTasks) {
TEST(OmahaCustomizationTest, ConfigManager_RegistryKeys) {
const ConfigManager& cm = *ConfigManager::Instance();

EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\Clients\\"), cm.user_registry_clients()); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\Clients\\"), cm.machine_registry_clients()); // NOLINT
EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\Clients\\"), cm.registry_clients(false)); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\Clients\\"), cm.registry_clients(true)); // NOLINT

EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.user_registry_clients_goopdate()); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.machine_registry_clients_goopdate()); // NOLINT
EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.registry_clients_goopdate(false)); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.registry_clients_goopdate(true)); // NOLINT

EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\ClientState\\"), cm.user_registry_client_state()); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\ClientState\\"), cm.machine_registry_client_state()); // NOLINT
EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\ClientState\\"), cm.registry_client_state(false)); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\ClientState\\"), cm.registry_client_state(true)); // NOLINT

EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.user_registry_client_state_goopdate()); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.machine_registry_client_state_goopdate()); // NOLINT
EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.registry_client_state_goopdate(false)); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.registry_client_state_goopdate(true)); // NOLINT

EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\ClientStateMedium\\"), cm.machine_registry_client_state_medium()); // NOLINT

EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\"), cm.user_registry_update()); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\"), cm.machine_registry_update()); // NOLINT
EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\Update\\"), cm.registry_update(false)); // NOLINT
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\Update\\"), cm.registry_update(true)); // NOLINT

EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\"), cm.user_registry_google());
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\"), cm.machine_registry_google());
EXPECT_GU_STREQ(_T("HKCU\\Software\\Google\\"), cm.registry_google(false));
EXPECT_GU_STREQ(_T("HKLM\\Software\\Google\\"), cm.registry_google(true));
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\"), cm.user_registry_clients()); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\"), cm.machine_registry_clients()); // NOLINT
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\"), cm.registry_clients(false)); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\"), cm.registry_clients(true)); // NOLINT

EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.user_registry_clients_goopdate()); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.machine_registry_clients_goopdate()); // NOLINT
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.registry_clients_goopdate(false)); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.registry_clients_goopdate(true)); // NOLINT

EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\"), cm.user_registry_client_state()); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\"), cm.machine_registry_client_state()); // NOLINT
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\"), cm.registry_client_state(false)); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\"), cm.registry_client_state(true)); // NOLINT

EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.user_registry_client_state_goopdate()); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.machine_registry_client_state_goopdate()); // NOLINT
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.registry_client_state_goopdate(false)); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientState\\{430FD4D0-B729-4F61-AA34-91526481799D}"), cm.registry_client_state_goopdate(true)); // NOLINT

EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\ClientStateMedium\\"), cm.machine_registry_client_state_medium()); // NOLINT

EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\"), cm.user_registry_update()); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\"), cm.machine_registry_update()); // NOLINT
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\"), cm.registry_update(false)); // NOLINT
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\"), cm.registry_update(true)); // NOLINT

EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\"), cm.user_registry_google());
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\"), cm.machine_registry_google());
EXPECT_STREQ(_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\"), cm.registry_google(false));
EXPECT_STREQ(_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\"), cm.registry_google(true));
}

TEST(OmahaCustomizationTest, IsInternalUser) {
Expand Down
2 changes: 1 addition & 1 deletion omaha/enterprise/installer/custom_actions/show_error_action.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "omaha/enterprise/installer/custom_actions/msi_custom_action.h"

#define SOFTWARE_GOOGLE_UPDATE L"Software\\Google\\Update"
#define SOFTWARE_GOOGLE_UPDATE L"Software\\" PATH_COMPANY_NAME_ANSI "\\Update"
#define SOFTWARE_GOOGLE_UPDATE_CLIENTSTATE \
SOFTWARE_GOOGLE_UPDATE L"\\ClientState"

Expand Down
2 changes: 1 addition & 1 deletion omaha/enterprise/installer/test/test_setup.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <windows.h>

#define GOOGLE_UPDATE_KEY L"SOFTWARE\\Google\\Update"
#define GOOGLE_UPDATE_KEY L"SOFTWARE\\" PATH_COMPANY_NAME_ANSI "\\Update"
#define TEST_SETUP_APP_GUID L"{665BDD8E-F40C-4384-A9C6-CA3CD5665C83}"

namespace {
Expand Down
4 changes: 2 additions & 2 deletions omaha/goopdate/goopdate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,9 @@ GoopdateImpl::~GoopdateImpl() {
// Bug 994348 does not repro anymore.
// If the assert fires, clean up the key, and fix the code if we have unit
// tests or application code that create the key.
ASSERT(!RegKey::HasKey(_T("HKEY_USERS\\.DEFAULT\\Software\\Google\\Update")),
ASSERT(!RegKey::HasKey(_T("HKEY_USERS\\.DEFAULT\\Software\\") PATH_COMPANY_NAME _T("\\Update")),
(_T("This assert has fired because it has found the registry key at ")
_T("'HKEY_USERS\\.DEFAULT\\Software\\Google\\Update'. ")
_T("'HKEY_USERS\\.DEFAULT\\Software\\") PATH_COMPANY_NAME _T("\\Update'. ")
_T("Please delete the key and report to omaha-core team if ")
_T("the assert fires again.")));

Expand Down
6 changes: 3 additions & 3 deletions omaha/recovery/client/google_update_recovery.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ const TCHAR* const kQueryStringFormat =
// Information about where to obtain Omaha info.
// This must never change in Omaha.
const TCHAR* const kRegValueProductVersion = _T("pv");
const TCHAR* const kRelativeGoopdateRegPath = _T("Software\\Google\\Update\\");
const TCHAR* const kRelativeGoopdateRegPath = _T("Software\\") PATH_COMPANY_NAME _T("\\Update\\");
const TCHAR* const kRelativeClientsGoopdateRegPath =
_T("Software\\Google\\Update\\Clients\\")
_T("Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\")
_T("{430FD4D0-B729-4F61-AA34-91526481799D}");

// The UpdateDev registry value to override the Code Red url.
Expand Down Expand Up @@ -456,7 +456,7 @@ HRESULT DownloadRepairFile(const CString& download_target_path,

CString url;
HRESULT hr = GetRegStringValue(true,
_T("SOFTWARE\\Google\\UpdateDev"),
_T("SOFTWARE\\") PATH_COMPANY_NAME _T("\\UpdateDev"),
kRegValueNameCodeRedUrl,
&url);
if (FAILED(hr)) {
Expand Down
10 changes: 5 additions & 5 deletions omaha/recovery/client/google_update_recovery_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ const TCHAR kDummyAppLang[] = _T("en-us");
const TCHAR kTempDirectory[] = _T("C:\\WINDOWS\\Temp");

const TCHAR kFullMachineOmahaMainKeyPath[] =
_T("HKLM\\Software\\Google\\Update\\");
_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\");
const TCHAR kFullUserOmahaMainKeyPath[] =
_T("HKCU\\Software\\Google\\Update\\");
_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\");
const TCHAR kFullMachineOmahaClientKeyPath[] =
_T("HKLM\\Software\\Google\\Update\\Clients\\")
_T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\")
_T("{430FD4D0-B729-4f61-AA34-91526481799D}");
const TCHAR kFullUserOmahaClientKeyPath[] =
_T("HKCU\\Software\\Google\\Update\\Clients\\")
_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\Clients\\")
_T("{430FD4D0-B729-4f61-AA34-91526481799D}");

const HRESULT kDummyNoFileError = 0x80041234;
Expand All @@ -93,7 +93,7 @@ const TCHAR* const kInvalidFileUrl = _T("http://www.google.com/robots.txt");

// These methods were copied from omaha/testing/omaha_unittest.cpp.
const TCHAR kRegistryHiveOverrideRoot[] =
_T("HKCU\\Software\\Google\\Update\\UnitTest\\");
_T("HKCU\\Software\\") PATH_COMPANY_NAME _T("\\Update\\UnitTest\\");

const TCHAR kExpectedUrlForDummyAppAndNoOmahaValues[] = _T("https://clients2.google.com/service/check2?crx3=true&appid=%7B8E472B0D-3E8B-43b1-B89A-E8506AAF1F16%7D&appversion=3.4.5.6&applang=en-us&machine=1&version=0.0.0.0&userid=&osversion="); // NOLINT
const int kExpectedUrlForDummyAppAndNoOmahaValuesLength =
Expand Down
2 changes: 1 addition & 1 deletion omaha/tools/goopdump/data_dumper_goopdate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ void DataDumperGoopdate::DumpHostsFile(const DumpLog& dump_log) {
void DataDumperGoopdate::DumpUpdateDevKeys(const DumpLog& dump_log) {
DumpHeader header(dump_log, _T("UpdateDev Keys"));

DumpRegistryKeyData(dump_log, _T("HKLM\\Software\\Google\\UpdateDev"));
DumpRegistryKeyData(dump_log, _T("HKLM\\Software\\") PATH_COMPANY_NAME _T("\\UpdateDev"));
}

void DataDumperGoopdate::DumpLogFile(const DumpLog& dump_log) {
Expand Down

0 comments on commit 4c65834

Please sign in to comment.