VirtualBox

Ignore:
Timestamp:
Nov 8, 2024 4:39:19 PM (3 months ago)
Author:
vboxsync
Message:

Windows Guest Additions: Renamed VBoxDrvInst.exe -> VBoxGuestInstallHelper.exe. Marked the 'driver [...]' commands as being deprecated. bugref:10762

Location:
trunk/src/VBox/Additions/WINNT/Installer
Files:
6 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/Makefile.kmk

    r106892 r106896  
    3131# Include Sub-Makefiles.
    3232include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
     33
     34
     35#
     36# VBoxGuestInstallHelper - Helps with various installation tasks.
     37#
     38PROGRAMS += VBoxGuestInstallHelper
     39VBoxGuestInstallHelper_TEMPLATE = VBoxGuestR3Exe
     40VBoxGuestInstallHelper_DEFS    = _WIN32_WINNT=0x0400 _UNICODE UNICODE
     41VBoxGuestInstallHelper_DEFS   += VBOX_SVN_REV=$(VBOX_SVN_REV)
     42ifdef VBOX_WITH_WDDM
     43 VBoxGuestInstallHelper_DEFS  += VBOX_WITH_WDDM
     44endif
     45VBoxGuestInstallHelper_DEPS    = $(VBOX_SVN_REV_KMK)
     46VBoxGuestInstallHelper_SDKS    = ReorderCompilerIncs $(VBOX_WINPSDK_GST) $(VBOX_WINDDK_GST)
     47VBoxGuestInstallHelper_INCS    = ../../include
     48VBoxGuestInstallHelper_SOURCES = \
     49        VBoxGuestInstallHelper.cpp \
     50        VBoxGuestInstallHelper.rc \
     51        $(PATH_ROOT)/src/VBox/GuestHost/Installation/VBoxWinDrvCommon.cpp \
     52        $(PATH_ROOT)/src/VBox/GuestHost/Installation/VBoxWinDrvInst.cpp \
     53        $(PATH_ROOT)/src/VBox/GuestHost/Installation/VBoxWinDrvStore.cpp
     54VBoxGuestInstallHelper_VBOX_IMPORT_CHECKER.win.x86 := nt4 # setupapi was introduced in NT4
     55
    3356
    3457#

  • trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

    r106895 r106896  
    11/* $Id$ */
    22/** @file
    3  * VBoxDrvInst - Driver and service installation helper for Windows guests.
     3 * VBoxGuestInstallHelper - Driver and service installation helper for Windows guests.
    44 */
    55
    … …  
    5959#include <iprt/string.h>
    6060#include <iprt/system.h>
     61#include <iprt/thread.h> /* For RTThreadSleep(). */
    6162#include <iprt/utf16.h>
    6263
    … …  
    594595}
    595596
     597/**
     598 * Shows a deprecation notice for a command.
     599 *
     600 * @param   pszCmd              Command which is deprecated.
     601 */
     602static void showCmdDeprecationNotice(const char *pszCmd)
     603{
     604    PrintStr("!!! Deprecation Notice !!!\n");
     605    PrintSSS("\tThe command \"", pszCmd, "\" is deprecated, is not supported anymore\n");
     606    PrintStr("\tand will be removed in a future version.\n");
     607    PrintStr("!!! Deprecation Notice !!!\n\n");
     608    PrintStr("Please use VBoxGuestInstallHelper.exe instead.\n\n");
     609
     610    RTThreadSleep(RT_MS_10SEC); /* Make it painful to use. */
     611}
     612
    596613/** Handles 'driver install'. */
    597614static int handleDriverInstall(unsigned cArgs, wchar_t **papwszArgs)
    598615{
     616    showCmdDeprecationNotice("install");
     617
    599618    char *pszInfFile = NULL;
    600619    int rc = RTUtf16ToUtf8(papwszArgs[0], &pszInfFile);
    … …  
    637656static int handleDriverUninstall(unsigned cArgs, wchar_t **papwszArgs)
    638657{
     658    showCmdDeprecationNotice("uninstall");
     659
    639660    char *pszInfFile = NULL;
    640661    int rc = RTUtf16ToUtf8(papwszArgs[0], &pszInfFile);
    … …  
    683704static int handleDriverExecuteInf(unsigned cArgs, wchar_t **papwszArgs)
    684705{
     706    showCmdDeprecationNotice("executeinf");
     707
    685708    char *pszInfFile = NULL;
    686709    int rc = RTUtf16ToUtf8(papwszArgs[0], &pszInfFile);
    … …  
    22192242             "Version: " RT_XSTR(VBOX_VERSION_MAJOR) "." RT_XSTR(VBOX_VERSION_MINOR) "." RT_XSTR(VBOX_VERSION_BUILD) "r" RT_XSTR(VBOX_SVN_REV) "\r\n"
    22202243             "\r\n"
    2221              "Syntax: VBoxDrvInst <command> <subcommand>\r\n"
     2244             "Syntax: VBoxGuestInstallHelper <command> <subcommand>\r\n"
    22222245             "\r\n"
    22232246             "Drivers:\r\n"
    2224              "    VBoxDrvInst driver install <inf-file> [pnp-id] [log-file]\r\n"
    2225              "    VBoxDrvInst driver uninstall <inf-file> <model> [pnp-id] [log-file]\r\n"
    2226              "    VBoxDrvInst driver executeinf <inf-file> [section]\r\n"
    2227              "    VBoxDrvInst driver nt4-install-video [install-dir]\r\n"
     2247             "    VBoxGuestInstallHelper driver install <inf-file> [pnp-id] [log-file]\r\n"
     2248             "    VBoxGuestInstallHelper driver uninstall <inf-file> <model> [pnp-id] [log-file]\r\n"
     2249             "    VBoxGuestInstallHelper driver executeinf <inf-file> [section]\r\n"
     2250             "    VBoxGuestInstallHelper driver nt4-install-video [install-dir]\r\n"
    22282251             "\r\n"
    22292252             "Service:\r\n"
    2230              "    VBoxDrvInst service create <name> <display-name> <service-type>\r\n"
     2253             "    VBoxGuestInstallHelper service create <name> <display-name> <service-type>\r\n"
    22312254             "        <start-type> <binary-path> [load-order] [deps] [user] [password]\r\n"
    2232              "    VBoxDrvInst service delete <name>\r\n"
     2255             "    VBoxGuestInstallHelper service delete <name>\r\n"
    22332256             "\r\n"
    22342257             "Network Provider:\r\n"
    2235              "    VBoxDrvInst netprovider add <name> <position>\r\n"
    2236              "    VBoxDrvInst netprovider remove <name>\r\n"
     2258             "    VBoxGuestInstallHelper netprovider add <name> <position>\r\n"
     2259             "    VBoxGuestInstallHelper netprovider remove <name>\r\n"
    22372260             "\r\n"
    22382261             "Registry:\r\n"
    2239              "    VBoxDrvInst registry write <root> <sub-key> <value-name> <type> <value>\r\n"
     2262             "    VBoxGuestInstallHelper registry write <root> <sub-key> <value-name> <type> <value>\r\n"
    22402263             "        [binary-conversion] [max-size]\r\n"
    2241              "    VBoxDrvInst registry delete <root> <sub-key> <value-name>\r\n"
     2264             "    VBoxGuestInstallHelper registry delete <root> <sub-key> <value-name>\r\n"
    22422265             /** @todo Add roots for these two. */
    2243              "    VBoxDrvInst registry addmultisz <sub-key> <value-name> <to-add> <position>\r\n"
    2244              "    VBoxDrvInst registry delmultisz <sub-key> <value-name> <to-remove>\r\n"
    2245              "    VBoxDrvInst registry addlistitem <root> <sub-key> <value-name> <to-add>\r\n"
     2266             "    VBoxGuestInstallHelper registry addmultisz <sub-key> <value-name> <to-add> <position>\r\n"
     2267             "    VBoxGuestInstallHelper registry delmultisz <sub-key> <value-name> <to-remove>\r\n"
     2268             "    VBoxGuestInstallHelper registry addlistitem <root> <sub-key> <value-name> <to-add>\r\n"
    22462269             "        [position [dup|no-dup]]\r\n"
    2247              "    VBoxDrvInst registry dellistitem <root> <sub-key> <value-name> <to-remove>\r\n"
     2270             "    VBoxGuestInstallHelper registry dellistitem <root> <sub-key> <value-name> <to-remove>\r\n"
    22482271             "\r\n"
    22492272             "Standard options:\r\n"
    2250              "    VBoxDrvInst [help|--help|/help|-h|/h|-?|/h] [...]\r\n"
    2251              "    VBoxDrvInst [version|--version|-V]\r\n"
     2273             "    VBoxGuestInstallHelper [help|--help|/help|-h|/h|-?|/h] [...]\r\n"
     2274             "    VBoxGuestInstallHelper [version|--version|-V]\r\n"
    22522275             );
    22532276    RT_NOREF(cArgs, papwszArgs);
    … …  
    22702293    } s_aActions[] =
    22712294    {
    2272         { "driver",         "install",              1,  3, handleDriverInstall },
    2273         { "driver",         "uninstall",            2,  4, handleDriverUninstall },
    2274         { "driver",         "executeinf",           1,  3, handleDriverExecuteInf },
     2295        { "driver",         "install",              1,  3, handleDriverInstall },    /* Deprecated */
     2296        { "driver",         "uninstall",            2,  4, handleDriverUninstall },  /* Deprecated */
     2297        { "driver",         "executeinf",           1,  3, handleDriverExecuteInf }, /* Deprecated */
    22752298        { "driver",         "nt4-install-video",    0,  1, handleDriverNt4InstallVideo },
    22762299        { "service",        "create",               5,  9, handleServiceCreate },

  • trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.rc

    r106895 r106896  
    11/* $Id$ */
    22/** @file
    3  * VBoxDrvInst - Resource file containing version info and icon.
     3 * VBoxGuestInstallHelper - Resource file containing version info and icon.
    44 */
    55
    … …  
    4545      BEGIN
    4646         VALUE "FileDescription",  "VirtualBox Driver Installer\0"
    47          VALUE "InternalName",     "VBoxDrvInst\0"
    48          VALUE "OriginalFilename", "VBoxDrvInst.exe\0"
     47         VALUE "InternalName",     "VBoxGuestInstallHelper\0"
     48         VALUE "OriginalFilename", "VBoxGuestInstallHelper.exe\0"
    4949         VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
    5050         VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR

  • trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

    r106854 r106896  
    4949 TOOL_ZIP_PACK ?= zip
    5050endif
    51 
    52 
    53 #
    54 # VBoxDrvInst - Helps with driver installation.
    55 #
    56 PROGRAMS += VBoxDrvInst
    57 VBoxDrvInst_TEMPLATE = VBoxGuestR3Exe
    58 VBoxDrvInst_DEFS    = _WIN32_WINNT=0x0400 _UNICODE UNICODE
    59 VBoxDrvInst_DEFS   += VBOX_SVN_REV=$(VBOX_SVN_REV)
    60 ifdef VBOX_WITH_WDDM
    61  VBoxDrvInst_DEFS  += VBOX_WITH_WDDM
    62 endif
    63 VBoxDrvInst_DEPS    = $(VBOX_SVN_REV_KMK)
    64 VBoxDrvInst_SDKS    = ReorderCompilerIncs $(VBOX_WINPSDK_GST) $(VBOX_WINDDK_GST)
    65 VBoxDrvInst_INCS    = ../include
    66 VBoxDrvInst_SOURCES = \
    67         VBoxDrvInst.cpp \
    68         VBoxDrvInst.rc \
    69         $(PATH_ROOT)/src/VBox/GuestHost/Installation/VBoxWinDrvCommon.cpp \
    70         $(PATH_ROOT)/src/VBox/GuestHost/Installation/VBoxWinDrvInst.cpp \
    71         $(PATH_ROOT)/src/VBox/GuestHost/Installation/VBoxWinDrvStore.cpp
    72 VBoxDrvInst_VBOX_IMPORT_CHECKER.win.x86 := nt4 # setupapi was introduced in NT4
    7351
    7452
    … …  
    140118
    141119  if !$(intersects win, $(VBOX_WITH_CORP_CODE_SIGNING)) && $(intersects win_planb,$(VBOX_WITH_CORP_CODE_SIGNING))
    142    $(evalcall2 def_VBoxAdditionsInstCertFiles,vbox-sha256-r3.cer,$(VBOX_PATH_ADDITIONS)/VBoxDrvInst.exe, \
     120   $(evalcall2 def_VBoxAdditionsInstCertFiles,vbox-sha256-r3.cer,$(VBOX_PATH_ADDITIONS)/VBoxGuestInstallHelper.exe, \
    143121        extract-exe-signer-cert, 1)
    144122   VBOX_GA_CERT_ROOT_SHA2_R3 := vbox-sha256-r3-root.cer
    145    $(evalcall2 def_VBoxAdditionsInstCertFiles,$(VBOX_GA_CERT_ROOT_SHA2_R3),$(VBOX_PATH_ADDITIONS)/VBoxDrvInst.exe, \
     123   $(evalcall2 def_VBoxAdditionsInstCertFiles,$(VBOX_GA_CERT_ROOT_SHA2_R3),$(VBOX_PATH_ADDITIONS)/VBoxGuestInstallHelper.exe, \
    146124        extract-signer-root --self-signed-roots-from-system, 1)
    147125   VBOX_GA_CERT_ROOT_SHA2_R3_TS := vbox-sha256-r3-timestamp-root.cer
    148    $(evalcall2 def_VBoxAdditionsInstCertFiles,$(VBOX_GA_CERT_ROOT_SHA2_R3_TS),$(VBOX_PATH_ADDITIONS)/VBoxDrvInst.exe, \
     126   $(evalcall2 def_VBoxAdditionsInstCertFiles,$(VBOX_GA_CERT_ROOT_SHA2_R3_TS),$(VBOX_PATH_ADDITIONS)/VBoxGuestInstallHelper.exe, \
    149127        extract-timestamp-root --self-signed-roots-from-system, 1)
    150128  endif
    … …  
    324302                $(if $(VBOX_WIN_ATTESTATION_SIGNING),$(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME)) \
    325303                $(VBOX_VERSION_STAMP) \
    326                 $$(VBoxDrvInst_1_STAGE_TARGET) \
     304                $$(VBoxGuestInstallHelper_1_STAGE_TARGET) \
    327305                | $(VBOX_SIGN_IMAGE_ORDERDEPS)
    328306        $(call MSG_L1,Creating $@, from $<)
    … …  
    374352                $(VBOX_NSIS_ICON_FILE) \
    375353                $(VBOX_VERSION_STAMP) \
    376                 $$(VBoxDrvInst_1_STAGE_TARGET) \
     354                $$(VBoxGuestInstallHelper_1_STAGE_TARGET) \
    377355                | $$(dir $$@)
    378356        $(call MSG_L1,Creating $@, from $<)

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

    r106849 r106896  
    5656!endif
    5757
    58   FILE "$%PATH_OUT%\bin\additions\VBoxDrvInst.exe"
     58  FILE "$%PATH_OUT%\bin\additions\VBoxGuestInstallHelper.exe"
    5959
    6060!if $%KBUILD_TARGET_ARCH% != "arm64" ;; @todo win.arm64: Make VBoxVideo and friends build on arm.
    … …  
    237237  ; Misc tools
    238238  SetOutPath "$0\Tools"
    239   FILE "$%PATH_OUT%\bin\additions\VBoxDrvInst.exe"
     239  FILE "$%PATH_OUT%\bin\additions\VBoxGuestInstallHelper.exe"
    240240!ifdef VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
    241241  FILE "$%PATH_OUT%\bin\additions\VBoxAudioTest.exe"

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsNT4.nsh

    r106061 r106896  
    162162
    163163  ; Install guest driver
    164   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxGuest$\" $\"VBoxGuest Support Driver$\" 1 1 $\"$SYSDIR\drivers\VBoxGuest.sys$\" $\"Base$\"" 'non-zero-exitcode=abort'
     164  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service create $\"VBoxGuest$\" $\"VBoxGuest Support Driver$\" 1 1 $\"$SYSDIR\drivers\VBoxGuest.sys$\" $\"Base$\"" 'non-zero-exitcode=abort'
    165165
    166166  ; Bugfix: Set "Start" to 1, otherwise, VBoxGuest won't start on boot-up!
    … …  
    173173
    174174  ; Video driver
    175   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver nt4-install-video" 'non-zero-exitcode=abort'
     175  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" driver nt4-install-video" 'non-zero-exitcode=abort'
    176176
    177177  ; Create the VBoxService service
    178178  ; No need to stop/remove the service here! Do this only on uninstallation!
    179179  ${LogVerbose} "Installing VirtualBox service ..."
    180   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxService$\" $\"VirtualBox Guest Additions Service$\" 16 2 $\"%SystemRoot%\system32\VBoxService.exe$\" $\"Base$\"" 'non-zero-exitcode=abort'
     180  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service create $\"VBoxService$\" $\"VirtualBox Guest Additions Service$\" 16 2 $\"%SystemRoot%\system32\VBoxService.exe$\" $\"Base$\"" 'non-zero-exitcode=abort'
    181181
    182182   ; Create the Shared Folders service ...
    … …  
    196196
    197197  ; Add the shared folders network provider
    198   ;${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider add VBoxSF" 'non-zero-exitcode=abort'
     198  ;${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" netprovider add VBoxSF" 'non-zero-exitcode=abort'
    199199
    200200FunctionEnd
    … …  
    237237
    238238  ; Remove the guest driver service
    239   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxGuest" 'non-zero-exitcode=log'
     239  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service delete VBoxGuest" 'non-zero-exitcode=log'
    240240  Delete /REBOOTOK "$SYSDIR\drivers\VBoxGuest.sys"
    241241
    242242  ; Delete the VBoxService service
    243243  Call ${un}StopVBoxService
    244   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxService" 'non-zero-exitcode=log'
     244  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service delete VBoxService" 'non-zero-exitcode=log'
    245245  DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "VBoxService"
    246246  Delete /REBOOTOK "$SYSDIR\VBoxService.exe"
    … …  
    257257
    258258  ; Delete the VBoxVideo service
    259   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxVideo" 'non-zero-exitcode=log'
     259  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service delete VBoxVideo" 'non-zero-exitcode=log'
    260260
    261261  ; Delete the VBox video driver files

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh

    r106321 r106896  
    3434
    3535  ; Remove common files
    36   Delete /REBOOTOK "$INSTDIR\VBoxDrvInst.exe"
     36  Delete /REBOOTOK "$INSTDIR\VBoxGuestInstallHelper.exe"
    3737
    3838  Delete /REBOOTOK "$INSTDIR\VBoxVideo.inf"

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

    r106844 r106896  
    141141
    142142  ; Write the new value in the adapter config (VBoxVideo.sys) using hex values in binary format
    143   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" registry write HKLM $reg_path_device CustomXRes REG_BIN $g_iScreenX DWORD"  'non-zero-exitcode=abort'
    144   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" registry write HKLM $reg_path_device CustomYRes REG_BIN $g_iScreenY DWORD"  'non-zero-exitcode=abort'
    145   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" registry write HKLM $reg_path_device CustomBPP REG_BIN $g_iScreenBpp DWORD" 'non-zero-exitcode=abort'
     143  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" registry write HKLM $reg_path_device CustomXRes REG_BIN $g_iScreenX DWORD"  'non-zero-exitcode=abort'
     144  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" registry write HKLM $reg_path_device CustomYRes REG_BIN $g_iScreenY DWORD"  'non-zero-exitcode=abort'
     145  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" registry write HKLM $reg_path_device CustomBPP REG_BIN $g_iScreenBpp DWORD" 'non-zero-exitcode=abort'
    146146
    147147  ; ... and tell Windows to use that mode on next start!
    … …  
    525525  ${If} $g_bNoGuestDrv == "false"
    526526    ${LogVerbose} "Installing guest driver ..."
    527     ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxGuest$g_strEarlyNTDrvInfix.inf$\" $\"PCI\VEN_80EE&DEV_CAFE$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
     527    ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" driver install $\"$INSTDIR\VBoxGuest$g_strEarlyNTDrvInfix.inf$\" $\"PCI\VEN_80EE&DEV_CAFE$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
    528528  ${Else}
    529529    ${LogVerbose} "Guest driver installation skipped!"
    … …  
    534534    ${If} $g_bWithWDDM == "true"
    535535      ${LogVerbose} "Installing WDDM video driver..."
    536       ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxWddm.inf$\" $\"$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
     536      ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" driver install $\"$INSTDIR\VBoxWddm.inf$\" $\"$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
    537537    ${Else}
    538538      ${LogVerbose} "Installing video driver ..."
    539       ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideo$g_strEarlyNTDrvInfix.inf$\" $\"$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
     539      ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" driver install $\"$INSTDIR\VBoxVideo$g_strEarlyNTDrvInfix.inf$\" $\"$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
    540540    ${EndIf}
    541541  ${Else}
    … …  
    549549  ${If} $g_bNoMouseDrv == "false"
    550550    ${LogVerbose} "Installing mouse driver ..."
    551     ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver executeinf $\"$INSTDIR\VBoxMouse.inf$\" $\"DefaultInstall.NT$%KBUILD_TARGET_ARCH%$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
     551    ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" driver executeinf $\"$INSTDIR\VBoxMouse.inf$\" $\"DefaultInstall.NT$%KBUILD_TARGET_ARCH%$\" $\"$INSTDIR\install_drivers.log$\"" 'non-zero-exitcode=abort'
    552552  ${Else}
    553553    ${LogVerbose} "Mouse driver installation skipped!"
    … …  
    559559  ;
    560560  ${LogVerbose} "Installing VirtualBox service ..."
    561   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxService$\" $\"VirtualBox Guest Additions Service$\" 16 2 $\"%SystemRoot%\System32\VBoxService.exe$\" $\"Base$\"" 'non-zero-exitcode=abort'
     561  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service create $\"VBoxService$\" $\"VirtualBox Guest Additions Service$\" 16 2 $\"%SystemRoot%\System32\VBoxService.exe$\" $\"Base$\"" 'non-zero-exitcode=abort'
    562562
    563563  ; Set service description
    … …  
    572572  ; Create the Shared Folders service ...
    573573  ; No need to stop/remove the service here! Do this only on uninstallation!
    574   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxSF$\" $\"VirtualBox Shared Folders$\" 2 1 $\"\SystemRoot\System32\drivers\VBoxSF.sys$\" $\"NetworkProvider$\"" 'non-zero-exitcode=abort'
     574  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service create $\"VBoxSF$\" $\"VirtualBox Shared Folders$\" 2 1 $\"\SystemRoot\System32\drivers\VBoxSF.sys$\" $\"NetworkProvider$\"" 'non-zero-exitcode=abort'
    575575
    576576  ; ... and the link to the network provider
    … …  
    580580
    581581  ; Add default network providers (if not present or corrupted)
    582   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider add WebClient"         'non-zero-exitcode=abort'
    583   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider add LanmanWorkstation" 'non-zero-exitcode=abort'
    584   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider add RDPNP"             'non-zero-exitcode=abort'
     582  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" netprovider add WebClient"         'non-zero-exitcode=abort'
     583  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" netprovider add LanmanWorkstation" 'non-zero-exitcode=abort'
     584  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" netprovider add RDPNP"             'non-zero-exitcode=abort'
    585585
    586586  ; Add the shared folders network provider
    587587  ${LogVerbose} "Adding network provider (Order = $g_iSfOrder) ..."
    588   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider add VBoxSF $g_iSfOrder" 'non-zero-exitcode=abort'
     588  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" netprovider add VBoxSF $g_iSfOrder" 'non-zero-exitcode=abort'
    589589
    590590
    … …  
    700700  ; Remove VirtualBox video driver
    701701  ${LogVerbose} "Uninstalling video driver ..."
    702   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideo$g_strEarlyNTDrvInfix.inf$\" $\"VBoxVideo*$\"" 'non-zero-exitcode=log'
    703   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxVideo" 'non-zero-exitcode=log'
     702  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" driver uninstall $\"$INSTDIR\VBoxVideo$g_strEarlyNTDrvInfix.inf$\" $\"VBoxVideo*$\"" 'non-zero-exitcode=log'
     703  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service delete VBoxVideo" 'non-zero-exitcode=log'
    704704  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideo.sys"
    705705  Delete /REBOOTOK "$g_strSystemDir\VBoxDisp.dll"
    … …  
    709709
    710710  ${LogVerbose} "Uninstalling WDDM video driver..."
    711   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxWddm.inf$\" $\"VBoxWddm*$\"" 'non-zero-exitcode=log'
    712   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxWddm" 'non-zero-exitcode=log'
     711  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" driver uninstall $\"$INSTDIR\VBoxWddm.inf$\" $\"VBoxWddm*$\"" 'non-zero-exitcode=log'
     712  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service delete VBoxWddm" 'non-zero-exitcode=log'
    713713  ;misha> @todo driver file removal (as well as service removal) should be done as driver package uninstall
    714   ;       could be done with "VBoxDrvInst.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
     714  ;       could be done with "VBoxGuestInstallHelper.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
    715715  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxWddm.sys"
    716716
    717717  ; Obsolete files begin
    718718  ${LogVerbose} "Uninstalling WDDM video driver for Windows 8..."
    719   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideoW8.inf$\" $\"VBoxVideoW8*$\"" 'non-zero-exitcode=log'
    720   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxVideoW8" 'non-zero-exitcode=log'
     719  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" driver uninstall $\"$INSTDIR\VBoxVideoW8.inf$\" $\"VBoxVideoW8*$\"" 'non-zero-exitcode=log'
     720  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service delete VBoxVideoW8" 'non-zero-exitcode=log'
    721721  ;misha> @todo driver file removal (as well as service removal) should be done as driver package uninstall
    722   ;       could be done with "VBoxDrvInst.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
     722  ;       could be done with "VBoxGuestInstallHelper.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
    723723  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideoW8.sys"
    724724
    725725  ${LogVerbose} "Uninstalling WDDM video driver for Windows Vista and 7..."
    726   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideoWddm.inf$\" $\"VBoxVideoWddm*$\"" 'non-zero-exitcode=log'
     726  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" driver uninstall $\"$INSTDIR\VBoxVideoWddm.inf$\" $\"VBoxVideoWddm*$\"" 'non-zero-exitcode=log'
    727727  ; Always try to remove both VBoxVideoWddm & VBoxVideo services no matter what is installed currently
    728   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxVideoWddm" 'non-zero-exitcode=log'
     728  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service delete VBoxVideoWddm" 'non-zero-exitcode=log'
    729729  ;misha> @todo driver file removal (as well as service removal) should be done as driver package uninstall
    730   ;       could be done with "VBoxDrvInst.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
     730  ;       could be done with "VBoxGuestInstallHelper.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
    731731  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideoWddm.sys"
    732732  ; Obsolete files end
    … …  
    761761  ; Remove mouse driver
    762762  ${LogVerbose} "Removing mouse driver ..."
    763   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxMouse.inf$\" $\"VBoxMouse*$\"" 'non-zero-exitcode=log'
     763  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" driver uninstall $\"$INSTDIR\VBoxMouse.inf$\" $\"VBoxMouse*$\"" 'non-zero-exitcode=log'
    764764  ; @todo Fix VBoxMouse.inf to also take care of the next line!
    765   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" registry delmultisz $\"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}$\" $\"UpperFilters$\" $\"VBoxMouse$\"" 'non-zero-exitcode=log'
     765  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" registry delmultisz $\"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}$\" $\"UpperFilters$\" $\"VBoxMouse$\"" 'non-zero-exitcode=log'
    766766
    767767  ; Delete the VBoxService service
    768768  Call ${un}StopVBoxService
    769   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxService" 'non-zero-exitcode=log'
     769  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service delete VBoxService" 'non-zero-exitcode=log'
    770770  DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "VBoxService"
    771771  Delete /REBOOTOK "$g_strSystemDir\VBoxService.exe"
    … …  
    786786  ; Remove guest driver
    787787  ${LogVerbose} "Removing guest driver ..."
    788   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxGuest$g_strEarlyNTDrvInfix.inf$\" $\"VBoxGuest*$\"" 'non-zero-exitcode=log'
    789 
    790   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxGuest" 'non-zero-exitcode=log'
     788  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" driver uninstall $\"$INSTDIR\VBoxGuest$g_strEarlyNTDrvInfix.inf$\" $\"VBoxGuest*$\"" 'non-zero-exitcode=log'
     789
     790  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service delete VBoxGuest" 'non-zero-exitcode=log'
    791791  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxGuest.sys"
    792792  Delete /REBOOTOK "$g_strSystemDir\VBCoInst.dll" ; Deprecated, does not get installed anymore
    … …  
    798798  ; Remove shared folders driver
    799799  ${LogVerbose} "Removing shared folders driver ..."
    800   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider remove VBoxSF" 'non-zero-exitcode=log'
    801   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxSF" 'non-zero-exitcode=log'
     800  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" netprovider remove VBoxSF" 'non-zero-exitcode=log'
     801  ${CmdExecute} "$\"$INSTDIR\VBoxGuestInstallHelper.exe$\" service delete VBoxSF" 'non-zero-exitcode=log'
    802802  Delete /REBOOTOK "$g_strSystemDir\VBoxMRXNP.dll" ; The network provider DLL will be locked
    803803  !if $%KBUILD_TARGET_ARCH% == "amd64"
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