Fixed virtual driver uninstall.

cloud_print/virtual_driver/win/install/setup.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <iomanip>
 #include <windows.h>
 #include <winspool.h>
 #include <setupapi.h>  // Must be included after windows.h
 
 #include "base/at_exit.h"
@@ skipping 23 matching lines @@
 const wchar_t kDriverName[] = L"MXDWDRV.DLL";
 const wchar_t kUiDriverName[] = L"PS5UI.DLL";
 const wchar_t kHelpName[] = L"PSCRIPT.HLP";
 const wchar_t* kDependencyList[] = {kDriverName, kUiDriverName, kHelpName};
 const wchar_t kUninstallRegistry[] =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
     L"{74AA24E0-AC50-4B28-BA46-9CF05467C9B7}";
 const wchar_t kInstallerName[] = L"virtual_driver_setup.exe";
 const wchar_t kGcpUrl[] = L"http://www.google.com/cloudprint";
 
-const char kDoUninstallSwitch[] = "douninstall";
+const char kDelete[] = "delete";
 const char kInstallSwitch[] = "install";
 const char kRegisterSwitch[] = "register";
 const char kUninstallSwitch[] = "uninstall";
 const char kUnregisterSwitch[] = "unregister";
 
 void SetGoogleUpdateKeys() {
   base::win::RegKey key;
   if (key.Create(HKEY_LOCAL_MACHINE, cloud_print::kKeyLocation,
                  KEY_SET_VALUE) != ERROR_SUCCESS) {
     LOG(ERROR) << "Unable to open key";
@@ skipping 454 matching lines @@
     if (SUCCEEDED(hr)) {
       break;
     }
     // Restart spooler and try again.
     SpoolerServiceCommand("stop");
     SpoolerServiceCommand("start");
   }
   return hr;
 }
 
-HRESULT DoLaunchUninstall(const FilePath& installer_source, bool wait) {
+HRESULT DeleteProgramDir(const FilePath& installer_source, bool wait) {
   FilePath temp_path;
   if (file_util::CreateTemporaryFile(&temp_path)) {
     file_util::CopyFile(installer_source, temp_path);
     file_util::DeleteAfterReboot(temp_path);
     CommandLine command_line(temp_path);
-    command_line.AppendArg(kDoUninstallSwitch);
+    command_line.AppendSwitchPath(kDelete, installer_source.DirName());
     base::LaunchOptions options;
     options.wait = wait;
     base::ProcessHandle process_handle;
     if (!base::LaunchProcess(command_line, options, &process_handle)) {
       LOG(ERROR) << "Unable to launch child uninstall.";
       return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
     }
     if (wait) {
       int exit_code = -1;
       base::TerminationStatus status =
           base::GetTerminationStatus(process_handle, &exit_code);
       if (status == base::TERMINATION_STATUS_NORMAL_TERMINATION) {
         return exit_code;
       } else {
         LOG(ERROR) << "Improper termination of uninstall. " << status;
         return E_FAIL;
       }
     }
   }
   return S_OK;
 }
 
-HRESULT LaunchChildForUninstall() {
+HRESULT DoUninstall() {
+  DeleteGoogleUpdateKeys();
+  HRESULT result = UnregisterVirtualDriver();
+  if (FAILED(result))
+    return result;
+  CleanupUninstall();
   FilePath installer_source;
-  if (PathService::Get(base::FILE_EXE, &installer_source)) {
-    return DoLaunchUninstall(installer_source, false);
-  }
+  if (PathService::Get(base::FILE_EXE, &installer_source))
+    return DeleteProgramDir(installer_source, false);
   return S_OK;
 }
 
 HRESULT DoUnregister() {
   return UnregisterVirtualDriver();
 }
 
 HRESULT DoRegister(const FilePath& install_path) {
   HRESULT result = UnregisterVirtualDriver();
   if (FAILED(result))
     return result;
   return RegisterVirtualDriver(install_path);
 }
 
-HRESULT DoUninstall() {
-  FilePath install_path;
-  GetCurrentInstallPath(&install_path);
-  if (install_path.value().empty()) {
+HRESULT DoDelete(const FilePath& install_path) {
+  if (install_path.value().empty())
+    return E_INVALIDARG;
+  if (!file_util::DirectoryExists(install_path))
     return S_FALSE;
-  }
-  HRESULT result = UnregisterVirtualDriver();
-  if (FAILED(result))
-    return result;
-  DeleteGoogleUpdateKeys();
-  if (file_util::DirectoryExists(install_path))
-    file_util::Delete(install_path, true);
-  CleanupUninstall();
-  return result;
+  Sleep(5000);  // Give parent some time to exit.
+  return file_util::Delete(install_path, true) ? S_OK : E_FAIL;
 }
 
 HRESULT DoInstall(const FilePath& install_path) {
   HRESULT result = UnregisterVirtualDriver();
   if (FAILED(result)) {
     LOG(ERROR) << "Unable to unregister.";
     return result;
   }
   FilePath old_install_path;
   GetCurrentInstallPath(&old_install_path);
@@ skipping 12 matching lines @@
 
 HRESULT ExecuteCommands() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   FilePath exe_path;
   if (FAILED(PathService::Get(base::DIR_EXE, &exe_path)) ||
       !file_util::DirectoryExists(exe_path)) {
     return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND);
   }
 
-  if (command_line.HasSwitch(kDoUninstallSwitch)) {
+  if (command_line.HasSwitch(kDelete)) {
+    return DoDelete(command_line.GetSwitchValuePath(kDelete));
+  } else if (command_line.HasSwitch(kUninstallSwitch)) {
     return DoUninstall();
-  } else if (command_line.HasSwitch(kUninstallSwitch)) {
-    return LaunchChildForUninstall();
   } else if (command_line.HasSwitch(kInstallSwitch)) {
     return DoInstall(exe_path);
   } else if (command_line.HasSwitch(kUnregisterSwitch)) {
     return DoUnregister();
   } else if (command_line.HasSwitch(kRegisterSwitch)) {
     return DoRegister(exe_path);
   }
 
   return E_INVALIDARG;
 }
@@ skipping 10 matching lines @@
 
   LOG(INFO) << "HRESULT=0x" << std::setbase(16) << retval;
 
   // Installer is silent by default as required by Google Update.
   if (CommandLine::ForCurrentProcess()->HasSwitch("verbose")) {
     cloud_print::DisplayWindowsMessage(NULL, retval,
         cloud_print::LoadLocalString(IDS_DRIVER_NAME));
   }
   return retval;
 }