Merged all Chromoting Host code into remoting_core.dll (Windows).

remoting/host/installer/win/chromoting.wxs

Index: remoting/host/installer/win/chromoting.wxs
diff --git a/remoting/host/installer/win/chromoting.wxs b/remoting/host/installer/win/chromoting.wxs
index 7a88536f58d5eb8ad9a5567197de8b52843925fa..e3ae2bbe1f6150d08ea195d03579ba4ddbf44206 100644
--- a/remoting/host/installer/win/chromoting.wxs
+++ b/remoting/host/installer/win/chromoting.wxs
@@ -23,6 +23,8 @@
   <?define OmahaAppid = "{b210701e-ffc4-49e3-932b-370728c72662}" ?>
   <?define UpgradeCode = "2b21f767-e157-4fa6-963c-55834c1433a6" ?>
 
+  <?define CoreBinary = "remoting_core.dll" ?>
+
   <?define ControllerAppid = "{4ff35d5e-d226-4550-9248-03e7779e67de}" ?>
   <?define ControllerBinary = "remoting_controller.exe" ?>
   <?define ControllerClass = "ElevatedController Class" ?>
@@ -136,6 +138,23 @@
               Vital="yes"/>
       </Component>
 
+      <Component Id="remoting_core" Guid="*">
+        <File Id="$(var.CoreBinary)"
+              DiskId="1"
+              KeyPath="yes"
+              Name="$(var.CoreBinary)"
+              Vital="yes"/>
+
+        <util:EventSource xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
+                          Name="$(var.EventSourceName)"
+                          Log="Application"
+                          CategoryCount="1"
+                          CategoryMessageFile="[#$(var.CoreBinary)]"
+                          EventMessageFile="[#$(var.CoreBinary)]"
+                          SupportsErrors="yes"
+                          SupportsInformationals="yes"/>
+      </Component>
+
       <?if $(var.RemotingMultiProcess) != 0 ?>
         <Component Id="remoting_desktop" Guid="*">
           <File Id="remoting_desktop.exe"
@@ -177,15 +196,6 @@
               DiskId="1"
               Name="remoting_host.exe"
               Vital="yes"/>
-        <util:EventSource xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
-                          Name="$(var.EventSourceName)"
-                          Log="Application"
-                          CategoryCount="1"
-                          CategoryMessageFile="[#remoting_host.exe]"
-                          EventMessageFile="[#remoting_host.exe]"
-                          SupportsErrors="yes"
-                          SupportsInformationals="yes"/>
-
         <fire:FirewallException xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"
                                 Id="me2me_firewall_exception"
                                 IgnoreFailure="yes"
@@ -273,7 +283,7 @@
 
               <RegistryValue Type="string"
                              Name="LocalizedString"
-                             Value="@[#$(var.ControllerBinary)],-100"/>
+                             Value="@[binaries]$(var.CoreBinary),-103"/>
 
               <RegistryKey Key="LocalServer32" Action="create">
                 <RegistryValue Type="string"
@@ -301,7 +311,7 @@
                                Value="1"/>
                 <RegistryValue Type="string"
                                Name="IconReference"
-                               Value="@[#$(var.ControllerBinary)],-101"/>
+                               Value="@[binaries]$(var.CoreBinary),-104"/>
               </RegistryKey>
             </RegistryKey>
           </RegistryKey>
@@ -340,7 +350,7 @@
                 <RegistryKey Key="0" Action="create">
                   <RegistryKey Key="win32" Action="create">
                     <RegistryValue Type="string"
-                                   Value="[#$(var.ControllerBinary)]"/>
+                                   Value="@[binaries]$(var.CoreBinary)"/>
                   </RegistryKey>
                 </RegistryKey>
 
@@ -437,10 +447,10 @@
 
     <CustomAction Id="set_service_display_name"
                   Property="chromoting_service_display_name"
-                  Value="@[binaries]remoting_daemon.exe,-101" />
+                  Value="@[binaries]$(var.CoreBinary),-101" />
     <CustomAction Id="set_service_description"
                   Property="chromoting_service_description"
-                  Value="@[binaries]remoting_daemon.exe,-102" />
+                  Value="@[binaries]$(var.CoreBinary),-102" />
 
     <!-- XP does not support MUI strings in the service name and description, so
          we fall back to plain strings on XP. -->
@@ -460,6 +470,7 @@
         <ComponentRef Id="omaha_registration"/>
       <?endif?>
       <ComponentRef Id="remoting_controller"/>
+      <ComponentRef Id="remoting_core"/>
       <ComponentRef Id="remoting_daemon"/>
       <?if $(var.RemotingMultiProcess) != 0 ?>
         <ComponentRef Id="remoting_desktop"/>