VirtualBox

Ignore:
Timestamp:
Jan 14, 2022 7:15:41 PM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
149301
Message:

SUP,Installer/win: Renamed VBoxDrv.sys to VBoxSup.sys. bugref:10162

Location:
trunk/src/VBox/HostDrivers/Support
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed

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

    r93115 r93239  
    621621 VBoxDrv_NAME.freebsd     = vboxdrv
    622622 VBoxDrv_NAME.solaris     = vboxdrv
     623 VBoxDrv_NAME.win         = VBoxSup
    623624 ifdef VBOX_SIGNING_MODE
    624625  VBoxDrv_INSTTYPE.win    = none
    … …  
    829830
    830831ifeq ($(KBUILD_TARGET), win)
    831  INSTALLS.win += VBoxDrv-inf
    832  VBoxDrv-inf_TEMPLATE = VBoxR0DrvInfCat
    833  VBoxDrv-inf_SOURCES = \
    834         $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.inf
    835  VBoxDrv-inf_CLEAN = $(VBoxDrv-inf_SOURCES)
    836  VBoxDrv-inf_BLDDIRS = $(PATH_TARGET)/VBoxDrvCat.dir
    837 
    838  $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.inf: $(PATH_SUB_CURRENT)/win/VBoxDrv.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    839         $(call MSG_GENERATE,VBoxDrv-inf,$@,$<)
     832 INSTALLS.win += VBoxSup-inf
     833 VBoxSup-inf_TEMPLATE = VBoxR0DrvInfCat
     834 VBoxSup-inf_SOURCES = \
     835        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.inf
     836 VBoxSup-inf_CLEAN = $(VBoxSup-inf_SOURCES)
     837 VBoxSup-inf_BLDDIRS = $(PATH_TARGET)/VBoxSupCat.dir
     838
     839 $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.inf: $(PATH_SUB_CURRENT)/win/VBoxSup.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
     840        $(call MSG_GENERATE,VBoxSup-inf,$@,$<)
    840841        $(call VBOX_EDIT_INF_FN,$<,$@)
    841842
    842843 ifdef VBOX_SIGNING_MODE
    843   VBoxDrv-inf_SOURCES += \
    844         $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.sys \
    845         $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.cat \
    846         $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.cat=>VBoxDrv-PreW10.cat
    847 
    848   $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.sys: $$(VBoxDrv_1_TARGET) | $$(dir $$@)
    849         $(INSTALL) -m 644 $< $(@D)
    850 
    851   $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.cat: \
    852                 $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.inf \
    853                 $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.sys
    854         $(call MSG_TOOL,Inf2Cat,VBoxDrv-inf,$@,$<)
     844  VBoxSup-inf_SOURCES += \
     845        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.sys \
     846        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.cat \
     847        $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.cat=>VBoxSup-PreW10.cat
     848
     849  $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.sys: $$(VBoxDrv_1_TARGET) | $$(dir $$@)
     850        $(INSTALL) -m 644 -- "$<" "$(@D)"
     851
     852  $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.cat: \
     853                $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.inf \
     854                $(PATH_TARGET)/VBoxSupCat.dir/VBoxSup.sys
     855        $(call MSG_TOOL,Inf2Cat,VBoxSup-inf,$@,$<)
    855856        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
    856857 endif # signing

  • trunk/src/VBox/HostDrivers/Support/SUPLibLdr.cpp

    r93115 r93239  
    152152    if (   pszModule
    153153        && *pszModule
    154         && strcmp(pszModule, "VBoxDrv.sys")
     154        && strcmp(pszModule, "VBoxSup.sys")
     155        && strcmp(pszModule, "VBoxDrv.sys") /* old name */
    155156        && strcmp(pszModule, "VMMR0.r0"))
    156157    {

  • trunk/src/VBox/HostDrivers/Support/SUPR0-def-pe.sed

    r93115 r93239  
    6868i\;
    6969i
    70 i\LIBRARY VBoxDrv.sys
     70i\LIBRARY VBoxSup.sys
    7171i
    7272i\EXPORTS

  • trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp

    r93115 r93239  
    6767*********************************************************************************************************************************/
    6868/** The support service name. */
    69 #define SERVICE_NAME    "VBoxDrv"
     69#define SERVICE_NAME    "VBoxSup"
    7070
    7171
    … …  
    314314    {
    315315        char szDriver[RTPATH_MAX];
    316         rc = RTPathExecDir(szDriver, sizeof(szDriver) - sizeof("\\VBoxDrv.sys"));
     316        rc = RTPathExecDir(szDriver, sizeof(szDriver) - sizeof("\\VBoxSup.sys"));
    317317        if (RT_SUCCESS(rc))
    318318        {
    319             strcat(szDriver, "\\VBoxDrv.sys");
     319            strcat(szDriver, "\\VBoxSup.sys");
    320320            SC_HANDLE hService = CreateService(hSMgrCreate,
    321321                                               SERVICE_NAME,
    … …  
    431431int suplibOsDeleteService(void)
    432432{
    433     /*
    434      * Assume it didn't exist, so we'll create the service.
    435      */
    436     int         rc;
     433    int         rcRet = VINF_SUCCESS;
    437434    SC_HANDLE   hSMgr = OpenSCManager(NULL, NULL, SERVICE_CHANGE_CONFIG);
    438435    DWORD       dwErr = GetLastError();
    … …  
    440437    if (hSMgr)
    441438    {
    442         SC_HANDLE hService = OpenService(hSMgr, SERVICE_NAME, DELETE);
     439        /*
     440         * Old service name.
     441         */
     442        SC_HANDLE hService = OpenService(hSMgr, "VBoxDrv", DELETE);
    443443        if (hService)
    444444        {
    445             /*
    446              * Delete the service.
    447              */
    448             if (DeleteService(hService))
    449                 rc = VINF_SUCCESS;
    450             else
     445            if (!DeleteService(hService))
    451446            {
    452447                dwErr = GetLastError();
    453                 AssertMsgFailed(("DeleteService failed dwErr=%Rwa\n", dwErr));
    454                 rc = RTErrConvertFromWin32(dwErr);
     448                AssertMsgFailed(("DeleteService failed for VBoxDrv dwErr=%Rwa\n", dwErr));
     449                rcRet = RTErrConvertFromWin32(dwErr);
    455450            }
    456451            CloseServiceHandle(hService);
    … …  
    459454        {
    460455            dwErr = GetLastError();
    461             if (dwErr == ERROR_SERVICE_DOES_NOT_EXIST)
    462                 rc = VINF_SUCCESS;
    463             else
    464             {
    465                 AssertMsgFailed(("OpenService failed dwErr=%Rwa\n", dwErr));
    466                 rc = RTErrConvertFromWin32(dwErr);
     456            if (dwErr != ERROR_SERVICE_DOES_NOT_EXIST)
     457            {
     458                AssertMsgFailed(("OpenService failed for VBoxDrv dwErr=%Rwa\n", dwErr));
     459                rcRet = RTErrConvertFromWin32(dwErr);
     460            }
     461        }
     462
     463        /*
     464         * The new service.
     465         */
     466        hService = OpenService(hSMgr, SERVICE_NAME, DELETE);
     467        if (hService)
     468        {
     469            if (!DeleteService(hService))
     470            {
     471                dwErr = GetLastError();
     472                AssertMsgFailed(("DeleteService for " SERVICE_NAME " failed dwErr=%Rwa\n", dwErr));
     473                rcRet = RTErrConvertFromWin32(dwErr);
     474            }
     475            CloseServiceHandle(hService);
     476        }
     477        else
     478        {
     479            dwErr = GetLastError();
     480            if (dwErr != ERROR_SERVICE_DOES_NOT_EXIST)
     481            {
     482                AssertMsgFailed(("OpenService failed for " SERVICE_NAME " dwErr=%Rwa\n", dwErr));
     483                rcRet = RTErrConvertFromWin32(dwErr);
    467484            }
    468485        }
    … …  
    470487    }
    471488    else
    472         rc = RTErrConvertFromWin32(dwErr);
    473     return rc;
     489        rcRet = RTErrConvertFromWin32(dwErr);
     490    return rcRet;
    474491}
    475492
    … …  
    495512        {
    496513            char szDriver[RTPATH_MAX];
    497             int rc = RTPathExecDir(szDriver, sizeof(szDriver) - sizeof("\\VBoxDrv.sys"));
     514            int rc = RTPathExecDir(szDriver, sizeof(szDriver) - sizeof("\\VBoxSup.sys"));
    498515            if (RT_SUCCESS(rc))
    499516            {
    500                 strcat(szDriver, "\\VBoxDrv.sys");
     517                strcat(szDriver, "\\VBoxSup.sys");
    501518
    502519                SC_LOCK hLock = LockServiceDatabase(hSMgr);

  • trunk/src/VBox/HostDrivers/Support/win/VBoxDrv.rc

    r93115 r93239  
    4444    BEGIN
    4545      VALUE "FileDescription",  "VirtualBox Support Driver\0"
    46       VALUE "InternalName",     "VBoxDrv\0"
    47       VALUE "OriginalFilename", "VBoxDrv.sys\0"
     46      VALUE "InternalName",     "VBoxSup\0"
     47      VALUE "OriginalFilename", "VBoxSup.sys\0"
    4848      VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
    4949      VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR

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

    r93237 r93239  
    3232;edit-DriverVer=08/26/2008,2.00.0000
    3333DriverPackageType=KernelService
    34 ;cat CatalogFile=VBoxDrv.cat
     34;cat CatalogFile=VBoxSup.cat
    3535
    3636[DestinationDirs]
    … …  
    3838
    3939[DefaultInstall@DOT-NT-ARCH@]
    40 CopyFiles=VBoxDrv_CopyFiles
     40CopyFiles=VBoxSup_CopyFiles
    4141
    4242[DefaultInstall@[email protected]]
    43 AddService=VBoxDrv,0x00000002,VBoxDrv_Service
     43AddService=VBoxSup,0x00000002,VBoxSup_Service
    4444
    4545[DefaultUninstall@DOT-NT-ARCH@]
    46 DefFiles=VBoxDrv_CopyFiles
     46DefFiles=VBoxSup_CopyFiles
    4747
    4848[DefaultUninstall@[email protected]]
    49 DelService=VBoxDrv,0x00000200
     49DelService=VBoxSup,0x00000200
    5050
    5151;; This doesn't actually work either (see VBoxUSBMon), though it triggers in the
    5252;; installer rather at manual installation on my test system (could be polluted & confused).
    53 ;; This may apparently also causes unloading trouble due to 'root\VBoxDrv' or something related to that.
     53;; This may apparently also causes unloading trouble due to 'root\VBoxSup' or something related to that.
    5454;; [Manufacturer]
    5555;; %ORACLE%=Oracle@COMMA-NT-ARCH@
    … …  
    5757;; ; Models section (referenced by [Manufacturer]).
    5858;; [Oracle@DOT-NT-ARCH@]
    59 ;; %VBoxDrv.DRVDESC%=VBoxDrvInstall,root\VBoxDrv
     59;; %VBoxSup.DRVDESC%=VBoxSupInstall,root\VBoxSup
    6060;;
    61 ;; [VBoxDrvInstall@DOT-NT-ARCH@]
    62 ;; CopyFiles=VBoxDrv_CopyFiles
     61;; [VBoxSupInstall@DOT-NT-ARCH@]
     62;; CopyFiles=VBoxSup_CopyFiles
    6363;;
    64 ;; [VBoxDrvInstall@[email protected]]
    65 ;; AddService=VBoxDrv,0x00000002,VBoxDrv_Service
     64;; [VBoxSupInstall@[email protected]]
     65;; AddService=VBoxSup,0x00000002,VBoxSup_Service
    6666
    6767[SourceDisksFiles]
    68 VBoxDrv.sys=1
     68VBoxSup.sys=1
    6969
    7070[SourceDisksNames]
    71 1=%VBoxDrv.DSKDESC%,
     711=%VBoxSup.DSKDESC%,
    7272
    73 [VBoxDrv_CopyFiles]
    74 VBoxDrv.sys
     73[VBoxSup_CopyFiles]
     74VBoxSup.sys
    7575
    76 [VBoxDrv_Service]
    77 DisplayName    = %VBoxDrv.SVCDESC%
     76[VBoxSup_Service]
     77DisplayName    = %VBoxSup.SVCDESC%
    7878ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
    7979;StartType      = 3                  ; SERVICE_DEMAND_START
    8080StartType      = 1                  ; autostart to fix Vista problem
    8181ErrorControl   = 1                  ; SERVICE_ERROR_NORMAL
    82 ServiceBinary  = %12%\VBoxDrv.sys
     82ServiceBinary  = %12%\VBoxSup.sys
    8383
    8484[Strings]
    8585ORACLE = "Oracle Corporation"
    86 VBoxDrv.SVCDESC = "VirtualBox Service"
    87 VBoxDrv.DRVDESC = "VirtualBox Driver"
    88 VBoxDrv.DSKDESC = "VirtualBox Driver Installation Disk"
     86VBoxSup.SVCDESC = "VirtualBox Service"
     87VBoxSup.DRVDESC = "VirtualBox Support Driver"
     88VBoxSup.DSKDESC = "VirtualBox Support Driver Installation Disk"
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