From f65ffdcd92198ef61c1a4eeb754d69c855c239da Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Tue, 3 Sep 2013 07:05:03 +0200
Subject: [PATCH] Win64 needs an extra reg entry

---
 TrueCrypt_x64_7.1.1.0.r7.msi.sha1sum |  1 -
 TrueCrypt_x86_7.1.1.0.r7.msi.sha1sum |  1 -
 builder-product.cfg                  |  2 +-
 truecrypt-x64.aip                    | 31 +++++++++++++++++++---------
 truecrypt-x86.aip                    | 27 ++++++++++++++++--------
 5 files changed, 40 insertions(+), 22 deletions(-)
 delete mode 100644 TrueCrypt_x64_7.1.1.0.r7.msi.sha1sum
 delete mode 100644 TrueCrypt_x86_7.1.1.0.r7.msi.sha1sum

diff --git a/TrueCrypt_x64_7.1.1.0.r7.msi.sha1sum b/TrueCrypt_x64_7.1.1.0.r7.msi.sha1sum
deleted file mode 100644
index ab40026..0000000
--- a/TrueCrypt_x64_7.1.1.0.r7.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-1446f9324ac3b115c0000ae83117ef51fd6c90ce  /home/mario/.opsi-dist-cache/truecrypt.truecrypt-7.1.1.0/X86_64/TrueCrypt_x64_7.1.1.0.r7.msi
diff --git a/TrueCrypt_x86_7.1.1.0.r7.msi.sha1sum b/TrueCrypt_x86_7.1.1.0.r7.msi.sha1sum
deleted file mode 100644
index f0b7225..0000000
--- a/TrueCrypt_x86_7.1.1.0.r7.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-044958640f0dc875d34a295475c4ee95866c6a9c  /home/mario/.opsi-dist-cache/truecrypt.truecrypt-7.1.1.0/X86/TrueCrypt_x86_7.1.1.0.r7.msi
diff --git a/builder-product.cfg b/builder-product.cfg
index e3d0bed..37f8f79 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,7 @@ VENDOR="truecrypt.org"
 PN="truecrypt.truecrypt"
 NAME="TrueCrypt"
 DESCRIPTION="Free open-source disk encryption software for Windows."
-UVERSION="7"
+UVERSION="8"
 VERSION="7.1.1.0"
 RELEASE="3"
 PRIORITY="0"
diff --git a/truecrypt-x64.aip b/truecrypt-x64.aip
index 110000d..70f6e68 100644
--- a/truecrypt-x64.aip
+++ b/truecrypt-x64.aip
@@ -31,24 +31,32 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
     <ROW Component="AppUserModelID" ComponentId="{3654EDCD-1B9A-4682-9B90-CF741A8F8818}" Directory_="APPDIR" Attributes="4" KeyPath="AppUserModelID"/>
+    <ROW Component="Count" ComponentId="{7673A1E3-B4FB-403B-AE57-90D64273551D}" Directory_="APPDIR" Attributes="4" KeyPath="Count"/>
+    <ROW Component="DisplayName" ComponentId="{CEB299CB-0E76-4BCA-934C-7CC05DCB6F5A}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName"/>
+    <ROW Component="ErrorControl" ComponentId="{25CF5B30-458A-414E-902E-851F6D8B7CCA}" Directory_="APPDIR" Attributes="4" KeyPath="ErrorControl"/>
+    <ROW Component="ImagePath" ComponentId="{D51E22A1-A3AD-4DD0-9584-E648F3139840}" Directory_="APPDIR" Attributes="4" KeyPath="ImagePath"/>
     <ROW Component="License.txt" ComponentId="{E0041456-F1ED-4366-A0F8-89EB9258FCBC}" Directory_="APPDIR" Attributes="0" KeyPath="License.txt"/>
+    <ROW Component="NextInstance" ComponentId="{D71FF7FE-1FB1-4CC0-B989-F306AE061CE7}" Directory_="APPDIR" Attributes="4" KeyPath="NextInstance"/>
     <ROW Component="ProductInformation" ComponentId="{BB35EA1C-EBCC-48D9-932A-22161890CC75}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
-    <ROW Component="RegistryEntries" ComponentId="{6F2E527E-7753-453D-A64F-95C8BA285EB1}" Directory_="APPDIR" Attributes="4" KeyPath="regF1670050CC4ED3AE9B34EC57200F7A1F"/>
     <ROW Component="Shell" ComponentId="{E9BB35CC-E669-41C3-882D-AE9A8622AC1D}" Directory_="APPDIR" Attributes="4" KeyPath="Shell"/>
