Support platform-specific CAs (including ARM64).

5 files changed, 61 insertions, 17 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);
 
diff --git a/src/ca/XmlFile.cpp b/src/ca/XmlFile.cpp
index 95449126..71c9a390 100644
--- a/src/ca/XmlFile.cpp
+++ b/src/ca/XmlFile.cpp
@@ -464,9 +464,7 @@ LExit:
     ReleaseStr(pwzCurrentFile);
     ReleaseStr(pwzCustomActionData);
 
-    if (FAILED(hr))
-        er = ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
+    return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er);
 }
 
 
@@ -483,7 +481,6 @@ extern "C" UINT __stdcall ExecXmlFile(
     HRESULT hrOpenFailure = S_OK;
     UINT er = ERROR_SUCCESS;
 
-    BOOL fIsWow64Process = FALSE;
     BOOL fIsFSRedirectDisabled = FALSE;
     BOOL fPreserveDate = FALSE;
 
@@ -533,10 +530,12 @@ extern "C" UINT __stdcall ExecXmlFile(
     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)
         ExitOnFailure(hr = E_INVALIDARG, "invalid custom action data");
@@ -558,6 +557,7 @@ extern "C" UINT __stdcall ExecXmlFile(
 
         if (xaOpenFilex64 == xa)
         {
+#ifndef _WIN64
             if (!fIsWow64Process)
             {
                 hr = E_NOTIMPL;
@@ -568,6 +568,7 @@ extern "C" UINT __stdcall ExecXmlFile(
             ExitOnFailure(hr, "Custom action was told to act on a 64-bit component, but was unable to disable filesystem redirection through the Wow64 API.");
 
             fIsFSRedirectDisabled = TRUE;
+#endif
         }
 
         hr = XmlLoadDocumentFromFileEx(pwzFile, XML_LOAD_PRESERVE_WHITESPACE, &pixd);
@@ -810,7 +811,9 @@ LExit:
         fIsFSRedirectDisabled = FALSE;
         WcaRevertWow64FSRedirection();
     }
+#ifndef _WIN64
     WcaFinalizeWow64();
+#endif
 
     ReleaseStr(pwzCustomActionData);
     ReleaseStr(pwzData);
@@ -829,9 +832,7 @@ LExit:
 
     XmlUninitialize();
 
-    if (FAILED(hr))
-        er = ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
+    return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er);
 }
 
 
@@ -882,6 +883,7 @@ extern "C" UINT __stdcall ExecXmlFileRollback(
     hr = WcaReadStreamFromCaData(&pwz, &pbData, &cbData);
     ExitOnFailure(hr, "failed to read file contents from custom action data");
 
+#ifndef _WIN64
     fIs64Bit = (BOOL)iIs64Bit;
 
     if (fIs64Bit)
@@ -902,6 +904,7 @@ extern "C" UINT __stdcall ExecXmlFileRollback(
         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
 
     // Always preserve the modified date on rollback
     hr = FileGetTime(pwzFileName, NULL, NULL, &ft);
@@ -937,8 +940,6 @@ LExit:
 
     ReleaseMem(pbData);
 
-    if (FAILED(hr))
-        er = ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
+    return WcaFinalize(FAILED(hr) ? ERROR_INSTALL_FAILURE : er);
 }
 
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(
     HRESULT hr = S_OK;
     LPWSTR pwzCommand = NULL;
     DWORD dwTimeout = 0;
+#ifndef _WIN64
     BOOL fIsWow64Initialized = FALSE;
     BOOL fRedirected = FALSE;
 
@@ -145,6 +146,7 @@ HRESULT ExecCommon64(
     hr = WcaDisableWow64FSRedirection();
     ExitOnFailure(hr, "Failed to enable filesystem redirection.");
     fRedirected = TRUE;
+#endif
 
     hr = BuildCommandLine(wzArgumentsProperty, &pwzCommand);
     ExitOnFailure(hr, "Failed to get Command Line");
@@ -157,6 +159,7 @@ HRESULT ExecCommon64(
 LExit:
     ReleaseStr(pwzCommand);
 
+#ifndef _WIN64
     if (fRedirected)
     {
         WcaRevertWow64FSRedirection();
@@ -166,6 +169,7 @@ LExit:
     {
         WcaFinalizeWow64();
     }
+#endif
 
     return hr;
 }
diff --git a/src/ca/scaperfexec.cpp b/src/ca/scaperfexec.cpp
index 04c0648a..c5425754 100644
--- a/src/ca/scaperfexec.cpp
+++ b/src/ca/scaperfexec.cpp
@@ -87,10 +87,10 @@ extern "C" UINT __stdcall RegisterPerfmon(
 
     HMODULE hMod = NULL;
     PFNPERFCOUNTERTEXTSTRINGS pfnPerfCounterTextString;
-    DWORD_PTR dwRet;
+    DWORD dwRet;
     LPWSTR pwzShortPath = NULL;
-    DWORD_PTR cchShortPath = MAX_PATH;
-    DWORD_PTR cchShortPathLength  = 0;
+    DWORD cchShortPath = MAX_PATH;
+    DWORD cchShortPathLength  = 0;
 
     LPWSTR pwzCommand = NULL;
 
diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj
index a2391880..38d209b2 100644
--- a/src/ca/utilca.vcxproj
+++ b/src/ca/utilca.vcxproj
@@ -6,6 +6,30 @@
   <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.11\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.11\build\WixToolset.WcaUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|X64">
+      <Configuration>Debug</Configuration>
+      <Platform>X64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|X64">
+      <Configuration>Release</Configuration>
+      <Platform>X64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -20,7 +44,7 @@
     <ProjectGuid>{076018F7-19BD-423A-ABBF-229273DA08D8}</ProjectGuid>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <TargetName>utilca</TargetName>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <ProjectModuleDefinitionFile>utilca.def</ProjectModuleDefinitionFile>
     <Description>WiX Toolset Util CustomAction</Description>