diff options
| author |   Simon Rozman <simon@rozman.si> | 2020-02-27 14:56:44 +0100 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-02-29 19:39:11 +0800 |
| commit | 6d6e2190801b278b3aab84d910737925b8df5c2f (patch) | |
| tree | a898793345db86d83f5ff4ee72cfefa5a54a8204 /installer/installer.wxs | |
| parent | Version bump (diff) | |
| download | wintun-6d6e2190801b278b3aab84d910737925b8df5c2f.tar.xz wintun-6d6e2190801b278b3aab84d910737925b8df5c2f.zip | |
Reschedule EvaluateWintun between InstallInitialize and InstallFinalize0.8.1
WireGuard is always doing so-called "minor" upgrade. This makes it
enough to run EvaluateWintun only once - somewhere after CostFinalize.
The component state we bind our driver install/remove logic to will be a
singleton: either be installed, left alone, or uninstalled. One single
action for install product session and RemoveExistingProducts session.
Other applications using Wintun might use the so-called "major" upgrade.
In this scenario the existing product is completely uninstalled first.
Including Wintun. The EvaluateWintun was called only once and it
determined that Wintun driver should be uninstalled. Since the MSI did
not execute EvaluateWintun again when installing the new product later,
the Wintun remained uninstalled.
In the case of major upgrades, the Wintun requires two separate action
logics: what to do with Wintun on uninstall of the old product, and what
to do with it when new product is installed.
Therefore, EvaluateWintun has been moved between InstallInitialize and
InstallFinalize to have MSI execute it in install and uninstall
sessions.
Reported-by: Dmitry Smirnov <dmitry.smirnov@netprotect.com>
Tested-by: Simon Rozman <simon@rozman.si>
Signed-off-by: Simon Rozman <simon@rozman.si>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'installer/installer.wxs')
| -rw-r--r-- | installer/installer.wxs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/installer/installer.wxs b/installer/installer.wxs index 1883618..f1706cf 100644 --- a/installer/installer.wxs +++ b/installer/installer.wxs @@ -34,7 +34,7 @@ <CustomAction Id="EvaluateWintun" SuppressModularization="yes" BinaryKey="installer.dll" DllEntry="MsiEvaluate" Execute="immediate" /> <CustomAction Id="ProcessWintun" SuppressModularization="yes" BinaryKey="installer.dll" DllEntry="MsiProcess" Execute="deferred" Impersonate="no" /> <InstallExecuteSequence> - <Custom Action="EvaluateWintun" After="CostFinalize" /> + <Custom Action="EvaluateWintun" Before="ProcessWintun" /> <Custom Action="ProcessWintun" After="InstallFiles" /> </InstallExecuteSequence> |