* vlc.win32.nsi: brand new NSIS auto-installer script.

* Makefile.am: use vlc icon in the NSIS installer.

diff --git a/Makefile.am b/Makefile.am
index 454b11fbb223d300a3816944dfe4be76cb686593..a4c6c077d19d1b80c8126b5055dea8f9295a1e37 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,13 +21,13 @@ EXTRA_DIST = \
        MAINTAINERS \
        README.MacOSX.rtf \
        bootstrap \
-       install-win32 \
        src/extras/COPYING \
        toolbox \
        vlc-config.in.in \
        vlc.ebuild \
        vlc.spec \
        vlc.spec.mdk \
+       vlc.win32.nsi \
        $(NULL)
 
 BUILT_SOURCES =
@@ -566,19 +566,19 @@ remove_distdir_woody = \
 # XXX: this rule is probably only useful to you if you have exactly
 # the same setup as me. Contact sam@zoy.org if you need to use it.
 #
-# Check that tmp isn't in the way
 package-win32-base:
+# Check that tmp isn't in the way
        @if test -e "$(srcdir)/vlc-${VERSION}"; then \
          echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is in the way"; \
          false; \
        else \
          echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \
        fi
-# Create installation script
-       cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi"
+
 # Copy relevant files
+       cp "$(srcdir)/vlc.win32.nsi" "$(srcdir)/vlc-${VERSION}/"
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
-       cp "$(top_builddir)/vlc$(EXEEXT).manifest" "$(srcdir)/vlc-${VERSION}/"
+       cp "$(top_builddir)/vlc.exe.manifest" "$(srcdir)/vlc-${VERSION}/"
        $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"
        @if test -n "$(UPX)"; then \
            $(UPX) -9 "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"; fi ;
