The Chromoting service should not start automatically unless it was configured from the webapp to d…

remoting/host/elevated_controller_win.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 "remoting/host/elevated_controller_win.h"
 
 #include <sddl.h>
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 209 matching lines @@
                      file_content.size());
 }
 
 STDMETHODIMP ElevatedControllerWin::StartDaemon() {
   ScopedScHandle service;
   HRESULT hr = OpenService(&service);
   if (FAILED(hr)) {
     return hr;
   }
 
+  // Change the service start type to 'auto'.
+  if (!::ChangeServiceConfigW(service,
+                              SERVICE_WIN32_OWN_PROCESS,

[Wez, 2012/04/10 21:26:20]

nit: Use SERVICE_NO_CHANGE here, so the installer controls the type.

[alexeypa (please no reviews), 2012/04/10 22:18:16]

Done.

+                              SERVICE_AUTO_START,
+                              SERVICE_NO_CHANGE,
+                              NULL,
+                              NULL,
+                              NULL,
+                              NULL,
+                              NULL,
+                              NULL,
+                              NULL)) {
+    DWORD error = GetLastError();
+    LOG_GETLASTERROR(ERROR)
+        << "Failed to change the '" << kWindowsServiceName
+        << "'service start type to 'auto'";
+    return HRESULT_FROM_WIN32(error);
+  }
+
+  // Start the service.
   if (!StartService(service, 0, NULL)) {
     DWORD error = GetLastError();
     if (error != ERROR_SERVICE_ALREADY_RUNNING) {
       LOG_GETLASTERROR(ERROR)
           << "Failed to start the '" << kWindowsServiceName << "'service";
 
       return HRESULT_FROM_WIN32(error);
     }
   }
 
   return S_OK;
 }
 
 STDMETHODIMP ElevatedControllerWin::StopDaemon() {
   ScopedScHandle service;
   HRESULT hr = OpenService(&service);
   if (FAILED(hr)) {
     return hr;
   }
 
+  // Change the service start type to 'manual'.
+  if (!::ChangeServiceConfigW(service,
+                              SERVICE_WIN32_OWN_PROCESS,

[Wez, 2012/04/10 21:26:20]

nit: Same here.

[alexeypa (please no reviews), 2012/04/10 22:18:16]

Done.

+                              SERVICE_DEMAND_START,
+                              SERVICE_NO_CHANGE,
+                              NULL,
+                              NULL,
+                              NULL,
+                              NULL,
+                              NULL,
+                              NULL,
+                              NULL)) {
+    DWORD error = GetLastError();
+    LOG_GETLASTERROR(ERROR)
+        << "Failed to change the '" << kWindowsServiceName
+        << "'service start type to 'manual'";
+    return HRESULT_FROM_WIN32(error);
+  }
+
+  // Stop the service.
   SERVICE_STATUS status;
   if (!ControlService(service, SERVICE_CONTROL_STOP, &status)) {
     DWORD error = GetLastError();
     if (error != ERROR_SERVICE_NOT_ACTIVE) {
       LOG_GETLASTERROR(ERROR)
           << "Failed to stop the '" << kWindowsServiceName << "'service";
       return HRESULT_FROM_WIN32(error);
     }
   }
 
@@ skipping 11 matching lines @@
       ::OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASE,
                        SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE));
   if (!scmanager.IsValid()) {
     error = GetLastError();
     LOG_GETLASTERROR(ERROR)
         << "Failed to connect to the service control manager";
 
     return HRESULT_FROM_WIN32(error);
   }
 
+  DWORD desired_access = SERVICE_CHANGE_CONFIG | SERVICE_QUERY_STATUS |
+                         SERVICE_START | SERVICE_STOP;
   ScopedScHandle service(
       ::OpenServiceW(scmanager, UTF8ToUTF16(kWindowsServiceName).c_str(),
-                     SERVICE_QUERY_STATUS | SERVICE_START | SERVICE_STOP));
+                     desired_access));
   if (!service.IsValid()) {
     error = GetLastError();
     LOG_GETLASTERROR(ERROR)
         << "Failed to open to the '" << kWindowsServiceName << "' service";
 
     return HRESULT_FROM_WIN32(error);
   }
 
   service_out->Set(service.Take());
   return S_OK;
 }
 
 } // namespace remoting