VBox

Timestamp:

Dec 15, 2017 11:38:43 PM (7 years ago)

Author:

vboxsync

Message:

NT4 can use VBoxService.exe, so drop VBoxServiceNT.exe.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

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

-              r70164
+              r70175
   SetOutPath "$0\Bin"
   FILE "$%PATH_OUT%\bin\additions\VBoxService.exe"
-!if $%BUILD_TARGET_ARCH% == "x86"
-  FILE "$%PATH_OUT%\bin\additions\VBoxServiceNT.exe"
-!endif
   ; Shared Folders
 …
 !endif
+  ${If} $g_strWinVersion == "NT4"
+    StrCpy $2 "VBoxServiceNT.exe"
+  ${Else}
+    StrCpy $2 "VBoxService.exe"
+  ${EndIf}
+  StrCpy $2 "VBoxService.exe"
   ${nsProcess::FindProcess} $2 $0

-              r70164
+              r70175
   ; VBoxService
   FILE "$%PATH_OUT%\bin\additions\VBoxServiceNT.exe"
   AccessControl::SetOnFile "$SYSDIR\VBoxServiceNT.exe" "(BU)" "GenericRead"
+  FILE "$%PATH_OUT%\bin\additions\VBoxService.exe"
+  AccessControl::SetOnFile "$SYSDIR\VBoxService.exe" "(BU)" "GenericRead"
   ; The drivers into the "drivers" directory
 …
   ; Create the VBoxService service
   ; No need to stop/remove the service here! Do this only on uninstallation!
   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxService$\" $\"VirtualBox Guest Additions Service$\" 16 2 $\"%SystemRoot%\system32\VBoxServiceNT.exe$\" $\"Base$\"" "false"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxService$\" $\"VirtualBox Guest Additions Service$\" 16 2 $\"%SystemRoot%\system32\VBoxService.exe$\" $\"Base$\"" "false"
    ; Create the Shared Folders service ...
 …
   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxService" "true"
   DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "VBoxService"
   Delete /REBOOTOK "$SYSDIR\VBoxServiceNT.exe"
+  Delete /REBOOTOK "$SYSDIR\VBoxService.exe"
   ; Delete the VBoxTray app

Note: See TracChangeset for help on using the changeset viewer.