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/scasched.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/scasched.cpp')
-rw-r--r-- | src/ca/scasched.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ca/scasched.cpp b/src/ca/scasched.cpp index ba230a9e..d81b1f14 100644 --- a/src/ca/scasched.cpp +++ b/src/ca/scasched.cpp | |||
@@ -21,14 +21,14 @@ extern "C" UINT __stdcall ConfigureSmbInstall( | |||
21 | ExitOnFailure(hr, "Failed to initialize"); | 21 | ExitOnFailure(hr, "Failed to initialize"); |
22 | 22 | ||
23 | // check to see if necessary tables are specified | 23 | // check to see if necessary tables are specified |
24 | if (WcaTableExists(L"FileShare") != S_OK) | 24 | if (WcaTableExists(L"Wix4FileShare") != S_OK) |
25 | { | 25 | { |
26 | WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no FileShare table"); | 26 | WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no Wix4FileShare table"); |
27 | ExitFunction1(hr = S_FALSE); | 27 | ExitFunction1(hr = S_FALSE); |
28 | } | 28 | } |
29 | 29 | ||
30 | hr = ScaSmbRead(&pssList); | 30 | hr = ScaSmbRead(&pssList); |
31 | ExitOnFailure(hr, "failed to read FileShare table"); | 31 | ExitOnFailure(hr, "failed to read Wix4FileShare table"); |
32 | 32 | ||
33 | hr = ScaSmbInstall(pssList); | 33 | hr = ScaSmbInstall(pssList); |
34 | ExitOnFailure(hr, "failed to install FileShares"); | 34 | ExitOnFailure(hr, "failed to install FileShares"); |
@@ -43,7 +43,7 @@ LExit: | |||
43 | 43 | ||
44 | 44 | ||
45 | /******************************************************************** | 45 | /******************************************************************** |
46 | ConfigureSmb - CUSTOM ACTION ENTRY POINT for installing fileshare settings | 46 | ConfigureSmb - CUSTOM ACTION ENTRY POINT for uninstalling fileshare settings |
47 | 47 | ||
48 | ********************************************************************/ | 48 | ********************************************************************/ |
49 | extern "C" UINT __stdcall ConfigureSmbUninstall( | 49 | extern "C" UINT __stdcall ConfigureSmbUninstall( |
@@ -60,14 +60,14 @@ extern "C" UINT __stdcall ConfigureSmbUninstall( | |||
60 | ExitOnFailure(hr, "Failed to initialize"); | 60 | ExitOnFailure(hr, "Failed to initialize"); |
61 | 61 | ||
62 | // check to see if necessary tables are specified | 62 | // check to see if necessary tables are specified |
63 | if (WcaTableExists(L"FileShare") != S_OK) | 63 | if (WcaTableExists(L"Wix4FileShare") != S_OK) |
64 | { | 64 | { |
65 | WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no FileShare table"); | 65 | WcaLog(LOGMSG_VERBOSE, "Skipping SMB CustomAction, no Wix4FileShare table"); |
66 | ExitFunction1(hr = S_FALSE); | 66 | ExitFunction1(hr = S_FALSE); |
67 | } | 67 | } |
68 | 68 | ||
69 | hr = ScaSmbRead(&pssList); | 69 | hr = ScaSmbRead(&pssList); |
70 | ExitOnFailure(hr, "failed to read FileShare table"); | 70 | ExitOnFailure(hr, "failed to read Wix4FileShare table"); |
71 | 71 | ||
72 | hr = ScaSmbUninstall(pssList); | 72 | hr = ScaSmbUninstall(pssList); |
73 | ExitOnFailure(hr, "failed to uninstall FileShares"); | 73 | ExitOnFailure(hr, "failed to uninstall FileShares"); |
@@ -106,7 +106,7 @@ extern "C" UINT __stdcall ConfigureUsers( | |||
106 | fInitializedCom = TRUE; | 106 | fInitializedCom = TRUE; |
107 | 107 | ||
108 | hr = ScaUserRead(&psuList); | 108 | hr = ScaUserRead(&psuList); |
109 | ExitOnFailure(hr, "failed to read User table"); | 109 | ExitOnFailure(hr, "failed to read Wix4User table"); |
110 | 110 | ||
111 | hr = ScaUserExecute(psuList); | 111 | hr = ScaUserExecute(psuList); |
112 | ExitOnFailure(hr, "failed to add/remove User actions"); | 112 | ExitOnFailure(hr, "failed to add/remove User actions"); |