* backport of [11296]

[vlc] / vlc.win32.nsi

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index 12ac317262fb6de85dbffb6b1aac521f235e8b80..37d0b9c83087dee336775dae36fe26f4dfc00df7 100644 (file)
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -83,8 +83,8 @@ NoBackup:
   ReadRegStr $0 HKCR "VLC$R0" ""\r
   WriteRegStr HKCR "VLC$R0" "" "VLC media file"\r
   WriteRegStr HKCR "VLC$R0\shell" "" "Play"\r
-  WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '$INSTDIR\vlc.exe "%1"'\r
-  WriteRegStr HKCR "VLC$R0\DefaultIcon" "" "$INSTDIR\vlc.exe,0"\r
+  WriteRegStr HKCR "VLC$R0\shell\Play\command" "" '"$INSTDIR\vlc.exe" "%1"'\r
+  WriteRegStr HKCR "VLC$R0\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
 FunctionEnd\r
 \r
 Function un.RegisterExtension\r
@@ -134,7 +134,6 @@ Section "Media player (required)" SEC01
   File  /r plugins\r
   File  /r locale\r
   File  /r skins\r
-  File  /r skins2\r
   File  /r http\r
 \r
   WriteRegStr HKCR Applications\vlc.exe "" ""\r
@@ -151,22 +150,27 @@ Section "Media player (required)" SEC01
 \r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival" ""\r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Action" "Play DVD movie"\r
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "DefaultIcon" "$INSTDIR\vlc.exe,0"\r
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Invoke.ProgID" "VLC.MediaFile"\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "DefaultIcon" '"$INSTDIR\vlc.exe",0'\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "InvokeProgID" "VLC.DVDMovie"\r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "InvokeVerb" "play"\r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Provider" "VideoLAN VLC media player"\r
 \r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayCDAudioOnArrival" "VLCPlayCDAudioOnArrival" ""\r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Action" "Play CD audio"\r
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "DefaultIcon" "$INSTDIR\vlc.exe,0"\r
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Invoke.ProgID" "VLC.MediaFile"\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "DefaultIcon" '"$INSTDIR\vlc.exe",0'\r
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "InvokeProgID" "VLC.CDAudio"\r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "InvokeVerb" "play"\r
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayCDAudioOnArrival" "Provider" "VideoLAN VLC media player"\r
-  WriteRegStr HKCR "VLC.MediaFile" "" "VLC media file"\r
-  WriteRegStr HKCR "VLC.MediaFile\shell" "" "Play"\r
-  WriteRegStr HKCR "VLC.MediaFile\shell\Play\command" "" \\r
-    '$INSTDIR\vlc.exe "%1"'\r
-  WriteRegStr HKCR "VLC.MediaFile\DefaultIcon" "" "$INSTDIR\vlc.exe,0"\r
+  WriteRegStr HKCR "VLC.DVDMovie" "" "VLC DVD Movie"\r
+  WriteRegStr HKCR "VLC.DVDMovie\shell" "" "Play"\r
+  WriteRegStr HKCR "VLC.DVDMovie\shell\Play\command" "" \\r
+    '$INSTDIR\vlc.exe dvd:%1@1:0'\r
+  WriteRegStr HKCR "VLC.DVDMovie\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
+  WriteRegStr HKCR "VLC.CDAudio" "" "VLC CD Audio"\r
+  WriteRegStr HKCR "VLC.CDAudio\shell" "" "Play"\r
+  WriteRegStr HKCR "VLC.CDAudio\shell\Play\command" "" \\r
+    '$INSTDIR\vlc.exe cdda:%1'\r
+  WriteRegStr HKCR "VLC.CDAudio\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'\r
 \r
 SectionEnd\r
 \r
@@ -174,11 +178,13 @@ Section "Start Menu + Desktop Shortcut" SEC02
   SectionIn 1 2 3\r
   CreateDirectory "$SMPROGRAMS\VideoLAN"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \\r
-    "$INSTDIR\vlc.exe" "--intf wxwin"\r
+    "$INSTDIR\vlc.exe" "--intf wxwin --wxwin-embed"\r
+  CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (alt).lnk" \\r
+    "$INSTDIR\vlc.exe" "--intf wxwin --no-wxwin-embed"\r
   CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (skins).lnk" \\r
