!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
!define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
\r
+\r
;;;;;;;;;;;;;;;;;;;;;;;;;\r
; General configuration ;\r
;;;;;;;;;;;;;;;;;;;;;;;;;\r
\r
; MUI Settings\r
!define MUI_ABORTWARNING\r
-!define MUI_ICON "vlc48x48.ico"\r
-!define MUI_UNICON "vlc48x48.ico"\r
+!define MUI_ICON "vlc48x48new.ico"\r
+!define MUI_UNICON "vlc48x48new.ico"\r
!define MUI_COMPONENTSPAGE_SMALLDESC\r
\r
; Welcome page\r
"$INSTDIR\vlc.exe" "--intf wxwin"\r
WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \\r
"${PRODUCT_WEB_SITE}"\r
- CreateShortCut "$SMPROGRAMS\VideoLAN\Website.lnk" \\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_NAME} Website.lnk" \\r
"$INSTDIR\${PRODUCT_NAME}.url"\r
+ WriteIniStr "$INSTDIR\Documentation.url" "InternetShortcut" "URL" \\r
+ "${PRODUCT_WEB_SITE}/doc/"\r
+ CreateShortCut "$SMPROGRAMS\VideoLAN\Documentation.lnk" \\r
+ "$INSTDIR\Documentation.url"\r
SectionEnd\r
\r
Section /o "Mozilla plugin" SEC03\r
SectionIn 2 3\r
File /r mozilla\r
\r
- WriteRegStr HKLM \\r
- SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION} \\r
- "Path" '"$INSTDIR\mozilla\npvlc.dll"'\r
+ ; doesn't work. bug in mozilla/mozilla firefox or moz documentation (xpt file isn't loaded)\r
+ ; see mozilla bugs 184506 and 159445\r
+ ;!define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"\r
+ ;WriteRegStr HKLM ${Moz} "Description" "VideoLAN VLC plugin for Mozilla"\r
+ ;WriteRegStr HKLM ${Moz} "Path" "$INSTDIR\mozilla\npvlc.dll"\r
+ ;WriteRegStr HKLM ${Moz} "Product" "VLC media player"\r
+ ;WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN"\r
+ ;WriteRegStr HKLM ${Moz} "Version" "${VERSION}"\r
+ ;WriteRegStr HKLM ${Moz} "XPTPath" "$INSTDIR\mozilla\vlcintf.xpt"\r
+\r
+ Push $R0\r
+ Push $R1\r
+ Push $R2\r
+\r
+ !define Index 'Line${__LINE__}'\r
+ StrCpy $R1 "0"\r
+\r
+ "${Index}-Loop:"\r
+\r
+ ; Check for Key\r
+ EnumRegKey $R0 HKLM "SOFTWARE\Mozilla" "$R1"\r
+ StrCmp $R0 "" "${Index}-End"\r
+ IntOp $R1 $R1 + 1\r
+ ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins"\r
+ StrCmp $R2 "" "${Index}-Loop" ""\r
+\r
+ CopyFiles "$INSTDIR\mozilla\*" "$R2"\r
+ Goto "${Index}-Loop"\r
+\r
+ "${Index}-End:"\r
+ !undef Index\r
+\r
SectionEnd\r
\r
Section /o "ActiveX plugin" SEC04\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
- !insertmacro RegisterExtensionSection ".ac3"\r
- !insertmacro RegisterExtensionSection ".asf"\r
- !insertmacro RegisterExtensionSection ".asx"\r
- !insertmacro RegisterExtensionSection ".avi"\r
- !insertmacro RegisterExtensionSection ".bin"\r
- !insertmacro RegisterExtensionSection ".cue"\r
- !insertmacro RegisterExtensionSection ".divx"\r
- !insertmacro RegisterExtensionSection ".dts"\r
- !insertmacro RegisterExtensionSection ".dv"\r
- !insertmacro RegisterExtensionSection ".flac"\r
- !insertmacro RegisterExtensionSection ".m1v"\r
- !insertmacro RegisterExtensionSection ".m2v"\r
- !insertmacro RegisterExtensionSection ".m3u"\r
- !insertmacro RegisterExtensionSection ".mka"\r
- !insertmacro RegisterExtensionSection ".mkv"\r
- !insertmacro RegisterExtensionSection ".mov"\r
- !insertmacro RegisterExtensionSection ".mp1"\r
- !insertmacro RegisterExtensionSection ".mp2"\r
- !insertmacro RegisterExtensionSection ".mp3"\r
- !insertmacro RegisterExtensionSection ".mp4"\r
- !insertmacro RegisterExtensionSection ".mpeg"\r
- !insertmacro RegisterExtensionSection ".mpeg1"\r
- !insertmacro RegisterExtensionSection ".mpeg2"\r
- !insertmacro RegisterExtensionSection ".mpeg4"\r
- !insertmacro RegisterExtensionSection ".mpg"\r
- !insertmacro RegisterExtensionSection ".ogg"\r
- !insertmacro RegisterExtensionSection ".ogm"\r
- !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
+ SubSection "Audio Files"\r
+ ; Make sure we have the same list in uninstall\r
+ !insertmacro RegisterExtensionSection ".a52"\r
+ !insertmacro RegisterExtensionSection ".aac"\r
+ !insertmacro RegisterExtensionSection ".ac3"\r
+ !insertmacro RegisterExtensionSection ".dts"\r
+ !insertmacro RegisterExtensionSection ".flac"\r
+ !insertmacro RegisterExtensionSection ".mka"\r
+ !insertmacro RegisterExtensionSection ".mp1"\r
+ !insertmacro RegisterExtensionSection ".mp2"\r
+ !insertmacro RegisterExtensionSection ".mp3"\r
+ !insertmacro RegisterExtensionSection ".ogg"\r
+ !insertmacro RegisterExtensionSection ".spx"\r
+ !insertmacro RegisterExtensionSection ".wav"\r
+ !insertmacro RegisterExtensionSection ".wma"\r
+ SubSectionEnd\r
+ SubSection "Video Files"\r
+ ; Make sure we have the same list in uninstall\r
+ !insertmacro RegisterExtensionSection ".asf"\r
+ !insertmacro RegisterExtensionSection ".avi"\r
+ !insertmacro RegisterExtensionSection ".divx"\r
+ !insertmacro RegisterExtensionSection ".dv"\r
+ !insertmacro RegisterExtensionSection ".m1v"\r
+ !insertmacro RegisterExtensionSection ".m2v"\r
+ !insertmacro RegisterExtensionSection ".mkv"\r
+ !insertmacro RegisterExtensionSection ".mov"\r
+ !insertmacro RegisterExtensionSection ".mp4"\r
+ !insertmacro RegisterExtensionSection ".mpeg"\r
+ !insertmacro RegisterExtensionSection ".mpeg1"\r
+ !insertmacro RegisterExtensionSection ".mpeg2"\r
+ !insertmacro RegisterExtensionSection ".mpeg4"\r
+ !insertmacro RegisterExtensionSection ".mpg"\r
+ !insertmacro RegisterExtensionSection ".ogm"\r
+ !insertmacro RegisterExtensionSection ".vob"\r
+ !insertmacro RegisterExtensionSection ".wmv"\r
+ SubSectionEnd\r
+ SubSection "Other"\r
+ ; Make sure we have the same list in uninstall\r
+ !insertmacro RegisterExtensionSection ".asx"\r
+ !insertmacro RegisterExtensionSection ".bin"\r
+ !insertmacro RegisterExtensionSection ".cue"\r
+ !insertmacro RegisterExtensionSection ".m3u"\r
+ !insertmacro RegisterExtensionSection ".pls"\r
+ !insertmacro RegisterExtensionSection ".vlc"\r
+ SubSectionEnd\r
SubSectionEnd\r
\r
Section -Post\r
!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} \\r
"Adds icons to your start menu and your desktop for easy access"\r
!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} \\r
- "The VLC mozilla plugin"\r
+ "The VLC Mozilla and Mozilla Firefox plugin"\r
!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \\r
"The VLC ActiveX plugin"\r
!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} \\r
UnRegDLL "$INSTDIR\axvlc.dll"\r
Delete /REBOOTOK "$INSTDIR\axvlc.dll"\r
\r
+ ;remove mozilla plugin\r
+ Push $R0\r
+ Push $R1\r
+ Push $R2\r
+\r
+ !define Index 'Line${__LINE__}'\r
+ StrCpy $R1 "0"\r
+\r
+ "${Index}-Loop:"\r
+\r
+ ; Check for Key\r
+ EnumRegKey $R0 HKLM "SOFTWARE\Mozilla" "$R1"\r
+ StrCmp $R0 "" "${Index}-End"\r
+ IntOp $R1 $R1 + 1\r
+ ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins"\r
+ StrCmp $R2 "" "${Index}-Loop" ""\r
+\r
+ Delete "$R2\vlcintf.xpt"\r
+ Delete "$R2\npvlc.dll"\r
+ Goto "${Index}-Loop"\r
+\r
+ "${Index}-End:"\r
+ !undef Index\r
+\r
RMDir "$SMPROGRAMS\VideoLAN"\r
RMDir /r $SMPROGRAMS\VideoLAN\r
RMDir /r $INSTDIR\r
projects / vlc / blobdiff