Write EngineVersion, ProtocolVersion, and Win64 to the Burn manifest.

8 files changed, 91 insertions, 14 deletions

diff --git a/src/burn/Directory.Build.props b/src/burn/Directory.Build.props
index f929fa2b..6050781d 100644
--- a/src/burn/Directory.Build.props
+++ b/src/burn/Directory.Build.props
@@ -7,4 +7,8 @@
   </PropertyGroup>
 
   <Import Project="..\Directory.Build.props" />
+  
+  <PropertyGroup>
+    <BurnGeneratedHeaderDirectory>$(BaseIntermediateOutputPath)..\</BurnGeneratedHeaderDirectory>
+  </PropertyGroup>
 </Project>
diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj
index 5c4860f1..b5cfcb45 100644
--- a/src/burn/engine/engine.vcxproj
+++ b/src/burn/engine/engine.vcxproj
@@ -35,13 +35,14 @@
     <TargetName>engine</TargetName>
     <CharacterSet>Unicode</CharacterSet>
     <Description>Native component of WixToolset.Burn</Description>
+    <CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;$(ProjectAdditionalIncludeDirectories)</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;$(BurnGeneratedHeaderDirectory);$(ProjectAdditionalIncludeDirectories)</ProjectAdditionalIncludeDirectories>
   </PropertyGroup>
 
   <ImportGroup Label="ExtensionSettings">
@@ -144,14 +145,15 @@
     <ClInclude Include="variant.h" />
   </ItemGroup>
 
-  <ItemGroup>
-    <CustomBuild Include="engine.mc">
+  <ItemDefinitionGroup>
+    <CustomBuildStep>
       <Message>Compiling message file...</Message>
       <Command>mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z engine.messages "$(InputDir)engine.mc"
 rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
+      <Inputs>$(InputDir)engine.mc</Inputs>
       <Outputs>$(IntDir)engine.messages.h;$(IntDir)engine.messages.rc</Outputs>
-    </CustomBuild>
-  </ItemGroup>
+    </CustomBuildStep>
+  </ItemDefinitionGroup>
 
   <Target Name="SetWixVersion" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="ClCompile">
     <PropertyGroup>
@@ -160,14 +162,26 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
       <rup>$(GitBaseVersionPatch)</rup>
       <rpr>$(GitCommits)</rpr>
       <szVerMajorMinorBuild>$(rmj).$(rmm).$(rup).$(rpr)</szVerMajorMinorBuild>
-      <wixver>rmj=$(rmj);rmm=$(rmm);rup=$(rup);rpr=$(rpr);szVerMajorMinorBuild="$(szVerMajorMinorBuild)"</wixver>
     </PropertyGroup>
 
     <ItemGroup>
-      <ClCompile>
-        <PreprocessorDefinitions>$(wixver);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </ClCompile>
+      <BurnVersionLines Include="
+// &lt;auto-generated/&gt;
+#ifndef _VERSION_FILE_H_
+#define _VERSION_FILE_H_
+
+#define szVerMajorMinorBuild &quot;$(szVerMajorMinorBuild)&quot;
+#define wzVerMajorMinorBuild L&quot;$(szVerMajorMinorBuild)&quot;
+#define rmj     $(rmj)
+#define rmm     $(rmm)
+#define rup     $(rup)
+#define rpr     $(rpr)
+
+#endif
+"/>
     </ItemGroup>
+    
+    <WriteLinesToFile Overwrite="true" File="$(BurnGeneratedHeaderDirectory)engine.version.h" Lines="@(BurnVersionLines)" />
   </Target>
 
   <ItemGroup>
diff --git a/src/burn/engine/manifest.cpp b/src/burn/engine/manifest.cpp
index 7e16de13..0cd10dbb 100644
--- a/src/burn/engine/manifest.cpp
+++ b/src/burn/engine/manifest.cpp
@@ -7,6 +7,11 @@ static HRESULT ParseFromXml(
     __in IXMLDOMDocument* pixdDocument,
     __in BURN_ENGINE_STATE* pEngineState
     );
+#if DEBUG
+static void ValidateHarvestingAttributes(
+    __in IXMLDOMDocument* pixdDocument
+    );
+#endif
 
 // function definitions
 
@@ -43,6 +48,10 @@ extern "C" HRESULT ManifestLoadXmlFromBuffer(
     hr = XmlLoadDocumentFromBuffer(pbBuffer, cbBuffer, &pixdDocument);
     ExitOnFailure(hr, "Failed to load manifest as XML document.");
 
+#if DEBUG
+    ValidateHarvestingAttributes(pixdDocument);
+#endif
+
     hr = ParseFromXml(pixdDocument, pEngineState);
 
 LExit:
@@ -162,3 +171,44 @@ LExit:
     ReleaseObject(pixeBundle);
     return hr;
 }
