VirtualBox

Ignore:
Timestamp:
Dec 12, 2024 11:07:22 AM (7 weeks ago)
Author:
vboxsync
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/src/VBox/HostDrivers/VBoxNetFlt
Files:
14 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.

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