+    <ROW Component="Start" ComponentId="{026183E4-F152-4BB0-AD9D-4AC8EC9C3857}" Directory_="APPDIR" Attributes="4" KeyPath="Start"/>
     <ROW Component="TrueCrypt" ComponentId="{32B7B53F-5E98-4F0D-912F-5E4015303E59}" Directory_="TrueCrypt_Dir" Attributes="0"/>
     <ROW Component="TrueCrypt.exe" ComponentId="{EF04CB91-32E3-4A7E-B60D-E15C8C44AF8F}" Directory_="APPDIR" Attributes="0" KeyPath="TrueCrypt.exe"/>
     <ROW Component="TrueCryptFormat.exe" ComponentId="{2C0BB146-27FE-4507-AA31-D8CEB0E7F44A}" Directory_="APPDIR" Attributes="0" KeyPath="TrueCryptFormat.exe"/>
     <ROW Component="TrueCryptUserGuide.pdf" ComponentId="{DFBB4AA0-15BF-49BF-BD9E-5358918E0CB6}" Directory_="APPDIR" Attributes="0" KeyPath="TrueCryptUserGuide.pdf" Type="0"/>
+    <ROW Component="Type" ComponentId="{283B1B3A-C761-402A-8982-5F0DD3349540}" Directory_="APPDIR" Attributes="4" KeyPath="Type"/>
+    <ROW Component="WOW64" ComponentId="{05B83A71-58D9-4C92-9F20-A7ECBB869B6B}" Directory_="APPDIR" Attributes="4" KeyPath="WOW64"/>
     <ROW Component="_" ComponentId="{EF1E2776-EFC8-41B4-B10B-CC5522D62375}" Directory_="APPDIR" Attributes="4" KeyPath="_"/>
     <ROW Component="__1" ComponentId="{714F2F4F-1E67-46F5-88A1-A283162DB3B2}" Directory_="APPDIR" Attributes="4" KeyPath="__1"/>
     <ROW Component="__2" ComponentId="{639673A0-43BF-4B3C-9369-9FE612E3798C}" Directory_="APPDIR" Attributes="4" KeyPath="__2"/>
     <ROW Component="__3" ComponentId="{D8379EFC-667E-41D3-B0B7-8216E807EBCD}" Directory_="APPDIR" Attributes="4" KeyPath="__3"/>
+    <ROW Component="__7" ComponentId="{A885D992-EB44-471C-A831-169FE5BDFB30}" Directory_="APPDIR" Attributes="4" KeyPath="__7"/>
     <ROW Component="open" ComponentId="{1384018C-75CC-41F3-B609-6E07EFC6E56E}" Directory_="APPDIR" Attributes="4" KeyPath="open"/>
     <ROW Component="truecryptx64.sys" ComponentId="{5E862494-0686-4C28-8D88-CAD2C3137EB2}" Directory_="DRIVERSFOLDER" Attributes="256" KeyPath="truecryptx64.sys" Type="0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="Driver" Title="TrueCrypt Driver" Display="2" Level="1" Directory_="APPDIR" Attributes="0" Components="RegistryEntries"/>
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AppUserModelID License.txt ProductInformation Shell TrueCrypt TrueCrypt.exe TrueCryptFormat.exe TrueCryptUserGuide.pdf _ __1 __2 __3 open truecryptx64.sys"/>
+    <ROW Feature="Driver" Title="TrueCrypt Driver" Display="2" Level="1" Directory_="APPDIR" Attributes="0"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AppUserModelID Count DisplayName ErrorControl ImagePath License.txt NextInstance ProductInformation Shell Start TrueCrypt TrueCrypt.exe TrueCryptFormat.exe TrueCryptUserGuide.pdf Type WOW64 _ __1 __2 __3 __7 open truecryptx64.sys"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@@ -57,7 +65,7 @@
     <ROW File="TrueCrypt.exe" Component_="TrueCrypt.exe" FileName="TrueCr~1.exe|TrueCrypt.exe" Attributes="0" SourcePath="TrueCrypt-7.1.a\TrueCrypt.exe" SelfReg="false" NextFile="TrueCryptFormat.exe" DigSign="true"/>
     <ROW File="TrueCryptFormat.exe" Component_="TrueCryptFormat.exe" FileName="TrueCr~2.exe|TrueCrypt Format.exe" Attributes="0" SourcePath="TrueCrypt-7.1.a\TrueCrypt Format.exe" SelfReg="false" NextFile="Language.de.xml" DigSign="true"/>
     <ROW File="TrueCryptUserGuide.pdf" Component_="TrueCryptUserGuide.pdf" FileName="TrueCr~1.pdf|TrueCrypt User Guide.pdf" Attributes="0" SourcePath="TrueCrypt-7.1.a\TrueCrypt User Guide.pdf" SelfReg="false" NextFile="License.txt"/>