@@ -637,6 +637,8 @@ package-win32-base:
        cp $(srcdir)/share/http/vlm/*.html \
            $(srcdir)/vlc-${VERSION}/http/vlm/ ;
 
+       cp $(srcdir)/share/vlc48x48.ico $(srcdir)/vlc-${VERSION}/ ;
+
        mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla"
 if BUILD_MOZILLA
        cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ;
@@ -649,7 +651,7 @@ endif
 package-win32-base-exe:
 # Create package 
        wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
-             -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/nsi
+             -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi
 
 package-win32-base-zip:
 # Create package 

diff --git a/install-win32 b/install-win32
deleted file mode 100644 (file)
index 3a180dc..0000000
--- a/install-win32
+++ /dev/null
@@ -1,113 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
-; NSIS installer script for vlc ;\r
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
-\r
-;;;;;;;;;;;;;\r
-; CHANGELOG ;\r
-;;;;;;;;;;;;;\r
-; modifications by Gildas Bazin <gbazin@netcourrier.com> 6 Jul 2003\r
-; . Start menu shortcuts now created in the "All Users" section.\r
-; modifications by Gildas Bazin <gbazin@netcourrier.com> 6 Apr 2003\r
-; . added shortcut to the skins interface, added the default skin.\r
-; modifications by Gildas Bazin <gbazin@netcourrier.com> 26 Feb 2003\r
-; . added the locale directory.\r
-; modifications by Samuel Hocevar <sam@zoy.org> 05 Apr 2002\r
-; . no need for @VERSION@ anymore\r
-; . updated script for NSIS 1.96.\r
-; modifications by Samuel Hocevar <sam@zoy.org> 12 Nov 2001\r
-; . removed version information.\r
-; written by Pierre Baillet <oct@zoy.org> 29 Jul 2001 v0.2\r
-; . lists all installed files so as to prevent installer.nsi to be included\r
-;   in the release.\r
-; . really remove the shortcuts.\r
-; . added an exec command to display the program file folder. (grOovy)\r
-\r
-;;;;;;;;;;;;;;;;;;;;;;;;;\r
-; General configuration ;\r
-;;;;;;;;;;;;;;;;;;;;;;;;;\r
-\r
-OutFile ..\vlc-${VERSION}-win32.exe\r
-SetCompressor bzip2\r
-\r
-Name "VLC media player"\r
-Caption "VLC '${VERSION}' for Win32 Setup"\r
-;Icon ../share/gvlc32x32.ico\r
-\r
-CRCCheck on\r
-\r
-InstallDir "$PROGRAMFILES\VideoLAN\VLC"\r
-\r
-; check if the program has already been installed, if so, take this dir\r
-; as install dir\r
-InstallDirRegKey HKLM SOFTWARE\VideoLAN\VLC "Install_Dir"\r
-DirText "Choose a directory to install in to:"\r
-\r
-AutoCloseWindow false\r
-ShowInstDetails show\r
-\r
-SetOverwrite ifnewer\r
-SetDatablockOptimize on\r
-SetDateSave off\r
-SetCompress auto\r
-\r
-UninstallText "This will uninstall the VLC media player."\r
-\r
-;;;;;;;;;;;;;;;;;;;;\r
-; Install settings ;\r
-;;;;;;;;;;;;;;;;;;;;\r
-\r
-Section "Install"\r
-       SetOutPath $INSTDIR\r
-\r
-       File  vlc.exe\r
-       File  vlc.exe.manifest\r
-       File  *.txt\r
-\r
-       File  /r plugins\r
-       File  /r locale\r
-       File  /r skins\r
-       File  /r skins2\r
-       File  /r http\r
-       File  /r mozilla\r
-\r
-        SetShellVarContext all\r
-\r
-       CreateDirectory "$SMPROGRAMS\VideoLAN"\r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" \\r
-                       "$INSTDIR\vlc.exe" "--intf wxwin"\r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (skins).lnk" \\r
-                       "$INSTDIR\vlc.exe" "--intf skins"\r
-\r
-        WriteRegStr HKLM \\r
-            SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \\r
-            "DisplayName" "VideoLAN VLC media player ${VERSION}"\r
-        WriteRegStr HKLM \\r
-            SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \\r
-            "UninstallString" '"$INSTDIR\uninstall.exe"'\r
-       WriteUninstaller "uninstall.exe"\r
-\r
-       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "InstallDir" $INSTDIR\r
-       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Version" "${VERSION}"\r
-\r
-        WriteRegStr HKLM \\r
-            SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION} \\r
-            "Path" '"$INSTDIR\mozilla\npvlc.dll"'\r
-\r
-       Exec "explorer $SMPROGRAMS\VideoLAN\"\r
-SectionEnd\r
-\r
-;;;;;;;;;;;;;;;;;;;;;;\r
-; Uninstall settings ;\r
-;;;;;;;;;;;;;;;;;;;;;;\r
-\r
-Section "Uninstall"\r
-        SetShellVarContext all\r
-       RMDir /r $SMPROGRAMS\VideoLAN\r
-       RMDir /r $INSTDIR\r
-       DeleteRegKey HKLM SOFTWARE\VideoLAN\r
-        DeleteRegKey HKLM \\r
-            SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}\r
-\r
-        DeleteRegKey HKLM \\r
-            Software\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN\r
-SectionEnd\r

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
new file mode 100644 (file)
index 0000000..c6379da
--- /dev/null
+++ b/vlc.win32.nsi
@@ -0,0 +1,309 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
+; NSIS installer script for vlc ;\r
+; (http://nsis.sourceforge.net) ;\r
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
+\r
+!define PRODUCT_NAME "VLC media player"\r
+!define PRODUCT_VERSION '${VERSION}'\r
+!define PRODUCT_GROUP "VideoLAN"\r
+!define PRODUCT_PUBLISHER "VideoLAN Team"\r
+!define PRODUCT_WEB_SITE "http://www.videolan.org"\r
+!define PRODUCT_DIR_REGKEY "Software\VideoLAN\VLC"\r
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
+\r
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
+; NSIS Modern User Interface configuration ;\r
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
+\r
+; MUI 1.67 compatible ------\r
+!include "MUI.nsh"\r
+\r
+; MUI Settings\r
+!define MUI_ABORTWARNING\r
+!define MUI_ICON "vlc48x48.ico"\r
+!define MUI_UNICON "vlc48x48.ico"\r
+!define MUI_COMPONENTSPAGE_SMALLDESC\r
+\r
+; Welcome page\r
+!insertmacro MUI_PAGE_WELCOME\r
+; License page\r
+!insertmacro MUI_PAGE_LICENSE "COPYING.txt"\r
+; Components page\r
+!insertmacro MUI_PAGE_COMPONENTS\r
+; Directory page\r
+!insertmacro MUI_PAGE_DIRECTORY\r
+; Instfiles page\r
+!insertmacro MUI_PAGE_INSTFILES\r
+; Finish page\r
+!define MUI_FINISHPAGE_RUN "$INSTDIR\vlc.exe"\r
+!insertmacro MUI_PAGE_FINISH\r
+\r
+; Uninstaller pages\r
+!insertmacro MUI_UNPAGE_INSTFILES\r
+\r
+; Language files\r
+!insertmacro MUI_LANGUAGE "English"\r
+\r
+; Reserve files\r
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS\r
+\r
+; MUI end ------\r
+\r
+;;;;;;;;;;;;;;;;;;;;;;;;;;\r
+; File type associations ;\r
+;;;;;;;;;;;;;;;;;;;;;;;;;;\r
+\r
+Function RegisterExtension\r
+  ; back up old value for extension $R0 (eg. ".opt")\r
+  ReadRegStr $1 HKCR "$R0" ""\r
+  StrCmp $1 "" NoBackup\r
+    StrCmp $1 "VLC$R0" "NoBackup"\r
+    WriteRegStr HKCR "$R0" "VLC.backup" $1\r
+NoBackup:\r
+  WriteRegStr HKCR "$R0" "" "VLC$R0"\r
+  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
+FunctionEnd\r
+\r
+Function un.RegisterExtension\r
+  ;start of restore script\r
+  ReadRegStr $1 HKCR "$R0" ""\r
+  StrCmp $1 "VLC$R0" 0 NoOwn ; only do this if we own it\r
+    ReadRegStr $1 HKCR "$R0" "VLC.backup"\r
+    StrCmp $1 "" 0 Restore ; if backup="" then delete the whole key\r
+      DeleteRegKey HKCR "$R0"\r
+    Goto NoOwn\r
+Restore:\r
+      WriteRegStr HKCR "$R0" "" $1\r
+      DeleteRegValue HKCR "$R0" "VLC.backup"\r
+NoOwn:\r
+    DeleteRegKey HKCR "VLC$R0" ;Delete key with association settings\r
+FunctionEnd\r
+\r
+!macro RegisterExtensionSection EXT\r
+  Section /o ${EXT}\r
+    Push $R0\r
+    StrCpy $R0 ${EXT}\r
+    Call RegisterExtension\r
+    Pop $R0\r
+  SectionEnd\r
+!macroend\r
+\r
+!macro UnRegisterExtensionSection EXT\r
+  Push $R0\r
+  StrCpy $R0 ${EXT}\r
+  Call un.RegisterExtension\r
+  Pop $R0\r
+!macroend\r
+\r
+;;;;;;;;;;;;;;;;;;;;;;;;;\r
+; General configuration ;\r
+;;;;;;;;;;;;;;;;;;;;;;;;;\r
+\r
+Name "${PRODUCT_GROUP} ${PRODUCT_NAME} ${PRODUCT_VERSION}"\r
+OutFile ..\vlc-${VERSION}-win32.exe\r
+InstallDir "$PROGRAMFILES\VideoLAN\VLC"\r
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "Install_Dir"\r
+SetCompressor lzma\r
+ShowInstDetails show\r
+ShowUnInstDetails show\r
+SetOverwrite ifnewer\r
+CRCCheck on\r
+\r
+InstType "Normal"\r
+InstType "Full"\r
+\r
+Section "Media player (required)" SEC01\r
+  SectionIn 1 2 3 RO\r
+  SetShellVarContext all\r
+  SetOutPath "$INSTDIR"\r
+\r
+  File  vlc.exe\r
+  File  vlc.exe.manifest\r
+  File  *.txt\r
+\r
+  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
+  WriteRegStr HKCR Applications\vlc.exe\shell "" "Play"\r
+  WriteRegStr HKCR Applications\vlc.exe\shell\Play\command "" \\r
+    '$INSTDIR\vlc.exe "%1"'\r
+\r
+SectionEnd\r
+\r
+Section "Start Menu + Desktop Shortcut" SEC02\r
+  SectionIn 1 2 3\r
+  CreateDirectory "$SMPROGRAMS\VideoLAN"\r
+  CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player.lnk" \\r
+    "$INSTDIR\vlc.exe" "--intf wxwin"\r
+  CreateShortCut "$SMPROGRAMS\VideoLAN\VLC media player (skins).lnk" \\r
+    "$INSTDIR\vlc.exe" "--intf skins"\r
+  CreateShortCut "$DESKTOP\VLC media player.lnk" "$INSTDIR\vlc.exe"\r
+  WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \\r
+    "${PRODUCT_WEB_SITE}"\r
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Website.lnk" \\r
+    "$INSTDIR\${PRODUCT_NAME}.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
+SectionEnd\r
+\r
+SubSection "File type associations" SEC04\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 ".dat"\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 ".wav"\r
+  !insertmacro RegisterExtensionSection ".wma"\r
+  !insertmacro RegisterExtensionSection ".wmv"\r
+SubSectionEnd\r
+\r
+Section -Post\r
+  WriteUninstaller "$INSTDIR\uninstall.exe"\r
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "InstallDir" $INSTDIR\r
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "Version" "${VERSION}"\r
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\vlc.exe"\r
+\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \\r
+    "DisplayName" "$(^Name)"\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \\r
+    "UninstallString" "$INSTDIR\uninstall.exe"\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \\r
+    "DisplayIcon" "$INSTDIR\vlc.exe"\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \\r
+    "DisplayVersion" "${PRODUCT_VERSION}"\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \\r
+    "URLInfoAbout" "${PRODUCT_WEB_SITE}"\r
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" \\r
+    "Publisher" "${PRODUCT_PUBLISHER}"\r
+SectionEnd\r
+\r
+; Section descriptions\r
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN\r
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} \\r
+    "The media player itself"\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
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \\r
+    "Sets VLC media player as the default application for the specified file type"\r
+!insertmacro MUI_FUNCTION_DESCRIPTION_END\r
+\r
+\r
+Function un.onUninstSuccess\r
+  HideWindow\r
+  MessageBox MB_ICONINFORMATION|MB_OK \\r
+    "$(^Name) was successfully removed from your computer."\r
+FunctionEnd\r
+\r
+Function un.onInit\r
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \\r
+    "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2\r
+  Abort\r
+FunctionEnd\r
+\r
+Section Uninstall\r
+  SetShellVarContext all\r
+\r
+  ; Make sure we have the same list in install\r
+  !insertmacro UnRegisterExtensionSection ".a52"\r
+  !insertmacro UnRegisterExtensionSection ".aac"\r
+  !insertmacro UnRegisterExtensionSection ".ac3"\r
+  !insertmacro UnRegisterExtensionSection ".asf"\r
+  !insertmacro UnRegisterExtensionSection ".asx"\r
+  !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
+  !insertmacro UnRegisterExtensionSection ".flac"\r
+  !insertmacro UnRegisterExtensionSection ".m1v"\r
+  !insertmacro UnRegisterExtensionSection ".m2v"\r
+  !insertmacro UnRegisterExtensionSection ".m3u"\r
+  !insertmacro UnRegisterExtensionSection ".mka"\r
+  !insertmacro UnRegisterExtensionSection ".mkv"\r
+  !insertmacro UnRegisterExtensionSection ".mov"\r
+  !insertmacro UnRegisterExtensionSection ".mp1"\r
+  !insertmacro UnRegisterExtensionSection ".mp2"\r
+  !insertmacro UnRegisterExtensionSection ".mp3"\r
+  !insertmacro UnRegisterExtensionSection ".mp4"\r
+  !insertmacro UnRegisterExtensionSection ".mpeg"\r
+  !insertmacro UnRegisterExtensionSection ".mpeg1"\r
+  !insertmacro UnRegisterExtensionSection ".mpeg2"\r
+  !insertmacro UnRegisterExtensionSection ".mpeg4"\r
+  !insertmacro UnRegisterExtensionSection ".mpg"\r
+  !insertmacro UnRegisterExtensionSection ".ogg"\r
+  !insertmacro UnRegisterExtensionSection ".ogm"\r
+  !insertmacro UnRegisterExtensionSection ".pls"\r
+  !insertmacro UnRegisterExtensionSection ".spx"\r
+  !insertmacro UnRegisterExtensionSection ".vob"\r
+  !insertmacro UnRegisterExtensionSection ".wav"\r
+  !insertmacro UnRegisterExtensionSection ".wma"\r
+  !insertmacro UnRegisterExtensionSection ".wmv"\r
+\r
+  RMDir "$SMPROGRAMS\VideoLAN"\r
+  RMDir /r $SMPROGRAMS\VideoLAN\r
+  RMDir /r $INSTDIR\r
+  DeleteRegKey HKLM Software\VideoLAN\r
+\r
+  DeleteRegKey HKCR Applications\vlc.exe\r
+\r
+  DeleteRegKey HKLM \\r
+    SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}\r
+\r
+  DeleteRegKey HKLM \\r
+    Software\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN\r
+\r
+  Delete "$DESKTOP\VLC media player.lnk"\r
+\r
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"\r
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"\r
+  SetAutoClose true\r
+SectionEnd\r