儲存庫 vbox 的更動 34729

時間撮記:

2010-12-6 上午10:44:21 (14 年 以前)

作者:

vboxsync

訊息:

Windows Guest Additions installer: Set flag for a needed reboot after uninstallation to prevent immediately installation with still in-use drivers that might fail.

位置:

trunk/src/VBox/Additions/WINNT/Installer

檔案:

• VBoxGuestAdditions.nsi (修改) (3 筆差異)
• VBoxGuestAdditionsCommon.nsh (修改) (1 筆差異)

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

@@ -1106 +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"
@@ -1167 +1176 @@
   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 SetRebootNeeded
+
 FunctionEnd
 
@@ -1233 +1248 @@
 restart:
 
-  DetailPrint "Rebooting ..."
+  DetailPrint "Restarting computer ..."
   Reboot
 

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

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