Changeset 64227 in vbox for trunk/src/VBox/Additions/WINNT/Installer

Timestamp:

Oct 12, 2016 1:23:06 PM (8 years ago)

Author:

vboxsync

Message:

Windows Additions installer: SCM path fixes. Untested.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxDrvInst.cpp (modified) (2 diffs)
• VBoxGuestAdditionsNT4.nsh (modified) (5 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp

@@ -97 +97 @@
 # define VBOX_DRVINST_LOGFILE                 "C:\\Temp\\VBoxDrvInstDIFx.log"
 #endif
+
+/** @todo Get rid of all that TCHAR crap! Use WCHAR wherever possible. */
 
 bool GetErrorMsg(DWORD dwLastError, _TCHAR *pszMsg, DWORD dwBufSize)
@@ -1214 +1216 @@
                 && argc >= 8)
             {
+                /* Make sure that the image path is in quotes. */
+                _TCHAR szImagePath[_MAX_PATH];
+                _sntprintf(szImagePath, sizeof(szImagePath) / sizeof(TCHAR), _T("\"%ws\""), argv[7]);
+
                 rc = CreateService(argv[3],
                                    argv[4],
                                    _ttoi(argv[5]),
                                    _ttoi(argv[6]),
-                                   argv[7],
+                                   szImagePath,
                                    (argc > 8) ? argv[8] : NULL,
                                    (argc > 9) ? argv[9] : NULL,

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

@@ -5 +5 @@
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2016 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -145 +145 @@
   ; Bugfix: Correct invalid "ImagePath" (\??\C:\WINNT\...)
   WriteRegDWORD HKLM "SYSTEM\CurrentControlSet\Services\VBoxGuest" "Start" 1
-  WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\VBoxGuest" "ImagePath" "System32\Drivers\VBoxGuestNT.sys"
+  WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\VBoxGuest" "ImagePath" "\SystemRoot\System32\DRIVERS\VBoxGuestNT.sys"
 
   ; Run VBoxTray when Windows NT starts
@@ -157 +157 @@
   ; 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 $\"system32\VBoxServiceNT.exe$\" $\"Base$\"" "false"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxService$\" $\"VirtualBox Guest Additions Service$\" 16 2 $\"%SystemRoot%\system32\VBoxServiceNT.exe$\" $\"Base$\"" "false"
 
    ; Create the Shared Folders service ...
@@ -201 +201 @@
 
   ; Write mouse driver name to registry overwriting the default name
-  WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\i8042prt" "ImagePath" "System32\DRIVERS\VBoxMouseNT.sys"
+  WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\i8042prt" "ImagePath" "\SystemRoot\System32\DRIVERS\VBoxMouseNT.sys"
 
 FunctionEnd
@@ -254 +254 @@
   ; warn the user and set it to the default driver to not screw up NT4 here
   ${If} $0 == "System32\DRIVERS\VBoxMouseNT.sys"
-    WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\i8042prt" "ImagePath" "System32\DRIVERS\i8042prt.sys"
+    WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\i8042prt" "ImagePath" "\SystemRoot\System32\DRIVERS\i8042prt.sys"
     ${LogVerbose} "Old mouse driver is set to VBoxMouseNT.sys, defaulting to i8042prt.sys ..."
   ${Else}

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

@@ -5 +5 @@
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2016 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -429 +429 @@
   ; No need to stop/remove the service here! Do this only on uninstallation!
   ${LogVerbose} "Installing VirtualBox service ..."
-  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxService$\" $\"VirtualBox Guest Additions Service$\" 16 2 $\"system32\VBoxService.exe$\" $\"Base$\"" "false"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxService$\" $\"VirtualBox Guest Additions Service$\" 16 2 $\"%SystemRoot%\System32\VBoxService.exe$\" $\"Base$\"" "false"
 
   ; Set service description
@@ -440 +440 @@
   ; Create the Shared Folders service ...
   ; No need to stop/remove the service here! Do this only on uninstallation!
-  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxSF$\" $\"VirtualBox Shared Folders$\" 2 1 $\"system32\drivers\VBoxSF.sys$\" $\"NetworkProvider$\"" "false"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxSF$\" $\"VirtualBox Shared Folders$\" 2 1 $\"\SystemRoot\System32\drivers\VBoxSF.sys$\" $\"NetworkProvider$\"" "false"
 
   ; ... and the link to the network provider