Merge pull request #218 from game1024/release/v1.7

fix wxs script

Author: game1024

installer/OpenSpeedy.wxs

@@ -32,27 +32,30 @@
 
   <Fragment>
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-      <Component Id="MainExecutable" Guid="11111111-1111-1111-1111-111111111111">
-        <File Id="MainExecutable" Source="files\Speedy.exe" KeyPath="yes">
-          <Shortcut Id="StartMenuShortcut" 
-                   Directory="ProgramMenuFolder" 
-                   Name="OpenSpeedy" 
-                   WorkingDirectory="INSTALLFOLDER" 
-                   Icon="SpeedyIcon" 
-                   IconIndex="0" 
-                   Advertise="yes" />
-        </File>
+      <Component Id="MainExecutable" Guid="11111111-1111-1111-1111-111111111111" Win64="yes">
+        <File Id="MainExecutable" Source="files\Speedy.exe" KeyPath="yes" />
       </Component>
-      <Component Id="Bridge32" Guid="22222222-2222-2222-2222-222222222222">
+      <Component Id="StartMenuShortcut" Guid="66666666-6666-6666-6666-666666666666" Win64="yes">
+        <Shortcut Id="StartMenuShortcut" 
+                 Directory="ProgramMenuFolder" 
+                 Name="OpenSpeedy" 
+                 Target="[INSTALLFOLDER]Speedy.exe"
+                 WorkingDirectory="INSTALLFOLDER"
+                 Icon="SpeedyIcon"
+                 IconIndex="0" />
+        <RemoveFolder Id="RemoveProgramMenuFolder" Directory="ProgramMenuFolder" On="uninstall" />
+        <RegistryValue Root="HKCU" Key="Software\OpenSpeedy" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+      </Component>
+      <Component Id="Bridge32" Guid="22222222-2222-2222-2222-222222222222" Win64="yes">
         <File Id="Bridge32Exe" Source="files\bridge32.exe" KeyPath="yes" />
       </Component>
-      <Component Id="Bridge64" Guid="33333333-3333-3333-3333-333333333333">
+      <Component Id="Bridge64" Guid="33333333-3333-3333-3333-333333333333" Win64="yes">
         <File Id="Bridge64Exe" Source="files\bridge64.exe" KeyPath="yes" />
       </Component>
-      <Component Id="SpeedPatch32" Guid="44444444-4444-4444-4444-444444444444">
+      <Component Id="SpeedPatch32" Guid="44444444-4444-4444-4444-444444444444" Win64="yes">
         <File Id="SpeedPatch32Dll" Source="files\speedpatch32.dll" KeyPath="yes" />
       </Component>
-      <Component Id="SpeedPatch64" Guid="55555555-5555-5555-5555-555555555555">
+      <Component Id="SpeedPatch64" Guid="55555555-5555-5555-5555-555555555555" Win64="yes">
         <File Id="SpeedPatch64Dll" Source="files\speedpatch64.dll" KeyPath="yes" />
       </Component>
     </ComponentGroup>