-    <ROW File="truecryptx64.sys" Component_="truecryptx64.sys" FileName="truecr~1.sys|truecrypt-x64.sys" Attributes="0" SourcePath="TrueCrypt-7.1.a\truecrypt-x64.sys" SelfReg="false"/>
+    <ROW File="truecryptx64.sys" Component_="truecryptx64.sys" FileName="truecr~2.sys|truecrypt.sys" Attributes="0" SourcePath="TrueCrypt-7.1.a\truecrypt-x64.sys" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
     <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFileName="[|ProductName]_x64_[|ProductVersion]" Languages="en" InstallationType="4" UseLargeSchema="true" MsiPackageType="x64"/>
@@ -159,20 +167,23 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
     <ROW Registry="AppUserModelID" Root="0" Key="TrueCryptVolume" Name="AppUserModelID" Value="TrueCryptFoundation.TrueCrypt" Component_="AppUserModelID"/>
+    <ROW Registry="Count" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt\Enum" Name="Count" Value="#1" Component_="Count"/>
+    <ROW Registry="DisplayName" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="DisplayName" Value="truecrypt" Component_="DisplayName"/>
+    <ROW Registry="ErrorControl" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ErrorControl" Value="#1" Component_="ErrorControl"/>
+    <ROW Registry="ImagePath" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ImagePath" Value="#%[DRIVERSFOLDER]truecrypt.sys" Component_="ImagePath"/>
+    <ROW Registry="NextInstance" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt\Enum" Name="NextInstance" Value="#1" Component_="NextInstance"/>
     <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
     <ROW Registry="Shell" Root="0" Key="TrueCryptVolume\Shell" Name="+" Component_="Shell"/>
+    <ROW Registry="Start" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Start" Value="#1" Component_="Start"/>
+    <ROW Registry="Type" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Type" Value="#1" Component_="Type"/>
     <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
+    <ROW Registry="WOW64" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="WOW64" Value="#1" Component_="WOW64"/>
     <ROW Registry="_" Root="0" Key=".tc" Value="TrueCryptVolume" Component_="_"/>
     <ROW Registry="__1" Root="0" Key="TrueCryptVolume" Value="TrueCrypt Volume" Component_="__1"/>
     <ROW Registry="__2" Root="0" Key="TrueCryptVolume\DefaultIcon" Value="[APPDIR]\TrueCrypt.exe,1" Component_="__2"/>
     <ROW Registry="__3" Root="0" Key="TrueCryptVolume\Shell\open\command" Value="&quot;[APPDIR]TrueCrypt.exe&quot; /v &quot;%1&quot;" Component_="__3"/>
+    <ROW Registry="__7" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt\Enum" Name="0" Value="Root\LEGACY_TRUECRYPT\0000" Component_="__7"/>
     <ROW Registry="open" Root="0" Key="TrueCryptVolume\Shell\open" Name="+" Component_="open"/>
-    <ROW Registry="reg090B89827BCC890BD3804FADA096A80D" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Start" Value="#00000001" Component_="RegistryEntries"/>
-    <ROW Registry="reg56DC911C73516220E99A398C3F1FAE0F" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Type" Value="#00000001" Component_="RegistryEntries"/>
-    <ROW Registry="reg70F3CDE6C997F7EF10F9971994B15AC6" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="*" Component_="RegistryEntries"/>
-    <ROW Registry="regE0FD439926EC1D6CF1D26CA865662B39" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ErrorControl" Value="#00000001" Component_="RegistryEntries"/>
-    <ROW Registry="regF01C28298E4DE3F31C3826D95B5861F9" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ImagePath" Value="#%[DRIVERSFOLDER]truecrypt-x64.sys" Component_="RegistryEntries"/>
-    <ROW Registry="regF1670050CC4ED3AE9B34EC57200F7A1F" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="DisplayName" Value="truecrypt" Component_="RegistryEntries"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
     <ROW Shortcut="License" Directory_="TrueCrypt_Dir" Name="License" Component_="License.txt" Target="[#License.txt]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
