You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardexpand all lines: contrib/windows/packaging/MSI_main-v2.wxs.tt
+2-2
Original file line number
Diff line number
Diff line change
@@ -525,13 +525,13 @@
525
525
<LaunchConditionsSequence="400" />
526
526
527
527
[%- IF bits==32 %]
528
-
<CustomAction="SchedSecureObjects"After="CreateFolders"><![CDATA[NOT INSTALLDIR<<ProgramFilesFolder AND NOT REMOVE~="ALL"]]></Custom>
528
+
<CustomAction="SchedSecureObjects"After="CreateFolders"><![CDATA[(NOT INSTALLDIR<<ProgramFilesFolder OR (LOCAL<>"" AND NOT LOCAL<<ProgramFiles64Folder)) AND NOT REMOVE~="ALL"]]></Custom>
529
529
<CustomAction="SetFixInstallDir"After="SchedSecureObjects"><![CDATA[NOT INSTALLDIR<<ProgramFilesFolder AND NOT REMOVE~="ALL"]]></Custom>
530
530
<CustomAction="FixInstallDir"After="SetFixInstallDir"><![CDATA[NOT INSTALLDIR<<ProgramFilesFolder AND NOT REMOVE~="ALL"]]></Custom>
531
531
<CustomAction="SetFixLocalDir"After="SchedSecureObjects"><![CDATA[LOCAL<>"" AND NOT LOCAL<<ProgramFilesFolder AND NOT REMOVE~="ALL"]]></Custom>
532
532
<CustomAction="FixLocalDir"After="SetFixLocalDir"><![CDATA[LOCAL<>"" AND NOT LOCAL<<ProgramFilesFolder AND NOT REMOVE~="ALL"]]></Custom>
533
533
[%- ELSE %]
534
-
<CustomAction="SchedSecureObjects_x64"After="CreateFolders"><![CDATA[NOT INSTALLDIR<<ProgramFiles64Folder AND NOT REMOVE~="ALL"]]></Custom>
534
+
<CustomAction="SchedSecureObjects_x64"After="CreateFolders"><![CDATA[(NOT INSTALLDIR<<ProgramFiles64Folder OR (LOCAL<>"" AND NOT LOCAL<<ProgramFiles64Folder)) AND NOT REMOVE~="ALL"]]></Custom>
535
535
<CustomAction="SetFixInstallDir"After="SchedSecureObjects_x64"><![CDATA[NOT INSTALLDIR<<ProgramFiles64Folder AND NOT REMOVE~="ALL"]]></Custom>
536
536
<CustomAction="FixInstallDir"After="SetFixInstallDir"><![CDATA[NOT INSTALLDIR<<ProgramFiles64Folder AND NOT REMOVE~="ALL"]]></Custom>
537
537
<CustomAction="SetFixLocalDir"After="SchedSecureObjects_x64"><![CDATA[LOCAL<>"" AND NOT LOCAL<<ProgramFiles64Folder AND NOT REMOVE~="ALL"]]></Custom>
0 commit comments