Changeset 35678 in vbox for trunk

Timestamp:

Jan 24, 2011 2:42:36 PM (14 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Install guest driver first.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (2 diffs)

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

@@ -321 +321 @@
   AccessControl::GrantOnFile "$g_strSystemDir\VBoxHook.dll" "(BU)" "GenericRead"
 
-  DetailPrint "Installing Drivers..."
+  DetailPrint "Installing drivers ..."
 
   Push $0 ; For fetching results
 
+drv_guest:
+
+  StrCmp $g_bNoGuestDrv "true" drv_video
+  DetailPrint "Installing guest driver ..."
+  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxGuest.inf"'
+  Pop $0 ; Ret value
+  LogText "Guest driver result: $0"
+  IntCmp $0 0 +1 error error  ; Check ret value (0=OK, 1=Error)
+
 drv_video:
 
-  StrCmp $g_bNoVideoDrv "true" drv_guest
+  StrCmp $g_bNoVideoDrv "true" drv_mouse
   SetOutPath "$INSTDIR"
   ${If} $g_bWithWDDM == "true"
@@ -339 +348 @@
   LogText "Video driver result: $0"
   IntCmp $0 0 +1 error error ; Check ret value (0=OK, 1=Error)
-
-drv_guest:
-
-  StrCmp $g_bNoGuestDrv "true" drv_mouse
-  DetailPrint "Installing guest driver ..."
-  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxGuest.inf"'
-  Pop $0 ; Ret value
-  LogText "Guest driver result: $0"
-  IntCmp $0 0 +1 error error  ; Check ret value (0=OK, 1=Error)
 
 drv_mouse: