From 9250fd629a127f75b4d497e4653d1ea2250a88e2 Mon Sep 17 00:00:00 2001
From: ph1ll <phillip.campbell@dionach.com>
Date: Thu, 3 Jul 2014 10:25:17 +0100
Subject: [PATCH] Added support for 32bit app pools

---
 Installer/Installer.wixproj               |  2 +-
 Installer/Product.wxs                     | 17 ++++++++++++++---
 NativeCodeModule/NativeCodeModule.vcxproj |  4 +++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj
index 0aa8369..0aa91a5 100644
--- a/Installer/Installer.wixproj
+++ b/Installer/Installer.wixproj
@@ -6,7 +6,7 @@
     <ProductVersion>3.8</ProductVersion>
     <ProjectGuid>{8a36cbc1-ddf7-4419-ad3f-f741f7df5a2f}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>iis_stripheaders_module_1.0.1_x64</OutputName>
+    <OutputName>iis_stripheaders_module_1.0.2</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
diff --git a/Installer/Product.wxs b/Installer/Product.wxs
index 942f9b6..9ccf942 100644
--- a/Installer/Product.wxs
+++ b/Installer/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-    <Product Id="AA63692A-DF9E-4B3A-A998-0542F82E0270" Name="IIS StripHeaders module" Language="1033" Version="1.0.1.0" Manufacturer="Dionach Ltd" UpgradeCode="FDFC59AA-E51F-4394-B9AA-5DA92C84A2ED">
-        <Package Id="44ADBB5A-C001-40E1-9272-6594E73517B9" Description="IIS StripHeaders module installer" InstallerVersion="200" Languages="1033" SummaryCodepage="1252" Compressed="yes" InstallScope="perMachine" />
+    <Product Id="3AC619A3-0FC4-43C6-A687-B54AD5E7BDDC" Name="IIS StripHeaders module" Language="1033" Version="1.0.2.0" Manufacturer="Dionach Ltd" UpgradeCode="FDFC59AA-E51F-4394-B9AA-5DA92C84A2ED">
+        <Package Id="877DF3E6-5C83-4187-BF99-EE7C2C6D5CB3" Description="IIS StripHeaders module installer" InstallerVersion="200" Languages="1033" SummaryCodepage="1252" Compressed="yes" InstallScope="perMachine" />
         <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
         <Upgrade Id="FDFC59AA-E51F-4394-B9AA-5DA92C84A2ED">
             <UpgradeVersion
@@ -50,12 +50,22 @@
                     </Directory>
                 </Directory>
             </Directory>
+            <Directory Id="SystemFolder">
+                <Directory Id="INETSRVDIR32" Name="inetsrv">
+                </Directory>
+            </Directory>
         </Directory>
         <!-- Add files and registry values -->
+        <DirectoryRef Id="INETSRVDIR32">
+            <!-- Add the stripheaders.dll module -->
+            <Component Id="stripheaders32.dll" Guid="0332F0DE-0BD5-4032-BF53-02ED3595AACA">
+                <File Source="..\Release\stripheaders.dll" KeyPath="yes" Checksum="yes" Id="dll32"/>
+            </Component>
+        </DirectoryRef>
         <DirectoryRef Id="INETSRVDIR">
             <!-- Add the stripheaders.dll module -->
             <Component Id="stripheaders.dll" Guid="4BBF0D80-2CE8-4EC3-BDDD-93786BE2258C">
-                <File Source="$(var.NativeCodeModule.TargetPath)" KeyPath="yes" Checksum="yes"/>
+                <File Source="..\x64\Release\stripheaders.dll" KeyPath="yes" Checksum="yes" Id="dll64"/>
             </Component>
             <!-- Add the registry key to disbale the Microsoft-HTTPAPI Server header -->
             <Component Id="HTTPAPIHeaderRegistryEntry" Guid="18C15683-E20E-4C6E-B4BC-2770F68D54DE">
@@ -97,6 +107,7 @@
         <!-- install the files and registry values defined above -->
         <Feature Id="MainInstall" Title="Main Install" Level="1">
             <ComponentRef Id="stripheaders.dll" />
+            <ComponentRef Id="stripheaders32.dll" />
             <ComponentRef Id="HTTPAPIHeaderRegistryEntry" />
             <ComponentRef Id="stripHeaders_schema.xml" />
             <ComponentRef Id="APPLICATIONHOSTXML" />
diff --git a/NativeCodeModule/NativeCodeModule.vcxproj b/NativeCodeModule/NativeCodeModule.vcxproj
index ee8a132..c7b1388 100644
--- a/NativeCodeModule/NativeCodeModule.vcxproj
+++ b/NativeCodeModule/NativeCodeModule.vcxproj
@@ -72,6 +72,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>stripheaders</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>
@@ -116,13 +117,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NATIVECODEMODULE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>stripheaders.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>stripheadersmodule.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">