MSI packaging tweaks for Windows 64-bit

Change-Id: I69d52554b531dab6fc12ffe16e6ca91241fda3a5
Reviewed-on: https://gerrit.libreoffice.org/14283Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>

config_host.mk.in

@@ -609,6 +609,7 @@ export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
 export WINDOWS_SDK_LIB_SUBDIR=@WINDOWS_SDK_LIB_SUBDIR@
 export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@
 export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@
+export WINDOWS_X64=@WINDOWS_X64@
 export WINDRES=@WINDRES@
 export WINEGCC=@WINEGCC@
 export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@

configure.ac

@@ -3947,6 +3947,7 @@ cygwin*)
             CPUNAME=X86_64
             RTL_ARCH=X86_64
             PLATFORMID=windows_x86_64
+            WINDOWS_X64=1
         else
             CPUNAME=INTEL
             RTL_ARCH=x86
@@ -4359,6 +4360,7 @@ AC_SUBST(OS)
 AC_SUBST(P_SEP)
 AC_SUBST(WORKDIR)
 AC_SUBST(PLATFORMID)
+AC_SUBST(WINDOWS_X64)
 AC_DEFINE_UNQUOTED(WORKDIR,"$WORKDIR")
 
 dnl ===================================================================

instsetoo_native/util/openoffice.lst.in

@@ -33,6 +33,7 @@ Globals
             OOOVENDOR The Document Foundation
             OOODOWNLOADNAME 1
             STARTCENTER_HIDE_EXTERNAL_LINKS 0
+            64BITPRODUCT @WINDOWS_X64@
         }
     }
 }

solenv/bin/modules/installer/windows/directory.pm

@@ -62,9 +62,9 @@ sub overwrite_programfilesfolder
 {
     my ( $allvariables ) = @_;
 
-    if ( $allvariables->{'PROGRAMFILESFOLDERNAME'} )
+    if (( $allvariables->{'64BITPRODUCT'} ) && ( $allvariables->{'64BITPRODUCT'} == 1 ))
     {
-        $installer::globals::programfilesfolder = $allvariables->{'PROGRAMFILESFOLDERNAME'};
+        $installer::globals::programfilesfolder = "ProgramFiles64Folder";
     }
 }