-    "$INSTDIR\vlc.exe" "--intf skins2"\r
-  CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (old skins).lnk" \\r
     "$INSTDIR\vlc.exe" "--intf skins"\r
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Reset VLC defaults and quit.lnk" \\r
+    "$INSTDIR\vlc.exe" "--reset-config --reset-plugins-cache --save-config vlc:quit "\r
   CreateShortCut "$DESKTOP\VLC media player.lnk" \\r
     "$INSTDIR\vlc.exe" "--intf wxwin"\r
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \\r
@@ -189,14 +195,21 @@ SectionEnd
 \r
 Section /o "Mozilla plugin" SEC03\r
   SectionIn 2 3\r
-  File  /r mozilla\r
+  File /r mozilla\r
 \r
   WriteRegStr HKLM \\r
     SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION} \\r
     "Path" '"$INSTDIR\mozilla\npvlc.dll"'\r
 SectionEnd\r
 \r
-SubSection "File type associations" SEC04\r
+Section /o "ActiveX plugin" SEC04\r
+  SectionIn 2 3\r
+  SetOutPath "$INSTDIR"\r
+  File activex\axvlc.dll\r
+  RegDLL "$INSTDIR\axvlc.dll"\r
+SectionEnd\r
+\r
+SubSection "File type associations" SEC05\r
   ; Make sure we have the same list in uninstall\r
   !insertmacro RegisterExtensionSection ".a52"\r
   !insertmacro RegisterExtensionSection ".aac"\r
@@ -206,7 +219,6 @@ SubSection "File type associations" SEC04
   !insertmacro RegisterExtensionSection ".avi"\r
   !insertmacro RegisterExtensionSection ".bin"\r
   !insertmacro RegisterExtensionSection ".cue"\r
-  !insertmacro RegisterExtensionSection ".dat"\r
   !insertmacro RegisterExtensionSection ".divx"\r
   !insertmacro RegisterExtensionSection ".dts"\r
   !insertmacro RegisterExtensionSection ".dv"\r
@@ -231,6 +243,7 @@ SubSection "File type associations" SEC04
   !insertmacro RegisterExtensionSection ".pls"\r
   !insertmacro RegisterExtensionSection ".spx"\r
   !insertmacro RegisterExtensionSection ".vob"\r
+  !insertmacro RegisterExtensionSection ".vlc"\r
   !insertmacro RegisterExtensionSection ".wav"\r
   !insertmacro RegisterExtensionSection ".wma"\r
   !insertmacro RegisterExtensionSection ".wmv"\r
@@ -265,6 +278,8 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} \\r
     "The VLC mozilla plugin"\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \\r
+    "The VLC ActiveX plugin"\r
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} \\r
     "Sets VLC media player as the default application for the specified file type"\r
 !insertmacro MUI_FUNCTION_DESCRIPTION_END\r
 \r
@@ -293,7 +308,6 @@ Section Uninstall
   !insertmacro UnRegisterExtensionSection ".avi"\r
   !insertmacro UnRegisterExtensionSection ".bin"\r
   !insertmacro UnRegisterExtensionSection ".cue"\r
-  !insertmacro UnRegisterExtensionSection ".dat"\r
   !insertmacro UnRegisterExtensionSection ".divx"\r
   !insertmacro UnRegisterExtensionSection ".dts"\r
   !insertmacro UnRegisterExtensionSection ".dv"\r
@@ -318,10 +332,14 @@ Section Uninstall
   !insertmacro UnRegisterExtensionSection ".pls"\r
   !insertmacro UnRegisterExtensionSection ".spx"\r
   !insertmacro UnRegisterExtensionSection ".vob"\r
+  !insertmacro UnRegisterExtensionSection ".vlc"\r
   !insertmacro UnRegisterExtensionSection ".wav"\r
   !insertmacro UnRegisterExtensionSection ".wma"\r
   !insertmacro UnRegisterExtensionSection ".wmv"\r
 \r
+  UnRegDLL "$INSTDIR\axvlc.dll"\r
+  Delete /REBOOTOK "$INSTDIR\axvlc.dll"\r
+\r
   RMDir "$SMPROGRAMS\VideoLAN"\r
   RMDir /r $SMPROGRAMS\VideoLAN\r
   RMDir /r $INSTDIR\r