Delete the Google directory if it is empty.

This CL does a best-effort attempt to delete the company directory if it is empty. The company directory is `%LocalAppData%/Google` or `%ProgramFiles%/Google`.
google · May 31, 2023 · 8fa5322 · 8fa5322
1 parent 405e03e
commit 8fa5322
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/omaha/common/config_manager.cc b/omaha/common/config_manager.cc
@@ -790,6 +790,24 @@ CString ConfigManager::GetMachineGoopdateInstallDir() const {
   return path;
 }
 
+CString ConfigManager::GetUserCompanyDir() const {
+  CString path;
+  VERIFY_SUCCEEDED(GetDir32(CSIDL_LOCAL_APPDATA,
+                            CString(OMAHA_REL_COMPANY_DIR),
+                            false,
+                            &path));
+  return path;
+}
+
+CString ConfigManager::GetMachineCompanyDir() const {
+  CString path;
+  VERIFY_SUCCEEDED(GetDir32(CSIDL_PROGRAM_FILES,
+                            CString(OMAHA_REL_COMPANY_DIR),
+                            false,
+                            &path));
+  return path;
+}
+
 CString ConfigManager::GetTempDir() const {
   return ::IsUserAnAdmin() ? GetSecureSystemTempDir() :
                              app_util::GetTempDirForImpersonatedOrCurrentUser();

diff --git a/omaha/common/config_manager.h b/omaha/common/config_manager.h
@@ -251,6 +251,12 @@ class ConfigManager {
   // %ProgramFiles%/Google/Update
   CString GetMachineGoopdateInstallDir() const;
 
+  // Gets the Google company directory. Does not create the directory if it does
+  // not already exist.
+  // `%LocalAppData%/Google` or `%ProgramFiles%/Google`.
+  CString GetUserCompanyDir() const;
+  CString GetMachineCompanyDir() const;
+
   // Creates and returns a secure directory, %ProgramFiles%/Google/Temp, if
   // running as Admin. Otherwise, returns the %TMP% for the impersonated or
   // current user.

diff --git a/omaha/setup/setup_files.cc b/omaha/setup/setup_files.cc
@@ -163,6 +163,20 @@ void SetupFiles::Uninstall() {
     SETUP_LOG(LE, (_T("[DeleteDirectory failed][%s][0x%08x]"),
                    install_dir, hr));
   }
+
+  // Best-effort attempt to delete the company directory if it is empty.
+  CString company_dir(
+      is_machine_ ? ConfigManager::Instance()->GetMachineCompanyDir() :
+                    ConfigManager::Instance()->GetUserCompanyDir());
+  if (!File::IsDirectory(company_dir) || !::PathIsDirectoryEmpty(company_dir)) {
+    return;
+  }
+
+  // `::RemoveDirectory` deletes an existing empty directory.
+  if (!::RemoveDirectory(company_dir)) {
+    hr = HRESULTFromLastError();
+    SETUP_LOG(LE, (_T("[::RemoveDirectory failed][%s][%#x]"), company_dir, hr));
+  }
 }
 
 HRESULT SetupFiles::CopyShell() {