2 files changed, 29 insertions, 0 deletions

diff --git a/src/ext/Util/ca/OsInfo.cpp b/src/ext/Util/ca/OsInfo.cpp
index 4783673e..eb76a3a0 100644
--- a/src/ext/Util/ca/OsInfo.cpp
+++ b/src/ext/Util/ca/OsInfo.cpp
@@ -485,3 +485,31 @@ LExit:
     }
     return WcaFinalize(er);
 }
+
+/********************************************************************
+WixQueryNativeMachine - entry point for WixQueryNativeMachine custom action
+
+ Called as Type 1 custom action (DLL from the Binary table) from 
+ Windows Installer to set properties that indicates the native machine architecture
+********************************************************************/
+extern "C" UINT __stdcall WixQueryNativeMachine(
+    __in MSIHANDLE hInstall
+    )
+{
+    HRESULT hr = S_OK;
+    USHORT usNativeMachine = IMAGE_FILE_MACHINE_UNKNOWN;
+    DWORD er = ERROR_SUCCESS;
+
+    hr = WcaInitialize(hInstall, "WixQueryNativeMachine");
+    ExitOnFailure(hr, "WixQueryNativeMachine failed to initialize");
+    
+    hr = ::ProcNativeMachine(::GetCurrentProcess(), &usNativeMachine);
+    ExitOnFailure(hr, "Failed to get native machine value.");
+
+    WcaSetIntProperty(L"WIX_NATIVE_MACHINE", usNativeMachine);
+
+LExit:
+    if (FAILED(hr))
+        er = ERROR_INSTALL_FAILURE;
+    return WcaFinalize(er);
+}
\ No newline at end of file
diff --git a/src/ext/Util/ca/utilca.def b/src/ext/Util/ca/utilca.def
index 412d86a3..3912ce56 100644
--- a/src/ext/Util/ca/utilca.def
+++ b/src/ext/Util/ca/utilca.def
@@ -22,6 +22,7 @@ EXPORTS
     WixQueryOsDirs
     WixQueryOsWellKnownSID
     WixQueryOsDriverInfo
+    WixQueryNativeMachine
 ; netshortcuts.cpp
     WixSchedInternetShortcuts
     WixCreateInternetShortcuts