Support platform-specific CAs (including ARM64).

1 files changed, 17 insertions, 2 deletions

diff --git a/src/ca/XmlConfig.cpp b/src/ca/XmlConfig.cpp
index 8c60979d..afd3dafb 100644
--- a/src/ca/XmlConfig.cpp
+++ b/src/ca/XmlConfig.cpp
@@ -588,8 +588,9 @@ extern "C" UINT __stdcall ExecXmlConfig(
     HRESULT hrOpenFailure = S_OK;
     UINT er = ERROR_SUCCESS;
 
-    BOOL fIsWow64Process = FALSE;
+#ifndef _WIN64
     BOOL fIsFSRedirectDisabled = FALSE;
+#endif
     BOOL fPreserveDate = FALSE;
 
     LPWSTR pwzCustomActionData = NULL;
@@ -635,10 +636,12 @@ extern "C" UINT __stdcall ExecXmlConfig(
     hr = WcaReadIntegerFromCaData(&pwz, (int*) &xa);
     ExitOnFailure(hr, "failed to process CustomActionData");
 
+#ifndef _WIN64
     // Initialize the Wow64 API - store the result in fWow64APIPresent
     // If it fails, this doesn't warrant an error yet, because we only need the Wow64 API in some cases
     WcaInitializeWow64();
-    fIsWow64Process = WcaIsWow64Process();
+    BOOL fIsWow64Process = WcaIsWow64Process();
+#endif
 
     if (xaOpenFile != xa && xaOpenFilex64 != xa)
     {
@@ -657,6 +660,7 @@ extern "C" UINT __stdcall ExecXmlConfig(
         // Open the file
         ReleaseNullObject(pixd);
 
+#ifndef _WIN64
         if (xaOpenFilex64 == xa)
         {
             if (!fIsWow64Process)
@@ -670,6 +674,7 @@ extern "C" UINT __stdcall ExecXmlConfig(
 
             fIsFSRedirectDisabled = TRUE;
         }
+#endif
 
         hr = XmlLoadDocumentFromFileEx(pwzFile, XML_LOAD_PRESERVE_WHITESPACE, &pixd);
         if (FAILED(hr))
@@ -945,15 +950,18 @@ extern "C" UINT __stdcall ExecXmlConfig(
                 ExitOnFailure(hr, "failed to set modified time of file : %ls", pwzFile);
             }
 
+#ifndef _WIN64
             if (fIsFSRedirectDisabled)
             {
                 fIsFSRedirectDisabled = FALSE;
                 WcaRevertWow64FSRedirection();
             }
+#endif
         }
     }
 
 LExit:
+#ifndef _WIN64
     // Make sure we revert FS Redirection if necessary before exiting
     if (fIsFSRedirectDisabled)
     {
@@ -961,6 +969,7 @@ LExit:
         WcaRevertWow64FSRedirection();
     }
     WcaFinalizeWow64();
+#endif
 
     ReleaseStr(pwzCustomActionData);
     ReleaseStr(pwzData);
@@ -1001,7 +1010,9 @@ extern "C" UINT __stdcall ExecXmlConfigRollback(
     UINT er = ERROR_SUCCESS;
 
     int iIs64Bit;
+#ifndef _WIN64
     BOOL fIs64Bit = FALSE;
+#endif
 
     LPWSTR pwzCustomActionData = NULL;
     LPWSTR pwz = NULL;
@@ -1035,6 +1046,7 @@ extern "C" UINT __stdcall ExecXmlConfigRollback(
     hr = WcaReadStreamFromCaData(&pwz, &pbData, &cbData);
     ExitOnFailure(hr, "failed to read file contents from custom action data");
 
+#ifndef _WIN64
     fIs64Bit = (BOOL)iIs64Bit;
 
     if (fIs64Bit)
@@ -1055,6 +1067,7 @@ extern "C" UINT __stdcall ExecXmlConfigRollback(
         hr = WcaDisableWow64FSRedirection();
         ExitOnFailure(hr, "Custom action was told to rollback a 64-bit component, but was unable to Disable Filesystem Redirection through the Wow64 API.");
     }
+#endif
 
     hr = FileGetTime(pwzFileName, NULL, NULL, &ft);
     ExitOnFailure(hr, "Failed to get modified date of file %ls.", pwzFileName);
@@ -1082,11 +1095,13 @@ LExit:
 
     ReleaseFile(hFile);
 
+#ifndef _WIN64
     if (fIs64Bit)
     {
         WcaRevertWow64FSRedirection();
         WcaFinalizeWow64();
     }
+#endif
 
     ReleaseMem(pbData);