X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc.win32.nsi;h=31e0f4140539254ce0d1832aa7bab70e4c0dc9d3;hb=8ca12ef79e1732c745be733528c1441f5fffd7f8;hp=3398b1a909a24c2c2c1743a867d1fffe99026f6a;hpb=bb62c5d5c0608d4215e4276973cf3e5c071ade99;p=vlc diff --git a/vlc.win32.nsi b/vlc.win32.nsi index 3398b1a909..31e0f41405 100644 --- a/vlc.win32.nsi +++ b/vlc.win32.nsi @@ -11,6 +11,7 @@ !define PRODUCT_DIR_REGKEY "Software\VideoLAN\VLC" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" +!define PRODUCT_ID "{ea92ef52-afe4-4212-bacb-dfe9fca94cd6}" ;;;;;;;;;;;;;;;;;;;;;;;;; ; General configuration ; @@ -68,6 +69,63 @@ InstType "Full" ; MUI end ------ + +;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Push extensions on stack ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;; +!macro MacroAudioExtensions _action + !insertmacro ${_action} ".a52" + !insertmacro ${_action} ".aac" + !insertmacro ${_action} ".ac3" + !insertmacro ${_action} ".dts" + !insertmacro ${_action} ".flac" + !insertmacro ${_action} ".mka" + !insertmacro ${_action} ".mp1" + !insertmacro ${_action} ".mp2" + !insertmacro ${_action} ".mp3" + !insertmacro ${_action} ".ogg" + !insertmacro ${_action} ".spx" + !insertmacro ${_action} ".wav" + !insertmacro ${_action} ".wma" +!macroend + +!macro MacroVideoExtensions _action + !insertmacro ${_action} ".asf" + !insertmacro ${_action} ".avi" + !insertmacro ${_action} ".divx" + !insertmacro ${_action} ".dv" + !insertmacro ${_action} ".m1v" + !insertmacro ${_action} ".m2v" + !insertmacro ${_action} ".mkv" + !insertmacro ${_action} ".mov" + !insertmacro ${_action} ".mp4" + !insertmacro ${_action} ".mpeg" + !insertmacro ${_action} ".mpeg1" + !insertmacro ${_action} ".mpeg2" + !insertmacro ${_action} ".mpeg4" + !insertmacro ${_action} ".mpg" + !insertmacro ${_action} ".ps" + !insertmacro ${_action} ".ts" + !insertmacro ${_action} ".ogm" + !insertmacro ${_action} ".vob" + !insertmacro ${_action} ".wmv" +!macroend + +!macro MacroOtherExtensions _action + !insertmacro ${_action} ".asx" + !insertmacro ${_action} ".bin" + !insertmacro ${_action} ".cue" + !insertmacro ${_action} ".m3u" + !insertmacro ${_action} ".pls" + !insertmacro ${_action} ".vlc" +!macroend + +!macro MacroAllExtensions _action + !insertmacro MacroAudioExtensions ${_action} + !insertmacro MacroVideoExtensions ${_action} + !insertmacro MacroOtherExtensions ${_action} +!macroend + ;;;;;;;;;;;;;;;;;;;;;;;;;; ; File type associations ; ;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -83,8 +141,8 @@ NoBackup: ReadRegStr $0 HKCR "VLC$R0" "" WriteRegStr HKCR "VLC$R0" "" "VLC media file" WriteRegStr HKCR "VLC$R0\shell" "" "Play" - WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '$INSTDIR\vlc.exe "%1"' - WriteRegStr HKCR "VLC$R0\DefaultIcon" "" "$INSTDIR\vlc.exe,0" + WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '"$INSTDIR\vlc.exe" "%1"' + WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0' FunctionEnd Function un.RegisterExtension @@ -118,6 +176,27 @@ FunctionEnd Pop $R0 !macroend +!macro WriteRegStrSupportedTypes EXT + WriteRegStr HKCR Applications\vlc.exe\SupportedTypes ${EXT} "" +!macroend + +;;;;;;;;;;;;;;;;;;;;;;;; +; Context menu entries ; +;;;;;;;;;;;;;;;;;;;;;;;; + +!macro AddContextMenu EXT + WriteRegStr HKCR ${EXT}\shell\PlayWithVLC "" "Play with VLC media player" + WriteRegStr HKCR ${EXT}\shell\PlayWithVLC\command "" '$INSTDIR\vlc.exe "%1"' + + WriteRegStr HKCR ${EXT}\shell\AddToPlaylistVLC "" "Add to VLC media player's Playlist" + WriteRegStr HKCR ${EXT}\shell\AddToPlaylistVLC\command "" '$INSTDIR\vlc.exe --one-instance --playlist-enqueue "%1"' +!macroend + +!macro DeleteContextMenu EXT + DeleteRegKey HKCR ${EXT}\shell\PlayWithVLC + DeleteRegKey HKCR ${EXT}\shell\AddToPlaylistVLC +!macroend + ;;;;;;;;;;;;;;;;;;;;;; ; Installer sections ; ;;;;;;;;;;;;;;;;;;;;;; @@ -134,13 +213,15 @@ Section "Media player (required)" SEC01 File /r plugins File /r locale File /r skins - File /r skins2 File /r http + ; Add VLC to "recomended programs" for the following extensions WriteRegStr HKCR Applications\vlc.exe "" "" - WriteRegStr HKCR Applications\vlc.exe\shell "" "Play" + WriteRegStr HKCR Applications\vlc.exe "FriendlyAppName" "VLC media player" + WriteRegStr HKCR Applications\vlc.exe\shell\Play "" "Play with VLC" WriteRegStr HKCR Applications\vlc.exe\shell\Play\command "" \ '$INSTDIR\vlc.exe "%1"' + !insertmacro MacroAllExtensions WriteRegStrSupportedTypes WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" "Play with VLC media player" WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \ @@ -151,22 +232,27 @@ Section "Media player (required)" SEC01 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival" "" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Action" "Play DVD movie" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "DefaultIcon" "$INSTDIR\vlc.exe,0" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Invoke.ProgID" "VLC.MediaFile" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "DefaultIcon" '"$INSTDIR\vlc.exe",0' + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "InvokeProgID" "VLC.DVDMovie" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "InvokeVerb" "play" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Provider" "VideoLAN VLC media player" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayCDAudioOnArrival" "VLCPlayCDAudioOnArrival" "" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Action" "Play CD audio" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "DefaultIcon" "$INSTDIR\vlc.exe,0" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Invoke.ProgID" "VLC.MediaFile" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "DefaultIcon" '"$INSTDIR\vlc.exe",0' + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "InvokeProgID" "VLC.CDAudio" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "InvokeVerb" "play" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Provider" "VideoLAN VLC media player" - WriteRegStr HKCR "VLC.MediaFile" "" "VLC media file" - WriteRegStr HKCR "VLC.MediaFile\shell" "" "Play" - WriteRegStr HKCR "VLC.MediaFile\shell\Play\command" "" \ - '$INSTDIR\vlc.exe "%1"' - WriteRegStr HKCR "VLC.MediaFile\DefaultIcon" "" "$INSTDIR\vlc.exe,0" + WriteRegStr HKCR "VLC.DVDMovie" "" "VLC DVD Movie" + WriteRegStr HKCR "VLC.DVDMovie\shell" "" "Play" + WriteRegStr HKCR "VLC.DVDMovie\shell\Play\command" "" \ + '$INSTDIR\vlc.exe dvd:%1@1:0' + WriteRegStr HKCR "VLC.DVDMovie\DefaultIcon" "" '"$INSTDIR\vlc.exe",0' + WriteRegStr HKCR "VLC.CDAudio" "" "VLC CD Audio" + WriteRegStr HKCR "VLC.CDAudio\shell" "" "Play" + WriteRegStr HKCR "VLC.CDAudio\shell\Play\command" "" \ + '$INSTDIR\vlc.exe cdda:%1' + WriteRegStr HKCR "VLC.CDAudio\DefaultIcon" "" '"$INSTDIR\vlc.exe",0' SectionEnd @@ -174,66 +260,86 @@ Section "Start Menu + Desktop Shortcut" SEC02 SectionIn 1 2 3 CreateDirectory "$SMPROGRAMS\VideoLAN" CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \ - "$INSTDIR\vlc.exe" "--intf wxwin" + "$INSTDIR\vlc.exe" "--intf wxwin --wxwin-embed" + CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (alt).lnk" \ + "$INSTDIR\vlc.exe" "--intf wxwin --no-wxwin-embed" CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (skins).lnk" \ - "$INSTDIR\vlc.exe" "--intf skins2" - CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (old skins).lnk" \ "$INSTDIR\vlc.exe" "--intf skins" + CreateShortCut "$SMPROGRAMS\VideoLAN\Reset VLC defaults and quit.lnk" \ + "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache --save-config vlc:quit " CreateShortCut "$DESKTOP\VLC media player.lnk" \ "$INSTDIR\vlc.exe" "--intf wxwin" WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \ "${PRODUCT_WEB_SITE}" - CreateShortCut "$SMPROGRAMS\VideoLAN\Website.lnk" \ + CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_NAME} Website.lnk" \ "$INSTDIR\${PRODUCT_NAME}.url" + WriteIniStr "$INSTDIR\Documentation.url" "InternetShortcut" "URL" \ + "${PRODUCT_WEB_SITE}/doc/" + CreateShortCut "$SMPROGRAMS\VideoLAN\Documentation.lnk" \ + "$INSTDIR\Documentation.url" SectionEnd Section /o "Mozilla plugin" SEC03 SectionIn 2 3 - File /r mozilla + File /r mozilla + + ; doesn't work. bug in mozilla/mozilla firefox or moz documentation (xpt file isn't loaded) + ; see mozilla bugs 184506 and 159445 + ;!define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}" + ;WriteRegStr HKLM ${Moz} "Description" "VideoLAN VLC plugin for Mozilla" + ;WriteRegStr HKLM ${Moz} "Path" "$INSTDIR\mozilla\npvlc.dll" + ;WriteRegStr HKLM ${Moz} "Product" "VLC media player" + ;WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN" + ;WriteRegStr HKLM ${Moz} "Version" "${VERSION}" + ;WriteRegStr HKLM ${Moz} "XPTPath" "$INSTDIR\mozilla\vlcintf.xpt" + + Push $R0 + Push $R1 + Push $R2 - WriteRegStr HKLM \ - SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION} \ - "Path" '"$INSTDIR\mozilla\npvlc.dll"' + !define Index 'Line${__LINE__}' + StrCpy $R1 "0" + + "${Index}-Loop:" + + ; Check for Key + EnumRegKey $R0 HKLM "SOFTWARE\Mozilla" "$R1" + StrCmp $R0 "" "${Index}-End" + IntOp $R1 $R1 + 1 + ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins" + StrCmp $R2 "" "${Index}-Loop" "" + + CopyFiles "$INSTDIR\mozilla\*" "$R2" + Goto "${Index}-Loop" + + "${Index}-End:" + !undef Index + +SectionEnd + +Section /o "ActiveX plugin" SEC04 + SectionIn 2 3 + SetOutPath "$INSTDIR" + File activex\axvlc.dll + RegDLL "$INSTDIR\axvlc.dll" +SectionEnd + +Section "Context Menus" SEC05 + SectionIn 1 2 3 + !insertmacro MacroAllExtensions AddContextMenu SectionEnd -SubSection "File type associations" SEC04 - ; Make sure we have the same list in uninstall - !insertmacro RegisterExtensionSection ".a52" - !insertmacro RegisterExtensionSection ".aac" - !insertmacro RegisterExtensionSection ".ac3" - !insertmacro RegisterExtensionSection ".asf" - !insertmacro RegisterExtensionSection ".asx" - !insertmacro RegisterExtensionSection ".avi" - !insertmacro RegisterExtensionSection ".bin" - !insertmacro RegisterExtensionSection ".cue" - !insertmacro RegisterExtensionSection ".divx" - !insertmacro RegisterExtensionSection ".dts" - !insertmacro RegisterExtensionSection ".dv" - !insertmacro RegisterExtensionSection ".flac" - !insertmacro RegisterExtensionSection ".m1v" - !insertmacro RegisterExtensionSection ".m2v" - !insertmacro RegisterExtensionSection ".m3u" - !insertmacro RegisterExtensionSection ".mka" - !insertmacro RegisterExtensionSection ".mkv" - !insertmacro RegisterExtensionSection ".mov" - !insertmacro RegisterExtensionSection ".mp1" - !insertmacro RegisterExtensionSection ".mp2" - !insertmacro RegisterExtensionSection ".mp3" - !insertmacro RegisterExtensionSection ".mp4" - !insertmacro RegisterExtensionSection ".mpeg" - !insertmacro RegisterExtensionSection ".mpeg1" - !insertmacro RegisterExtensionSection ".mpeg2" - !insertmacro RegisterExtensionSection ".mpeg4" - !insertmacro RegisterExtensionSection ".mpg" - !insertmacro RegisterExtensionSection ".ogg" - !insertmacro RegisterExtensionSection ".ogm" - !insertmacro RegisterExtensionSection ".pls" - !insertmacro RegisterExtensionSection ".spx" - !insertmacro RegisterExtensionSection ".vob" - !insertmacro RegisterExtensionSection ".wav" - !insertmacro RegisterExtensionSection ".wma" - !insertmacro RegisterExtensionSection ".wmv" -SubSectionEnd +SectionGroup "File type associations" SEC06 + SectionGroup "Audio Files" + !insertmacro MacroAudioExtensions RegisterExtensionSection + SectionGroupEnd + SectionGroup "Video Files" + !insertmacro MacroVideoExtensions RegisterExtensionSection + SectionGroupEnd + SectionGroup "Other" + !insertmacro MacroOtherExtensions RegisterExtensionSection + SectionGroupEnd +SectionGroupEnd Section -Post WriteUninstaller "$INSTDIR\uninstall.exe" @@ -262,8 +368,12 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} \ "Adds icons to your start menu and your desktop for easy access" !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} \ - "The VLC mozilla plugin" + "The VLC Mozilla and Mozilla Firefox plugin" !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \ + "The VLC ActiveX plugin" + !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} \ + "Add context menu items (Play With VLC and Add To VLC's Playlist)" + !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} \ "Sets VLC media player as the default application for the specified file type" !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -283,42 +393,35 @@ FunctionEnd Section Uninstall SetShellVarContext all - ; Make sure we have the same list in install - !insertmacro UnRegisterExtensionSection ".a52" - !insertmacro UnRegisterExtensionSection ".aac" - !insertmacro UnRegisterExtensionSection ".ac3" - !insertmacro UnRegisterExtensionSection ".asf" - !insertmacro UnRegisterExtensionSection ".asx" - !insertmacro UnRegisterExtensionSection ".avi" - !insertmacro UnRegisterExtensionSection ".bin" - !insertmacro UnRegisterExtensionSection ".cue" - !insertmacro UnRegisterExtensionSection ".divx" - !insertmacro UnRegisterExtensionSection ".dts" - !insertmacro UnRegisterExtensionSection ".dv" - !insertmacro UnRegisterExtensionSection ".flac" - !insertmacro UnRegisterExtensionSection ".m1v" - !insertmacro UnRegisterExtensionSection ".m2v" - !insertmacro UnRegisterExtensionSection ".m3u" - !insertmacro UnRegisterExtensionSection ".mka" - !insertmacro UnRegisterExtensionSection ".mkv" - !insertmacro UnRegisterExtensionSection ".mov" - !insertmacro UnRegisterExtensionSection ".mp1" - !insertmacro UnRegisterExtensionSection ".mp2" - !insertmacro UnRegisterExtensionSection ".mp3" - !insertmacro UnRegisterExtensionSection ".mp4" - !insertmacro UnRegisterExtensionSection ".mpeg" - !insertmacro UnRegisterExtensionSection ".mpeg1" - !insertmacro UnRegisterExtensionSection ".mpeg2" - !insertmacro UnRegisterExtensionSection ".mpeg4" - !insertmacro UnRegisterExtensionSection ".mpg" - !insertmacro UnRegisterExtensionSection ".ogg" - !insertmacro UnRegisterExtensionSection ".ogm" - !insertmacro UnRegisterExtensionSection ".pls" - !insertmacro UnRegisterExtensionSection ".spx" - !insertmacro UnRegisterExtensionSection ".vob" - !insertmacro UnRegisterExtensionSection ".wav" - !insertmacro UnRegisterExtensionSection ".wma" - !insertmacro UnRegisterExtensionSection ".wmv" + !insertmacro MacroAllExtensions DeleteContextMenu + !insertmacro MacroAllExtensions UnRegisterExtensionSection + + UnRegDLL "$INSTDIR\axvlc.dll" + Delete /REBOOTOK "$INSTDIR\axvlc.dll" + + ;remove mozilla plugin + Push $R0 + Push $R1 + Push $R2 + + !define Index 'Line${__LINE__}' + StrCpy $R1 "0" + + "${Index}-Loop:" + + ; Check for Key + EnumRegKey $R0 HKLM "SOFTWARE\Mozilla" "$R1" + StrCmp $R0 "" "${Index}-End" + IntOp $R1 $R1 + 1 + ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins" + StrCmp $R2 "" "${Index}-Loop" "" + + Delete "$R2\vlcintf.xpt" + Delete "$R2\npvlc.dll" + Goto "${Index}-Loop" + + "${Index}-End:" + !undef Index RMDir "$SMPROGRAMS\VideoLAN" RMDir /r $SMPROGRAMS\VideoLAN