* src/input/input.c: fixed memleaks.

[vlc] / install-win32

diff --git a/install-win32 b/install-win32
index 91dec7758c19f3170c22601731b678e92fb67373..dacd516cc4f6b709c5229d8dd76a746013b5bfaf 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -5,6 +5,12 @@
 ;;;;;;;;;;;;;\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
@@ -21,14 +27,16 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
 \r
 OutFile ..\vlc-${VERSION}-win32.exe\r
+SetCompressor bzip2\r
 \r
-Name "the VideoLAN Client"\r
-Caption "VideoLAN Client '${VERSION}' for Win32 Setup"\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\VideoLAN Client"\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
@@ -42,7 +50,7 @@ SetDatablockOptimize on
 SetDateSave off\r
 SetCompress auto\r
 \r
-UninstallText "This will uninstall the VideoLAN Client. Hit next to continue."\r
+UninstallText "This will uninstall the VLC media player."\r
 \r
 ;;;;;;;;;;;;;;;;;;;;\r
 ; Install settings ;\r
@@ -52,18 +60,37 @@ Section "Install"
        SetOutPath $INSTDIR\r
 \r
        File  vlc.exe\r
+       File  vlc.exe.manifest\r
        File  *.txt\r
 \r
-       File  /r share\r
        File  /r plugins\r
+       File  /r locale\r
+       File  /r skins\r
+       File  /r http\r
+       File  /r mozilla\r
+\r
+        SetShellVarContext all\r
 \r
        CreateDirectory "$SMPROGRAMS\VideoLAN"\r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" "$INSTDIR\vlc.exe" \r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\uninstall.exe"\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 "Install_Dir" $INSTDIR\r
-       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "${VERSION}"\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
@@ -73,14 +100,13 @@ SectionEnd
 ;;;;;;;;;;;;;;;;;;;;;;\r
 \r
 Section "Uninstall"\r
-       Delete $SMPROGRAMS\VideoLAN\*\r
-       RMDir $SMPROGRAMS\VideoLAN\r
-       Delete $INSTDIR\share\*\r
-       RMDir $INSTDIR\share\r
-       Delete $INSTDIR\plugins\*\r
-       RMDir $INSTDIR\plugins\r
-       Delete $INSTDIR\*\r
-       RMDir $INSTDIR\r
+        SetShellVarContext all\r
+       RMDir /r $SMPROGRAMS\VideoLAN\r
+       RMDir /r $INSTDIR\r
        DeleteRegKey HKLM SOFTWARE\VideoLAN\r
-SectionEnd\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