bzr commit into wex-installer-1.0 branch (mike.lischke:457)

[Mike Lischke]

#At file:///D:/Work/MySQL/installer/ based on revid:mike.lischke@stripped

  457 Mike Lischke	2011-05-09
      Removed obsolete user DPI registry search. DPI determination has been simplified already.

    modified:
      Setup/Product.wxs
=== modified file 'Setup/Product.wxs'
=== modified file 'Setup/Product.wxs'
--- a/Setup/Product.wxs	2011-04-28 19:51:03 +0000
+++ b/Setup/Product.wxs	2011-05-09 08:07:40 +0000
@@ -7,14 +7,6 @@
       <UpgradeVersion OnlyDetect="no" Maximum="$(var.ProductVersion)" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="yes" />
     </Upgrade>
 
-    <Property Id="CURRENTUSERDPI">
-      <RegistrySearch Id="CurrentUserDPI"
-                      Root="HKCU"
-                      Key="Control Panel\Desktop\WindowMetrics"
-                      Name="AppliedDPI"
-                      Type="raw" />
-    </Property>
-
     <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
     <Icon Id="InstallerIcon.exe" SourceFile="$(var.SolutionDir)common\mysql-installer.ico"/>
     <Property Id="ARPPRODUCTICON" Value="InstallerIcon.exe"/>
@@ -56,7 +48,6 @@
               <util:XmlFile Id="SetProductCachePath" Action="setValue" ElementPath="//ProductCachePath" Value="[ProductCache]" File="[#config.xml]" SelectionLanguage="XPath" Sequence="1" />
               <util:XmlFile Id="SetInstallationRoot" Action="setValue" ElementPath="//InstallationRoot" Value="[INSTALLLOCATION]" File="[#config.xml]" SelectionLanguage="XPath" Sequence="2" />
               <util:XmlFile Id="SetProductCode" Action="setValue" ElementPath="//ProductCode" Value="[ProductCode]" File="[#config.xml]" SelectionLanguage="XPath" Sequence="3" />
-              <util:XmlFile Id="SetCurrentUserDPU" Action="setValue" ElementPath="//CurrentUserDPI" Value="[CURRENTUSERDPI]" File="[#config.xml]" SelectionLanguage="XPath" Sequence="4" />
 
               <File Id="products.xml" Name="products.xml.temp" Source="$(var.SolutionDir)common\products.xml"/>
               <File Id="mytemplate.ini" Name="my-template.ini" Source="$(var.SolutionDir)common\my-template.ini"/>


Attachment: [text/bzr-bundle] bzr/[e-mail]