VirtualBox

Changeset 98336 in vbox


Ignore:
Timestamp:
Jan 27, 2023 4:55:51 PM (2 years ago)
Author:
vboxsync
Message:

HostDrivers/*.inf, Installer/*.inf: Use more consistent naming. For the R0 "drivers" add an empty .Services section in the hope to make Microsoft's tightened validation checks happy.

Location:
trunk/src/VBox
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/HostDrivers/Support/win/VBoxSup.inf

    r98103 r98336  
    5959DelService=VBoxSup,0x00000200
    6060
    61 ;; This doesn't actually work either (see VBoxUSBMon), though it triggers in the
     61;; This does not actually work either (see VBoxUSBMon), though it triggers in the
    6262;; installer rather at manual installation on my test system (could be polluted & confused).
    6363;; This may apparently also causes unloading trouble due to 'root\VBoxSup' or something related to that.
    6464;; [Manufacturer]
    65 ;; %ORACLE%=Oracle@COMMA-NT-ARCH@
     65;; %ORACLE%=VBoxSup@COMMA-NT-ARCH@
    6666;;
    6767;; ; Models section (referenced by [Manufacturer]).
    68 ;; [Oracle@DOT-NT-ARCH@]
    69 ;; %VBoxSup.DRVDESC%=VBoxSupInstall,root\VBoxSup
     68;; [VBoxSup@DOT-NT-ARCH@]
     69;; %VBoxSup.DRVDESC%=VBoxSup_Install,root\VBoxSup
    7070;;
    71 ;; [VBoxSupInstall@DOT-NT-ARCH@]
     71;; [VBoxSup_Install@DOT-NT-ARCH@]
    7272;; CopyFiles=VBoxSup_CopyFiles
    7373;;
    74 ;; [VBoxSupInstall@[email protected]]
     74;; [VBoxSup_Install@[email protected]]
    7575;; AddService=VBoxSup,0x00000002,VBoxSup_Service
    7676

  • trunk/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp6.inf

    r98103 r98336  
    4242Class       = Net
    4343ClassGUID   = {4D36E972-E325-11CE-BFC1-08002BE10318}
    44 Provider    = %Provider%
     44Provider    = %ORACLE%
    4545;edit-DriverVer=10/23/2014,1.0.1.0
    4646
    4747
    4848[Manufacturer]
    49 %Provider% = VBox,NTx86,NTamd64
     49%ORACLE% = VBoxNetAdp6@COMMA-NT-ARCH@
    5050
    5151[ControlFlags]
    5252
    53 [VBox]
    54 %VBoxNetAdp6_Desc% = VBoxNetAdp6.ndi, sun_VBoxNetAdp
    55 
    56 [VBox.NTx86]
    57 %VBoxNetAdp6_Desc% = VBoxNetAdp6.ndi, sun_VBoxNetAdp
    58 
    59 [VBox.NTamd64]
     53[VBoxNetAdp6@DOT-NT-ARCH@]
    6054%VBoxNetAdp6_Desc% = VBoxNetAdp6.ndi, sun_VBoxNetAdp
    6155
    … …  
    10195
    10296[Strings]
    103 Provider = "Oracle Corporation"
     97ORACLE = "Oracle Corporation"
    10498DiskDescription = "VirtualBox NDIS 6.0 Miniport Driver"
    10599VBoxNetAdp6_Desc = "VirtualBox Host-Only Ethernet Adapter"

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetAdp.inf

    r98103 r98336  
    4040Class      = Net
    4141ClassGUID  = {4d36e972-e325-11ce-bfc1-08002be10318}
    42 Provider   = %Provider%
     42Provider   = %ORACLE%
    4343; DriverPackageType=Network
    4444; DriverPackageDisplayName=%VBoxNetAdp_Desc%
    … …  
    5959
    6060[Manufacturer]
    61 %Provider% = VBox,NTx86,NTia64,NTamd64
     61%ORACLE% = VBoxNetAdp@COMMA-NT-ARCH@
    6262
    63 [VBox]
    64 %VBoxNetAdp_Desc% = VBoxNetAdp.ndi, sun_VBoxNetAdp
    65 
    66 [VBox.NTx86]
    67 %VBoxNetAdp_Desc% = VBoxNetAdp.ndi, sun_VBoxNetAdp
    68 
    69 [VBox.NTia64]
    70 %VBoxNetAdp_Desc% = VBoxNetAdp.ndi, sun_VBoxNetAdp
    71 
    72 [VBox.NTamd64]
     63[VBoxNetAdp@DOT-NT-ARCH@]
    7364%VBoxNetAdp_Desc% = VBoxNetAdp.ndi, sun_VBoxNetAdp
    7465
    … …  
    9990
    10091[Strings]
    101 Provider = "Oracle Corporation"
     92ORACLE = "Oracle Corporation"
    10293VBoxNetAdp_Desc = "VirtualBox Host-Only Ethernet Adapter"
    10394DiskDescription = "VirtualBox Host-Only Ethernet Adapter"

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt.inf

    r98103 r98336  
    4040Class      = NetService
    4141ClassGUID  = {4D36E974-E325-11CE-BFC1-08002BE10318}
    42 Provider   = %Provider%
     42Provider   = %ORACLE%
    4343;DriverPackageType=Network
    4444;DriverPackageDisplayName=%VBoxNetFlt_Desc%
    … …  
    4747
    4848[Manufacturer]
    49 %Provider% = VBox,NTx86,NTamd64
     49%ORACLE% = VBoxNetFlt@COMMA-NT-ARCH@
    5050
    5151[ControlFlags]
    5252
    53 [VBox]
    54 %VBoxNetFlt_Desc% = VBoxNetFlt.ndi, sun_VBoxNetFlt
    55 
    56 [VBox.NTx86]
    57 %VBoxNetFlt_Desc% = VBoxNetFlt.ndi, sun_VBoxNetFlt
    58 
    59 [VBox.NTamd64]
     53[VBoxNetFlt@DOT-NT-ARCH@]
    6054%VBoxNetFlt_Desc% = VBoxNetFlt.ndi, sun_VBoxNetFlt
    6155
    … …  
    117111
    118112[Strings]
    119 Provider = "Oracle Corporation"
     113ORACLE = "Oracle Corporation"
    120114DiskDescription = "VirtualBox Bridged Networking Driver"
    121115VBoxNetFlt_Desc = "VirtualBox Bridged Networking Driver"

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM.inf

    r98103 r98336  
    4040Class      = Net
    4141ClassGUID  = {4d36e972-e325-11ce-bfc1-08002be10318}
    42 Provider   = %Provider%
     42Provider   = %ORACLE%
    4343;DriverPackageType=NdisImMiniport
    4444;DriverPackageDisplayName=%VBoxNetFltMP_Desc%
    … …  
    5353
    5454[Manufacturer]
    55 %Provider% = VBox,NTx86,NTamd64
     55%ORACLE% = VBoxNetFltMP@COMMA-NT-ARCH@
    5656
    57 [VBox]
    58 %VBoxNetFltMP_Desc% = VBoxNetFltMP.ndi, sun_VBoxNetFltmp
    59 
    60 [VBox.NTx86]
    61 %VBoxNetFltMP_Desc% = VBoxNetFltMP.ndi, sun_VBoxNetFltmp
    62 
    63 [VBox.NTamd64]
     57[VBoxNetFltMP@DOT-NT-ARCH@]
    6458%VBoxNetFltMP_Desc% = VBoxNetFltMP.ndi, sun_VBoxNetFltmp
    6559
    … …  
    8074
    8175[Strings]
    82 Provider = "Oracle Corporation"
     76ORACLE = "Oracle Corporation"
    8377VBoxNetFltMP_Desc = "VirtualBox Bridged Networking Driver Miniport"
    8478

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf.inf

    r98103 r98336  
    4040Class       = NetService
    4141ClassGUID   = {4D36E974-E325-11CE-BFC1-08002BE10318}
    42 Provider    = %Provider%
     42Provider    = %ORACLE%
    4343;edit-DriverVer=10/23/2014,1.0.1.0
    4444
    4545
    4646[Manufacturer]
    47 %Provider% = VBox,NTx86,NTamd64
     47%ORACLE% = VBoxNetLwf@COMMA-NT-ARCH@
    4848
    4949[ControlFlags]
    5050
    51 [VBox]
    52 %VBoxNetLwf_Desc% = VBoxNetLwf.ndi, oracle_VBoxNetLwf
    53 
    54 [VBox.NTx86]
    55 %VBoxNetLwf_Desc% = VBoxNetLwf.ndi, oracle_VBoxNetLwf
    56 
    57 [VBox.NTamd64]
     51[VBoxNetLwf@DOT-NT-ARCH@]
    5852%VBoxNetLwf_Desc% = VBoxNetLwf.ndi, oracle_VBoxNetLwf
    5953
    … …  
    120114
    121115[Strings]
    122 Provider = "Oracle Corporation"
     116ORACLE = "Oracle Corporation"
    123117DiskDescription = "VirtualBox NDIS6 Bridged Networking Driver"
    124118VBoxNetLwf_Desc = "VirtualBox NDIS6 Bridged Networking Driver"

  • trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUSB.inf

    r98103 r98336  
    5050
    5151[Manufacturer]
    52 ;x86   %MfgName%=ORACLE
    53 ;amd64 %MfgName%=ORACLE, NTamd64
     52%ORACLE%=VBoxUSB@COMMA-NT-ARCH@
    5453
    55 ;x86   [ORACLE]
    56 ;amd64 [ORACLE.NTamd64]
     54[VBoxUSB@DOT-NT-ARCH@]
    5755%USB\VID_80EE&PID_CAFE.DeviceDesc%=VBoxUSB.Dev, USB\VID_80EE&PID_CAFE
    5856
    … …  
    8684[Strings]
    8785ORACLE="Oracle Corporation"
    88 MfgName="Oracle Corporation"
    8986Disk_Description="VBoxUSB Installation Disk"
    9087USB\VID_80EE&PID_CAFE.DeviceDesc="VirtualBox USB"

  • trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUSBMon.inf

    r98103 r98336  
    5555;; Cannot get this to work (same works fine for VBoxDrv):
    5656;; [Manufacturer]
    57 ;; %ORACLE%=Oracle@COMMA-NT-ARCH@
     57;; %ORACLE%=VBoxUSBMon@COMMA-NT-ARCH@
    5858;;
    5959;; ; Models section (referenced by [Manufacturer]).
    60 ;; [Oracle@DOT-NT-ARCH@]
    61 ;; %VBoxUSBMon.DRVDESC%=VBoxUSBMonInstall,root\VBoxUSBMon
     60;; [VBoxUSBMon@DOT-NT-ARCH@]
     61;; %VBoxUSBMon.DRVDESC%=VBoxUSBMon_Install,root\VBoxUSBMon
    6262;;
    63 ;; [VBoxUSBMonInstall@DOT-NT-ARCH@]
     63;; [VBoxUSBMon_Install@DOT-NT-ARCH@]
    6464;; CopyFiles=VBoxUSBMon_CopyFiles
    6565;;
    66 ;; [VBoxUSBMonInstall@[email protected]]
     66;; [VBoxUSBMon_Install@[email protected]]
    6767;; AddService=VBoxUSBMon,0x00000002,VBoxUSBMon_Service,VBoxUSBMon_AddEventLog
    6868

  • trunk/src/VBox/Installer/win/Scripts/VBoxExtPackPuel.inf

    r98103 r98336  
    4444[DestinationDirs]
    4545DefaultDestDir = 12
    46 VBoxExtPackPuelInstall.Files = 12
     46VBoxExtPackPuel_Install.Files = 12
    4747
    4848[Manufacturer]
    49 ;x86 %ORACLE%=VBoxExtPackPuel
    50 ;amd64 %ORACLE%=VBoxExtPackPuel, NTamd64
     49%ORACLE%=VBoxExtPackPuel@COMMA-NT-ARCH@
    5150
    52 ;x86 [VBoxExtPackPuel]
    53 ;amd64 [VBoxExtPackPuel.NTamd64]
    54 %VBoxExtPackPuel.DrvDesc% = VBoxExtPackPuelInstall, root\VBoxExtPackPuel
     51[VBoxExtPackPuel@DOT-NT-ARCH@]
     52%VBoxExtPackPuel.DrvDesc% = VBoxExtPackPuel_Install, root\VBoxExtPackPuel
    5553
    56 [VBoxExtPackPuelInstall]
    57 CopyFiles = VBoxExtPackPuelInstall.Files
     54[VBoxExtPackPuel_Install]
     55CopyFiles = VBoxExtPackPuel_CopyFiles
    5856
    59 [VBoxExtPackPuelInstall.Files]
     57[VBoxExtPackPuel_Install.Services]
     58
     59[VBoxExtPackPuel_CopyFiles]
    6060;VBoxEhciR0.r0,,,2
    6161VBoxNvmeR0.r0,,,2

  • trunk/src/VBox/Installer/win/Scripts/VMMR0.inf

    r98103 r98336  
    4343[DestinationDirs]
    4444DefaultDestDir = 12
    45 VBoxVMMInstall.Files = 12
     45VBoxVMM_Install.Files = 12
    4646
    4747[Manufacturer]
    … …  
    4949
    5050[VBoxVMM@DOT-NT-ARCH@]
    51 %VBoxVMM.DrvDesc% = VBoxVMMInstall, root\VBoxVMM
     51%VBoxVMM.DrvDesc% = VBoxVMM_Install, root\VBoxVMM
    5252
    53 [VBoxVMMInstall]
    54 CopyFiles = VBoxVMMInstall.Files
     53[VBoxVMM_Install]
     54CopyFiles = VBoxVMM_CopyFiles
    5555
    56 [VBoxVMMInstall.Files]
     56[VBoxVMM_Install.Services]
     57
     58[VBoxVMM_CopyFiles]
    5759VMMR0.r0,,,2
    5860VBoxDDR0.r0,,,2
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