diff options
| author | Bob Arnson <bob@joyofsetup.com> | 2020-03-05 19:48:12 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-03-09 12:16:09 -0400 |
| commit | e9d10933bedb8215ec50ca85db272d6647426b31 (patch) | |
| tree | 262cbaf190de5d5461941c79923bef8cf4cf7ad1 /src/ca/RestartManager.cpp | |
| parent | 7533ca33de2b8125e9f9ecb3b28a247acca85f83 (diff) | |
| download | wix-e9d10933bedb8215ec50ca85db272d6647426b31.tar.gz wix-e9d10933bedb8215ec50ca85db272d6647426b31.tar.bz2 wix-e9d10933bedb8215ec50ca85db272d6647426b31.zip | |
Version extension ids.
Partial fix for wixtoolset/issues#5933.
Diffstat (limited to 'src/ca/RestartManager.cpp')
| -rw-r--r-- | src/ca/RestartManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ca/RestartManager.cpp b/src/ca/RestartManager.cpp index 3cfc07ee..c31819c1 100644 --- a/src/ca/RestartManager.cpp +++ b/src/ca/RestartManager.cpp | |||
| @@ -18,8 +18,8 @@ enum eRmuResourceType | |||
| 18 | }; | 18 | }; |
| 19 | 19 | ||
| 20 | LPCWSTR vcsRestartResourceQuery = | 20 | LPCWSTR vcsRestartResourceQuery = |
| 21 | L"SELECT `WixRestartResource`.`WixRestartResource`, `WixRestartResource`.`Component_`, `WixRestartResource`.`Resource`, `WixRestartResource`.`Attributes` " | 21 | L"SELECT `Wix4RestartResource`.`Wix4RestartResource`, `Wix4RestartResource`.`Component_`, `Wix4RestartResource`.`Resource`, `Wix4RestartResource`.`Attributes` " |
| 22 | L"FROM `WixRestartResource`"; | 22 | L"FROM `Wix4RestartResource`"; |
| 23 | enum eRestartResourceQuery { rrqRestartResource = 1, rrqComponent, rrqResource, rrqAttributes }; | 23 | enum eRestartResourceQuery { rrqRestartResource = 1, rrqComponent, rrqResource, rrqAttributes }; |
| 24 | 24 | ||
| 25 | /******************************************************************** | 25 | /******************************************************************** |
| @@ -58,9 +58,9 @@ extern "C" UINT __stdcall WixRegisterRestartResources( | |||
| 58 | ExitOnFailure(hr, "Failed to initialize."); | 58 | ExitOnFailure(hr, "Failed to initialize."); |
| 59 | 59 | ||
| 60 | // Skip if the table doesn't exist. | 60 | // Skip if the table doesn't exist. |
| 61 | if (S_OK != WcaTableExists(L"WixRestartResource")) | 61 | if (S_OK != WcaTableExists(L"Wix4RestartResource")) |
| 62 | { | 62 | { |
| 63 | WcaLog(LOGMSG_STANDARD, "The RestartResource table does not exist; there are no resources to register with Restart Manager."); | 63 | WcaLog(LOGMSG_STANDARD, "The Wix4RestartResource table does not exist; there are no resources to register with Restart Manager."); |
| 64 | ExitFunction(); | 64 | ExitFunction(); |
| 65 | } | 65 | } |
| 66 | 66 | ||
