1 files changed, 12 insertions, 11 deletions

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);
 }