Changeset 34745 in vbox

Timestamp:

Dec 6, 2010 1:03:51 PM (14 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Back out reboot flag handling (r68547, r68538, r68537, r68536, r68534), needs more testing after beta.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (4 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -1001 +1001 @@
 Function .onInstSuccess
 
-  ; Prevent the installer from running again without telling the user
-  ; to reboot the OS first
-  Push 1
-  Call SetRebootNeeded
-
-  ; Tell VBoxTray to reflect installation success
   Push "${PRODUCT_NAME} successfully updated!"
   Push 0 ; Message type = info
@@ -1112 +1106 @@
   ${EndIf}
 
-  ; Is a reboot needed first in order to (re-)install the Guest Additions?
-  Call IsRebootNeeded
-  Pop $0
-  ${If} $0 == "1"
-    MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 $(VBOX_REBOOT_REQUIRED) /SD IDNO IDNO +2
-      Reboot ; IDYES
-      Abort  ; IDNO
-  ${EndIf}
-
   ; Only uninstall?
   ${If} $g_bUninstall == "true"
@@ -1182 +1167 @@
   MessageBox MB_ICONINFORMATION|MB_OK $(VBOX_UNINST_SUCCESS) /SD IDOK
 
-  ; Prevent the installer from running again without telling the user
-  ; to reboot the OS first. This should be done in case of still running drivers
-  ; after uninstallation
-  Push 1
-  Call un.SetRebootNeeded
-
 FunctionEnd
 
@@ -1254 +1233 @@
 restart:
 
-  DetailPrint "Restarting computer ..."
+  DetailPrint "Rebooting ..."
   Reboot
 

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

@@ -231 +231 @@
 !insertmacro CheckArchitecture "un."
 
-!macro IsRebootNeeded un
-Function ${un}IsRebootNeeded
-
-  Push $0
-  ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce\VBoxGuestAdditions" "RebootNeeded"
-  Push $0
-
-FunctionEnd
-!macroend
-!insertmacro IsRebootNeeded ""
-!insertmacro IsRebootNeeded "un."
-
-!macro SetRebootNeeded un
-Function ${un}SetRebootNeeded
-
-  Pop $0
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\RunOnce\VBoxGuestAdditions" "RebootNeeded" $0
-
-FunctionEnd
-!macroend
-!insertmacro SetRebootNeeded ""
-!insertmacro SetRebootNeeded "un."
-
 !macro GetWindowsVer un
 Function ${un}GetWindowsVer