X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc.win32.nsi;h=e6f60af7ac12e8c09a62865712f08e77cf6f1b61;hb=c47ebbb7232aa86aa9a569095d3ff96b9cc75bb4;hp=37d0b9c83087dee336775dae36fe26f4dfc00df7;hpb=f19fc089c27aa05baf0d5a030fc0d802876532a0;p=vlc

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index 37d0b9c830..e6f60af7ac 100644
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -12,6 +12,7 @@
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 ; General configuration ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -189,17 +190,50 @@ Section "Start Menu + Desktop Shortcut" SEC02
     "$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
 
-  WriteRegStr HKLM \
-    SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION} \
-    "Path" '"$INSTDIR\mozilla\npvlc.dll"'
+  ; 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
+
+  !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
@@ -210,43 +244,51 @@ Section /o "ActiveX plugin" SEC04
 SectionEnd
 
 SubSection "File type associations" SEC05
-  ; 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 ".vlc"
-  !insertmacro RegisterExtensionSection ".wav"
-  !insertmacro RegisterExtensionSection ".wma"
-  !insertmacro RegisterExtensionSection ".wmv"
+  SubSection "Audio Files"
+    ; Make sure we have the same list in uninstall
+    !insertmacro RegisterExtensionSection ".a52"
+    !insertmacro RegisterExtensionSection ".aac"
+    !insertmacro RegisterExtensionSection ".ac3"
+    !insertmacro RegisterExtensionSection ".dts"
+    !insertmacro RegisterExtensionSection ".flac"
+    !insertmacro RegisterExtensionSection ".mka"
+    !insertmacro RegisterExtensionSection ".mp1"
+    !insertmacro RegisterExtensionSection ".mp2"
+    !insertmacro RegisterExtensionSection ".mp3"
+    !insertmacro RegisterExtensionSection ".ogg"
+    !insertmacro RegisterExtensionSection ".spx"
+    !insertmacro RegisterExtensionSection ".wav"
+    !insertmacro RegisterExtensionSection ".wma"
+  SubSectionEnd
+  SubSection "Video Files"
+    ; Make sure we have the same list in uninstall
+    !insertmacro RegisterExtensionSection ".asf"
+    !insertmacro RegisterExtensionSection ".avi"
+    !insertmacro RegisterExtensionSection ".divx"
+    !insertmacro RegisterExtensionSection ".dv"
+    !insertmacro RegisterExtensionSection ".m1v"
+    !insertmacro RegisterExtensionSection ".m2v"
+    !insertmacro RegisterExtensionSection ".mkv"
+    !insertmacro RegisterExtensionSection ".mov"
+    !insertmacro RegisterExtensionSection ".mp4"
+    !insertmacro RegisterExtensionSection ".mpeg"
+    !insertmacro RegisterExtensionSection ".mpeg1"
+    !insertmacro RegisterExtensionSection ".mpeg2"
+    !insertmacro RegisterExtensionSection ".mpeg4"
+    !insertmacro RegisterExtensionSection ".mpg"
+    !insertmacro RegisterExtensionSection ".ogm"
+    !insertmacro RegisterExtensionSection ".vob"
+    !insertmacro RegisterExtensionSection ".wmv"
+  SubSectionEnd
+  SubSection "Other"
+    ; Make sure we have the same list in uninstall
+    !insertmacro RegisterExtensionSection ".asx"
+    !insertmacro RegisterExtensionSection ".bin"
+    !insertmacro RegisterExtensionSection ".cue"
+    !insertmacro RegisterExtensionSection ".m3u"
+    !insertmacro RegisterExtensionSection ".pls"
+    !insertmacro RegisterExtensionSection ".vlc"
+  SubSectionEnd
 SubSectionEnd
 
 Section -Post
@@ -276,7 +318,7 @@ 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} \
@@ -340,6 +382,30 @@ Section Uninstall
   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
   RMDir /r $INSTDIR