diff --git a/truecrypt-x86.aip b/truecrypt-x86.aip
index bbfc172..2eec793 100644
--- a/truecrypt-x86.aip
+++ b/truecrypt-x86.aip
@@ -31,24 +31,31 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
     <ROW Component="AppUserModelID" ComponentId="{198BB0F6-3169-4089-92D7-E1C935290F71}" Directory_="APPDIR" Attributes="4" KeyPath="AppUserModelID"/>
+    <ROW Component="Count" ComponentId="{4DC4FA40-6143-44A7-99FB-D339688A70DE}" Directory_="APPDIR" Attributes="4" KeyPath="Count"/>
+    <ROW Component="DisplayName" ComponentId="{1C8876CF-6ED4-4A20-94A4-151D53DACAE9}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName"/>
+    <ROW Component="ErrorControl" ComponentId="{DF7B4D88-212C-4381-966C-133E4AB68E73}" Directory_="APPDIR" Attributes="4" KeyPath="ErrorControl"/>
+    <ROW Component="ImagePath" ComponentId="{E86535C0-7E7C-44F2-A0FF-FA66030C7C73}" Directory_="APPDIR" Attributes="4" KeyPath="ImagePath"/>
     <ROW Component="License.txt" ComponentId="{E6DABB98-6F55-4CA5-AC98-01F16983F289}" Directory_="APPDIR" Attributes="0" KeyPath="License.txt"/>
+    <ROW Component="NextInstance" ComponentId="{CDBB955F-30A5-4DD9-821F-7D968A9BCF2C}" Directory_="APPDIR" Attributes="4" KeyPath="NextInstance"/>
     <ROW Component="ProductInformation" ComponentId="{C6F3396A-55E6-443D-8E51-078070CD894C}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
-    <ROW Component="RegistryEntries" ComponentId="{4D75F2DC-9118-4603-8321-A27B384E1C50}" Directory_="APPDIR" Attributes="4" KeyPath="regF1670050CC4ED3AE9B34EC57200F7A1F"/>
     <ROW Component="Shell" ComponentId="{D026C89A-9811-45BD-8EF5-98AE9BB052B6}" Directory_="APPDIR" Attributes="4" KeyPath="Shell"/>
+    <ROW Component="Start" ComponentId="{7C3414B4-0245-4354-9802-8899BAE4B497}" Directory_="APPDIR" Attributes="4" KeyPath="Start"/>
     <ROW Component="TrueCrypt" ComponentId="{D0854398-C6E0-4D96-A0B0-25CBF45B7D55}" Directory_="TrueCrypt_Dir" Attributes="0"/>
     <ROW Component="TrueCrypt.exe" ComponentId="{E7B95E40-39AB-4581-A99F-B80660BC49D0}" Directory_="APPDIR" Attributes="0" KeyPath="TrueCrypt.exe"/>
     <ROW Component="TrueCryptFormat.exe" ComponentId="{A0721551-CC16-44D4-81F1-E2F3969B3FB5}" Directory_="APPDIR" Attributes="0" KeyPath="TrueCryptFormat.exe"/>
     <ROW Component="TrueCryptUserGuide.pdf" ComponentId="{43D06687-689A-4D0A-931B-4181C2D9D449}" Directory_="APPDIR" Attributes="0" KeyPath="TrueCryptUserGuide.pdf" Type="0"/>
     <ROW Component="TrueCrypt_Driver" ComponentId="{73FCD85E-90E8-41DE-8FFA-96189BDFCF21}" Directory_="DRIVERSFOLDER" Attributes="0" KeyPath="TCDriver"/>
+    <ROW Component="Type" ComponentId="{EE07B6EC-1DE6-4D3C-9C89-2023F17ED886}" Directory_="APPDIR" Attributes="4" KeyPath="Type"/>
     <ROW Component="_" ComponentId="{A6FCFBD2-9E21-4D58-80DF-03F9D87CC9AD}" Directory_="APPDIR" Attributes="4" KeyPath="_"/>
     <ROW Component="__1" ComponentId="{FE790CB6-7294-4862-AB33-CA7D48CDD659}" Directory_="APPDIR" Attributes="4" KeyPath="__1"/>
     <ROW Component="__2" ComponentId="{4B97E3E8-3003-4C5A-A9C9-E90808DA5EB1}" Directory_="APPDIR" Attributes="4" KeyPath="__2"/>
     <ROW Component="__3" ComponentId="{71DB4ADA-E921-4AB2-8937-05783C3E2742}" Directory_="APPDIR" Attributes="4" KeyPath="__3"/>
