Changeset 107362 in vbox for trunk/src/VBox/Installer/win
- Timestamp:
- Dec 18, 2024 3:40:40 PM (5 weeks ago)
- Location:
- trunk/src/VBox/Installer/win
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/win/VBoxMergeApp.wxi
r107361 r107362 119 119 120 120 <?if $(env.VBOX_WITH_MIDL_PROXY_STUB) = "yes" ?> 121 122 <Component Id="cp_ProxyStub" Guid="CDD09BA4-8D87-4383-DCA6-1CCCF9D11091" Bitness="$(var.Property_Bitness)" Condition="(VersionNT >= 601)"> 123 <!-- Only install this proxy stub DLL on Windows 7 and later (OLE32.ObjectStublessClientXX imports). --> 124 121 <Component Id="cp_ProxyStub" Guid="CDD09BA4-8D87-4383-DCA6-1CCCF9D11091" Bitness="$(var.Property_Bitness)"> 125 122 <File Id="file_VBoxProxyStub" Name="VBoxProxyStub.dll" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxProxyStub.dll"> 126 123 <Class Id="$(env.VBOX_MIDL_PROXY_CLSID)" Context="InprocServer32" Description="PSFactoryBuffer" ThreadingModel="both" /> … … 128 125 <?include $(env.PATH_TARGET)\VirtualBox_TypeLib.wxi ?> 129 126 </Component> 130 131 <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>132 <Component Id="cp_ProxyStubLegacy" Guid="97F12055-5B6D-481C-E8CD-F41D8C733280" Bitness="$(var.Property_Bitness)" Condition="(VersionNT < 601)">133 <!-- Only install this proxy stub DLL pre-Windows 7 (AMD64: legacy NDR stuff; Both: No ObjectStublessClientXX). -->134 <File Id="file_VBoxProxyStubLegacy" Name="VBoxProxyStubLegacy.dll" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxProxyStubLegacy.dll">135 <Class Id="$(env.VBOX_MIDL_PROXY_CLSID)" Context="InprocServer32" Description="PSFactoryBuffer" ThreadingModel="both" />136 </File>137 <?include $(env.PATH_TARGET)\VirtualBox_TypeLib.wxi ?>138 </Component>139 <?endif?>140 141 127 <?endif?> 142 128 -
trunk/src/VBox/Installer/win/VirtualBox.wxs
r107361 r107362 276 276 <?if $(env.VBOX_WITH_MIDL_PROXY_STUB) = "yes" ?> 277 277 <ComponentRef Id="cp_ProxyStub" /> 278 <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>279 <ComponentRef Id="cp_ProxyStubLegacy" />280 <?endif?>281 278 <?endif?> 282 279 <?if $(env.VBOX_WITH_DTRACE) = "yes" ?>
Note:
See TracChangeset
for help on using the changeset viewer.