Attempt to fix start of SIP Communicator on Windows x64. As jsmooth cannot create a 64-bit wrapper, the 32-bit ones looks for a JVM in registry under the key "HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/JavaSoft/Java Runtime Environment" but the real 64-bit JVM is under "HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Runtime Environment". So we force JVM search first in "\\Program Files\Java\\jre6". Fix also updater download link for the Windows x64 version.

resources/install/windows/run.exe.jsmooth

@@ -6,6 +6,7 @@
 <JVMSearchPath>jdkpath</JVMSearchPath>
 <JVMSearchPath>exepath</JVMSearchPath>
 <JVMSearchPath>jview</JVMSearchPath>
+<bundledJVMPath>..\..\..\..\..\..\..\..\Program Files\Java\jre6</bundledJVMPath>
 <classPath>lib\felix.jar</classPath>
 <classPath>lib\jdic-all.jar</classPath>
 <classPath>lib\jdic_stub.jar</classPath>

resources/install/windows/uninstall.jsmooth

@@ -6,6 +6,7 @@
 <JVMSearchPath>jdkpath</JVMSearchPath>
 <JVMSearchPath>exepath</JVMSearchPath>
 <JVMSearchPath>jview</JVMSearchPath>
+<bundledJVMPath>..\..\..\..\..\..\..\..\Program Files\Java\jre6</bundledJVMPath>
 <classPath>Uninstaller\uninstaller.jar</classPath>
 <currentDirectory>${EXECUTABLEPATH}</currentDirectory>
 <embeddedJar>false</embeddedJar>

src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java

@@ -31,7 +31,7 @@
 
 /**
  * Activates the UpdateCheck plugin
- * 
+ *
  * @author Damian Minkov
  * @author Lubomir Marinov
  */
@@ -61,7 +61,7 @@ public class UpdateCheckActivator
 
     private static UserCredentials userCredentials = null;
 
-    private static final String UPDATE_USERNAME_CONFIG = 
+    private static final String UPDATE_USERNAME_CONFIG =
         "net.java.sip.communicator.plugin.updatechecker.UPDATE_SITE_USERNAME";
     private static final String UPDATE_PASSWORD_CONFIG =
         "net.java.sip.communicator.plugin.updatechecker.UPDATE_SITE_PASSWORD";
@@ -107,7 +107,7 @@ public void start(BundleContext bundleContext) throws Exception
     /**
      * Stop the bundle. Nothing to stop for now.
      * @param bundleContext
-     * @throws Exception 
+     * @throws Exception
      */
     public void stop(BundleContext bundleContext)
         throws Exception
@@ -164,7 +164,7 @@ public static ConfigurationService getConfigurationService()
      * The returned reference to <code>ShutdownService</code> is not being
      * cached.
      * </p>
-     * 
+     *
      * @return reference to a <code>ShutdownService</code> implementation
      *         currently registered in the bundle context of the active
      *         <code>UpdateCheckActivator</code> instance
@@ -355,6 +355,9 @@ public void actionPerformed(ActionEvent e)
 
                 public void actionPerformed(ActionEvent e)
                 {
+                    if(OSUtils.IS_WINDOWS64)
+                        downloadLink = downloadLink.replace("x86", "x64");
+
                     dialog.dispose();
                     windowsUpdate();
                 }
@@ -777,9 +780,6 @@ public void actionPerformed(ActionEvent e)
                         if(OSUtils.IS_LINUX64)
                             downloadLink
                                 = downloadLink.replace("i386", "amd64");
-                        else if(OSUtils.IS_WINDOWS64)
-                            downloadLink
-                                = downloadLink.replace("x86", "x64");
 
                         getBrowserLauncher().openURL(downloadLink);
                         dialog.dispose();