+    <ROW Component="__4" ComponentId="{85B741B0-5565-465D-BBE7-A9249964A256}" Directory_="APPDIR" Attributes="4" KeyPath="__4"/>
     <ROW Component="open" ComponentId="{2D842D9B-3848-457A-A1C8-789A14708E4B}" Directory_="APPDIR" Attributes="4" KeyPath="open"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="Driver" Title="TrueCrypt Driver" Display="2" Level="1" Directory_="APPDIR" Attributes="0" Components="RegistryEntries TrueCrypt_Driver"/>
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AppUserModelID License.txt ProductInformation Shell TrueCrypt TrueCrypt.exe TrueCryptFormat.exe TrueCryptUserGuide.pdf _ __1 __2 __3 open"/>
+    <ROW Feature="Driver" Title="TrueCrypt Driver" Display="2" Level="1" Directory_="APPDIR" Attributes="0" Components="TrueCrypt_Driver"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AppUserModelID Count DisplayName ErrorControl ImagePath License.txt NextInstance ProductInformation Shell Start TrueCrypt TrueCrypt.exe TrueCryptFormat.exe TrueCryptUserGuide.pdf Type _ __1 __2 __3 __4 open"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@@ -159,20 +166,22 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
     <ROW Registry="AppUserModelID" Root="0" Key="TrueCryptVolume" Name="AppUserModelID" Value="TrueCryptFoundation.TrueCrypt" Component_="AppUserModelID"/>
+    <ROW Registry="Count" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt\Enum" Name="Count" Value="#1" Component_="Count"/>
+    <ROW Registry="DisplayName" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="DisplayName" Value="truecrypt" Component_="DisplayName"/>
+    <ROW Registry="ErrorControl" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ErrorControl" Value="#1" Component_="ErrorControl"/>
+    <ROW Registry="ImagePath" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ImagePath" Value="#%[DRIVERSFOLDER]truecrypt.sys" Component_="ImagePath"/>
+    <ROW Registry="NextInstance" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt\Enum" Name="NextInstance" Value="#1" Component_="NextInstance"/>
     <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
     <ROW Registry="Shell" Root="0" Key="TrueCryptVolume\Shell" Name="+" Component_="Shell"/>
+    <ROW Registry="Start" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Start" Value="#1" Component_="Start"/>
+    <ROW Registry="Type" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Type" Value="#1" Component_="Type"/>
     <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
     <ROW Registry="_" Root="0" Key=".tc" Value="TrueCryptVolume" Component_="_"/>
     <ROW Registry="__1" Root="0" Key="TrueCryptVolume" Value="TrueCrypt Volume" Component_="__1"/>
     <ROW Registry="__2" Root="0" Key="TrueCryptVolume\DefaultIcon" Value="[APPDIR]\TrueCrypt.exe,1" Component_="__2"/>
     <ROW Registry="__3" Root="0" Key="TrueCryptVolume\Shell\open\command" Value="&quot;[APPDIR]TrueCrypt.exe&quot; /v &quot;%1&quot;" Component_="__3"/>
+    <ROW Registry="__4" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt\Enum" Name="0" Value="Root\LEGACY_TRUECRYPT\0000" Component_="__4"/>
     <ROW Registry="open" Root="0" Key="TrueCryptVolume\Shell\open" Name="+" Component_="open"/>
-    <ROW Registry="reg090B89827BCC890BD3804FADA096A80D" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Start" Value="#00000001" Component_="RegistryEntries"/>
-    <ROW Registry="reg56DC911C73516220E99A398C3F1FAE0F" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Type" Value="#00000001" Component_="RegistryEntries"/>
-    <ROW Registry="reg70F3CDE6C997F7EF10F9971994B15AC6" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="*" Component_="RegistryEntries"/>
-    <ROW Registry="regE0FD439926EC1D6CF1D26CA865662B39" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ErrorControl" Value="#00000001" Component_="RegistryEntries"/>
-    <ROW Registry="regF01C28298E4DE3F31C3826D95B5861F9" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ImagePath" Value="#%[DRIVERSFOLDER]truecrypt.sys" Component_="RegistryEntries"/>
-    <ROW Registry="regF1670050CC4ED3AE9B34EC57200F7A1F" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="DisplayName" Value="truecrypt" Component_="RegistryEntries"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
     <ROW Shortcut="License" Directory_="TrueCrypt_Dir" Name="License" Component_="License.txt" Target="[#License.txt]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>