Changeset 70164 in vbox

Timestamp:

Dec 15, 2017 5:32:56 PM (7 years ago)

Author:

vboxsync

Message:

Additions: No more VBoxGuestNT.sys; NT uses the same driver build as the rest now.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Installer/Makefile.kmk (modified) (1 diff)
• WINNT/Installer/VBoxGuestAdditionsCommon.nsh (modified) (1 diff)
• WINNT/Installer/VBoxGuestAdditionsNT4.nsh (modified) (3 diffs)
• common/VBoxGuest/win/VBoxGuestInst.cpp (modified) (1 diff)
• common/VBoxService/VBoxServiceVMInfo-win.cpp (modified) (1 diff)

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

@@ -90 +90 @@
 ifeq ($(KBUILD_TARGET_ARCH),x86)
 DRIVER_FILES += \
-        $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \
-        $(PATH_STAGE_BIN)/additions/VBoxGuestNT.sys
+        $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys
 endif
 DRIVER_FILES += \

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

@@ -205 +205 @@
   FILE "$%PATH_OUT%\bin\additions\VBoxControl.exe"
 
-!if $%BUILD_TARGET_ARCH% == "x86"
-  SetOutPath "$0\VBoxGuest\NT4"
-  FILE "$%PATH_OUT%\bin\additions\VBoxGuestNT.sys"
-!endif
-
   ; VBoxService
   SetOutPath "$0\Bin"

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

@@ -139 +139 @@
   FILE "$%PATH_OUT%\bin\additions\VBoxMouseNT.sys"
   AccessControl::SetOnFile "$SYSDIR\drivers\VBoxMouseNT.sys" "(BU)" "GenericRead"
-  FILE "$%PATH_OUT%\bin\additions\VBoxGuestNT.sys"
-  AccessControl::SetOnFile "$SYSDIR\drivers\VBoxGuestNT.sys" "(BU)" "GenericRead"
+  FILE "$%PATH_OUT%\bin\additions\VBoxGuest.sys"
+  AccessControl::SetOnFile "$SYSDIR\drivers\VBoxGuest.sys" "(BU)" "GenericRead"
   ;FILE "$%PATH_OUT%\bin\additions\VBoxSFNT.sys" ; Shared Folders not available on NT4!
   ;AccessControl::SetOnFile "$SYSDIR\drivers\VBoxSFNT.sys" "(BU)" "GenericRead"
@@ -151 +151 @@
 
   ; Install guest driver
-  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxGuest$\" $\"VBoxGuest Support Driver$\" 1 1 $\"$SYSDIR\drivers\VBoxGuestNT.sys$\" $\"Base$\"" "false"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service create $\"VBoxGuest$\" $\"VBoxGuest Support Driver$\" 1 1 $\"$SYSDIR\drivers\VBoxGuest.sys$\" $\"Base$\"" "false"
 
   ; Bugfix: Set "Start" to 1, otherwise, VBoxGuest won't start on boot-up!
   ; Bugfix: Correct invalid "ImagePath" (\??\C:\WINNT\...)
   WriteRegDWORD HKLM "SYSTEM\CurrentControlSet\Services\VBoxGuest" "Start" 1
-  WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\VBoxGuest" "ImagePath" "\SystemRoot\System32\DRIVERS\VBoxGuestNT.sys"
+  WriteRegStr HKLM "SYSTEM\CurrentControlSet\Services\VBoxGuest" "ImagePath" "\SystemRoot\System32\DRIVERS\VBoxGuest.sys"
 
   ; Run VBoxTray when Windows NT starts
@@ -235 +235 @@
   ; Remove the guest driver service
   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxGuest" "true"
-  Delete /REBOOTOK "$SYSDIR\drivers\VBoxGuestNT.sys"
+  Delete /REBOOTOK "$SYSDIR\drivers\VBoxGuest.sys"
 
   ; Delete the VBoxService service

trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestInst.cpp

@@ -56 +56 @@
     char szDriver[MAX_PATH];
     GetSystemDirectory(szDriver, sizeof(szDriver));
-    strcat(szDriver, "\\drivers\\VBoxGuestNT.sys");
+    strcat(szDriver, "\\drivers\\VBoxGuest.sys");
 
     SC_HANDLE hService = CreateService(hSMgrCreate,

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -1366 +1366 @@
 #endif /* !RT_ARCH_AMD64 */
 
+        { szDriversDir, "VBoxGuest.sys" },
 #ifdef TARGET_NT4
-        { szDriversDir, "VBoxGuestNT.sys" },
         { szDriversDir, "VBoxMouseNT.sys" },
 #else
-        { szDriversDir, "VBoxGuest.sys" },
         { szDriversDir, "VBoxMouse.sys" },
         { szDriversDir, "VBoxSF.sys"    },