VirtualBox

Changeset 53090 in vbox for trunk/src


Ignore:
Timestamp:
Oct 20, 2014 11:13:03 AM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
96609
Message:

pr7231. NDIS6 support has been added into the Windows installer.

Location:
trunk/src/VBox
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

    r53082 r53090  
    20732073
    20742074#define VBOXNETCFGWIN_NETADP_ID L"sun_VBoxNetAdp"
    2075 static HRESULT vboxNetCfgWinNetAdpUninstall(IN INetCfg *pNc, DWORD InfRmFlags)
     2075static HRESULT vboxNetCfgWinNetAdpUninstall(IN INetCfg *pNc, LPCWSTR pwszId, DWORD InfRmFlags)
    20762076{
    20772077    HRESULT hr = S_OK;
    20782078    NonStandardLog("Finding NetAdp driver package and trying to uninstall it ...\n");
    20792079
    2080     VBoxDrvCfgInfUninstallAllF(L"Net", VBOXNETCFGWIN_NETADP_ID, InfRmFlags);
     2080    VBoxDrvCfgInfUninstallAllF(L"Net", pwszId, InfRmFlags);
    20812081    NonStandardLog("NetAdp is not installed currently\n");
    20822082    return hr;
    20832083}
    20842084
    2085 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetAdpUninstall(IN INetCfg *pNc)
    2086 {
    2087     return vboxNetCfgWinNetAdpUninstall(pNc, SUOI_FORCEDELETE);
     2085VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetAdpUninstall(IN INetCfg *pNc, IN LPCWSTR pwszId)
     2086{
     2087    return vboxNetCfgWinNetAdpUninstall(pNc, pwszId, SUOI_FORCEDELETE);
    20882088}
    20892089

  • trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

    r53038 r53090  
    10851085UINT __stdcall Ndis6CreateHostOnlyInterface(MSIHANDLE hModule)
    10861086{
    1087     return _createHostOnlyInterface(hModule, NETADP6_ID, L"VBoxNetAdp6.inf");
    1088 }
    1089 
     1087    return _createHostOnlyInterface(hModule, NETADP_ID, L"VBoxNetAdp6.inf");
     1088}
    10901089
    10911090static UINT _removeHostOnlyInterfaces(MSIHANDLE hModule, LPCWSTR pwszId)
    … …  
    11241123}
    11251124
    1126 UINT __stdcall UninstallNetAdp(MSIHANDLE hModule)
    1127 {
    1128 #ifdef VBOX_WITH_NETFLT
    1129     INetCfg *pNetCfg;
    1130     UINT uErr;
    1131 
    1132     netCfgLoggerEnable(hModule);
    1133 
    1134     BOOL bOldIntMode = SetupSetNonInteractiveMode(FALSE);
    1135 
    1136     __try
    1137     {
    1138         logStringW(hModule, L"Uninstalling NetAdp");
    1139 
    1140         uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
    1141         if (uErr == ERROR_SUCCESS)
    1142         {
    1143             HRESULT hr = VBoxNetCfgWinNetAdpUninstall(pNetCfg);
    1144             if (hr != S_OK)
    1145                 logStringW(hModule, L"UninstallNetAdp: VBoxNetCfgWinUninstallComponent failed, error = 0x%x", hr);
    1146 
    1147             uErr = errorConvertFromHResult(hModule, hr);
    1148 
    1149             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
    1150 
    1151             logStringW(hModule, L"Uninstalling NetAdp done, error = 0x%x", uErr);
    1152         }
    1153         else
    1154             logStringW(hModule, L"UninstallNetAdp: doNetCfgInit failed, error = 0x%x", uErr);
    1155     }
    1156     __finally
    1157     {
    1158         if (bOldIntMode)
    1159         {
    1160             /* The prev mode != FALSE, i.e. non-interactive. */
    1161             SetupSetNonInteractiveMode(bOldIntMode);
    1162         }
    1163         netCfgLoggerDisable();
    1164     }
    1165 #endif /* VBOX_WITH_NETFLT */
    1166 
    1167     /* Never fail the install even if we did not succeed. */
    1168     return ERROR_SUCCESS;
    1169 }
    1170 
    11711125UINT __stdcall RemoveHostOnlyInterfaces(MSIHANDLE hModule)
    11721126{
    11731127    return _removeHostOnlyInterfaces(hModule, NETADP_ID);
    11741128}
    1175 
    1176 UINT __stdcall Ndis6RemoveHostOnlyInterfaces(MSIHANDLE hModule)
    1177 {
    1178     return _removeHostOnlyInterfaces(hModule, NETADP6_ID);
    1179 }
    1180 
    1181 
    11821129
    11831130static UINT _stopHostOnlyInterfaces(MSIHANDLE hModule, LPCWSTR pwszId)
    … …  
    12121159{
    12131160    return _stopHostOnlyInterfaces(hModule, NETADP_ID);
    1214 }
    1215 
    1216 UINT __stdcall Ndis6StopHostOnlyInterfaces(MSIHANDLE hModule)
    1217 {
    1218     return _stopHostOnlyInterfaces(hModule, NETADP6_ID);
    12191161}
    12201162
    … …  
    13021244UINT __stdcall Ndis6UpdateHostOnlyInterfaces(MSIHANDLE hModule)
    13031245{
    1304     return _updateHostOnlyInterfaces(hModule, L"VBoxNetAdp6.inf", NETADP6_ID);
     1246    return _updateHostOnlyInterfaces(hModule, L"VBoxNetAdp6.inf", NETADP_ID);
     1247}
     1248
     1249static UINT _uninstallNetAdp(MSIHANDLE hModule, LPCWSTR pwszId)
     1250{
     1251#ifdef VBOX_WITH_NETFLT
     1252    INetCfg *pNetCfg;
     1253    UINT uErr;
     1254
     1255    netCfgLoggerEnable(hModule);
     1256
     1257    BOOL bOldIntMode = SetupSetNonInteractiveMode(FALSE);
     1258
     1259    __try
     1260    {
     1261        logStringW(hModule, L"Uninstalling NetAdp");
     1262
     1263        uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
     1264        if (uErr == ERROR_SUCCESS)
     1265        {
     1266            HRESULT hr = VBoxNetCfgWinNetAdpUninstall(pNetCfg, pwszId);
     1267            if (hr != S_OK)
     1268                logStringW(hModule, L"UninstallNetAdp: VBoxNetCfgWinUninstallComponent failed, error = 0x%x", hr);
     1269
     1270            uErr = errorConvertFromHResult(hModule, hr);
     1271
     1272            VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
     1273
     1274            logStringW(hModule, L"Uninstalling NetAdp done, error = 0x%x", uErr);
     1275        }
     1276        else
     1277            logStringW(hModule, L"UninstallNetAdp: doNetCfgInit failed, error = 0x%x", uErr);
     1278    }
     1279    __finally
     1280    {
     1281        if (bOldIntMode)
     1282        {
     1283            /* The prev mode != FALSE, i.e. non-interactive. */
     1284            SetupSetNonInteractiveMode(bOldIntMode);
     1285        }
     1286        netCfgLoggerDisable();
     1287    }
     1288#endif /* VBOX_WITH_NETFLT */
     1289
     1290    /* Never fail the install even if we did not succeed. */
     1291    return ERROR_SUCCESS;
     1292}
     1293
     1294UINT __stdcall UninstallNetAdp(MSIHANDLE hModule)
     1295{
     1296    return _uninstallNetAdp(hModule, NETADP_ID);
    13051297}
    13061298

  • trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.def

    r52824 r53090  
    3434    RemoveHostOnlyInterfaces
    3535    Ndis6CreateHostOnlyInterface
    36     Ndis6StopHostOnlyInterfaces
    3736    Ndis6UpdateHostOnlyInterfaces
    38     Ndis6RemoveHostOnlyInterfaces
    3937
     38

  • trunk/src/VBox/Installer/win/NLS/de_DE.wxl

    r51011 r53090  
    5151    <String Id="VB_NetFltDriver">[ProductName] Treiber für Bridged Networking.</String>
    5252    <String Id="VB_NetAdpDriver">[ProductName] Netzwerk-Adapter Treiber für Hostinterface-Networking.</String>
    53 
    54     <String Id="VB_Python">Python-Support für VirtualBox.</String>
     53    <String Id="VB_NetLwfDriver">[ProductName] driver for NDIS6 Bridged Networking.</String>
     54    <String Id="VB_NetAdp6Driver">[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking.</String>
     55
     56  <String Id="VB_Python">Python-Support für VirtualBox.</String>
    5557
    5658    <!---->
    … …  
    114116    <String Id="CustomizeDlg_SelItemPath">CustomizeDlgLocation-CustomizeDlgLocation</String>
    115117
     118    <!---->
     119 
     120  <String Id="SelectionNetworkTypeDlg_CommonDescription">Please, choose what kind of network adapters you will use:</String>
     121  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5">
     122    Default installation.
     123    NDIS5 network adapters.
     124  </String>
     125  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6">
     126    NDIS6 network adapters.
     127    If you don't sure in this feature you should not choose it.
     128  </String>
     129  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5">Use NDIS5 network adapters.</String>
     130  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6">Use NDIS6 network adapters.</String>
     131 
    116132    <!---->
    117133

  • trunk/src/VBox/Installer/win/NLS/en_US.wxl

    r51011 r53090  
    5151    <String Id="VB_NetFltDriver">[ProductName] driver for Bridged Networking.</String>
    5252    <String Id="VB_NetAdpDriver">[ProductName] virtual network adapter driver for Host-Only Networking.</String>
     53    <String Id="VB_NetLwfDriver">[ProductName] driver for NDIS6 Bridged Networking.</String>
     54    <String Id="VB_NetAdp6Driver">[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking.</String>
    5355
    5456    <String Id="VB_Python">Python support for VirtualBox.</String>
    … …  
    125127    <String Id="Customize2Dlg_CreateQuickLaunch">Create a shortcut in the Quick Launch Bar</String>
    126128    <String Id="Customize2Dlg_RegisterFileExtensions">Register file associations</String>
     129
     130    <!---->
     131
     132    <String Id="SelectionNetworkTypeDlg_CommonDescription">Please, choose what kind of network adapters you will use:</String>
     133    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5">Default installation.
     134NDIS5 network adapters.</String>
     135    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6">NDIS6 network adapters.
     136If you don't sure in this feature you should not choose it.</String>
     137    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5">Use NDIS5 network adapters.</String>
     138    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6">Use NDIS6 network adapters.</String>
    127139
    128140    <!---->

  • trunk/src/VBox/Installer/win/NLS/fa_IR.wxl

    r51011 r53090  
    4646    <String Id="VB_NetFltDriver">درایور [ProductName] برای شبکه پل شده.</String>
    4747    <String Id="VB_NetAdpDriver">درایور آداپتور شبکه مجازی [ProductName] برای شبکه فقط-میزبان.</String>
    48     <String Id="VB_Python">پشتیبانی از پایتون برای ویرچوال باکس.</String>
     48    <String Id="VB_NetLwfDriver">[ProductName] driver for NDIS6 Bridged Networking.</String>
     49    <String Id="VB_NetAdp6Driver">[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking.</String>
     50
     51  <String Id="VB_Python">پشتیبانی از پایتون برای ویرچوال باکس.</String>
    4952    <!---->
    5053    <String Id="NeedAdmin">برای حذف [ProductName] شما نیاز به اجازه مدیر دارید! این راه انداز حالا لغو میشود.</String>
    … …  
    9194    <String Id="CustomizeDlg_SelItemSize">CustomizeDlgItemSize-CustomizeDlgItemSize</String>
    9295    <String Id="CustomizeDlg_SelItemPath">CustomizeDlgLocation-CustomizeDlgLocation</String>
     96    <!---->
     97  <String Id="SelectionNetworkTypeDlg_CommonDescription">Please, choose what kind of network adapters you will use:</String>
     98  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5">
     99    Default installation.
     100    NDIS5 network adapters.
     101  </String>
     102  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6">
     103    NDIS6 network adapters.
     104    If you don't sure in this feature you should not choose it.
     105  </String>
     106  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5">Use NDIS5 network adapters.</String>
     107  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6">Use NDIS6 network adapters.</String>
    93108    <!---->
    94109    <String Id="Customize2Dlg_Header">سفارشی</String>

  • trunk/src/VBox/Installer/win/NLS/fr_FR.wxl

    r51011 r53090  
    5151    <String Id="VB_NetFltDriver">Pilote [ProductName] pour l'accès réseau par pont.</String>
    5252    <String Id="VB_NetAdpDriver">Pilote de carte réseau virtuelle [ProductName] pour l'accès réseau privé hôte.</String>
    53     <String Id="VB_Python">Python support for VirtualBox.</String>
     53    <String Id="VB_NetLwfDriver">[ProductName] driver for NDIS6 Bridged Networking.</String>
     54    <String Id="VB_NetAdp6Driver">[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking.</String>
     55
     56  <String Id="VB_Python">Python support for VirtualBox.</String>
    5457
    5558    <!---->
    … …  
    112115    <String Id="CustomizeDlg_SelItemPath">&lt;Chemin de l'entrée sélectionnée&gt;</String>
    113116
     117    <!---->
     118 
     119  <String Id="SelectionNetworkTypeDlg_CommonDescription">Please, choose what kind of network adapters you will use:</String>
     120  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5">
     121    Default installation.
     122    NDIS5 network adapters.
     123  </String>
     124  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6">
     125    NDIS6 network adapters.
     126    If you don't sure in this feature you should not choose it.
     127  </String>
     128  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5">Use NDIS5 network adapters.</String>
     129  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6">Use NDIS6 network adapters.</String>
     130 
    114131    <!---->
    115132

  • trunk/src/VBox/Installer/win/NLS/it_IT.wxl

    r51011 r53090  
    4646    <String Id="VB_NetFltDriver">Driver di [ProductName] per la rete con bridge.</String>
    4747    <String Id="VB_NetAdpDriver">Driver per la scheda di rete virtuale di [ProductName] per la rete solo host.</String>
    48     <String Id="VB_Python">Supporto Python per VirtualBox.</String>
     48    <String Id="VB_NetLwfDriver">[ProductName] driver for NDIS6 Bridged Networking.</String>
     49    <String Id="VB_NetAdp6Driver">[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking.</String>
     50
     51  <String Id="VB_Python">Supporto Python per VirtualBox.</String>
    4952    <!---->
    5053    <String Id="NeedAdmin">Devi avere diritti di amministrazione per (dis)installare [ProductName]! L'installazione sarà interrotta immediatamente.</String>
    … …  
    9295    <String Id="CustomizeDlg_SelItemPath">CustomizeDlgLocation-CustomizeDlgLocation</String>
    9396    <!---->
     97  <String Id="SelectionNetworkTypeDlg_CommonDescription">Please, choose what kind of network adapters you will use:</String>
     98  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5">
     99    Default installation.
     100    NDIS5 network adapters.
     101  </String>
     102  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6">
     103    NDIS6 network adapters.
     104    If you don't sure in this feature you should not choose it.
     105  </String>
     106  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5">Use NDIS5 network adapters.</String>
     107  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6">Use NDIS6 network adapters.</String>
     108  <!---->
    94109    <String Id="Customize2Dlg_Header">Personalizza</String>
    95110    <String Id="Customize2Dlg_Desc">Scegli dalle opzioni seguenti:</String>

  • trunk/src/VBox/Installer/win/NLS/tr_TR.wxl

    r51011 r53090  
    3636    <String Id="ButtonText_Exit">Çı&amp;kış</String>
    3737
    38         <String Id="InstallModeCustom">Özel</String>
     38          <String Id="InstallModeCustom">Özel</String>
    3939    <String Id="Setup">Kur</String>
    4040
    … …  
    5151    <String Id="VB_NetFltDriver">Köprü Ağı Oluşturma için [ProductName] sürücüsü.</String>
    5252    <String Id="VB_NetAdpDriver">Sadece-Anamakine Ağı Oluşturma için [ProductName] sanal ağ bağdaştırıcısı sürücüsü.</String>
    53 
    54     <String Id="VB_Python">VirtualBox için Python desteği.</String>
     53    <String Id="VB_NetLwfDriver">[ProductName] driver for NDIS6 Bridged Networking.</String>
     54    <String Id="VB_NetAdp6Driver">[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking.</String>
     55
     56  <String Id="VB_Python">VirtualBox için Python desteği.</String>
    5557
    5658        <!---->
    … …  
    118120    <String Id="CustomizeDlg_SelItemPath">CustomizeDlgLocation-CustomizeDlgLocation</String>
    119121
    120     <!---->
     122  <!---->
     123 
     124  <String Id="SelectionNetworkTypeDlg_CommonDescription">Please, choose what kind of network adapters you will use:</String>
     125  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5">
     126    Default installation.
     127    NDIS5 network adapters.
     128  </String>
     129  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6">
     130    NDIS6 network adapters.
     131    If you don't sure in this feature you should not choose it.
     132  </String>
     133  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5">Use NDIS5 network adapters.</String>
     134  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6">Use NDIS6 network adapters.</String>
    121135
    122136        <String Id="Customize2Dlg_Header">Özelleştir</String>

  • trunk/src/VBox/Installer/win/NLS/zh_TW.wxl

    r51011 r53090  
    5151    <String Id="VB_NetFltDriver">[ProductName] 驅動程式針對橋接網路。</String>
    5252    <String Id="VB_NetAdpDriver">[ProductName] 虛擬網路介面卡針對「僅限主機」網路。</String>
    53 
    54     <String Id="VB_Python">VirtualBox 的 Python 支援。</String>
     53    <String Id="VB_NetLwfDriver">[ProductName] driver for NDIS6 Bridged Networking.</String>
     54    <String Id="VB_NetAdp6Driver">[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking.</String>
     55
     56  <String Id="VB_Python">VirtualBox 的 Python 支援。</String>
    5557
    5658    <!---->
    … …  
    119121
    120122    <!---->
     123
     124  <String Id="SelectionNetworkTypeDlg_CommonDescription">Please, choose what kind of network adapters you will use:</String>
     125  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5">
     126    Default installation.
     127    NDIS5 network adapters.
     128  </String>
     129  <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6">
     130    NDIS6 network adapters.
     131    If you don't sure in this feature you should not choose it.
     132  </String>
     133  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5">Use NDIS5 network adapters.</String>
     134  <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6">Use NDIS6 network adapters.</String>
     135
     136  <!----> 
    121137
    122138    <String Id="Customize2Dlg_Header">自訂</String>

  • trunk/src/VBox/Installer/win/UserInterface.wxi

    r51046 r53090  
    295295            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Next)">
    296296        <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
    297                 <Publish Event="NewDialog" Value="VBoxCustomize2Dlg">1</Publish>
     297                <Publish Event="NewDialog" Value="VBoxSelectionNetworkTypeDlg"><![CDATA[VersionNT >= 600]]></Publish>
     298                <Publish Event="NewDialog" Value="VBoxCustomize2Dlg"><![CDATA[VersionNT < 600]]></Publish>
    298299        <?else ?>
    299300                <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg">1</Publish>
    … …  
    302303            </Control>
    303304            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
     305                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     306            </Control>
     307
     308            <!-- Build number text drawn left bottom -->
     309            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
     310            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
     311                <Text>[Version_text] $(var.Property_Version)</Text>
     312            </Control>
     313        </Dialog>
     314
     315        <!-- Dialog for selection network adapters type (NDIS5 or NDIS6) -->
     316        <RadioButtonGroup Property="NETWORKTYPE">
     317          <RadioButton Text="!(loc.SelectionNetworkTypeDlg_RadioButtonNDIS5)" Value="NDIS5" X="5" Y="0" Width="120" Height="20" />
     318          <RadioButton Text="!(loc.SelectionNetworkTypeDlg_RadioButtonNDIS6)" Value="NDIS6" X="5" Y="20" Width="120" Height="20" />
     319        </RadioButtonGroup>
     320        <Dialog Id="VBoxSelectionNetworkTypeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
     321            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
     322            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
     323            <Control Id="Title" Type="Text" X="15" Y="6" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
     324                <Text>[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)</Text>
     325            </Control>
     326            <Control Id="Description" Type="Text" X="25" Y="23" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
     327                <Text>!(loc.CustomizeDlg_SelFeatures)</Text>
     328            </Control>
     329
     330            <Control Id="CommonDescription" Type="Text" X="25" Y="55" Width="325" Height="20" Transparent="yes" NoPrefix="yes">
     331              <Text>!(loc.SelectionNetworkTypeDlg_CommonDescription)</Text>
     332            </Control>
     333
     334            <!-- The radio button group used for choosing NDIS5 or NDIS6 network drivers -->
     335            <Control Id="Buttons" Type="RadioButtonGroup" X="25" Y="100" Width="130" Height="60" Property="NETWORKTYPE" />
     336
     337            <!-- Description text -->
     338            <Control Id="DescriptionNDIS5" Type="Text" X="200" Y="105" Width="150" Height="60" Transparent="yes" NoPrefix="yes">
     339              <Text>!(loc.SelectionNetworkTypeDlg_DescriptionNDIS5)</Text>
     340              <Condition Action="hide"> NETWORKTYPE = "NDIS6"</Condition>
     341              <Condition Action="show"> NETWORKTYPE = "NDIS5"</Condition>
     342            </Control>
     343            <Control Id="DescriptionNDIS6" Type="Text" X="200" Y="105" Width="150" Height="60" Transparent="yes" NoPrefix="yes">
     344              <Text>!(loc.SelectionNetworkTypeDlg_DescriptionNDIS6)</Text>
     345              <Condition Action="hide"> NETWORKTYPE = "NDIS5"</Condition>
     346              <Condition Action="show"> NETWORKTYPE = "NDIS6"</Condition>
     347            </Control>
     348
     349            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17"
     350                Default="yes" Cancel="yes" Text="!(loc.ButtonText_Next)">
     351                <Publish Event="NewDialog" Value="VBoxCustomize2Dlg">1</Publish>
     352            </Control>
     353            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17"
     354                Text="!(loc.ButtonText_Back)">
     355                <Publish Event="NewDialog" Value="VBoxCustomizeDlg">1</Publish>
     356            </Control>
     357            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17"
     358                Text="!(loc.ButtonText_Cancel)">
    304359                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
    305360            </Control>
    … …  
    346401                Default="yes" Cancel="yes" Text="!(loc.ButtonText_Next)">
    347402            <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    348                 <Publish Event="NewDialog" Value="VBoxWarnDisconNetIfacesDlg"><![CDATA[(&VBoxNetworkFlt=3) AND NOT(!VBoxNetworkFlt=3)]]></Publish>
     403                <Publish Event="NewDialog" Value="VBoxWarnDisconNetIfacesDlg"><![CDATA[(&VBoxNetworkFlt=3)]]></Publish>
    349404                <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg"><![CDATA[(&VBoxNetworkFlt<3)]]></Publish>
    350405            <?else ?>
    … …  
    354409            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17"
    355410                Text="!(loc.ButtonText_Back)">
    356                 <Publish Event="NewDialog" Value="VBoxCustomizeDlg">1</Publish>
     411                <Publish Event="NewDialog" Value="VBoxSelectionNetworkTypeDlg"><![CDATA[VersionNT >= 600]]></Publish>
     412                <Publish Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[VersionNT < 600]]></Publish>
     413               
    357414            </Control>
    358415            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17"

  • trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxi

    r52825 r53090  
    2626<?endif ?>
    2727        <ServiceControl Id="VBoxNetAdpServiceControl" Stop="both" Remove="uninstall" Name="VBoxNetAdp" Wait="yes" />
     28        <Condition><![CDATA[NETWORKTYPE="NDIS5"]]></Condition>
    2829    </Component>
    2930

  • trunk/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi

    r53038 r53090  
    2121    <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" >
    2222        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    23             <![CDATA[NOT Installed]]>
     23            <![CDATA[(NOT Installed) AND ($cp_NetAdpDriver=3)]]>
    2424        <?else ?>
    25             <![CDATA[&VBoxNetworkAdp=3]]>
     25            <![CDATA[(NOT Installed) AND ($cp_NetAdpDriver=3)]]>
    2626        <?endif ?>
    2727    </Custom>
    2828    <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" >
    2929        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    30             <![CDATA[NOT Installed]]>
     30            <![CDATA[(NOT Installed) AND ($cp_NetAdpDriver=3)]]>
    3131        <?else ?>
    32             <![CDATA[&VBoxNetworkAdp=3]]>
     32            <![CDATA[(NOT Installed) AND ($cp_NetAdpDriver=3)]]>
    3333        <?endif ?>
    3434    </Custom>
    … …  
    4747    <Custom Action="ca_UninstallNetAdp" After="ca_StopHostOnlyInterfaces" >
    4848        <![CDATA[(UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")]]>
    49         </Custom>
     49    </Custom>
    5050
    5151<?endif ?>

  • trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxi

    r52825 r53090  
    3131<?endif ?>
    3232        <ServiceControl Id="VBoxNetFltServiceControl" Stop="both" Remove="uninstall" Name="VBoxNetFlt" Wait="yes" />
     33        <Condition><![CDATA[NETWORKTYPE="NDIS5"]]></Condition>
    3334    </Component>
     35
    3436<?endif ?> <!-- VBOX_WITH_NETFLT -->
    3537

  • trunk/src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi

    r52986 r53090  
    2020    <Custom Action="ca_RollbackInstallNetFltArgs" Before="ca_RollbackInstallNetFlt" >
    2121        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    22             <![CDATA[NOT Installed]]>
     22            <![CDATA[$cp_NetFltDriver=3 AND (NOT Installed)]]>
    2323        <?else ?>
    24             <![CDATA[&VBoxNetworkFlt=3]]>
     24            <![CDATA[$cp_NetFltDriver=3 AND (NOT Installed)]]>
    2525        <?endif ?>
    2626    </Custom>
    2727    <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt" >
    2828        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    29             <![CDATA[NOT Installed]]>
     29            <![CDATA[$cp_NetFltDriver=3 AND (NOT Installed)]]>
    3030        <?else ?>
    31             <![CDATA[&VBoxNetworkFlt=3]]>
     31            <![CDATA[$cp_NetFltDriver=3 AND (NOT Installed)]]>
    3232        <?endif ?>
    3333    </Custom>
    3434    <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt" >
    3535        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    36             <![CDATA[NOT Installed]]>
     36            <![CDATA[$cp_NetFltDriver=3 AND (NOT Installed)]]>
    3737        <?else ?>
    38             <![CDATA[&VBoxNetworkFlt=3]]>
     38            <![CDATA[$cp_NetFltDriver=3 AND (NOT Installed)]]>
    3939        <?endif ?>
    4040    </Custom>
    4141    <Custom Action="ca_InstallNetFlt" Before="InstallFinalize" >
    4242        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    43             <![CDATA[NOT Installed]]>
     43            <![CDATA[$cp_NetFltDriver=3 AND (NOT Installed)]]>
    4444        <?else ?>
    45             <![CDATA[&VBoxNetworkFlt=3]]>
     45            <![CDATA[$cp_NetFltDriver=3 AND (NOT Installed)]]>
    4646        <?endif ?>
    4747    </Custom>
    … …  
    5050            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
    5151        <?else ?>
    52             <![CDATA[&VBoxNetworkFlt=2]]>
     52            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
    5353        <?endif ?>
    5454    </Custom>
    … …  
    5757            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
    5858        <?else ?>
    59             <![CDATA[&VBoxNetworkFlt=2]]>
     59            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
    6060        <?endif ?>
    6161    </Custom>
    … …  
    6464            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
    6565        <?else ?>
    66             <![CDATA[&VBoxNetworkFlt=2]]>
     66            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
    6767        <?endif ?>
    6868    </Custom>
    … …  
    7171            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
    7272        <?else ?>
    73             <![CDATA[&VBoxNetworkFlt=2]]>
     73            <![CDATA[(UPGRADINGPRODUCTCODE) OR (REMOVE="ALL")]]>
    7474        <?endif ?>
    7575    </Custom>
     76
    7677<?endif?> <!-- VBOX_WITH_NETFLT -->
    7778

  • trunk/src/VBox/Installer/win/VirtualBox.wxs

    r52827 r53090  
    3030    <?endif ?>
    3131    <?define Property_VBoxMergeNetworkAdp = "$(env.VBOX_WIN_INST_MERGE_NETADP)" ?>
     32    <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
     33        <?define Property_VBoxMergeNetworkLwf = "$(env.VBOX_WIN_INST_MERGE_NETLWF)" ?>
     34    <?endif ?>
     35    <?define Property_VBoxMergeNetworkAdp6 = "$(env.VBOX_WIN_INST_MERGE_NETADP6)" ?>
    3236    <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
    3337        <?define Property_VBoxMergePython = "$(env.VBOX_WIN_INST_MERGE_PYTHON)" ?>
    … …  
    5862    <Property Id="ARPURLUPDATEINFO">http://www.virtualbox.org</Property>
    5963
     64    <!-- Default property for network adapter type -->
     65    <Property Id="NETWORKTYPE" Value="NDIS5" Secure="yes"/>
     66
    6067    <!-- Install the product for all users on the system -->
    6168    <Property Id="ALLUSERS"><![CDATA[1]]></Property>
    … …  
    179186    <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    180187        <?include VBoxMergeNetFltCA.wxi ?>
     188        <?include VBoxMergeNetLwfCA.wxi ?>
    181189    <?endif ?>
    182190    <?include VBoxMergeNetAdpCA.wxi ?>
     191    <?include VBoxMergeNetAdp6CA.wxi ?>
    183192    <?include VBoxMergeUSBCA.wxi ?>
    184193    <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
    … …  
    230239                            <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
    231240                                <?include VBoxMergeNetAdp.wxi ?>
     241                            </Directory>
     242<?endif ?>
     243                        </Directory>
     244
     245<?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
     246                        <Directory Id="dir_NetLwf" Name="netlwf">
     247    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     248                            <Merge Id="msm_VBoxNetworkLwf" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkLwf)" DiskId="1" />
     249    <?else ?>
     250                            <Directory Id="msm_VBoxNetworkLwfFolder" FileSource=".">
     251                                <?include VBoxMergeNetLwf.wxi ?>
     252                            </Directory>
     253    <?endif ?>
     254                        </Directory>
     255<?endif ?>
     256                        <Directory Id="dir_NetAdp6" Name="netadp6">
     257<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
     258                            <Merge Id="msm_VBoxNetworkAdp6" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp6)" DiskId="1" />
     259<?else ?>
     260                            <Directory Id="msm_VBoxNetworkAdp6Folder" FileSource=".">
     261                                <?include VBoxMergeNetAdp6.wxi ?>
    232262                            </Directory>
    233263<?endif ?>
    … …  
    372402    <?else ?>
    373403                <ComponentRef Id="cp_NetFltDriver" />
     404                <ComponentRef Id="cp_NetLwfDriver" />
    374405    <?endif ?>
    375406            </Feature>
    … …  
    382413    <?else ?>
    383414                <ComponentRef Id="cp_NetAdpDriver" />
     415                <ComponentRef Id="cp_NetAdp6Driver" />
    384416    <?endif ?>
    385417            </Feature>
     418
    386419        </Feature>
    387420<?endif ?>
    … …  
    465498        <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    466499            <?include VBoxMergeNetFltSeq.wxi ?>
     500            <?include VBoxMergeNetLwfSeq.wxi ?>
    467501        <?endif ?>
    468502        <?include VBoxMergeNetAdpSeq.wxi ?>
     503        <?include VBoxMergeNetAdp6Seq.wxi ?>
    469504        <?include VBoxMergeUSBSeq.wxi ?>
    470505        <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette