Clean up TouchFile.
Bob Arnson committed
Jan 19, 2024 at 16:53 UTC
cde596e1bb9288f8cebb447a5f8cb79ca684cfe1
2 files changed
+6
-6
src/ext/Util/ca/TouchFile.cpp
+1
-1
@@ -288,7 +288,7 @@ extern "C" UINT WINAPI WixExecuteTouchFile(
288
{
289
if (iTouchFileAttributes & TOUCH_FILE_ATTRIBUTE_VITAL)
290
{
291
- ExitOnFailure(hr, "Failed to touch file: '%ls' for: %ls", &sczPath, sczId);
291
+ ExitOnFailure(hr, "Failed to touch file: '%ls' for: %ls", sczPath, sczId);
292
}
293
else
294
{
src/ext/Util/wixlib/UtilExtension_Platform.wxi
+5
-5
@@ -240,8 +240,8 @@
240
<CustomAction Id="$(var.Prefix)RollbackTouchFile$(var.Suffix)" DllEntry="WixExecuteTouchFile" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
241
242
<InstallExecuteSequence>
243
- <Custom Action="$(var.Prefix)TouchFileDuringUninstall" Before="RemoveFiles" Overridable="yes" />
244
- <Custom Action="$(var.Prefix)TouchFileDuringInstall" After="InstallFiles" Overridable="yes" />
243
+ <Custom Action="$(var.Prefix)TouchFileDuringUninstall$(var.Suffix)" Before="RemoveFiles" Overridable="yes" />
244
+ <Custom Action="$(var.Prefix)TouchFileDuringInstall$(var.Suffix)" After="InstallFiles" Overridable="yes" />
245
</InstallExecuteSequence>
246
</Fragment>
247
@@ -317,7 +317,7 @@
317
<Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
318
</InstallUISequence>
319
</Fragment>
320
-
320
+
321
<Fragment>
322
<CustomAction Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
323
@@ -341,7 +341,7 @@
341
<Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
342
</InstallUISequence>
343
</Fragment>
344
-
344
+
345
<Fragment>
346
<CustomAction Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
347
@@ -353,7 +353,7 @@
353
<Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes" Condition="VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)" />
354
</InstallUISequence>
355
</Fragment>
356
-
356
+
357
<Fragment>
358
<CustomAction Id="$(var.Prefix)QueryNativeMachine$(var.Suffix)" DllEntry="WixQueryNativeMachine" Execute="firstSequence" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
359