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

[vlc] / install-win32

diff --git a/install-win32 b/install-win32
index 5e3bdb4bfac365d0b4fed39cd3e2fab2b064a52b..dacd516cc4f6b709c5229d8dd76a746013b5bfaf 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -5,8 +5,10 @@
 ;;;;;;;;;;;;;\r
 ; CHANGELOG ;\r
 ;;;;;;;;;;;;;\r
-; modifications by Gildas Bazin <gbazin@netcourrier.com> 01 Mar 2003\r
-; . added a shortcut to the faq in the menu.\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
@@ -58,33 +60,37 @@ Section "Install"
        SetOutPath $INSTDIR\r
 \r
        File  vlc.exe\r
+       File  vlc.exe.manifest\r
        File  *.txt\r
-       File  *.htm\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" \\r
                        "$INSTDIR\vlc.exe" "--intf wxwin"\r
        CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (skins).lnk" \\r
                        "$INSTDIR\vlc.exe" "--intf skins"\r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (custom).lnk" \\r
-                       "$INSTDIR\vlc.exe" \r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\FAQ.lnk" "$INSTDIR\FAQ.htm"\r
 \r
         WriteRegStr HKLM \\r
             SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \\r
-            "DisplayName" "VideoLAN VLC media player"\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
@@ -94,9 +100,13 @@ SectionEnd
 ;;;;;;;;;;;;;;;;;;;;;;\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