diff options
-rw-r--r-- | src/ext/Util/ca/qtexecca.cpp | 49 | ||||
-rw-r--r-- | src/ext/Util/ca/utilca.def | 2 |
2 files changed, 0 insertions, 51 deletions
diff --git a/src/ext/Util/ca/qtexecca.cpp b/src/ext/Util/ca/qtexecca.cpp index ddcc812f..df4e9a8d 100644 --- a/src/ext/Util/ca/qtexecca.cpp +++ b/src/ext/Util/ca/qtexecca.cpp | |||
@@ -174,55 +174,6 @@ LExit: | |||
174 | return hr; | 174 | return hr; |
175 | } | 175 | } |
176 | 176 | ||
177 | // These two custom actions are deprecated, and should go away in wix v4.0. WixQuietExec replaces this one, | ||
178 | // and is not intended to have any difference in behavior apart from CA name and property names. | ||
179 | extern "C" UINT __stdcall CAQuietExec( | ||
180 | __in MSIHANDLE hInstall | ||
181 | ) | ||
182 | { | ||
183 | Assert(hInstall); | ||
184 | HRESULT hr = S_OK; | ||
185 | UINT er = ERROR_SUCCESS; | ||
186 | |||
187 | hr = WcaInitialize(hInstall, "CAQuietExec"); | ||
188 | ExitOnFailure(hr, "Failed to initialize"); | ||
189 | |||
190 | hr = ExecCommon(CAQUIET_ARGUMENTS_PROPERTY, CAQUIET_TIMEOUT_PROPERTY, TRUE, TRUE); | ||
191 | ExitOnFailure(hr, "Failed in ExecCommon method"); | ||
192 | |||
193 | LExit: | ||
194 | if (FAILED(hr)) | ||
195 | { | ||
196 | er = ERROR_INSTALL_FAILURE; | ||
197 | } | ||
198 | |||
199 | return WcaFinalize(er); | ||
200 | } | ||
201 | |||
202 | // 2nd deprecated custom action name, superseded by WixQuietExec64 | ||
203 | extern "C" UINT __stdcall CAQuietExec64( | ||
204 | __in MSIHANDLE hInstall | ||
205 | ) | ||
206 | { | ||
207 | Assert(hInstall); | ||
208 | HRESULT hr = S_OK; | ||
209 | UINT er = ERROR_SUCCESS; | ||
210 | |||
211 | hr = WcaInitialize(hInstall, "CAQuietExec64"); | ||
212 | ExitOnFailure(hr, "Failed to initialize"); | ||
213 | |||
214 | hr = ExecCommon64(CAQUIET64_ARGUMENTS_PROPERTY, CAQUIET_TIMEOUT_PROPERTY, TRUE, TRUE); | ||
215 | ExitOnFailure(hr, "Failed in ExecCommon64 method"); | ||
216 | |||
217 | LExit: | ||
218 | if (FAILED(hr)) | ||
219 | { | ||
220 | er = ERROR_INSTALL_FAILURE; | ||
221 | } | ||
222 | |||
223 | return WcaFinalize(er); | ||
224 | } | ||
225 | |||
226 | extern "C" UINT __stdcall WixQuietExec( | 177 | extern "C" UINT __stdcall WixQuietExec( |
227 | __in MSIHANDLE hInstall | 178 | __in MSIHANDLE hInstall |
228 | ) | 179 | ) |
diff --git a/src/ext/Util/ca/utilca.def b/src/ext/Util/ca/utilca.def index 3912ce56..96545566 100644 --- a/src/ext/Util/ca/utilca.def +++ b/src/ext/Util/ca/utilca.def | |||
@@ -28,8 +28,6 @@ EXPORTS | |||
28 | WixCreateInternetShortcuts | 28 | WixCreateInternetShortcuts |
29 | WixRollbackInternetShortcuts | 29 | WixRollbackInternetShortcuts |
30 | ; qtexecca.cpp | 30 | ; qtexecca.cpp |
31 | CAQuietExec | ||
32 | CAQuietExec64 | ||
33 | WixQuietExec | 31 | WixQuietExec |
34 | WixQuietExec64 | 32 | WixQuietExec64 |
35 | WixSilentExec | 33 | WixSilentExec |