Changeset 36571 in vbox for trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

Timestamp:

Apr 6, 2011 9:30:03 AM (14 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Apply WFP settings after taking ownership and settings access rights.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (2 diffs)

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

@@ -733 +733 @@
   Pop $0
 
-!if $%VBOX_WITH_GUEST_INSTALL_HELPER% == "1"
-  !ifdef WFP_FILE_EXCEPTION
-    VBoxGuestInstallHelper::DisableWFP "$0"
-    Pop $1 ; Get return value (ignored for now)
-    DetailPrint "Setting WFP exception for '$0': $1"
-  !endif
-!endif
-
   IfFileExists "$g_strSystemDir\takeown.exe" 0 +2
     nsExec::ExecToLog '"$g_strSystemDir\takeown.exe" /F "$0"'
@@ -749 +741 @@
   Pop $1
   DetailPrint "Setting access rights for '$0': $1"
+
+!if $%VBOX_WITH_GUEST_INSTALL_HELPER% == "1"
+  !ifdef WFP_FILE_EXCEPTION
+    VBoxGuestInstallHelper::DisableWFP "$0"
+    Pop $1 ; Get return value (ignored for now)
+    DetailPrint "Setting WFP exception for '$0': $1"
+  !endif
+!endif
 
 FunctionEnd