diff options
Diffstat (limited to 'src/ca/FormatFiles.cpp')
-rw-r--r-- | src/ca/FormatFiles.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ca/FormatFiles.cpp b/src/ca/FormatFiles.cpp index 6a816700..464b92d6 100644 --- a/src/ca/FormatFiles.cpp +++ b/src/ca/FormatFiles.cpp | |||
@@ -27,9 +27,9 @@ extern "C" UINT __stdcall WixSchedFormatFiles( | |||
27 | PSCZ sczRollbackCustomActionData; | 27 | PSCZ sczRollbackCustomActionData; |
28 | 28 | ||
29 | LPCWSTR wzQuery = | 29 | LPCWSTR wzQuery = |
30 | L"SELECT `WixFormatFiles`.`Binary_`, `WixFormatFiles`.`File_`, `File`.`Component_` " | 30 | L"SELECT `Wix4FormatFile`.`Binary_`, `Wix4FormatFile`.`File_`, `File`.`Component_` " |
31 | L"FROM `WixFormatFiles`, `File` " | 31 | L"FROM `Wix4FormatFile`, `File` " |
32 | L"WHERE `WixFormatFiles`.`File_` = `File`.`File`"; | 32 | L"WHERE `Wix4FormatFile`.`File_` = `File`.`File`"; |
33 | enum eQuery { eqBinaryKey = 1, eqFileKey, eqComponentKey }; | 33 | enum eQuery { eqBinaryKey = 1, eqFileKey, eqComponentKey }; |
34 | 34 | ||
35 | // initialize | 35 | // initialize |
@@ -38,7 +38,7 @@ extern "C" UINT __stdcall WixSchedFormatFiles( | |||
38 | 38 | ||
39 | // query and loop through all the files | 39 | // query and loop through all the files |
40 | hr = WcaOpenExecuteView(wzQuery, &hView); | 40 | hr = WcaOpenExecuteView(wzQuery, &hView); |
41 | ExitOnFailure(hr, "Failed to open view on WixFormatFiles table"); | 41 | ExitOnFailure(hr, "Failed to open view on Wix4FormatFile table"); |
42 | 42 | ||
43 | DWORD cFiles = 0; | 43 | DWORD cFiles = 0; |
44 | while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) | 44 | while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) |
@@ -100,19 +100,19 @@ extern "C" UINT __stdcall WixSchedFormatFiles( | |||
100 | { | 100 | { |
101 | hr = S_OK; | 101 | hr = S_OK; |
102 | } | 102 | } |
103 | ExitOnFailure(hr, "Failure occurred while processing WixFormatFiles table"); | 103 | ExitOnFailure(hr, "Failure occurred while processing Wix4FormatFile table"); |
104 | 104 | ||
105 | // schedule deferred CAs if there's anything to do | 105 | // schedule deferred CAs if there's anything to do |
106 | if (sczRollbackCustomActionData && *sczRollbackCustomActionData) | 106 | if (sczRollbackCustomActionData && *sczRollbackCustomActionData) |
107 | { | 107 | { |
108 | hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"WixRollbackFormatFiles"), sczRollbackCustomActionData, cFiles * COST_FILEFORMATTING); | 108 | hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"RollbackFormatFiles"), sczRollbackCustomActionData, cFiles * COST_FILEFORMATTING); |
109 | ExitOnFailure(hr, "Failed to schedule WixRollbackFormatFiles"); | 109 | ExitOnFailure(hr, "Failed to schedule RollbackFormatFiles"); |
110 | } | 110 | } |
111 | 111 | ||
112 | if (sczExecCustomActionData && *sczExecCustomActionData) | 112 | if (sczExecCustomActionData && *sczExecCustomActionData) |
113 | { | 113 | { |
114 | hr = WcaDoDeferredAction(PLATFORM_DECORATION(L"WixExecFormatFiles"), sczExecCustomActionData, cFiles * COST_FILEFORMATTING); | 114 | hr = WcaDoDeferredAction(CUSTOM_ACTION_DECORATION(L"ExecFormatFiles"), sczExecCustomActionData, cFiles * COST_FILEFORMATTING); |
115 | ExitOnFailure(hr, "Failed to schedule WixExecFormatFiles"); | 115 | ExitOnFailure(hr, "Failed to schedule ExecFormatFiles"); |
116 | } | 116 | } |
117 | 117 | ||
118 | LExit: | 118 | LExit: |