diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-16 22:55:52 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-16 22:55:52 +0000 |
| commit | cd47c2446f1a9dee96610f298989848f8986a8be (patch) | |
| tree | 02c30d62a9164987d0aaba2f72c58a50053205d6 /src/VBox/Installer/win/VBoxMergeAppCA.wxi | |
| parent | Releasing progress-linux version 7.0.14-dfsg-4~progress7.99u1. (diff) | |
| download | virtualbox-cd47c2446f1a9dee96610f298989848f8986a8be.tar.xz virtualbox-cd47c2446f1a9dee96610f298989848f8986a8be.zip | |
Merging upstream version 7.0.16-dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/VBox/Installer/win/VBoxMergeAppCA.wxi')
| -rw-r--r-- | src/VBox/Installer/win/VBoxMergeAppCA.wxi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/VBox/Installer/win/VBoxMergeAppCA.wxi b/src/VBox/Installer/win/VBoxMergeAppCA.wxi index ddc29f5e..2a3eef7f 100644 --- a/src/VBox/Installer/win/VBoxMergeAppCA.wxi +++ b/src/VBox/Installer/win/VBoxMergeAppCA.wxi @@ -35,5 +35,11 @@ <CustomAction Id="ca_IsWindows10" BinaryKey="VBoxInstallHelper" DllEntry="IsWindows10" Execute="immediate" Return="ignore" Impersonate="no" /> + <!-- Makes sure we check if the chosen target directory is valid before allowing to install. See @bugref{10616} --> + <CustomAction Id="ca_CheckTargetDirPre" BinaryKey="VBoxInstallHelper" + DllEntry="CheckTargetDir" Execute="immediate" Return="ignore" Impersonate="no" /> + <!-- Makes sure that the target directory we installed into still is valid. Rollback if it isn't. See @bugref{10616} --> + <CustomAction Id="ca_CheckTargetDirPost" BinaryKey="VBoxInstallHelper" + DllEntry="CheckTargetDir" Execute="immediate" Return="check" Impersonate="no" /> </Include> |