Remove ElevatedController

remoting/host/installer/win/chromoting.wxs

 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?define EventSourceName = "chromoting" ?>
   <?define ServiceName = "chromoting" ?>
 
   <!-- TODO(alexeypa): There strings should be localized,
        see http://crbug.com/121785 -->
   <?if $(var.Branding) ~= Chrome ?>
     <?define ChromotingHost = "Chrome Remote Desktop Host" ?>
@@ skipping 23 matching lines @@
 
   <?define OmahaAppid = "{b210701e-ffc4-49e3-932b-370728c72662}" ?>
   <?define UpgradeCode = "2b21f767-e157-4fa6-963c-55834c1433a6" ?>
 
   <?define CoreBinary = "remoting_core.dll" ?>
   <?define HostBinary = "remoting_host.exe" ?>
 
   <?define ChromotingTypelib = "{b6396c45-b0cc-456b-9f49-f12964ee6df4}" ?>
 
   <!-- AppIDs used by the COM components. -->
-  <?define ControllerAppid = "{4ff35d5e-d226-4550-9248-03e7779e67de}" ?>
   <?define RdpAppid = "{52e6fd1a-f16e-49c0-aacb-5436a915448b}" ?>
 
-  <?define ControllerClass = "ElevatedController Class" ?>
-  <?define ControllerProgid =
-      "ChromotingElevatedController.ElevatedController" ?>
-
   <?define IRdpDesktopSessionId = "{6a7699f0-ee43-43e7-aa30-a6738f9bd470}" ?>
   <?define IRdpDesktopSessionEventHandlerId =
       "{b59b96da-83cb-40ee-9b91-c377400fc3e3}" ?>
 
   <!--
     The long hex value(s) below are security descriptors generated from SDDL
     definition using the PowerShell script below:
 
     $sddl = "<SDDL definition goes here>"
     $i = ([wmiclass]"Win32_SecurityDescriptorHelper").SDDLToBinarySD($sddl).BinarySD
     -join ($i | foreach {$_.ToString("X2")})
   -->
 
   <!--
     A security descriptor that gives SYSTEM, built-in administrators and
     LocalService accounts COM_RIGHTS_EXECUTE, COM_RIGHTS_EXECUTE_LOCAL, and
     COM_RIGHTS_ACTIVATE_LOCAL rights. It specifies a mandatory label that
     specifies "no execute up" policy for medium integrity level.
 
     $sddl = "O:BAG:BAD:(A;;0xb;;;SY)(A;;0xb;;;BA)(A;;0xb;;;LS)S:(ML;;NX;;;ME)"
   -->
   <?define RdpSd = "010014807800000088000000140000003000000002001C000100000011001400040000000101000000000010002000000200480003000000000014000B000000010100000000000512000000000018000B00000001020000000000052000000020020000000014000B0000000101000000000005130000000102000000000005200000002002000001020000000000052000000020020000" ?>
 
   <!-- Verify that all required parameters are defined. -->
-  <?ifndef ControllerClsid ?>
-    <?error ControllerClsid must be defined ?>
-  <?endif?>
-
   <?ifndef RdpDesktopSessionClsid ?>
     <?error RdpDesktopSessionClsid must be defined ?>
   <?endif?>
 
   <?ifndef Version ?>
     <?error Version must be defined ?>
   <?endif?>
 
   <Product Id="*"
            Language="1033"
@@ skipping 206 matching lines @@
                            Name="name"
                            Value="$(var.ChromotingHost)"/>
           </RegistryKey>
         </Component>
       <?endif?>
 
       <Component Id="remoting_lib" Guid="*">
         <RegistryKey Root="HKLM"
                      Key="SOFTWARE\Classes">
           <RegistryKey Key="AppId">
-            <RegistryKey Key="$(var.ControllerAppid)" Action="create">
-              <RegistryValue Type="string"
-                             Value="ChromotingElevatedController"/>
-            </RegistryKey>
-
             <RegistryKey Key="$(var.RdpAppid)" Action="create">
               <RegistryValue Type="string"
                              Value="ChromotingRdpDesktopSession"/>
               <RegistryValue Name="AccessPermission"
                              Type="binary"
                              Value="$(var.RdpSd)"/>
               <RegistryValue Name="LaunchPermission"
                              Type="binary"
                              Value="$(var.RdpSd)"/>
               <RegistryValue Name="RunAs"
                              Type="string"
                              Value="NT AUTHORITY\LocalService"/>
             </RegistryKey>
 
           </RegistryKey>
 
