Win32: Change the order of the links at the installer

[vlc] / extras / package / win32 / vlc.win32.nsi.in

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index 5c549a65564494514588e4f0efd2d09217cc299e..3266c03a7016eb16483c8c0a8f849137b618c389 100644 (file)
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -20,7 +20,7 @@
 !define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_DIR_REGKEY}"
 !define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
 
-@HAVE_WIN64_FALSE@ !define INSTALL_ACTIVEX
+!define INSTALL_ACTIVEX
 !define INSTALL_MOZILLA
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -28,9 +28,9 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile ..\vlc-${VERSION}-win32.exe
+@HAVE_WIN64_FALSE@ OutFile ..\vlc-${VERSION}-win32.exe
+@HAVE_WIN64_TRUE@  OutFile ..\vlc-${VERSION}-win64.exe
 InstallDir "$@PROGRAMFILES@\VideoLAN\VLC"
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 !ifdef NSIS_LZMA_COMPRESS_WHOLE
 SetCompressor lzma
 !else
@@ -78,21 +78,8 @@ RequestExecutionLevel user
   ; Instfiles page
     !insertmacro MUI_PAGE_INSTFILES
   ; Finish page
-
-    Function ExecAppFile
-      Exec '$INSTDIR\vlc.exe'
-    FunctionEnd
-
-    Function AppRunAs
-      !insertmacro UAC.CallFunctionAsUser ExecAppFile
-    FunctionEnd
-
-    !define MUI_FINISHPAGE_RUN
-    !define MUI_FINISHPAGE_RUN_FUNCTION AppRunAs
     !define MUI_FINISHPAGE_LINK $Link_VisitWebsite
     !define MUI_FINISHPAGE_LINK_LOCATION "http://www.videolan.org/vlc/"
-    !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
-    !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
     !define MUI_FINISHPAGE_NOREBOOTSUPPORT
     !insertmacro MUI_PAGE_FINISH
 
@@ -161,6 +148,7 @@ NoBackup:
   WriteRegStr HKCR "VLC$R0" "" "VLC media file ($R0)"
   WriteRegStr HKCR "VLC$R0\shell" "" "Open"
   WriteRegStr HKCR "VLC$R0\shell\Open" "" $ShellAssociation_Play
+  WriteRegStr HKCR "VLC$R0\shell\Open" "MultiSelectModel" "Player"
   WriteRegStr HKCR "VLC$R0\shell\Open\command" "" '"$INSTDIR\vlc.exe" --started-from-file "%1"'
   WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
 
@@ -257,6 +245,8 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 !macro MacroAudioExtensions _action
+  !insertmacro ${_action} ".3ga"
+  !insertmacro ${_action} ".669"
   !insertmacro ${_action} ".a52"
   !insertmacro ${_action} ".aac"
   !insertmacro ${_action} ".ac3"
@@ -284,8 +274,11 @@ FunctionEnd
   !insertmacro ${_action} ".mp2"
   !insertmacro ${_action} ".mp3"
   !insertmacro ${_action} ".mpc"
+  !insertmacro ${_action} ".mpga"
   !insertmacro ${_action} ".oma"
   !insertmacro ${_action} ".oga"
+  !insertmacro ${_action} ".qcp"
+  !insertmacro ${_action} ".ra"
   !insertmacro ${_action} ".rmi"
   !insertmacro ${_action} ".snd"
   !insertmacro ${_action} ".s3m"
@@ -310,9 +303,11 @@ FunctionEnd
   !insertmacro ${_action} ".asf"
   !insertmacro ${_action} ".avi"
   !insertmacro ${_action} ".divx"
+  !insertmacro ${_action} ".drc"
   !insertmacro ${_action} ".dv"
   !insertmacro ${_action} ".f4v"
   !insertmacro ${_action} ".flv"
+  !insertmacro ${_action} ".gvi"
   !insertmacro ${_action} ".gxf"
   !insertmacro ${_action} ".m1v"
   !insertmacro ${_action} ".m2t"
@@ -352,6 +347,7 @@ FunctionEnd
   !insertmacro ${_action} ".vro"
   !insertmacro ${_action} ".webm"
   !insertmacro ${_action} ".wmv"
+  !insertmacro ${_action} ".xesc"
 !macroend
 
 !macro MacroOtherExtensions _action
@@ -366,6 +362,7 @@ FunctionEnd
   !insertmacro ${_action} ".ram"
   !insertmacro ${_action} ".sdp"
   !insertmacro ${_action} ".vlc"
+  !insertmacro ${_action} ".wvx"
   !insertmacro ${_action} ".xspf"
 !macroend
 
@@ -584,8 +581,6 @@ SectionEnd
 Section $Name_Section02a SEC02a
   SectionIn 1 2 3
   CreateDirectory "$SMPROGRAMS\VideoLAN"
-  CreateShortCut "$SMPROGRAMS\VideoLAN\Reset VLC media player preferences and cache files.lnk" \
-    "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache vlc://quit"
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \
     "$INSTDIR\vlc.exe" ""
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player skinned.lnk" \
@@ -596,6 +591,8 @@ Section $Name_Section02a SEC02a
     "$INSTDIR\NEWS.txt" ""
   CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_GROUP} Website.lnk" \
     "$INSTDIR\${PRODUCT_GROUP} Website.url"
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Reset VLC media player preferences and cache files.lnk" \
+    "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache vlc://quit"
 SectionEnd
 
 Section $Name_Section02b SEC02b
@@ -605,7 +602,7 @@ Section $Name_Section02b SEC02b
 SectionEnd
 
 !ifdef INSTALL_MOZILLA
-Section /o $Name_Section03 SEC03
+Section $Name_Section03 SEC03
   SectionIn 3
 
   SetOutPath "$INSTDIR"
@@ -771,6 +768,18 @@ SectionEnd
 ;;; Start function
 Function .onInit
 
+@HAVE_WIN64_TRUE@ !include "x64.nsh"
+@HAVE_WIN64_TRUE@ ${If} ${RunningX64}
+@HAVE_WIN64_TRUE@ ${Else}
+@HAVE_WIN64_TRUE@    MessageBox MB_OK|MB_ICONSTOP "This version of VLC only runs on 64bits operating systems.$\nYour operating system is 32bits.$\n$\nPlease get the 32 BITS version."
+@HAVE_WIN64_TRUE@    Quit
+@HAVE_WIN64_TRUE@ ${Endif}
+
+@HAVE_WIN64_TRUE@ SetRegView 64
+ReadRegStr $INSTDIR HKLM "${PRODUCT_DIR_REGKEY}" ""
+StrCmp $INSTDIR "" 0 +1
+StrCpy $INSTDIR "$@PROGRAMFILES@\VideoLAN\VLC"
+
 UAC_Elevate:
     UAC::RunElevated
     StrCmp 1223 $0 UAC_ElevationAborted