Changeset 59329 in vbox for trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi

Timestamp:

Jan 13, 2016 9:24:28 PM (9 years ago)

Author:

vboxsync

Message:

Installer/win: Implemented VBOX_WITH_MIDL_PROXY_STUB=1 registration.

File:

• trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi (modified) (1 diff)

trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi

@@ -19 +19 @@
 <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
     <Directory Id="dir_VBoxCOM32On64X86" Name="x86">
-        <!-- The 32-bit client COM component (see also cp_MainCom below) -->
+        <!-- The 32-bit client COM component (see also cp_MainCom in VBoxMergeApp.wxi) -->
         <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no">
             <!-- Note: This file ID *must not* be changed because of our typelib template generation file! -->
+    <?if $(env.VBOX_WITH_MIDL_PROXY_STUB) != "yes" ?>
             <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"
                   Source="$(env.PATH_OUT)\bin\x86\VBoxClient-x86.dll" KeyPath="yes"
                   DiskId="$(var.Property_DiskIdCommon)">
             </File>
+    <?else?>
+            <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"
+                  Source="$(env.PATH_OUT)\bin\x86\VBoxClient-x86.dll"
+                  DiskId="$(var.Property_DiskIdCommon)">
+            </File>
+            <!-- Our key path, see VBoxMergeApp.wxi. -->
+            <File Id="file_VBoxProxyStub_x86" Name="VBoxProxyStub-x86.dll" KeyPath="yes"
+                Source="$(env.PATH_OUT)\bin\VBoxProxyStub-x86.dll"
+                DiskId="$(var.Property_DiskIdCommon)">
+                <Class Id="{327E3C00-EE61-462F-AED3-0DFF6CBF9904}" Context="InprocServer32"
+                    Description="PSFactoryBuffer" ThreadingModel="both" />
+            </File>
+    <?endif?>
             <File Id="file_VBoxRT_x86" Name="VBoxRT-x86.dll"
                   Source="$(env.PATH_OUT)\bin\x86\VBoxRT-x86.dll"