mDNSResponder: Update to v878.1.1

The sources can be obtained via:

https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-878.1.1.tar.gz

Update #3522.

5 files changed, 349 insertions, 7 deletions

diff --git a/mDNSResponder/mDNSWindows/BonjourQuickLooks.sln b/mDNSResponder/mDNSWindows/BonjourQuickLooks.sln
new file mode 100644
index 00000000..cef4fe62
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/BonjourQuickLooks.sln
@@ -0,0 +1,81 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DLL", "DLL\dnssd.vcxproj", "{AB581101-18F0-46F6-B56A-83A6B1EA657E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder", "SystemService\Service.vcxproj", "{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdnsNSP", "mdnsNSP\mdnsNSP.vcxproj", "{F4F15529-F0EB-402F-8662-73C5797EE557}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dns-sd", "..\Clients\DNS-SD.VisualStudio\dns-sd.vcxproj", "{AA230639-E115-4A44-AA5A-44A61235BA50}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AB581101-18F0-46F6-B56A-83A6B1EA657E} = {AB581101-18F0-46F6-B56A-83A6B1EA657E}
+	EndProjectSection
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "BonjourQuickLooksInstaller", "BonjourQuickLooksInstaller\BonjourQuickLooksInstaller.wixproj", "{E24A4DC1-9B6F-4DA4-BD76-7D5FE73732BF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|Win32.Build.0 = Debug|Win32
+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|x64.ActiveCfg = Debug|x64
+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|x64.Build.0 = Debug|x64
+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Debug|x86.ActiveCfg = Debug|Win32
+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|Win32.ActiveCfg = Release|Win32
+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|Win32.Build.0 = Release|Win32
+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|x64.ActiveCfg = Release|x64
+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|x64.Build.0 = Release|x64
+		{AB581101-18F0-46F6-B56A-83A6B1EA657E}.Release|x86.ActiveCfg = Release|Win32
+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|Win32.Build.0 = Debug|Win32
+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|x64.ActiveCfg = Debug|x64
+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|x64.Build.0 = Debug|x64
+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Debug|x86.ActiveCfg = Debug|Win32
+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|Win32.ActiveCfg = Release|Win32
+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|Win32.Build.0 = Release|Win32
+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|x64.ActiveCfg = Release|x64
+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|x64.Build.0 = Release|x64
+		{C1D98254-BA27-4427-A3BE-A68CA2CC5F69}.Release|x86.ActiveCfg = Release|Win32
+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|Win32.Build.0 = Debug|Win32
+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|x64.ActiveCfg = Debug|x64
+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|x64.Build.0 = Debug|x64
+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Debug|x86.ActiveCfg = Debug|Win32
+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|Win32.ActiveCfg = Release|Win32
+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|Win32.Build.0 = Release|Win32
+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|x64.ActiveCfg = Release|x64
+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|x64.Build.0 = Release|x64
+		{F4F15529-F0EB-402F-8662-73C5797EE557}.Release|x86.ActiveCfg = Release|Win32
+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|Win32.Build.0 = Debug|Win32
+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|x64.ActiveCfg = Debug|x64
+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|x64.Build.0 = Debug|x64
+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Debug|x86.ActiveCfg = Debug|Win32
+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|Win32.ActiveCfg = Release|Win32
+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|Win32.Build.0 = Release|Win32
+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|x64.ActiveCfg = Release|x64
+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|x64.Build.0 = Release|x64
+		{AA230639-E115-4A44-AA5A-44A61235BA50}.Release|x86.ActiveCfg = Release|Win32
+		{E24A4DC1-9B6F-4DA4-BD76-7D5FE73732BF}.Debug|Win32.ActiveCfg = Debug|x86
+		{E24A4DC1-9B6F-4DA4-BD76-7D5FE73732BF}.Debug|x64.ActiveCfg = Debug|x64
+		{E24A4DC1-9B6F-4DA4-BD76-7D5FE73732BF}.Debug|x64.Build.0 = Debug|x64
+		{E24A4DC1-9B6F-4DA4-BD76-7D5FE73732BF}.Debug|x86.ActiveCfg = Debug|x86
+		{E24A4DC1-9B6F-4DA4-BD76-7D5FE73732BF}.Debug|x86.Build.0 = Debug|x86
+		{E24A4DC1-9B6F-4DA4-BD76-7D5FE73732BF}.Release|Win32.ActiveCfg = Release|x86
+		{E24A4DC1-9B6F-4DA4-BD76-7D5FE73732BF}.Release|x64.ActiveCfg = Release|x64
+		{E24A4DC1-9B6F-4DA4-BD76-7D5FE73732BF}.Release|x64.Build.0 = Release|x64
+		{E24A4DC1-9B6F-4DA4-BD76-7D5FE73732BF}.Release|x86.ActiveCfg = Release|x86
+		{E24A4DC1-9B6F-4DA4-BD76-7D5FE73732BF}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/mDNSResponder/mDNSWindows/BonjourQuickLooksInstaller/BonjourQuickLooksInstaller.wixproj b/mDNSResponder/mDNSWindows/BonjourQuickLooksInstaller/BonjourQuickLooksInstaller.wixproj
new file mode 100644
index 00000000..f98a8505
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/BonjourQuickLooksInstaller/BonjourQuickLooksInstaller.wixproj
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>e24a4dc1-9b6f-4da4-bd76-7d5fe73732bf</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>BonjourQuickLooks</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>
+    <Name>BonjourQuickLooksInstaller</Name>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Clients\DNS-SD.VisualStudio\dns-sd.vcxproj">
+      <Name>dns-sd</Name>
+      <Project>{aa230639-e115-4a44-aa5a-44a61235ba50}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\DLL\dnssd.vcxproj">
+      <Name>DLL</Name>
+      <Project>{ab581101-18f0-46f6-b56a-83a6b1ea657e}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\mdnsNSP\mdnsNSP.vcxproj">
+      <Name>mdnsNSP</Name>
+      <Project>{f4f15529-f0eb-402f-8662-73c5797ee557}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\SystemService\Service.vcxproj">
+      <Name>mDNSResponder</Name>
+      <Project>{c1d98254-ba27-4427-a3be-a68ca2cc5f69}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixFirewallExtension">
+      <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
+      <Name>WixFirewallExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
diff --git a/mDNSResponder/mDNSWindows/BonjourQuickLooksInstaller/Product.wxs b/mDNSResponder/mDNSWindows/BonjourQuickLooksInstaller/Product.wxs
new file mode 100644
index 00000000..88cb8314
--- /dev/null
+++ b/mDNSResponder/mDNSWindows/BonjourQuickLooksInstaller/Product.wxs
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2016 Apple Inc. All rights reserved. -->
+
+<Wix	xmlns		= "http://schemas.microsoft.com/wix/2006/wi"
+		xmlns:fire	= "http://schemas.microsoft.com/wix/FirewallExtension" >
+	
+	<?define ProductManufacturer		= "Apple Inc."?>
+	<?define ProductName				= "Bonjour (QuickLooks Testing)"?>
+	<?define UpgradeCode				= "46AE3251-43D6-41CF-8CDF-E902C38516D1"?>
+	<?define ProductVersion				= "1.0.0"?>
+	<?define ProductVersionMarketing	= "1.0.0"?>
+	<?if $(var.Platform) = x64?>
+		<?define Win64 = "yes" ?>
+		<?define PlatformSystemFolder		= "System64Folder"?>
+		<?define PlatformProgramFilesFolder	= "ProgramFiles64Folder"?>
+		<?define PlatformInstallDir			= "INSTALLDIR64"?>
+		<?define GUID_DNSSDExe				= "528ACC12-D4A8-11DE-927F-58D855D89593"?>
+		<?define GUID_DNSSDDLL				= "20F30EC6-1F92-11DC-8314-0800200C9A66"?>
+		<?define GUID_MDNSNSPDLL			= "255EBC6C-1F92-11DC-8314-0800200C9A66"?>
+		<?define GUID_MDNSResponderExe		= "BB3076CA-D4DF-11E0-8AC8-AA0E4824019B"?>
+	<?else?>
+		<?define Win64 = "no" ?>
+		<?define PlatformSystemFolder		= "SystemFolder"?>
+		<?define PlatformProgramFilesFolder	= "ProgramFilesFolder"?>
+		<?define PlatformInstallDir			= "INSTALLDIR"?>
+		<?define GUID_DNSSDExe				= "DCA08E52-8D4E-43AF-A0F7-9B809FCCFEBF"?>
+		<?define GUID_DNSSDDLL				= "E6B826D2-6338-4822-8DEA-EC03C2CA41A7"?>
+		<?define GUID_MDNSNSPDLL			= "0E416468-0A21-4778-BE61-64AAA5BE1039"?>
+		<?define GUID_MDNSResponderExe		= "836FE314-37A7-4905-90F0-AFE25F315CA3"?>
+	<?endif?>
+	<?define GUID_InstallerCache		= "EDD5CC92-97D7-4364-9CA6-F7001C75A90E"?>
+	
+	<Product
+		Id				= "*"
+		Language		= "1033"
+		Manufacturer	= "$(var.ProductManufacturer)"
+		Name			= "$(var.ProductName)"
+		UpgradeCode		= "$(var.UpgradeCode)"
+		Version			= "$(var.ProductVersion)" >
+		
+		<Package
+			Keywords			= "Installer,MSI"
+			Comments			= "$(var.ProductName) $(var.ProductVersion)"
+			Compressed			= "yes"
+			Description			= "[ProductName] Installer"
+			InstallerVersion	= "300"
+			Languages			= "1033"
+			Manufacturer		= "$(var.ProductManufacturer)"
+			SummaryCodepage		= "1252" />
+		
+		<!-- Launch Conditions -->
+		<Condition
+			Message = "You do not have sufficient privileges to complete this installation for all users of the machine. Log on as an administrator and then retry this installation." >
+			<![CDATA[Privileged]]>
+		</Condition>
+		<Condition
+			Message = "[ProductName] requires that your computer is running Windows XP SP2 or newer.">
+			<![CDATA[((VersionNT=501 AND ServicePackLevel>=2) OR VersionNT>501)]]>
+		</Condition>
+		<?if $(var.Win64) = "no"?>
+		<Condition
+			Message = "This installer is intended for 32-bit versions of Windows" >
+			<![CDATA[NOT VersionNT64]]>
+		</Condition>
+		<?endif?>
+		
+		<!-- Directory Table -->
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="$(var.PlatformSystemFolder)" />
+			<Directory Id="$(var.PlatformProgramFilesFolder)">
+				<Directory Id="Bonjour64InstallFolder" Name="Bonjour">
+					<Directory Id="$(var.PlatformInstallDir)" />
+				</Directory>
+			</Directory>
+			<Directory Id="DesktopFolder" />
+			<Directory Id="CommonAppDataFolder" Name="Application Data">
+				<Directory Id="AppleCommonAppDataFolder" Name="Apple">
+					<Directory Id="CachedInstallationsFolder" Name="Installer Cache">
+						<Directory Id="INSTALLERCACHE" Name="$(var.ProductName) $(var.ProductVersion)" />
+					</Directory>
+				</Directory>
+			</Directory>
+		</Directory>
+		
+		<!-- Features -->
+		<Feature Id="Bonjour" Title="Bonjour" Level="1" AllowAdvertise="no" Display="expand">
+			<ComponentRef Id="InstallerCache" />
+			<Feature Id="mDNSResponder" Title="mDNSResponder" Level="1" AllowAdvertise="no" Absent="disallow">
+				<ComponentRef Id="dns_sd.exe" />
+				<ComponentRef Id="dnssd.dll" />
+				<ComponentRef Id="mdnsNSP.dll" />
+				<ComponentRef Id="mDNSResponder.exe" />
+			</Feature>
+		</Feature>
+		
+		<!-- InstallerCache -->
+		<DirectoryRef Id="INSTALLERCACHE">
+			<Component Id="InstallerCache" Guid="$(var.GUID_InstallerCache)" KeyPath="yes">
+				<Condition><![CDATA[NOT DONTCACHEMSI]]></Condition>
+				<CreateFolder />
+				<CopyFile Id="BonjourQuickLooks.msi" SourceProperty="SourceDir" SourceName="BonjourQuickLooks.msi" DestinationDirectory="INSTALLERCACHE" />
+				<RemoveFile Id="BonjourQuickLooks.msi" Directory="INSTALLERCACHE" Name="BonjourQuickLooks.msi" On="uninstall" />
+				<RemoveFolder Id="INSTALLERCACHE" Directory="INSTALLERCACHE" On="uninstall" />
+			</Component>
+		</DirectoryRef>
+    	
+		<!-- Bonjour -->
+		<DirectoryRef Id="$(var.PlatformSystemFolder)">
+			<Component Id="dns_sd.exe" Guid="$(var.GUID_DNSSDExe)" Win64="$(var.Win64)">
+				<File Id="dns_sd.exe" Name="dns-sd.exe" KeyPath="yes" Source="$(var.dns-sd.TargetPath)" />
+			</Component>
+			<Component Id="dnssd.dll" Guid="$(var.GUID_DNSSDDLL)" Win64="$(var.Win64)">
+				<File Id="dnssd.dll" Name="dnssd.dll" KeyPath="yes" Source="$(var.DLL.TargetPath)" />
+			</Component>
+		</DirectoryRef>
+		
+		<DirectoryRef Id="$(var.PlatformInstallDir)">
+			<Component Id="mdnsNSP.dll" Guid="$(var.GUID_MDNSNSPDLL)" Win64="$(var.Win64)">
+				<File Id="mdnsNSP.dll" Name="mdnsNSP.dll" Source="$(var.mdnsNSP.TargetPath)" KeyPath="yes" SelfRegCost="1024" />
+			</Component>
+			<Component Id="mDNSResponder.exe" Guid="$(var.GUID_MDNSResponderExe)" Win64="$(var.Win64)">
+				<File Id="mDNSResponder.exe" Name="mDNSResponder.exe" Source="$(var.mDNSResponder.TargetPath)" KeyPath="yes">
+					<fire:FirewallException Id="mDNSException1" Name="Bonjour Service" IgnoreFailure="yes" Scope="any" />
+				</File>
+				<ServiceInstall
+					Id				= "BonjourService"
+					Name			= "Bonjour Service"
+					DisplayName		= "Bonjour Service"
+					Description		= "Enables hardware devices and software services to automatically configure themselves on the network and advertise their presence."
+					Start			= "auto"
+					Type			= "ownProcess"
+					ErrorControl	= "normal"
+					Vital			= "yes" >
+					<ServiceDependency Id="Tcpip" Group="no" />
+				</ServiceInstall>
+				<ServiceControl
+					Id		= "BonjourService"
+					Name	= "Bonjour Service"
+					Start	= "install"
+					Stop	= "both"
+					Remove	= "uninstall"
+					Wait	= "yes" />
+				<RegistryValue
+					Name	= "ManageLLRouting"
+					Root	= "HKLM"
+					Key		= "SYSTEM\CurrentControlSet\Services\Bonjour Service\Parameters"
+					Type	= "integer"
+					Value	= "1" />
+				<RegistryKey
+					Root	= "HKLM"
+					Key		= "SOFTWARE\Apple Inc.\Bonjour"
+					Action	= "createAndRemoveOnUninstall" >
+					<RegistryValue
+						Name	= "InstallDir"
+						Type	= "string"
+						Value	= "[$(var.PlatformInstallDir)]" />
+					<RegistryValue
+						Name	= "Version"
+						Type	= "string"
+						Value	= "$(var.ProductVersion)" />
+				</RegistryKey>
+			</Component>
+		</DirectoryRef>
+		
+		<!-- Media -->
+		<Media Id="1" EmbedCab="yes" Cabinet="BonjourQuickLooks.cab" CompressionLevel="high" />
+		
+		<!-- Properties -->
+		<Property Id="ALLUSERS" Value="1" />
+		<Property Id="ARPNOMODIFY" Value="1" />
+		<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" />
+		
+		<MajorUpgrade AllowDowngrades="yes" Schedule="afterInstallValidate" />
+	</Product>
+</Wix>
diff --git a/mDNSResponder/mDNSWindows/WinVersRes.h b/mDNSResponder/mDNSWindows/WinVersRes.h
index d7249be1..382bba49 100644
--- a/mDNSResponder/mDNSWindows/WinVersRes.h
+++ b/mDNSResponder/mDNSWindows/WinVersRes.h
@@ -24,10 +24,10 @@
 #define MASTER_COMPANY_NAME   "Apple Inc."
 
 // Define the product version for mDNSResponder on Windows
-#define MASTER_PROD_VERS		3,0,0,2
-#define MASTER_PROD_VERS_STR	"3,0,0,2"
-#define MASTER_PROD_VERS_STR2	"3.0.0.2"
-#define MASTER_PROD_VERS_STR3 "Explorer Plugin 3.0.0.2"
+#define MASTER_PROD_VERS		3,1,0,2
+#define MASTER_PROD_VERS_STR	"3,1,0,2"
+#define MASTER_PROD_VERS_STR2	"3.1.0.2"
+#define MASTER_PROD_VERS_STR3 "Explorer Plugin 3.1.0.2"
 
 // Define the legal copyright
 #define MASTER_LEGAL_COPYRIGHT "Copyright (C) 2003-2011 Apple Inc."
diff --git a/mDNSResponder/mDNSWindows/mDNSWin32.c b/mDNSResponder/mDNSWindows/mDNSWin32.c
index f2c43190..fa07af02 100755
--- a/mDNSResponder/mDNSWindows/mDNSWin32.c
+++ b/mDNSResponder/mDNSWindows/mDNSWin32.c
@@ -1920,7 +1920,7 @@ SetDNSServers( mDNS *const m )
 	{
 		mDNSAddr addr;
 		err = StringToAddress( &addr, ipAddr->IpAddress.String );
-		if ( !err ) mDNS_AddDNSServer(m, mDNSNULL, mDNSInterface_Any, 0, &addr, UnicastDNSPort, kScopeNone, DEFAULT_UDNS_TIMEOUT, mDNSfalse, 0, mDNStrue, mDNStrue, mDNSfalse);
+		if ( !err ) mDNS_AddDNSServer(m, mDNSNULL, mDNSInterface_Any, 0, &addr, UnicastDNSPort, kScopeNone, DEFAULT_UDNS_TIMEOUT, mDNSfalse, mDNSfalse, 0, mDNStrue, mDNStrue, mDNSfalse);
 	}
 
 exit:
@@ -2843,7 +2843,7 @@ mDNSlocal mStatus	SetupInterface( mDNS * const inMDNS, const struct ifaddrs *inI
     ifd->interfaceInfo.DirectLink = mDNSfalse;
     ifd->interfaceInfo.SupportsUnicastMDNSResponse = mDNStrue;
 
-	err = mDNS_RegisterInterface( inMDNS, &ifd->interfaceInfo, mDNSfalse );
+	err = mDNS_RegisterInterface( inMDNS, &ifd->interfaceInfo, NormalActivation );
 	require_noerr( err, exit );
 	ifd->hostRegistered = mDNStrue;
 	
@@ -2880,7 +2880,7 @@ mDNSlocal mStatus	TearDownInterface( mDNS * const inMDNS, mDNSInterfaceData *inI
 	if( inIFD->hostRegistered )
 	{
 		inIFD->hostRegistered = mDNSfalse;
-		mDNS_DeregisterInterface( inMDNS, &inIFD->interfaceInfo, mDNSfalse );
+		mDNS_DeregisterInterface( inMDNS, &inIFD->interfaceInfo, NormalActivation );
 	}
 	
 	// Tear down the multicast socket.