Changeset 107237 in vbox for trunk

Timestamp:

Dec 5, 2024 2:53:26 PM (2 months ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Fixed regression from r153570 within CmdExecute macro, where there was a double negation in the options checking as well as a bug which prevented the installation to abort if the caller told so via the given options.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsExternal.nsh (modified) (3 diffs)

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

@@ -45 +45 @@
 
   ; Check that the options are valid.
-  ${IfNot}    ${options} != "exitcode=0"
-  ${AndIfNot} ${options} != "ignore-exitcode"
+  ${If}    ${options} != "non-zero-exitcode=log"
+  ${AndIf} ${options} != "non-zero-exitcode=abort"
     Abort "Internal error in _cmdExecute: options=${options} cmdline=${cmdline}"
   ${EndIf}
@@ -58 +58 @@
     Pop $0 ; Return value (exit code)
     Pop $1 ; Stdout/stderr output (up to ${NSIS_MAX_STRLEN})
-    ${LogVerbose} "$1"
+    ${LogVerbose} "exit code=$0: $1"
   ${Else}
     nsExec::ExecToLog "${cmdline}"
@@ -69 +69 @@
   ; Check if it failed and take action according to the 2nd argument.
   ;
-  ${If} $0 <> 0
-    ${If} ${options} == "exitcode=0"
+  ${If}   $0 <> 0
+  ${OrIf} $0 == "error" ; Issued by the nsExec plugin if the DLL call failed (messy handling within nsExec, sigh).
+    ${If} ${options} == "non-zero-exitcode=abort"
       ${LogVerbose} "Error excuting $\"${cmdline}$\" (exit code: $0) -- aborting installation"
       Abort "Error excuting $\"${cmdline}$\" (exit code: $0) -- aborting installation"