Fixed AppID registration.

cloud_print/service/win/cloud_print_service.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 "cloud_print/service/win/cloud_print_service.h"
 
 #include <iomanip>
 #include <iostream>
 
 #include "base/at_exit.h"
@@ skipping 130 matching lines @@
 
   DECLARE_REGISTRY_APPID_RESOURCEID(IDR_CLOUDPRINTSERVICE,
                                     "{8013FB7C-2E3E-4992-B8BD-05C0C4AB0627}")
 
   HRESULT InitializeSecurity() {
     // TODO(gene): Check if we need to call CoInitializeSecurity and provide
     // the appropriate security settings for service.
     return S_OK;
   }
 
-  HRESULT Install(const FilePath& user_data_dir) {
+  HRESULT InstallService(const FilePath& user_data_dir) {
     // TODO(vitalybuka): consider "lite" version if we don't want unregister
     // printers here.
-    if (!Uninstall())
-      return E_FAIL;
+    HRESULT hr = UninstallService();
+    if (FAILED(hr))
+      return hr;
+
+    hr = UpdateRegistryAppId(true);
+    if (FAILED(hr))
+      return hr;
 
     FilePath service_path;
     CHECK(PathService::Get(base::FILE_EXE, &service_path));
     CommandLine command_line(service_path);
     command_line.AppendSwitch(kServiceSwitch);
     command_line.AppendSwitchPath(kUserDataDirSwitch, user_data_dir);
 
     ServiceHandle scm;
-    HRESULT hr = OpenServiceManager(&scm);
+    hr = OpenServiceManager(&scm);
     if (FAILED(hr))
       return hr;
 
     ServiceHandle service(
         ::CreateService(
             scm, m_szServiceName, m_szServiceName, SERVICE_ALL_ACCESS,
             SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
             command_line.GetCommandLineString().c_str(), NULL, NULL, NULL,
             L"NT AUTHORITY\\LocalService", NULL));
 
     if (!service.IsValid())
       return HResultFromLastError();
 
     return S_OK;
   }
 
+  HRESULT UninstallService() {
+    if (!Uninstall())
+      return E_FAIL;
+    return UpdateRegistryAppId(false);
+  }
+
   bool ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode) {
     CHECK(pnRetCode);
     CommandLine command_line(CommandLine::NO_PROGRAM);
     command_line.ParseFromString(lpCmdLine);
     bool is_service = false;
     *pnRetCode = ParseCommandLine(command_line, &is_service);
     if (FAILED(*pnRetCode)) {
       LOG(ERROR) << "Operation failed. 0x" << std::setw(8) <<
           std::setbase(16) << *pnRetCode;
     }
@@ skipping 22 matching lines @@
  private:
   HRESULT ParseCommandLine(const CommandLine& command_line, bool* is_service) {
     if (!is_service)
       return E_INVALIDARG;
     *is_service = false;
 
     if (command_line.HasSwitch(kStopSwitch))
       return StopService();
 
     if (command_line.HasSwitch(kUninstallSwitch))
-      return Uninstall() ? S_OK : E_FAIL;
+      return UninstallService();
 
     if (command_line.HasSwitch(kInstallSwitch)) {
       if (!command_line.HasSwitch(kUserDataDirSwitch)) {
         InvalidUsage();
         return S_FALSE;
       }
 
       FilePath data_dir = command_line.GetSwitchValuePath(kUserDataDirSwitch);
       HRESULT hr = ProcessServiceState(data_dir,
                                        command_line.HasSwitch(kQuietSwitch));
       if (FAILED(hr))
         return hr;
-      hr = Install(data_dir);
+      hr = InstallService(data_dir);
       if (SUCCEEDED(hr) && command_line.HasSwitch(kStartSwitch))
         return StartService();
 
       return hr;
     }
 
     if (command_line.HasSwitch(kStartSwitch))
       return StartService();
 
     if (command_line.HasSwitch(kServiceSwitch)) {
@@ skipping 20 matching lines @@
         std::cout << file.value() << ":\n";
         std::cout << contents << "\n";
       }
 
       if (!is_valid)
         LOG(ERROR) << "Invalid file: " << file.value();
 
       if (quiet)
         return is_valid ? S_OK : HRESULT_FROM_WIN32(ERROR_FILE_INVALID);
 
-      std::cout << "Do you want to use this file [y/n]:";
-      for (;;) {
-        std::string input;
-        std::getline(std::cin, input);
-        StringToLowerASCII(&input);
-        if (input == "y") {
-          return S_OK;
-        } else if (input == "n") {
-          is_valid = false;
-          break;
+      if (!contents.empty()) {
+        std::cout << "Do you want to use this file [y/n]:";
+        for (;;) {
+          std::string input;
+          std::getline(std::cin, input);
+          StringToLowerASCII(&input);
+          if (input == "y") {
+            return S_OK;
+          } else if (input == "n") {
+            is_valid = false;
+            break;
+          }
         }
       }
 
       while (!is_valid) {
         std::string email = GetOption("email", service_state.email(), false);
         std::string password = GetOption("password", "", true);
         std::string proxy_id = GetOption("connector_id",
                                          service_state.proxy_id(), false);
         is_valid = service_state.Configure(email, password, proxy_id);
         if (is_valid) {
@@ skipping 69 matching lines @@
 
   FilePath user_data_dir_;
 };
 
 CloudPrintServiceModule _AtlModule;
 
 int main() {
   base::AtExitManager at_exit;
   return _AtlModule.WinMain(0);
 }