-          <RegistryKey Key="$(var.ControllerProgid)" Action="create">
-            <RegistryValue Type="string"
-                           Value="$(var.ControllerClass)"/>
-
-            <RegistryKey Key="CLSID" Action="create">
-              <RegistryValue Type="string"
-                             Value="$(var.ControllerClsid)"/>
-            </RegistryKey>
-
-            <RegistryKey Key="CurVer" Action="create">
-              <RegistryValue Type="string"
-                             Value="$(var.ControllerProgid).$(var.Version)"/>
-            </RegistryKey>
-          </RegistryKey>
-
-          <RegistryKey Key="$(var.ControllerProgid).$(var.Version)"
-                       Action="create">
-            <RegistryValue Type="string"
-                           Value="$(var.ControllerClass)"/>
-
-            <RegistryKey Key="CLSID" Action="create">
-              <RegistryValue Type="string"
-                             Value="$(var.ControllerClsid)"/>
-            </RegistryKey>
-          </RegistryKey>
-
           <RegistryKey Key="CLSID">
-            <RegistryKey Key="$(var.ControllerClsid)" Action="create">
-              <RegistryValue Type="string"
-                             Value="$(var.ControllerClass)"/>
-
-              <RegistryValue Type="string"
-                             Name="AppID"
-                             Value="$(var.ControllerAppid)"/>
-
-              <RegistryValue Type="string"
-                             Name="LocalizedString"
-                             Value="@[binaries]$(var.CoreBinary),-103"/>
-
-              <RegistryKey Key="LocalServer32" Action="create">
-                <RegistryValue Type="string"
-                               Value="[binaries]$(var.HostBinary) --type=controller"/>
-              </RegistryKey>
-
-              <RegistryKey Key="ProgID" Action="create">
-                <RegistryValue Type="string"
-                               Value="$(var.ControllerProgid).$(var.Version)"/>
-              </RegistryKey>
-
-              <RegistryKey Key="TypeLib" Action="create">
-                <RegistryValue Type="string"
-                               Value="$(var.ChromotingTypelib)"/>
-              </RegistryKey>
-
-              <RegistryKey Key="VersionIndependentProgID" Action="create">
-                <RegistryValue Type="string"
-                               Value="$(var.ControllerProgid)"/>
-              </RegistryKey>
-
-              <RegistryKey Key="Elevation" Action="create">
-                <RegistryValue Type="integer"
-                               Name="Enabled"
-                               Value="1"/>
-                <RegistryValue Type="string"
-                               Name="IconReference"
-                               Value="@[binaries]$(var.CoreBinary),-104"/>
-              </RegistryKey>
-            </RegistryKey>
             <RegistryKey Key="$(var.RdpDesktopSessionClsid)" Action="create">
               <RegistryValue Type="string"
                              Value="RdpDesktopSession Class"/>
 
               <RegistryValue Type="string"
                              Name="AppID"
                              Value="$(var.RdpAppid)"/>
 
               <RegistryKey Key="LocalServer32" Action="create">
                 <RegistryValue Type="string"
@@ skipping 234 matching lines @@
 
     <CustomAction Id="query_auto_start_service"
                   Property="auto_start_service"
                   Value="[CHROMOTING_SERVICE_START_TYPE]" />
 
     <CustomAction Id="set_auto_start_service"
                   Impersonate="no"
                   Execute="deferred"
                   Script="jscript">
       <![CDATA[
-        var controller = new ActiveXObject("$(var.ControllerProgid)");
-        controller.StartDaemon();
+        var ADS_SERVICE_STOPPED = 0x00000001;
+        var service = GetObject("WinNT://./$(var.ServiceName),Service");
+        if (service.Status == ADS_SERVICE_STOPPED) {
+          service.Start();
+        }

[weitao, 2015/02/07 01:27:42]

ElevatedController.StartDaemon() did two things: change the service start type
to auto and start the service. But the former is not needed here because this
custom action is only executed if the service start type is auto.

[Sergey Ulanov, 2015/02/09 22:24:16]

Is the service kept in auto-start mode when the package is upgraded. From the
comment above it looks like it's not and that's why this action was needed. Is
the comment wrong?

If we don't want to change auto-start mode then the action needs to be renamed.

[weitao, 2015/02/10 01:05:18]

The comment is correct. The auto-start mode should only be changed by the user
when he enables/disables remote connection from the webapp. It should never be
changed by an upgrade.
I renamed the CA to start_chromoting_service.

       ]]>
     </CustomAction>
 
     <CustomAction Id="set_service_display_name"
                   Property="chromoting_service_display_name"
                   Value="@[binaries]$(var.CoreBinary),-101" />
     <CustomAction Id="set_service_description"
                   Property="chromoting_service_description"
                   Value="@[binaries]$(var.CoreBinary),-102" />
 
@@ skipping 53 matching lines @@
       <Custom Action="set_service_description" Before="InstallInitialize">
         <![CDATA[VersionNT >= 600]]>
       </Custom>
 
       <!-- Schedule RemoveExistingProducts before installing any files.
            See http://msdn.microsoft.com/en-us/library/aa371197.aspx. -->
       <RemoveExistingProducts After="InstallInitialize" />
     </InstallExecuteSequence>
   </Product>
 </Wix>