VirtualBox

Changeset 107296 in vbox


Ignore:
Timestamp:
Dec 12, 2024 11:07:22 AM (5 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
166326
Message:

Windows/Networking: Removed NDIS 5-based drivers, as we don't support Windows host OSes anymore which require this NDIS version -- only NDIS 6.0+ is supported now. bugref:10819

Location:
trunk
Files:
22 deleted
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r107236 r107296  
    37363736#      -wd4611: interaction between '_setjmp' and C++ object destruction is non-portable
    37373737#      -wd4324: '_TDI_PNP_CONTEXT_XP' : structure was padded due to __declspec(align())
    3738 #      -wd4505: VBoxNetFltNobj.h(45) : warning C4505: 'VBoxNetFltNobj::Release' : unreferenced local function has been removed
    3739 #               Probably related to http://stackoverflow.com/questions/3051992/compiler-warning-at-c-template-base-class
     3738#      -wd4505: tstSupSemInterruptibleSRE': unreferenced function with internal linkage has been removed
    37403739#      -wd4263: 'int VRDPChannelClipboard::SendPacket(const void *,uint32_t)' : member function does not override any base class virtual member function
    37413740#               Probably useful, but impractical, just like the next one.

  • trunk/doc/manual/en_US/dita/topics/install-win-performing.dita

    r105303 r107296  
    33<topic xml:lang="en-us" id="install-win-performing">
    44  <title>Performing the Installation</title>
    5  
     5
    66  <body>
    77    <p>The <ph conkeyref="vbox-conkeyref-phrases/product-name"/> installation can be started in either of the following
    … …  
    119119    <pre xml:space="preserve">VirtualBox.exe -msiparams ADDLOCAL=VBoxApplication,VBoxUSB</pre>
    120120    <pre xml:space="preserve">msiexec /i VirtualBox-&lt;version&gt;-Win.msi ADDLOCAL=VBoxApplication,VBoxUSB</pre>
    121     <p>The user is able to choose between NDIS5 and NDIS6 host network filter drivers during the installation. This is
    122       done using a command line parameter, <codeph>NETWORKTYPE</codeph>. The NDIS6 driver is the default for most
    123       supported Windows hosts. For some legacy Windows versions, the installer will automatically select the NDIS5
    124       driver and this cannot be changed. </p>
    125     <p>You can force an install of the legacy NDIS5 host network filter driver by specifying
    126         <codeph>NETWORKTYPE=NDIS5</codeph>. For example, to install the NDIS5 driver on Windows 7 use either of the
    127       following commands: </p>
    128     <pre xml:space="preserve">VirtualBox.exe -msiparams NETWORKTYPE=NDIS5</pre>
    129     <pre xml:space="preserve">msiexec /i VirtualBox-&lt;version&gt;-Win;.msi NETWORKTYPE=NDIS5</pre>
    130121  </body>
    131  
     122
    132123</topic>

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

    r107095 r107296  
    3939
    4040
    41 if1of ($(KBUILD_TARGET), darwin win) # this ifeq must go, see @todo around elif
    42  #
    43  # VBoxNetFlt.sys - The mixed case driver.
    44  #
    45  # Note! Legacy driver not built for win.arm64, we only use and ship VBoxNetLwf there.
    46  ## @todo Just drop VBoxNetFlt on win.*, min req is at least windows 7, which support ndis 6.20.
     41if1of ($(KBUILD_TARGET), darwin) # this ifeq must go, see @todo around elif
     42 #
     43 # The mixed case driver.
    4744 #
    4845 ifdef VBOX_WITH_VBOXDRV
    49   SYSMODS.darwin    += VBoxNetFlt
    50   SYSMODS.win.x86   += VBoxNetFlt
    51   SYSMODS.win.amd64 += VBoxNetFlt
     46  SYSMODS.darwin += VBoxNetFlt
    5247 endif
    5348
    … …  
    5651 VBoxNetFlt_INST = $(INST_VBOXNETFLT)$(if $(eq $(KBUILD_TARGET),darwin),Contents/MacOS/)
    5752 VBoxNetFlt_DEBUG_INST.darwin = $(patsubst %/,%,$(INST_VBOXNETFLT))
    58  if defined(VBOX_SIGNING_MODE) && "$(KBUILD_TARGET)" == "win"
    59   VBoxNetFlt_INSTTYPE = none
    60   VBoxNetFlt_DEBUG_INSTTYPE = both
    61  endif
    62  VBoxNetFlt_DEFS      = IN_RT_R0 IN_SUP_STATIC
    63  VBoxNetFlt_DEFS.win  = VBOXNETFLT_STATIC_CONFIG
    64  VBoxNetFlt_DEFS.win += VBOXNETFLT_NO_PACKET_QUEUE
    65  VBoxNetFlt_DEFS.win += NDIS_MINIPORT_DRIVER NDIS_WDM=1 BINARY_COMPATIBLE=0
    66  VBoxNetFlt_DEFS.win += NDIS50_MINIPORT=1 NDIS50=1
    67  ifdef VBOX_LOOPBACK_USEFLAGS
    68   VBoxNetFlt_DEFS.win += VBOX_LOOPBACK_USEFLAGS
    69  endif
    70  VBoxNetFlt_INCS = .
    71  VBoxNetFlt_SOURCES.darwin = \
     53 VBoxNetFlt_DEFS    = IN_RT_R0 IN_SUP_STATIC
     54 VBoxNetFlt_INCS    = .
     55 VBoxNetFlt_SOURCES = \
    7256        darwin/VBoxNetFlt-darwin.cpp
    73  VBoxNetFlt_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK_INCS)
    74  VBoxNetFlt_SOURCES.win = \
    75         win/drv/VBoxNetFltP-win.cpp \
    76         win/drv/VBoxNetFltM-win.cpp \
    77         win/drv/VBoxNetFltRt-win.cpp \
    78         win/drv/VBoxNetFlt-win.rc
    7957 VBoxNetFlt_SOURCES = VBoxNetFlt.c
    8058 #VBoxNetFlt_LDFLAGS.darwin = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded
    81  VBoxNetFlt_LDFLAGS.win.x86 = -Entry:DriverEntry@8
    82  VBoxNetFlt_LDFLAGS.win.amd64 = -Entry:DriverEntry
    83  VBoxNetFlt_LIBS.win = \
    84         $(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/ntoskrnl.lib \
    85         $(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/hal.lib \
    86         $(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/ndis.lib \
    87         $(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/tdi.lib \
    88         $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    8959 VBoxNetFlt_LIBS = \
    9060        $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
    9161
    9262 darwin/VBoxNetFlt-darwin.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
    93 
    9463
    9564 # Darwin extras.
    … …  
    12291        darwin/loadnetflt.sh
    12392 endif # darwin && host-drivers
    124 
    125 
    126  ifeq ($(KBUILD_TARGET),win)
    127   # Windows: VBoxNetFlt INF & CAT files.
    128   ifdef VBOX_WITH_VBOXDRV
    129    INSTALLS.win.x86   += VBoxNetFlt-inf
    130    INSTALLS.win.amd64 += VBoxNetFlt-inf
    131   endif
    132   VBoxNetFlt-inf_TEMPLATE = VBoxR0DrvInfCat
    133   VBoxNetFlt-inf_SOURCES = \
    134         $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.inf \
    135         $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFltM.inf
    136   VBoxNetFlt-inf_CLEAN = $(VBoxNetFlt-inf_SOURCES)
    137   VBoxNetFlt-inf_BLDDIRS = $(PATH_TARGET)/VBoxNetFltCat.dir
    138 
    139   $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.inf: $(PATH_SUB_CURRENT)/win/drv/VBoxNetFlt.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    140         $(call MSG_GENERATE,VBoxNetFlt-inf,$@,$<)
    141         $(call VBOX_EDIT_INF_FN,$<,$@)
    142 
    143   $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFltM.inf: $(PATH_SUB_CURRENT)/win/drv/VBoxNetFltM.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    144         $(call MSG_GENERATE,VBoxNetFlt-inf,$@,$<)
    145         $(call VBOX_EDIT_INF_FN,$<,$@)
    146 
    147   ifdef VBOX_SIGNING_MODE
    148    VBoxNetFlt-inf_SOURCES += \
    149         $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.sys \
    150         $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFltNobj.dll \
    151         $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat
    152 
    153    $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.sys: $$(VBoxNetFlt_1_TARGET) | $$(dir $$@)
    154         $(INSTALL) -m 644 $< $(@D)
    155 
    156    $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFltNobj.dll: $$(VBoxNetFltNobj_1_TARGET) | $$(dir $$@)
    157         $(INSTALL) -m 644 $< $(@D)
    158 
    159    $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
    160                 $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.sys \
    161                 $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFltNobj.dll \
    162                 $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.inf \
    163                 $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFltM.inf
    164         $(call MSG_TOOL,Inf2Cat,VBoxNetFlt-inf,$@,$<)
    165         $(call VBOX_MAKE_CAT_FN, $(@D),$@)
    166 
    167   endif # signing
    168  endif
    169 
    17093
    17194 ifeq ($(KBUILD_TARGET),win)
    … …  
    271194  WinNetConfigExe_EXTENDS = WinNetConfigSharedStatic
    272195
    273 
    274196  #
    275197  # Template for NetFltInstall and friends.
    276198  #
    277   TEMPLATE_VBoxNetFltR3 = Template for NetFltInstall, NetFltUninstall, NetAdpInstall, NetAdpUninstall, ++
     199  TEMPLATE_VBoxNetFltR3 = Template for NetAdp6Install and NetAdp6Uninstall
    278200  TEMPLATE_VBoxNetFltR3_EXTENDS   = VBoxR3Exe
    279201  TEMPLATE_VBoxNetFltR3_SDKS      = $(TEMPLATE_VBoxR3Exe_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxNtDll VBoxWinNewDevLib
    … …  
    285207        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib
    286208
    287   if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
    288    #
    289    # NetFltInstall
    290    #
    291    PROGRAMS.win += NetFltInstall
    292    NetFltInstall_TEMPLATE = VBoxNetFltR3
    293    NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp
    294 
    295    #
    296    # NetFltUninstall
    297    #
    298    PROGRAMS.win += NetFltUninstall
    299    NetFltUninstall_TEMPLATE = VBoxNetFltR3
    300    NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp
    301 
    302    #
    303    # NetAdpInstall
    304    #
    305    PROGRAMS.win += NetAdpInstall
    306    NetAdpInstall_TEMPLATE = VBoxNetFltR3
    307    NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp
    308 
    309    #
    310    # NetAdpUninstall
    311    #
    312    PROGRAMS.win += NetAdpUninstall
    313    NetAdpUninstall_TEMPLATE = VBoxNetFltR3
    314    NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp
    315   endif
    316 
    317209  #
    318210  # NetAdp6Install
    … …  
    345237  NetLwfUninstall_SOURCES = win/tools/VBoxNetLwfUninstall.cpp
    346238
    347   #
    348   # VBoxNetFltNobj
    349   #
    350   DLLS.win += VBoxNetFltNobj
    351   VBoxNetFltNobj_TEMPLATE  = VBoxR3StaticDll
    352   if defined(VBOX_SIGNING_MODE)
    353    VBoxNetFltNobj_INSTTYPE = none
    354    VBoxNetFltNobj_DEBUG_INSTTYPE = both
    355   endif
    356   VBoxNetFltNobj_SDKS      = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    357   VBoxNetFltNobj_DEFS      = WIN32 _ATL_STATIC_REGISTRY
    358   VBoxNetFltNobj_INCS      = \
    359         $(VBoxNetFltNobj_0_OUTDIR)
    360   VBoxNetFltNobj_SOURCES   = \
    361         win/nobj/VBoxNetFltNobj.cpp \
    362         win/nobj/VBoxNetFltNobj.def \
    363         win/nobj/VBoxNetFltNobj.rc
    364   #VBoxNetFltNobj_INTERMEDIATES =
    365   VBoxNetFltNobj_DEPS      = \
    366         $(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT_i.c \
    367         $(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT_p.c \
    368         $(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT.h \
    369         $(VBoxNetFltNobj_0_OUTDIR)/dlldata.c \
    370         $(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT.tlb
    371   VBoxNetFltNobj_CLEAN     = $(VBoxNetFltNobj_DEPS)
    372 
    373   $$(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT_i.c \
    374   + $$(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT_p.c \
    375   + $$(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT.h \
    376   + $$(VBoxNetFltNobj_0_OUTDIR)/dlldata.c \
    377   + $$(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT.tlb: \
    378                 $(PATH_SUB_CURRENT)/win/nobj/VBoxNetFltNobjT.idl \
    379                 | $$(dir $$@)
    380         $(VBOX_MIDL_REDIRECT) $(VBOX_WIN_MIDL) /nologo \
    381                 /out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxNetFltNobj_0_OUTDIR)) \
    382                 /cpp_cmd $(VBOX_MIDL_CPP_CMD) \
    383                 $(qforeachfile unq, incdir, $(SDK_$(VBOX_WINDDK)_INCS) $(SDK_$(VBOX_WINPSDK)_INCS),/I $(quote-sh $(incdir))) \
    384                 $(call VBOX_FN_MAKE_WIN_PATH,$<)
    385         $(call def_VBoxMidlOutputDisableMscWarnings,$(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT.h)
    386         $(call def_VBoxMidlOutputDisableMscWarnings,$(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT_i.c)
    387         $(call def_VBoxMidlOutputDisableMscWarnings,$(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT_p.c)
    388 
    389 
    390   #
    391   # VBoxNetAdp.sys - The VirtualBox Adapter miniport driver.
    392   #
    393   # Note! Legacy driver not built for win.arm64, we only use and ship VBoxNetAdp6 there.
    394   ## @todo Just drop VBoxNetAdp on win.*, min req is at least windows 7, which support ndis 6.20. We don't need this, do we?
    395   #
    396   ifdef VBOX_WITH_VBOXDRV
    397    ifneq ($(KBUILD_TARGET_ARCH),arm64)
    398     SYSMODS.win  += VBoxNetAdp
    399     INSTALLS.win += VBoxNetAdp-inf
    400    endif
    401   endif
    402 
    403   # The driver.
    404   VBoxNetAdp_TEMPLATE = VBoxR0Drv
    405   #VBoxNetAdp_INST = $(INST_VBOXNETADP)
    406   if defined(VBOX_SIGNING_MODE)
    407    VBoxNetAdp_INSTTYPE.win = none
    408    VBoxNetAdp_DEBUG_INSTTYPE.win = both
    409   endif
    410   VBoxNetAdp_DEFS = IN_RT_R0 IN_SUP_STATIC
    411   VBoxNetAdp_DEFS += VBOXNETFLT_STATIC_CONFIG VBOXNETADP
    412   VBoxNetAdp_DEFS += NDIS_MINIPORT_DRIVER NDIS_WDM=1 BINARY_COMPATIBLE=0
    413   VBoxNetAdp_DEFS += VBOXNETFLT_NO_PACKET_QUEUE
    414   VBoxNetAdp_DEFS.x86   = NDIS50_MINIPORT=1 NDIS50=1
    415   VBoxNetAdp_DEFS.amd64 = NDIS50_MINIPORT=1 NDIS50=1
    416   VBoxNetAdp_INCS := $(PATH_SUB_CURRENT)
    417   VBoxNetAdp_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK_INCS)
    418   VBoxNetAdp_SOURCES = \
    419         VBoxNetFlt.c \
    420         win/drv/VBoxNetFltM-win.cpp \
    421         win/drv/VBoxNetFltRt-win.cpp \
    422         win/drv/VBoxNetFlt-win.rc
    423   VBoxNetAdp_LDFLAGS.win.x86   = -Entry:DriverEntry@8
    424   VBoxNetAdp_LDFLAGS.win.amd64 = -Entry:DriverEntry
    425   VBoxNetAdp_LIBS.win = \
    426         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ntoskrnl.lib \
    427         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/hal.lib \
    428         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ndis.lib \
    429         $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    430   VBoxNetAdp_LIBS = \
    431         $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
    432 
    433   # VBoxNetAdp .INF & .CAT files.
    434   VBoxNetAdp-inf_TEMPLATE = VBoxR0DrvInfCat
    435   VBoxNetAdp-inf_SOURCES  = $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.inf
    436   VBoxNetAdp-inf_CLEAN    = $(VBoxNetAdp-inf_SOURCES)
    437   VBoxNetAdp-inf_BLDDIRS  = $(PATH_TARGET)/VBoxNetAdpCat.dir
    438 
    439   $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.inf: $(PATH_SUB_CURRENT)/win/drv/VBoxNetAdp.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    440         $(call MSG_GENERATE,VBoxNetAdp-inf,$@,$<)
    441         $(call VBOX_EDIT_INF_FN,$<,$@)
    442 
    443   ifdef VBOX_SIGNING_MODE
    444    VBoxNetAdp-inf_SOURCES += \
    445         $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.sys \
    446         $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.cat
    447 
    448    $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.sys: $$(VBoxNetAdp_1_TARGET) | $$(dir $$@)
    449         $(INSTALL) -m 644 $< $(@D)
    450 
    451    $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.cat: \
    452                 $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.sys \
    453                 $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.inf
    454         $(call MSG_TOOL,Inf2Cat,VBoxNetFlt-inf,$@,$<)
    455         $(call VBOX_MAKE_CAT_FN, $(@D),$@)
    456   endif # VBOX_SIGNING_MODE
    457 
    458239 endif # $(KBUILD_TARGET) == win
    459 
    460240else if1of ($(KBUILD_TARGET), solaris freebsd) ## @todo merge this with the mixed case stuff.
    461241 #

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp

    r106061 r107296  
    5555
    5656#define VBOX_NETADP_HWID L"sun_VBoxNetAdp"
    57 #ifdef NDIS60
    58 # define VBOX_NETADP_INF L"VBoxNetAdp6.inf"
    59 #else
    60 # define VBOX_NETADP_INF L"VBoxNetAdp.inf"
    61 #endif
     57#define VBOX_NETADP_INF  L"VBoxNetAdp6.inf"
    6258
    6359

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp

    r106061 r107296  
    5151*   Defined Constants And Macros                                                                                                 *
    5252*********************************************************************************************************************************/
    53 #ifdef NDIS60
    54 # define VBOX_NETADP_HWID L"sun_VBoxNetAdp6"
    55 #else
    56 # define VBOX_NETADP_HWID L"sun_VBoxNetAdp"
    57 #endif
     53#define VBOX_NETADP_HWID L"sun_VBoxNetAdp6"
    5854
    5955

  • trunk/src/VBox/HostDrivers/win/load.cmd

    r106837 r107296  
    6868rem Display device states.
    6969rem
    70 for %%i in (VBoxNetAdp VBoxNetAdp6 VBoxNetFlt VBoxNetLwf VBoxUSBMon VBoxUSB VBoxSup) do (
     70for %%i in (VBoxNetAdp6 VBoxNetLwf VBoxUSBMon VBoxUSB VBoxSup) do (
    7171    set type=
    7272    for /f "usebackq tokens=*" %%f in (`sc query %%i`) do (set xxx=%%f&&if "!xxx:~0,5!" =="STATE" set type=!xxx!)
    … …  
    8383echo **
    8484set MY_FAILED=no
    85 for %%i in (NetAdpUninstall.exe NetAdp6Uninstall.exe USBUninstall.exe NetFltUninstall.exe NetLwfUninstall.exe SUPUninstall.exe ^
    86             NetAdpInstall.exe   NetAdp6Install.exe   USBInstall.exe   NetFltInstall.exe   NetLwfInstall.exe   SUPInstall.exe ^
     85for %%i in (NetAdp6Uninstall.exe USBUninstall.exe NetFltUninstall.exe NetLwfUninstall.exe SUPUninstall.exe ^
     86            NetAdp6Install.exe   USBInstall.exe   NetFltInstall.exe   NetLwfInstall.exe   SUPInstall.exe ^
    8787            VBoxRT.dll) do if exist "%MY_DIR%\%%i" (copy "%MY_DIR%\%%i" "%MY_ALTDIR%\%%i" || set MY_FAILED=yes)
    8888if "%MY_FAILED%" == "yes" goto end
    … …  
    9494echo ** Unloading drivers...
    9595echo **
    96 for %%i in (NetAdpUninstall.exe NetAdp6Uninstall.exe USBUninstall.exe NetFltUninstall.exe NetLwfUninstall.exe SUPUninstall.exe) do (
     96for %%i in (NetAdp6Uninstall.exe USBUninstall.exe NetLwfUninstall.exe SUPUninstall.exe) do (
    9797    if exist "%MY_ALTDIR%\%%i" (echo ** Running %%i...&& "%MY_ALTDIR%\%%i")
    9898)

  • trunk/src/VBox/HostDrivers/win/loadall.cmd

    r106837 r107296  
    8383echo **
    8484set MY_FAILED=no
    85 for %%i in (NetAdpUninstall.exe NetAdp6Uninstall.exe USBUninstall.exe NetFltUninstall.exe NetLwfUninstall.exe SUPUninstall.exe ^
    86             NetAdpInstall.exe   NetAdp6Install.exe   USBInstall.exe   NetFltInstall.exe   NetLwfInstall.exe   SUPInstall.exe ^
     85for %%i in (NetAdp6Uninstall.exe USBUninstall.exe NetLwfUninstall.exe SUPUninstall.exe ^
     86            NetAdp6Install.exe   USBInstall.exe   NetLwfInstall.exe   SUPInstall.exe ^
    8787            VBoxRT.dll) do if exist "%MY_DIR%\%%i" (copy "%MY_DIR%\%%i" "%MY_ALTDIR%\%%i" || set MY_FAILED=yes)
    8888if "%MY_FAILED%" == "yes" goto end
    … …  
    9494echo ** Unloading drivers...
    9595echo **
    96 for %%i in (NetAdpUninstall.exe NetAdp6Uninstall.exe USBUninstall.exe NetFltUninstall.exe NetLwfUninstall.exe SUPUninstall.exe) do (
     96for %%i in (NetAdp6Uninstall.exe USBUninstall.exe NetLwfUninstall.exe SUPUninstall.exe) do (
    9797    if exist "%MY_ALTDIR%\%%i" (echo  * Running %%i...&& "%MY_ALTDIR%\%%i")
    9898)
    … …  
    107107for %%i in (^
    108108    VBoxSup.sys     VBoxSup.inf      VBoxSup.cat     VBoxSup-PreW10.cat ^
    109     VBoxNetAdp.sys  VBoxNetAdp.inf   VBoxNetAdp.cat ^
    110109    VBoxNetAdp6.sys VBoxNetAdp6.inf  VBoxNetAdp6.cat VBoxNetAdp6-PreW10.cat ^
    111     VBoxNetFlt.sys  VBoxNetFlt.inf   VBoxNetFlt.cat                         VBoxNetFltNobj.dll ^
    112     VBoxNetFltM.inf  ^
    113110    VBoxNetLwf.sys  VBoxNetLwf.inf   VBoxNetLwf.cat  VBoxNetLwf-PreW10.cat  ^
    114111    VBoxUSB.sys     VBoxUSB.inf      VBoxUSB.cat     VBoxUSB-PreW10.cat     ^
    … …  
    137134    set MY_INSTALLERS=SUPInstall.exe USBInstall.exe NetLwfInstall.exe NetAdp6Install.exe
    138135) else (
    139     set MY_INSTALLERS=SUPInstall.exe USBInstall.exe NetFltInstall.exe
     136    set MY_INSTALLERS=SUPInstall.exe USBInstall.exe
    140137    rem NetAdpInstall.exe; - busted
    141138)

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

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="[ProductName] Treiber für USB Geräte-Unterstützung." />
    6060    <String Id="VB_Network" Value="[ProductName] Treiber für Netzwerk-Unterstützung." />
    61     <String Id="VB_NetFltDriver" Value="[ProductName] Treiber für Netzwerkbrücke." />
    62     <String Id="VB_NetAdpDriver" Value="[ProductName] Treiber für virtuellen Netzwerk-Adapter für Host-only Netzwerke." />
    6361    <String Id="VB_NetLwfDriver" Value="[ProductName] Treiber für NDIS6-Netzwerkbrücke." />
    6462    <String Id="VB_NetAdp6Driver" Value="[ProductName] Treiber für virtuellen Netzwerk-Adapter für NDIS6-Host-only-Netzwerke." />
    … …  
    144142
    145143    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Bitte den zu verwendenden Netzwerktreiber auswählen:" />
    146     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 Netzwerktreiber.&#xA;Standard für ältere Windows-Versionen (vor Vista)." />
    147144    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 Netzwerktreiber.&#xA;Standard für neuere Windows-Versionen (Vista und neuer)." />
    148     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="NDIS5 Netzwerktreiber." />
    149145    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="NDIS6 Netzwerktreiber." />
    150146

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

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="Οδηγός συσκευών USB [ProductName] για υποστήριξη συσκευών USB." />
    6060    <String Id="VB_Network" Value="Οδηγός συσκευών δικτύου [ProductName] για υποστήριξη δικτύου." />
    61     <String Id="VB_NetFltDriver" Value="Οδηγός [ProductName] για γεφυρωμένη δικτύωση." />
    62     <String Id="VB_NetAdpDriver" Value="Οδηγός [ProductName] εικονικής κάρτας δικτύου για μόνο-με-οικοδεσπότη δίκτυα." />
    6361    <String Id="VB_NetLwfDriver" Value="Οδηγός [ProductName] για NDIS6 γεφυρωμένα δίκτυα." />
    6462    <String Id="VB_NetAdp6Driver" Value="Οδηγός [ProductName] εικονικής κάρτας δικτύου για NDIS6 μόνο-με-οικοδεσπότη δίκτυα." />
    … …  
    149147
    150148    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Επιλέξτε ποιο τύπο οδηγών δικτύου θα χρησιμοποιήσετε:" />
    151     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="Οδηγός δικτύου NDIS5.&#xA;Αυτή είναι η προεπιλογή για παλαιότερες εκδόσεις των Windows (προ-Vista)." />
    152149    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="Οδηγός δικτύου NDIS6.&#xA;Αυτό είναι η προεπιλογή για νεότερες εκδόσεις των Windows (Vista και νεώτερα)." />
    153     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Χρησιμοποιήστε τον οδηγό δικτύου NDIS5." />
    154150    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Χρησιμοποιήστε τον οδηγό δικτύου NDIS6." />
    155151

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

    r106061 r107296  
    5858    <String Id="VB_USBDriver" Value="[ProductName] USB device drivers for USB device support." />
    5959    <String Id="VB_Network" Value="[ProductName] network device drivers for networking support." />
    60     <String Id="VB_NetFltDriver" Value="[ProductName] driver for Bridged Networking." />
    61     <String Id="VB_NetAdpDriver" Value="[ProductName] virtual network adapter driver for Host-Only Networking." />
    6260    <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
    6361    <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
    … …  
    148146
    149147    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
    150     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
    151148    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
    152     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
    153149    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
    154150

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

    r106061 r107296  
    5454    <String Id="VB_USBDriver" Value="درایور دستگاه یو اِس بی [ProductName] برای پشتیبانی از دستگاه یو اِس بی." />
    5555    <String Id="VB_Network" Value="درایور دستگاه شبکه [ProductName] برای پشتیبانی از شبکه." />
    56     <String Id="VB_NetFltDriver" Value="درایور [ProductName] برای شبکه پل شده." />
    57     <String Id="VB_NetAdpDriver" Value="درایور آداپتور شبکه مجازی [ProductName] برای شبکه فقط-میزبان." />
    5856    <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
    5957    <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
    … …  
    118116    <!---->
    119117    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
    120     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
    121118    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
    122     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
    123119    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
    124120    <!---->

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

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="Pilotes USB [ProductName] pour le support de périphériques USB." />
    6060    <String Id="VB_Network" Value="Pilotes [ProductName] pour le support réseau." />
    61     <String Id="VB_NetFltDriver" Value="Pilote [ProductName] pour l'accès réseau par pont." />
    62     <String Id="VB_NetAdpDriver" Value="Pilote de carte réseau virtuelle [ProductName] pour l'accès réseau privé hôte." />
    6361    <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
    6462    <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
    … …  
    144142
    145143    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Veuillez choisir le type de pilotes réseau à utiliser :" />
    146     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
    147144    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
    148     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Utiliser pilotes réseau NDIS5." />
    149145    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Utiliser pilotes réseau NDIS6." />
    150146

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

    r106061 r107296  
    5454    <String Id="VB_USBDriver" Value="Driver di [ProductName] per il supporto di dispositivi USB." />
    5555    <String Id="VB_Network" Value="Driver di [ProductName] per il supporto di rete." />
    56     <String Id="VB_NetFltDriver" Value="Driver di [ProductName] per la rete con bridge." />
    57     <String Id="VB_NetAdpDriver" Value="Driver di [ProductName] per la scheda di rete virtuale per la rete solo host." />
    5856    <String Id="VB_NetLwfDriver" Value="Driver di [ProductName] per la rete con bridge NDIS6." />
    5957    <String Id="VB_NetAdp6Driver" Value="Driver di [ProductName] per la scheda di rete virtuale per la rete solo host NDIS6." />
    … …  
    118116    <!---->
    119117    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Scegli quale tipo di driver di rete utilizzerai:" />
    120     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="Driver di rete NDIS5.&#xA;Questo è il tipo predefinito per le vecchie versioni di Windows (pre-Vista)." />
    121118    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="Driver di rete NDIS6.&#xA;Questo è il tipo predefinito per le nuove versioni di Windows (Vista e successivi)." />
    122     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Usa driver di rete NDIS5." />
    123119    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Usa driver di rete NDIS6." />
    124120    <!---->

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

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="[ProductName] USB device drivers for USB device support." />
    6060    <String Id="VB_Network" Value="[ProductName] network device drivers for networking support." />
    61     <String Id="VB_NetFltDriver" Value="[ProductName] driver for Bridged Networking." />
    62     <String Id="VB_NetAdpDriver" Value="[ProductName] virtual network adapter driver for Host-Only Networking." />
    6361    <String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
    6462    <String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
    … …  
    149147
    150148    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
    151     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
    152149    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
    153     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
    154150    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
    155151

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

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="USB aygıtı desteği için [ProductName] USB aygıtı sürücüleri." />
    6060    <String Id="VB_Network" Value="Ağ oluşturma desteği için [ProductName] ağ aygıtı sürücüleri." />
    61     <String Id="VB_NetFltDriver" Value="Köprü Ağı Oluşturma için [ProductName] sürücüsü." />
    62     <String Id="VB_NetAdpDriver" Value="Yalnızca-Anamakine Ağı Oluşturma için [ProductName] sanal ağ bağdaştırıcısı sürücüsü." />
    6361    <String Id="VB_NetLwfDriver" Value="NDIS6 Köprü Ağı Oluşturma için [ProductName] sürücüsü." />
    6462    <String Id="VB_NetAdp6Driver" Value="NDIS6 Yalnızca-Anamakine Ağı Oluşturma için [ProductName] sanal ağ bağdaştırıcısı sürücüsü." />
    … …  
    149147
    150148    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Lütfen hangi tür ağ sürücülerini kullanacağınızı seçin:" />
    151     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 ağ sürücüleri.&#xA;Bu, Windows'un (Vista öncesi) daha eski sürümleri için varsayılandır." />
    152149    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 ağ sürücüleri.&#xA;Bu, Windows'un (Vista ve daha yenisi) daha yeni sürümleri için varsayılandır." />
    153     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="NDIS5 ağ sürücülerini kullan." />
    154150    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="NDIS6 ağ sürücülerini kullan." />
    155151

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

    r106061 r107296  
    5959<String Id="VB_USBDriver" Value="[ProductName] USB 设备驱动程序针对 USB 设备支持。" />
    6060<String Id="VB_Network" Value="[ProductName] 网络设备驱动程序针对网络支持。" />
    61 <String Id="VB_NetFltDriver" Value="[ProductName] 驱动程序针对桥接网络。" />
    62 <String Id="VB_NetAdpDriver" Value="[ProductName] 虚拟网络界面卡针对“仅主机”网络。" />
    6361<String Id="VB_NetLwfDriver" Value="[ProductName] driver for NDIS6 Bridged Networking." />
    6462<String Id="VB_NetAdp6Driver" Value="[ProductName] virtual network adapter driver for NDIS6 Host-Only Networking." />
    … …  
    149147
    150148<String Id="SelectionNetworkTypeDlg_CommonDescription" Value="Please choose which type of network drivers you will use:" />
    151 <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 network drivers.&#xA;This is default for older versions of Windows (pre-Vista)." />
    152149<String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 network drivers.&#xA;This is default for newer versions of Windows (Vista and newer)." />
    153 <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="Use NDIS5 network drivers." />
    154150<String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="Use NDIS6 network drivers." />
    155151

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

    r106061 r107296  
    5959    <String Id="VB_USBDriver" Value="[ProductName] USB 裝置驅動程式針對 USB 裝置支援。" />
    6060    <String Id="VB_Network" Value="[ProductName] 網路裝置驅動程式針對網路支援。" />
    61     <String Id="VB_NetFltDriver" Value="[ProductName] 驅動程式針對橋接網路。" />
    62     <String Id="VB_NetAdpDriver" Value="[ProductName] 虛擬網路介面卡針對「僅限主機」網路。" />
    6361    <String Id="VB_NetLwfDriver" Value="[ProductName] 驅動程式針對 NDIS6 橋接網路。" />
    6462    <String Id="VB_NetAdp6Driver" Value="[ProductName] 虛擬網路介面卡針對 NDIS6 「僅限主機」網路。" />
    … …  
    149147
    150148    <String Id="SelectionNetworkTypeDlg_CommonDescription" Value="請選擇您將使用的網路驅動程式類型:" />
    151     <String Id="SelectionNetworkTypeDlg_DescriptionNDIS5" Value="NDIS5 網路驅動程式。&#xA;這是舊版 Windows 的預設值 (Vista 前)。" />
    152149    <String Id="SelectionNetworkTypeDlg_DescriptionNDIS6" Value="NDIS6 網路驅動程式。&#xA;這是新版 Windows 的預設值 (Vista 和以上)。" />
    153     <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS5" Value="使用  NDIS5 網路驅動程式。" />
    154150    <String Id="SelectionNetworkTypeDlg_RadioButtonNDIS6" Value="使用  NDIS6 網路驅動程式。" />
    155151

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

    r106061 r107296  
    278278            </Control>
    279279            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    280                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    281             </Control>
    282 
    283             <!-- Build number text drawn left bottom -->
    284             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    285             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    286                 <Text Value="[Version_text] $(var.Property_Version)" />
    287             </Control>
    288         </Dialog>
    289 
    290         <!-- Dialog for selection network adapters type (NDIS5 or NDIS6) -->
    291         <RadioButtonGroup Property="NETWORKTYPE">
    292           <RadioButton Text="!(loc.SelectionNetworkTypeDlg_RadioButtonNDIS5)" Value="NDIS5" X="5" Y="0" Width="120" Height="20" />
    293           <RadioButton Text="!(loc.SelectionNetworkTypeDlg_RadioButtonNDIS6)" Value="NDIS6" X="5" Y="20" Width="120" Height="20" />
    294         </RadioButtonGroup>
    295 
    296         <Dialog Id="VBoxSelectionNetworkTypeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
    297             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
    298             <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    299             <Control Id="Title" Type="Text" X="15" Y="6" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
    300                 <Text Value="[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)" />
    301             </Control>
    302             <Control Id="Description" Type="Text" X="25" Y="23" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
    303                 <Text Value="!(loc.CustomizeDlg_SelFeatures)" />
    304             </Control>
    305 
    306             <Control Id="CommonDescription" Type="Text" X="25" Y="55" Width="325" Height="20" Transparent="yes" NoPrefix="yes">
    307               <Text Value="!(loc.SelectionNetworkTypeDlg_CommonDescription)" />
    308             </Control>
    309 
    310             <!-- The radio button group used for choosing NDIS5 or NDIS6 network drivers -->
    311             <Control Id="Buttons" Type="RadioButtonGroup" X="25" Y="100" Width="130" Height="60" Property="NETWORKTYPE" />
    312 
    313             <!-- Description text -->
    314             <Control Id="DescriptionNDIS5" Type="Text" X="200" Y="105" Width="150" Height="60" Transparent="yes" NoPrefix="yes" HideCondition="NETWORKTYPE = &quot;NDIS6&quot;" ShowCondition="NETWORKTYPE = &quot;NDIS5&quot;">
    315               <Text Value="!(loc.SelectionNetworkTypeDlg_DescriptionNDIS5)" />
    316 
    317 
    318             </Control>
    319             <Control Id="DescriptionNDIS6" Type="Text" X="200" Y="105" Width="150" Height="60" Transparent="yes" NoPrefix="yes" HideCondition="NETWORKTYPE = &quot;NDIS5&quot;" ShowCondition="NETWORKTYPE = &quot;NDIS6&quot;">
    320               <Text Value="!(loc.SelectionNetworkTypeDlg_DescriptionNDIS6)" />
    321 
    322 
    323             </Control>
    324 
    325             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Next)" />
    326             <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)" />
    327             <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Cancel)">
    328280                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    329281            </Control>

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

    r106061 r107296  
    4242        <Substitution Table="CustomAction" Row="setNetworkTypeADP6" Column="Target" Value="[=passedNetworkType]" />
    4343        <CustomAction Id="setNetworkTypeADP6" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
    44         <CustomAction Id="correctNetworkTypeADP6" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
    4544<?endif?>
    4645
    … …  
    5554<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    5655            <Custom Action="setNetworkTypeADP6" After="CostInitialize" />
    57             <Custom Action="correctNetworkTypeADP6" After="setNetworkTypeADP6" Condition="(VersionNT &lt; 600)" />
     56            <Custom Action="correctNetworkTypeADP6" After="setNetworkTypeADP6" />
    5857<?endif?>
    5958            <?include VBoxMergeNetAdp6Seq.wxi ?>

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

    r106061 r107296  
    4242        <Substitution Table="CustomAction" Row="setNetworkTypeLWF" Column="Target" Value="[=passedNetworkType]" />
    4343        <CustomAction Id="setNetworkTypeLWF" Property="NETWORKTYPE" Value="[localMSMNetworkType]" Execute="immediate" />
    44         <CustomAction Id="correctNetworkTypeLWF" Property="NETWORKTYPE" Value="NDIS5" Execute="immediate" />
    4544<?endif?>
    4645
    … …  
    5554<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    5655            <Custom Action="setNetworkTypeLWF" After="CostInitialize" />
    57             <Custom Action="correctNetworkTypeLWF" After="setNetworkTypeLWF" Condition="(VersionNT &lt; 600)" />
    5856<?endif?>
    5957            <?include VBoxMergeNetLwfSeq.wxi ?>

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

    r107015 r107296  
    3737        <?define Property_VBoxMergeUSB = "$(env.VBOX_WIN_INST_MERGE_USB)" ?>
    3838    <?endif?>
    39     <?if $(env.VBOX_WITH_NETFLT) = "yes" And $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    40         <?define Property_VBoxMergeNetworkFlt = "$(env.VBOX_WIN_INST_MERGE_NETFLT)" ?>
    41     <?endif?>
    4239    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    43         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    44             <?define Property_VBoxMergeNetworkAdp  = "$(env.VBOX_WIN_INST_MERGE_NETADP)" ?>
    45         <?endif?>
    4640        <?define Property_VBoxMergeNetworkAdp6 = "$(env.VBOX_WIN_INST_MERGE_NETADP6)" ?>
    4741    <?endif?>
    … …  
    7064
    7165    <Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes" />
    72 
    73 <?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
    74     <!-- Force NDIS5 on pre-Vista -->
    75     <SetProperty Id="NETWORKTYPE" After="LaunchConditions" Value="NDIS5" Condition="(VersionNT &lt; 600)" />
    76 <?endif?>
    7766
    7867    <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created -->
    … …  
    237226        <?include VBoxMergeCOM32On64CA.wxi ?>
    238227    <?endif?>
    239     <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    240         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    241             <?include VBoxMergeNetFltCA.wxi ?>
    242         <?endif?>
     228    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    243229        <?include VBoxMergeNetLwfCA.wxi ?>
    244     <?endif?>
    245     <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    246         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    247             <?include VBoxMergeNetAdpCA.wxi ?>
    248         <?endif?>
    249230        <?include VBoxMergeNetAdp6CA.wxi ?>
    250231    <?endif?>
    … …  
    367348            <Feature Id="VBoxNetworkFlt" Title="VirtualBox Bridged Networking" Level="1" Description="!(loc.VB_NetFltDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" AllowAdvertise="no">
    368349    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    369         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    370                 <MergeRef Id="msm_VBoxNetworkFlt" />
    371         <?endif?>
    372350                <MergeRef Id="msm_VBoxNetworkLwf" />
    373351    <?else?>
    374         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    375                 <ComponentRef Id="cp_NetFltDriver" />
    376         <?endif?>
    377352        <?if $(env.VBOX_SIGNING_MODE) != none ?>
    378353            <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    … …  
    380355            <?endif?>
    381356                <ComponentRef Id="cp_NetLwfDriverCat_W10" />
    382         <?endif?>
     357            <?endif?>
    383358                <ComponentRef Id="cp_NetLwfDriver" />
    384     <?endif?>
     359        <?endif?>
    385360            </Feature>
    386361            <Feature Id="VBoxNetworkAdp" Title="VirtualBox Host-Only Networking" Level="1" Description="!(loc.VB_NetAdpDriver)" ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" AllowAdvertise="no">
    387     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    388         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    389                 <MergeRef Id="msm_VBoxNetworkAdp" />
    390         <?endif?>
     362        <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    391363                <MergeRef Id="msm_VBoxNetworkAdp6" />
    392     <?else?>
    393         <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    394                 <ComponentRef Id="cp_NetAdpDriver" />
    395         <?endif?>
     364        <?else?>
    396365        <?if $(env.VBOX_SIGNING_MODE) != none ?>
    397366            <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
    … …  
    483452        <?include VBoxMergeCOM32On64Seq.wxi ?>
    484453    <?endif?>
    485     <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
    486         <?if $(env.KBUILD_TARGET_ARCH) = amd64 ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
    487             <?include VBoxMergeNetFltSeq.wxi ?>
    488         <?endif?>
     454    <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    489455        <?include VBoxMergeNetLwfSeq.wxi ?>
    490     <?endif?>
    491     <?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    492         <?if $(env.KBUILD_TARGET_ARCH) = amd64 ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
    493             <?include VBoxMergeNetAdpSeq.wxi ?>
    494         <?endif?>
    495456        <?include VBoxMergeNetAdp6Seq.wxi ?>
    496457    <?endif?>
    … …  
    558519<?endif?>
    559520                    <Directory Id="dir_Network" Name="network">
    560 <?if $(env.VBOX_WITH_NETFLT) = "yes" And $(env.KBUILD_TARGET_ARCH) = "amd64" ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
    561                         <Directory Id="dir_NetFlt" Name="netflt">
    562     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    563                             <Merge Id="msm_VBoxNetworkFlt" Language="0" SourceFile="$(var.Property_VBoxMergeNetworkFlt)" DiskId="1">
    564                             <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]" />
    565                             </Merge>
    566     <?else?>
    567                             <Directory Id="msm_VBoxNetworkFltFolder" FileSource=".">
    568                                 <?include VBoxMergeNetFlt.wxi ?>
    569                             </Directory>
    570     <?endif?>
    571                         </Directory>
    572 <?endif?>
    573 <?if $(env.VBOX_WITH_NETADP) = "yes" and $(env.KBUILD_TARGET_ARCH) = "amd64" ?> <!-- @todo bird: Remove this and use Adp6, we don't support XP any more. -->
    574                         <Directory Id="dir_NetAdp" Name="netadp">
    575     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    576                             <Merge Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp)" DiskId="1">
    577                             <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]" />
    578                             </Merge>
    579     <?else?>
    580                             <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
    581                                 <?include VBoxMergeNetAdp.wxi ?>
    582                             </Directory>
    583     <?endif?>
    584                         </Directory>
    585 <?endif?>
    586 
    587 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
     521<?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    588522                        <Directory Id="dir_NetLwf" Name="netlwf">
    589523    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    … …  
    598532                        </Directory>
    599533<?endif?>
    600 
    601534<?if $(env.VBOX_WITH_NETADP) = "yes" ?>
    602535                        <Directory Id="dir_NetAdp6" Name="netadp6">

  • trunk/src/VBox/Main/src-server/HostImpl.cpp

    r106061 r107296  
    933933        /* for the filter-based approach we get all miniports our filter (oracle_VBoxNetLwf)is bound to */
    934934        hrc = pNc->FindComponent(L"oracle_VBoxNetLwf", &pTcpIpNcc);
    935         if (hrc != S_OK)
    936         {
    937             /* fall back to NDIS5 miniport lookup (sun_VBoxNetFlt) */
    938             hrc = pNc->FindComponent(L"sun_VBoxNetFlt", &pTcpIpNcc);
    939         }
    940935#     ifndef VBOX_WITH_HARDENING
    941936        if (hrc != S_OK)
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