+
+#if DEBUG
+static void ValidateHarvestingAttributes(
+    __in IXMLDOMDocument* pixdDocument
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMElement* pixeBundle = NULL;
+    LPWSTR sczEngineVersion = NULL;
+    DWORD dwProtocolVersion = 0;
+    BOOL fWin64 = FALSE;
+
+    hr = pixdDocument->get_documentElement(&pixeBundle);
+    ExitOnFailure(hr, "Failed to get document element.");
+
+    hr = XmlGetAttributeEx(pixeBundle, L"EngineVersion", &sczEngineVersion);
+    ExitOnRequiredXmlQueryFailure(hr, "Failed to get BurnManifest/@EngineVersion attribute.");
+
+    hr = XmlGetAttributeUInt32(pixeBundle, L"ProtocolVersion", &dwProtocolVersion);
+    ExitOnRequiredXmlQueryFailure(hr, "Failed to get BurnManifest/@ProtocolVersion attribute.");
+
+    hr = XmlGetYesNoAttribute(pixeBundle, L"Win64", &fWin64);
+    ExitOnRequiredXmlQueryFailure(hr, "Failed to get BurnManifest/@Win64 attribute.");
+
+    Assert(CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczEngineVersion, -1, wzVerMajorMinorBuild, -1));
+
+    Assert(BURN_PROTOCOL_VERSION == dwProtocolVersion);
+
+#if !defined(_WIN64)
+    Assert(!fWin64);
+#else
+    Assert(fWin64);
+#endif
+
+LExit:
+    AssertSz(SUCCEEDED(hr), "Failed to get harvesting attributes.");
+
+    ReleaseStr(sczEngineVersion);
+    ReleaseObject(pixeBundle);
+}
+#endif
diff --git a/src/burn/engine/precomp.h b/src/burn/engine/precomp.h
index c83c1e74..19a6d48b 100644
--- a/src/burn/engine/precomp.h
+++ b/src/burn/engine/precomp.h
@@ -103,4 +103,5 @@
 #include "EngineForApplication.h"
 #include "EngineForExtension.h"
 #include "engine.messages.h"
+#include "engine.version.h"
 #include "engine.h"
diff --git a/src/burn/test/BurnUnitTest/BurnTestFixture.h b/src/burn/test/BurnUnitTest/BurnTestFixture.h
index 103972ef..470c81c1 100644
--- a/src/burn/test/BurnUnitTest/BurnTestFixture.h
+++ b/src/burn/test/BurnUnitTest/BurnTestFixture.h
@@ -33,7 +33,7 @@ namespace Bootstrapper
 
             this->testDirectory = WixBuildTools::TestSupport::TestData::Get();
 
-            LogInitialize(::GetModuleHandleW(NULL));
+            LogInitialize(::GetModuleHandleW(L"BurnUnitTest.dll"));
 
             LogSetLevel(REPORT_DEBUG, FALSE);
 
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
index b0159840..b05666b2 100644
--- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
+++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
@@ -39,8 +39,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);..\..\engine;..\..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);$(BurnGeneratedHeaderDirectory);..\..\engine;..\..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib;engine.res</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/burn/test/BurnUnitTest/ManifestTest.cpp b/src/burn/test/BurnUnitTest/ManifestTest.cpp
index 6973c772..d899e3f9 100644
--- a/src/burn/test/BurnUnitTest/ManifestTest.cpp
+++ b/src/burn/test/BurnUnitTest/ManifestTest.cpp
@@ -30,7 +30,13 @@ namespace Bootstrapper
             try
             {
                 LPCSTR szDocument =
-                    "<Bundle>"
+                    "<BurnManifest EngineVersion='" szVerMajorMinorBuild "' ProtocolVersion='1' Win64='"
+#if !defined(_WIN64)
+                    "no"
+#else
+                    "yes"
+#endif
+                    "'>"
                     "    <UX UxDllPayloadId='ux.dll'>"
                     "        <Payload Id='ux.dll' FilePath='ux.dll' Packaging='embedded' SourcePath='ux.dll' Hash='000000000000' />"
                     "    </UX>"
@@ -38,7 +44,7 @@ namespace Bootstrapper
                     "    <Variable Id='Variable1' Type='numeric' Value='1' Hidden='no' Persisted='no' />"
                     "    <RegistrySearch Id='Search1' Type='exists' Root='HKLM' Key='SOFTWARE\\Microsoft' Variable='Variable1' Condition='0' />"
                     "    <CommandLine Variables='upperCase' />"
-                    "</Bundle>";
+                    "</BurnManifest>";
 
                 hr = CacheInitialize(&engineState.cache, &engineState.internalCommand);
                 TestThrowOnFailure(hr, L"Failed initialize cache.");
diff --git a/src/burn/test/BurnUnitTest/precomp.h b/src/burn/test/BurnUnitTest/precomp.h
index ded9fc2d..11e54284 100644
--- a/src/burn/test/BurnUnitTest/precomp.h
+++ b/src/burn/test/BurnUnitTest/precomp.h
@@ -71,6 +71,8 @@
 #include "splashscreen.h"
 #include "detect.h"
 
+#include "engine.version.h"
+
 #pragma managed
 #include <vcclr.h>