aboutsummaryrefslogtreecommitdiff
path: root/src/ca/TouchFile.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ca/TouchFile.cpp')
-rw-r--r--src/ca/TouchFile.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ca/TouchFile.cpp b/src/ca/TouchFile.cpp
index 1c40a3eb..e704f922 100644
--- a/src/ca/TouchFile.cpp
+++ b/src/ca/TouchFile.cpp
@@ -2,7 +2,7 @@
2 2
3#include "precomp.h" 3#include "precomp.h"
4 4
5LPCWSTR vcsTouchFileQuery = L"SELECT `WixTouchFile`, `Component_`, `Path`, `Attributes` FROM `WixTouchFile`"; 5LPCWSTR vcsTouchFileQuery = L"SELECT `Wix4TouchFile`, `Component_`, `Path`, `Attributes` FROM `Wix4TouchFile`";
6enum TOUCH_FILE_QUERY { tfqId = 1, tfqComponent, tfqPath, tfqTouchFileAttributes }; 6enum TOUCH_FILE_QUERY { tfqId = 1, tfqComponent, tfqPath, tfqTouchFileAttributes };
7 7
8enum TOUCH_FILE_ATTRIBUTE 8enum TOUCH_FILE_ATTRIBUTE
@@ -134,7 +134,7 @@ static HRESULT ProcessTouchFileTable(
134 LPWSTR sczRollbackData = NULL; 134 LPWSTR sczRollbackData = NULL;
135 LPWSTR sczExecuteData = NULL; 135 LPWSTR sczExecuteData = NULL;
136 136
137 if (S_OK != WcaTableExists(L"WixTouchFile")) 137 if (S_OK != WcaTableExists(L"Wix4TouchFile"))
138 { 138 {
139 ExitFunction(); 139 ExitFunction();
140 } 140 }
@@ -142,7 +142,7 @@ static HRESULT ProcessTouchFileTable(
142 ::GetSystemTimeAsFileTime(&ftModified); 142 ::GetSystemTimeAsFileTime(&ftModified);
143 143
144 hr = WcaOpenExecuteView(vcsTouchFileQuery, &hView); 144 hr = WcaOpenExecuteView(vcsTouchFileQuery, &hView);
145 ExitOnFailure(hr, "Failed to open view on WixTouchFile table"); 145 ExitOnFailure(hr, "Failed to open view on Wix4TouchFile table");
146 146
147 while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) 147 while (S_OK == (hr = WcaFetchRecord(hView, &hRec)))
148 { 148 {
@@ -181,18 +181,18 @@ static HRESULT ProcessTouchFileTable(
181 { 181 {
182 hr = S_OK; 182 hr = S_OK;
183 } 183 }
184 ExitOnFailure(hr, "Failure occured while processing WixTouchFile table"); 184 ExitOnFailure(hr, "Failure occured while processing Wix4TouchFile table");
185 185
186 if (sczRollbackData) 186 if (sczRollbackData)
187 { 187 {
188 hr = WcaDoDeferredAction(L"WixRollbackTouchFile", sczRollbackData, 0); 188 hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackTouchFile"), sczRollbackData, 0);
189 ExitOnFailure(hr, "Failed to schedule WixRollbackTouchFile"); 189 ExitOnFailure(hr, "Failed to schedule RollbackTouchFile");
190 } 190 }
191 191
192 if (sczExecuteData) 192 if (sczExecuteData)
193 { 193 {
194 hr = WcaDoDeferredAction(L"WixExecuteTouchFile", sczExecuteData, 0); 194 hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecuteTouchFile"), sczExecuteData, 0);
195 ExitOnFailure(hr, "Failed to schedule WixExecuteTouchFile"); 195 ExitOnFailure(hr, "Failed to schedule ExecuteTouchFile");
196 } 196 }
197 197
198LExit: 198LExit: