diff options
author | Bob Arnson <bob@joyofsetup.com> | 2020-05-25 21:49:38 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2020-05-25 21:57:21 -0400 |
commit | 3aa4f95a7ac23567efbaebdae57007636e7f6058 (patch) | |
tree | a6985084bc89fc842b0869c8cbbf8aece9bb1b67 /src/ca/qtexecca.cpp | |
parent | 27afde67e4bb9ad06f8722a83984a09236516f69 (diff) | |
download | wix-3aa4f95a7ac23567efbaebdae57007636e7f6058.tar.gz wix-3aa4f95a7ac23567efbaebdae57007636e7f6058.tar.bz2 wix-3aa4f95a7ac23567efbaebdae57007636e7f6058.zip |
Support platform-specific CAs (including ARM64).
Diffstat (limited to 'src/ca/qtexecca.cpp')
-rw-r--r-- | src/ca/qtexecca.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ca/qtexecca.cpp b/src/ca/qtexecca.cpp index 6acad0bb..ddcc812f 100644 --- a/src/ca/qtexecca.cpp +++ b/src/ca/qtexecca.cpp | |||
@@ -131,6 +131,7 @@ HRESULT ExecCommon64( | |||
131 | HRESULT hr = S_OK; | 131 | HRESULT hr = S_OK; |
132 | LPWSTR pwzCommand = NULL; | 132 | LPWSTR pwzCommand = NULL; |
133 | DWORD dwTimeout = 0; | 133 | DWORD dwTimeout = 0; |
134 | #ifndef _WIN64 | ||
134 | BOOL fIsWow64Initialized = FALSE; | 135 | BOOL fIsWow64Initialized = FALSE; |
135 | BOOL fRedirected = FALSE; | 136 | BOOL fRedirected = FALSE; |
136 | 137 | ||
@@ -145,6 +146,7 @@ HRESULT ExecCommon64( | |||
145 | hr = WcaDisableWow64FSRedirection(); | 146 | hr = WcaDisableWow64FSRedirection(); |
146 | ExitOnFailure(hr, "Failed to enable filesystem redirection."); | 147 | ExitOnFailure(hr, "Failed to enable filesystem redirection."); |
147 | fRedirected = TRUE; | 148 | fRedirected = TRUE; |
149 | #endif | ||
148 | 150 | ||
149 | hr = BuildCommandLine(wzArgumentsProperty, &pwzCommand); | 151 | hr = BuildCommandLine(wzArgumentsProperty, &pwzCommand); |
150 | ExitOnFailure(hr, "Failed to get Command Line"); | 152 | ExitOnFailure(hr, "Failed to get Command Line"); |
@@ -157,6 +159,7 @@ HRESULT ExecCommon64( | |||
157 | LExit: | 159 | LExit: |
158 | ReleaseStr(pwzCommand); | 160 | ReleaseStr(pwzCommand); |
159 | 161 | ||
162 | #ifndef _WIN64 | ||
160 | if (fRedirected) | 163 | if (fRedirected) |
161 | { | 164 | { |
162 | WcaRevertWow64FSRedirection(); | 165 | WcaRevertWow64FSRedirection(); |
@@ -166,6 +169,7 @@ LExit: | |||
166 | { | 169 | { |
167 | WcaFinalizeWow64(); | 170 | WcaFinalizeWow64(); |
168 | } | 171 | } |
172 | #endif | ||
169 | 173 | ||
170 | return hr; | 174 | return hr; |
171 | } | 175 | } |