[xiph-commits] r11565 - branches/oggdsf_ce_port/build/NSIS/Release
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2
branches/oggdsf_ce_port/src/tests/testLoadLib
trunk/Tremor/win32/VS2005/libtremor
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Tue Jun 13 07:40:10 PDT 2006
Author: illiminable
Date: 2006-06-13 07:39:34 -0700 (Tue, 13 Jun 2006)
New Revision: 11565
Added:
branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release_prev8rt.nsi
Modified:
branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release.nsi
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/DataSourceFactory.cpp
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/DataSourceFactory.h
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/FilterFileSource.cpp
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/FilterFileSource.h
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPFileSource.h
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPStreamingFileSource.cpp
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPStreamingFileSource.h
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/IFilterDataSource.h
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.cpp
branches/oggdsf_ce_port/src/tests/testLoadLib/testLoadLib.cpp
trunk/Tremor/win32/VS2005/libtremor/libtremor.vcproj
Log:
* Update NSIS installer to work with vc8 runtimes -- works for 2K/XP/XP MCE, needs testing on older systems still
* Fix unicode filename bug -- for NT/2K/XP/XP MCE, may no longer execute on 95/98/ME needs testing
Modified: branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release.nsi
===================================================================
--- branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release.nsi 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release.nsi 2006-06-13 14:39:34 UTC (rev 11565)
@@ -2,14 +2,15 @@
; Location of Visual Studio runtime libraries on the compiling system
; ************* Change this to match the path where msvcp71.dll and msvcr71.dll live ******************
-!define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
+; !define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
+!define VS_RUNTIME_LOCATION "V:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT"
; *****************************************************************************************************
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "oggcodecs"
; CHANGE EVERY VERSION
-!define PRODUCT_VERSION "0.71.0946"
+!define PRODUCT_VERSION "0.72.0000"
!define PRODUCT_PUBLISHER "illiminable"
!define PRODUCT_WEB_SITE "http://www.illiminable.com/ogg/"
@@ -103,9 +104,10 @@
SetOutPath "$INSTDIR"
SetOverwrite ifnewer
- ; Runtime libraries from visual studio - 2
- File "${VS_RUNTIME_LOCATION}\msvcr71.dll"
- File "${VS_RUNTIME_LOCATION}\msvcp71.dll"
+ ; Runtime libraries from visual studio - 3
+ File "${VS_RUNTIME_LOCATION}\msvcr80.dll"
+ File "${VS_RUNTIME_LOCATION}\msvcp80.dll"
+ File "${VS_RUNTIME_LOCATION}\Microsoft.VC80.CRT.manifest"
; Libraries - 11
@@ -891,11 +893,11 @@
Delete "$INSTDIR\HISTORY"
- ; Delete runtimes - 2
- Delete "$INSTDIR\msvcr71.dll"
- Delete "$INSTDIR\msvcp71.dll"
+ ; Delete runtimes - 3
+ Delete "$INSTDIR\msvcr80.dll"
+ Delete "$INSTDIR\msvcp80.dll"
+ Delete "$INSTDIR\Microsoft.VC80.CRT.manifest"
-
;Delete accesory files, links etc.
Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
Added: branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release_prev8rt.nsi
===================================================================
--- branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release_prev8rt.nsi 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/build/NSIS/Release/oggcodecs_release_prev8rt.nsi 2006-06-13 14:39:34 UTC (rev 11565)
@@ -0,0 +1,920 @@
+; Script generated by the HM NIS Edit Script Wizard.
+
+; Location of Visual Studio runtime libraries on the compiling system
+; ************* Change this to match the path where msvcp71.dll and msvcr71.dll live ******************
+!define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
+; *****************************************************************************************************
+
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "oggcodecs"
+
+; CHANGE EVERY VERSION
+!define PRODUCT_VERSION "0.71.0946"
+
+!define PRODUCT_PUBLISHER "illiminable"
+!define PRODUCT_WEB_SITE "http://www.illiminable.com/ogg/"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\OOOggDump.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
+
+
+; Path from .nsi to oggcodecs root
+!define OGGCODECS_ROOT_DIR "..\..\.."
+
+; Local Build Path for configuration
+!define OGGCODECS_CONFIG_PATH "Release"
+!define OGGCODECS_VORBIS_CONFIG_PATH "Vorbis_Dynamic_Release"
+
+SetCompressor lzma
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; Include for library registration
+!include "Library.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+
+; Language Selection Dialog Settings
+!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
+!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!define MUI_LICENSEPAGE_CHECKBOX
+!insertmacro MUI_PAGE_LICENSE "${OGGCODECS_ROOT_DIR}\COPYRIGHTS.rtf"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Start menu page
+var ICONS_GROUP
+!define MUI_STARTMENUPAGE_NODISABLE
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "illiminable\oggcodecs"
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
+!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "Dutch"
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Japanese"
+!insertmacro MUI_LANGUAGE "Korean"
+!insertmacro MUI_LANGUAGE "Polish"
+; !insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "TradChinese"
+!insertmacro MUI_LANGUAGE "Turkish"
+
+; Reserve files
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "oggcodecs_${PRODUCT_VERSION}.exe"
+InstallDir "$PROGRAMFILES\illiminable\oggcodecs"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+Function .onInit
+ !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+Section "Ogg Core Files" SEC01
+ SetOutPath "$INSTDIR"
+ SetOverwrite ifnewer
+
+ ; Runtime libraries from visual studio - 2
+ File "${VS_RUNTIME_LOCATION}\msvcr71.dll"
+ File "${VS_RUNTIME_LOCATION}\msvcp71.dll"
+
+
+ ; Libraries - 11
+ File "${OGGCODECS_ROOT_DIR}\src\lib\core\ogg\libOOOgg\${OGGCODECS_CONFIG_PATH}\libOOOgg.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\core\ogg\libOOOggSeek\${OGGCODECS_CONFIG_PATH}\libOOOggSeek.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\cmml\libCMMLTags\${OGGCODECS_CONFIG_PATH}\libCMMLTags.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\cmml\libCMMLParse\${OGGCODECS_CONFIG_PATH}\libCMMLParse.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\vorbis\libs\libvorbis\win32\${OGGCODECS_VORBIS_CONFIG_PATH}\vorbis.dll"
+
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\theora\libs\libOOTheora\${OGGCODECS_CONFIG_PATH}\libOOTheora.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\flac\libs\libflac\obj\${OGGCODECS_CONFIG_PATH}\bin\libFLAC.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\flac\libs\libflac\obj\${OGGCODECS_CONFIG_PATH}\bin\libFLAC++.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\helper\libfishsound\win32\${OGGCODECS_CONFIG_PATH}\libfishsound.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\core\ogg\libVorbisComment\${OGGCODECS_CONFIG_PATH}\libVorbisComment.dll"
+
+ File "${OGGCODECS_ROOT_DIR}\src\lib\helper\libTemporalURI\${OGGCODECS_CONFIG_PATH}\libTemporalURI.dll"
+
+
+
+ ; Utilites - 4
+ File "${OGGCODECS_ROOT_DIR}\src\tools\OOOggDump\${OGGCODECS_CONFIG_PATH}\OOOggDump.exe"
+ File "${OGGCODECS_ROOT_DIR}\src\tools\OOOggStat\${OGGCODECS_CONFIG_PATH}\OOOggStat.exe"
+ File "${OGGCODECS_ROOT_DIR}\src\tools\OOOggValidate\${OGGCODECS_CONFIG_PATH}\OOOggValidate.exe"
+ File "${OGGCODECS_ROOT_DIR}\src\tools\OOOggCommentDump\${OGGCODECS_CONFIG_PATH}\OOOggCommentDump.exe"
+
+
+ ; Text files - 7
+ File "${OGGCODECS_ROOT_DIR}\ABOUT.txt"
+ File "${OGGCODECS_ROOT_DIR}\VERSIONS"
+ File "${OGGCODECS_ROOT_DIR}\README"
+ File "${OGGCODECS_ROOT_DIR}\COPYRIGHTS.rtf"
+ File "${OGGCODECS_ROOT_DIR}\COPYRIGHTS"
+
+ File "${OGGCODECS_ROOT_DIR}\AUTHORS"
+ File "${OGGCODECS_ROOT_DIR}\HISTORY"
+
+
+ ; Install Filters - 16
+
+
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\flac\filters\dsfFLACEncoder\${OGGCODECS_CONFIG_PATH}\dsfFLACEncoder.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\speex\filters\dsfSpeexEncoder\${OGGCODECS_CONFIG_PATH}\dsfSpeexEncoder.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\theora\filters\dsfTheoraEncoder\${OGGCODECS_CONFIG_PATH}\dsfTheoraEncoder.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\vorbis\filters\dsfVorbisEncoder\${OGGCODECS_CONFIG_PATH}\dsfVorbisEncoder.dll"
+
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\flac\filters\dsfNativeFLACSource\${OGGCODECS_CONFIG_PATH}\dsfNativeFLACSource.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\speex\filters\dsfSpeexDecoder\${OGGCODECS_CONFIG_PATH}\dsfSpeexDecoder.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\theora\filters\dsfTheoraDecoder\${OGGCODECS_CONFIG_PATH}\dsfTheoraDecoder.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\flac\filters\dsfFLACDecoder\${OGGCODECS_CONFIG_PATH}\dsfFLACDecoder.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\vorbis\filters\dsfVorbisDecoder\${OGGCODECS_CONFIG_PATH}\dsfVorbisDecoder.dll"
+
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\ogm\filters\dsfOGMDecoder\${OGGCODECS_CONFIG_PATH}\dsfOGMDecoder.dll"
+
+ File "${OGGCODECS_ROOT_DIR}\src\lib\core\directshow\dsfOggDemux2\${OGGCODECS_CONFIG_PATH}\dsfOggDemux2.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\core\directshow\dsfOggMux\${OGGCODECS_CONFIG_PATH}\dsfOggMux.dll"
+
+ ; File "${OGGCODECS_ROOT_DIR}\src\lib\core\directshow\dsfSeeking\${OGGCODECS_CONFIG_PATH}\dsfSeeking.dll"
+
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\cmml\dsfCMMLDecoder\${OGGCODECS_CONFIG_PATH}\dsfCMMLDecoder.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\codecs\cmml\dsfCMMLRawSource\${OGGCODECS_CONFIG_PATH}\dsfCMMLRawSource.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\core\directshow\dsfSubtitleVMR9\${OGGCODECS_CONFIG_PATH}\dsfSubtitleVMR9.dll"
+
+ ; File "${OGGCODECS_ROOT_DIR}\src\lib\core\directshow\dsfAnxDemux\${OGGCODECS_CONFIG_PATH}\dsfAnxDemux.dll"
+ File "${OGGCODECS_ROOT_DIR}\src\lib\core\directshow\dsfAnxMux\${OGGCODECS_CONFIG_PATH}\dsfAnxMux.dll"
+
+ ; Register libraries - 16
+
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfFLACEncoder.dll"'
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfSpeexEncoder.dll"'
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfTheoraEncoder.dll"'
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfVorbisEncoder.dll"'
+
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfNativeFLACSource.dll"'
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfSpeexDecoder.dll"'
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfTheoraDecoder.dll"'
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfFLACDecoder.dll"'
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfVorbisDecoder.dll"'
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfOGMDecoder.dll"'
+
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfOggDemux2.dll"'
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfOggMux.dll"'
+
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfCMMLDecoder.dll"'
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfCMMLRawSource.dll"'
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfSubtitleVMR9.dll"'
+
+ ExecWait 'regsvr32 "/s" "$INSTDIR\dsfAnxMux.dll"'
+
+ ; ExecWait 'regsvr32 "/s" "$INSTDIR\dsfAnxDemux.dll"'
+
+
+
+ ;Sleep 10000
+; Shortcuts
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ !insertmacro MUI_STARTMENU_WRITE_END
+SectionEnd
+
+Section -AdditionalIcons
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
+ CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
+ CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+ CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" "$INSTDIR\uninst.exe"
+ !insertmacro MUI_STARTMENU_WRITE_END
+SectionEnd
+
+Section -Post
+ WriteUninstaller "$INSTDIR\uninst.exe"
+ WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\OOOggDump.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\OOOggDump.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Registry Entries for directshow and WMP
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; * Media Group Entries for WMP
+;;; - flac (audio)
+;;; - oga
+;;; - ogv
+;;; - axa
+;;; - axv
+;;; - spx
+;;; - ogm(????? TODO:::)
+;;; - ogg(TODO::: Check if can have no group)
+;;; * Mime Type Entries for WMP
+;;; * Extension Entries for WMP - TODO::: Other entries, icons
+;;; * Media Type Entries/Filter association for Directshow
+;;; * MLS(?) Entries for WMP
+
+
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Media Group Entries - 6
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\FLAC]
+;@="FLAC File (flac)"
+;"Extensions"=".flac"
+;"MIME Types"="audio/x-flac"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\FLAC" "" "FLAC File (flac)"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\FLAC" "Extensions" ".flac"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\FLAC" "MIME Types" "audio/x-flac"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\OGA]
+;@="Ogg File (oga)"
+;"Extensions"=".oga"
+;"MIME Types"="audio/x-ogg"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\OGA" "" "Ogg File (oga)"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\OGA" "Extensions" ".oga"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\OGA" "MIME Types" "audio/x-ogg"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\OGV]
+;@="Ogg File (ogv)"
+;"Extensions"=".ogv"
+;"MIME Types"="video/x-ogg"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\OGV" "" "Ogg File (ogv)"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\OGV" "Extensions" ".ogv"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\OGV" "MIME Types" "video/x-ogg"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\AXA]
+;@="Annodex File (axa)"
+;"Extensions"=".axa"
+;"MIME Types"="audio/x-annodex"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\AXA" "" "Annodex File (axa)"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\AXA" "Extensions" ".axa"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\AXA" "MIME Types" "audio/x-annodex"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\AXV]
+;@="Annodex File (axv)"
+;"Extensions"=".axv"
+;"MIME Types"="video/x-annodex"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\AXV" "" "Annodex File (axv)"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\AXV" "Extensions" ".axv"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\AXV" "MIME Types" "video/x-annodex"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\SPX]
+;@="Ogg File (spx)"
+;"Extensions"=".spx"
+;"MIME Types"="audio/x-ogg"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\SPX" "" "Ogg File (spx)"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\SPX" "Extensions" ".spx"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\SPX" "MIME Types" "audio/x-ogg"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; WMP Mime type entries - 7
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/x-annodex]
+;@="Annodex File"
+;"AlreadyRegistered"="yes"
+;"Extension.Key"=".anx"
+;"Extensions.CommaSep"="anx,axa,axv"
+;"Extensions.SpaceSep"=".anx .axa .axv"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/x-annodex" "" "Annodex File"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/x-annodex" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/x-annodex" "Extension.Key" ".anx"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/x-annodex" "Extensions.CommaSep" "anx,axa,axv"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/x-annodex" "Extensions.SpaceSep" ".anx .axa .axv"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/ogg]
+;@="Ogg File"
+;"AlreadyRegistered"="yes"
+;"Extension.Key"=".ogg"
+;"Extensions.CommaSep"="ogg,oga,ogv,spx"
+;"Extensions.SpaceSep"=".ogg .oga .ogv .spx"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/ogg" "" "Ogg File"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/ogg" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/ogg" "Extension.Key" ".ogg"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/ogg" "Extensions.CommaSep" "ogg,oga,ogv,spx"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/ogg" "Extensions.SpaceSep" ".ogg .oga .ogv .spx"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-flac]
+;@="FLAC Audio File"
+;"AlreadyRegistered"="yes"
+;"Extension.Key"=".flac"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-flac" "" "FLAC Audio File"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-flac" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-flac" "Extension.Key" ".flac"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-ogg]
+;@="Ogg Audio File"
+;"AlreadyRegistered"="yes"
+;"Extension.Key"=".oga"
+;"Extensions.CommaSep"="oga,spx"
+;"Extensions.SpaceSep"=".oga .spx"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-ogg" "" "Ogg Audio File"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-ogg" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-ogg" "Extension.Key" ".oga"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-ogg" "Extensions.CommaSep" "oga,spx"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-ogg" "Extensions.SpaceSep" ".oga .spx"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\video/x-ogg]
+;@="Ogg Video File"
+;"AlreadyRegistered"="yes"
+;"Extension.Key"=".ogv"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\video/x-ogg" "" "Ogg Video File"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\video/x-ogg" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\video/x-ogg" "Extension.Key" ".ogv"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-annodex]
+;@="Annodex Audio File"
+;"AlreadyRegistered"="yes"
+;"Extension.Key"=".axa"
+;"Extensions.CommaSep"="axa"
+;"Extensions.SpaceSep"=".axa"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-annodex" "" "Annodex Audio File"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-annodex" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-annodex" "Extension.Key" ".axa"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-annodex" "Extensions.CommaSep" "axa"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-annodex" "Extensions.SpaceSep" ".axa"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\video/x-annodex]
+;@="Annodex Video File"
+;"AlreadyRegistered"="yes"
+;"Extension.Key"=".axv"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\video/x-annodex" "" "Annodex Video File"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\video/x-annodex" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\video/x-annodex" "Extension.Key" ".axv"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; WMP extension entries - 8
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx]
+;"AlreadyRegistered"="yes"
+;"MediaType.Description"="Annodex File"
+;"Permissions"=dword:0000000f
+;"Runtime"=dword:00000007
+;"Extension.MIME"="application/x-annodex"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx" "MediaType.Description" "Annodex File"
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx" "Permissions" 0x0000000f
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx" "Runtime" 0x00000007
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx" "Extension.MIME" "application/x-annodex"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa]
+;"AlreadyRegistered"="yes"
+;"MediaType.Description"="Annodex File"
+;"Permissions"=dword:0000000f
+;"Runtime"=dword:00000007
+;"PerceivedType"="audio"
+;"Extension.MIME"="audio/x-annodex"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "MediaType.Description" "Annodex File"
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "Permissions" 0x0000000f
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "Runtime" 0x00000007
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "PerceivedType" "audio"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "Extension.MIME" "audio/x-annodex"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv]
+;"AlreadyRegistered"="yes"
+;"MediaType.Description"="Annodex File"
+;"Permissions"=dword:0000000f
+;"Runtime"=dword:00000007
+;"Extension.MIME"="video/x-annodex"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "MediaType.Description" "Annodex File"
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "Permissions" 0x0000000f
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "Runtime" 0x00000007
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "PerceivedType" "video"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "Extension.MIME" "video/x-annodex"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.flac]
+;"AlreadyRegistered"="yes"
+;"MediaType.Description"="FLAC Audio"
+;"Permissions"=dword:0000000f
+;"Runtime"=dword:00000007
+;"PerceivedType"="audio"
+;"Extension.MIME"="audio/x-flac"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.flac" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.flac" "MediaType.Description" "FLAC Audio"
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.flac" "Permissions" 0x0000000f
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.flac" "Runtime" 0x00000007
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.flac" "PerceivedType" "audio"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.flac" "Extension.MIME" "audio/x-flac"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; mm_medlib_oga.reg
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.oga]
+;"AlreadyRegistered"="yes"
+;"MediaType.Description"="Ogg Audio"
+;"Permissions"=dword:0000000f
+;"Runtime"=dword:00000007
+;"PerceivedType"="audio"
+;"Extension.MIME"="audio/x-ogg"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.oga" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.oga" "MediaType.Description" "Ogg Audio"
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.oga" "Permissions" 0x0000000f
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.oga" "Runtime" 0x00000007
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.oga" "PerceivedType" "audio"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.oga" "Extension.MIME" "audio/x-ogg"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; mm_medlib_ogg.reg
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg]
+;"AlreadyRegistered"="yes"
+;"MediaType.Description"="Ogg File"
+;"Permissions"=dword:0000000f
+;"Runtime"=dword:00000007
+;"Extension.MIME"="application/ogg"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg" "MediaType.Description" "Ogg File"
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg" "Permissions" 0x0000000f
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg" "Runtime" 0x00000007
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg" "Extension.MIME" "application/ogg"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; mm_medlib_ogv.reg
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogv]
+;"AlreadyRegistered"="yes"
+;"MediaType.Description"="Ogg Video"
+;"Permissions"=dword:0000000f
+;"Runtime"=dword:00000007
+;"PerceivedType"="video"
+;"Extension.MIME"="video/x-ogg"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogv" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogv" "MediaType.Description" "Ogg Video"
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogv" "Permissions" 0x0000000f
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogv" "Runtime" 0x00000007
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogv" "PerceivedType" "video"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogv" "Extension.MIME" "video/x-ogg"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; mm_medlib_spx.reg
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx]
+;"AlreadyRegistered"="yes"
+;"MediaType.Description"="Ogg Speex Audio"
+;"Permissions"=dword:0000000f
+;"Runtime"=dword:00000007
+;"PerceivedType"="audio"
+;"Extension.MIME"="audio/x-ogg"
+
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "AlreadyRegistered" "yes"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "MediaType.Description" "Ogg Speex Audio"
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "Permissions" 0x0000000f
+ WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "Runtime" 0x00000007
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "PerceivedType" "audio"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "Extension.MIME" "audio/x-ogg"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Directshow extension to filter mapping - 8
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_CLASSES_ROOT\Media Type\Extensions\.anx]
+;"Source Filter"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+ WriteRegStr HKCR "Media Type\Extensions\.anx" "Source Filter" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_CLASSES_ROOT\Media Type\Extensions\.axa]
+;"Source Filter"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+ WriteRegStr HKCR "Media Type\Extensions\.axa" "Source Filter" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_CLASSES_ROOT\Media Type\Extensions\.axv]
+;"Source Filter"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+ WriteRegStr HKCR "Media Type\Extensions\.axv" "Source Filter" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_CLASSES_ROOT\Media Type\Extensions\.flac]
+;"Source Filter"="{6DDA37BA-0553-499a-AE0D-BEBA67204548}"
+
+ WriteRegStr HKCR "Media Type\Extensions\.flac" "Source Filter" "{6DDA37BA-0553-499a-AE0D-BEBA67204548}"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_CLASSES_ROOT\Media Type\Extensions\.oga]
+;"Source Filter"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+ WriteRegStr HKCR "Media Type\Extensions\.oga" "Source Filter" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_CLASSES_ROOT\Media Type\Extensions\.ogg]
+;"Source Filter"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+ WriteRegStr HKCR "Media Type\Extensions\.ogg" "Source Filter" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_CLASSES_ROOT\Media Type\Extensions\.ogv]
+;"Source Filter"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+ WriteRegStr HKCR "Media Type\Extensions\.ogv" "Source Filter" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;=========================================================
+;[HKEY_CLASSES_ROOT\Media Type\Extensions\.spx]
+;"Source Filter"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+ WriteRegStr HKCR "Media Type\Extensions\.spx" "Source Filter" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Directshow extension to filter mapping for HTTP - 7
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; mt_http.reg
+;=========================================================
+;[HKEY_CLASSES_ROOT\http\Extensions]
+;".OGG"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+;".OGV"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+;".OGA"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+;".SPX"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+;".ANX"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+;".AXV"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+;".AXA"="{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+
+ WriteRegStr HKCR "http\Extensions" ".OGG" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+ WriteRegStr HKCR "http\Extensions" ".OGV" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+ WriteRegStr HKCR "http\Extensions" ".OGA" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+ WriteRegStr HKCR "http\Extensions" ".SPX" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+ WriteRegStr HKCR "http\Extensions" ".ANX" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+ WriteRegStr HKCR "http\Extensions" ".AXV" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+ WriteRegStr HKCR "http\Extensions" ".AXA" "{C9361F5A-3282-4944-9899-6D99CDC5370B}"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; MLS Perceived type - 6
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; wmp_mls.reg
+;=========================================================
+;[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions]
+;"ogv"="video"
+;"oga"="audio"
+;"axv"="video"
+;"axa"="audio"
+;"spx"="audio"
+;"flac"="audio"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "ogv" "video"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "oga" "audio"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "axv" "video"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "axa" "audio"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "spx" "audio"
+ WriteRegStr HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "flac" "audio"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+SectionEnd
+
+
+Function un.onUninstSuccess
+; HideWindow
+ MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
+FunctionEnd
+
+Function un.onInit
+!insertmacro MUI_UNGETLANGUAGE
+ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+ Abort
+FunctionEnd
+
+Section Uninstall
+
+
+ ; Unregister libraries - 16
+
+ ; Unregister core annodex libraries
+
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfSubtitleVMR9.dll"'
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfCMMLDecoder.dll"'
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfCMMLRawSource.dll"'
+
+ ; ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfAnxDemux.dll"'
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfAnxMux.dll"'
+
+
+ ; Unregister core ogg libraries
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfOggDemux2.dll"'
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfOggMux.dll"'
+
+
+ ; Unregister encoders
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfFLACEncoder.dll"'
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfSpeexEncoder.dll"'
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfTheoraEncoder.dll"'
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfVorbisEncoder.dll"'
+
+
+ ; Unregister decoders
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfNativeFLACSource.dll"'
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfSpeexDecoder.dll"'
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfTheoraDecoder.dll"'
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfFLACDecoder.dll"'
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfVorbisDecoder.dll"'
+
+ ExecWait 'regsvr32 "/s" "/u" "$INSTDIR\dsfOGMDecoder.dll"'
+
+
+
+
+
+; Get rid of all the registry keys we made for directshow and WMP
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+ ; Media Type Groups entries - 6
+
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\FLAC"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\OGA"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\SPX"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\AXA"
+
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\OGV"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\AXV"
+
+
+ ; MIME Type entries - 7
+
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/ogg"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-flac"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-ogg"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\video/x-ogg"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\application/x-annodex"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\audio/x-annodex"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\video/x-annodex"
+
+
+ ; File Extension Entries - 8
+
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.flac"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.oga"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogv"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa"
+ DeleteRegKey HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv"
+
+
+ ; Extension to filter mapping - 8
+
+ DeleteRegKey HKCR "Media Type\Extensions\.anx"
+ DeleteRegKey HKCR "Media Type\Extensions\.axa"
+ DeleteRegKey HKCR "Media Type\Extensions\.axv"
+ DeleteRegKey HKCR "Media Type\Extensions\.flac"
+ DeleteRegKey HKCR "Media Type\Extensions\.oga"
+ DeleteRegKey HKCR "Media Type\Extensions\.ogg"
+ DeleteRegKey HKCR "Media Type\Extensions\.ogv"
+ DeleteRegKey HKCR "Media Type\Extensions\.spx"
+
+
+ ; Extension to filter mapping for http - 7
+ DeleteRegValue HKCR "http\Extensions" ".OGG"
+ DeleteRegValue HKCR "http\Extensions" ".OGV"
+ DeleteRegValue HKCR "http\Extensions" ".OGA"
+ DeleteRegValue HKCR "http\Extensions" ".SPX"
+ DeleteRegValue HKCR "http\Extensions" ".ANX"
+ DeleteRegValue HKCR "http\Extensions" ".AXA"
+ DeleteRegValue HKCR "http\Extensions" ".AXV"
+ ; TODO::: FLAC
+
+
+ ; MLS Perceived type - 6
+ DeleteRegValue HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "ogv"
+ DeleteRegValue HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "oga"
+ DeleteRegValue HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "axa"
+ DeleteRegValue HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "axv"
+ DeleteRegValue HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "spx"
+ DeleteRegValue HKLM "SOFTWARE\Microsoft\MediaPlayer\MLS\Extensions" "flac"
+
+
+
+
+
+ !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
+
+ ; Delete utils - 4
+ Delete "$INSTDIR\OOOggCommentDump.exe"
+ Delete "$INSTDIR\OOOggValidate.exe"
+ Delete "$INSTDIR\OOOggStat.exe"
+ Delete "$INSTDIR\OOOggDump.exe"
+
+
+ ; Delete libraries - 11
+ Delete "$INSTDIR\libFLAC++.dll"
+ Delete "$INSTDIR\libFLAC.dll"
+ Delete "$INSTDIR\libfishsound.dll"
+ Delete "$INSTDIR\libOOTheora.dll"
+ Delete "$INSTDIR\vorbis.dll"
+
+ Delete "$INSTDIR\libCMMLParse.dll"
+ Delete "$INSTDIR\libCMMLTags.dll"
+ Delete "$INSTDIR\libVorbisComment.dll"
+ Delete "$INSTDIR\libOOOggSeek.dll"
+ Delete "$INSTDIR\libOOOgg.dll"
+
+ Delete "$INSTDIR\libTemporalURI.dll"
+
+
+ ;Delete Filters - 16
+ Delete "$INSTDIR\dsfVorbisEncoder.dll"
+ Delete "$INSTDIR\dsfTheoraEncoder.dll"
+ Delete "$INSTDIR\dsfSpeexEncoder.dll"
+ Delete "$INSTDIR\dsfFLACEncoder.dll"
+
+ Delete "$INSTDIR\dsfVorbisDecoder.dll"
+ Delete "$INSTDIR\dsfFLACDecoder.dll"
+ Delete "$INSTDIR\dsfTheoraDecoder.dll"
+ Delete "$INSTDIR\dsfSpeexDecoder.dll"
+ Delete "$INSTDIR\dsfOGMDecoder.dll"
+
+ Delete "$INSTDIR\dsfNativeFLACSource.dll"
+
+ Delete "$INSTDIR\dsfCMMLDecoder.dll"
+ Delete "$INSTDIR\dsfCMMLRawSource.dll"
+
+ Delete "$INSTDIR\dsfSubtitleVMR9.dll"
+
+ Delete "$INSTDIR\dsfOggDemux2.dll"
+ Delete "$INSTDIR\dsfOggMux.dll"
+
+ ; Delete "$INSTDIR\dsfSeeking.dll"
+
+
+ Delete "$INSTDIR\dsfAnxMux.dll"
+ ; Delete "$INSTDIR\dsfAnxDemux.dll"
+
+
+
+ ; Delete text files - 7
+ Delete "$INSTDIR\ABOUT.txt"
+ Delete "$INSTDIR\VERSIONS"
+ Delete "$INSTDIR\README"
+ Delete "$INSTDIR\COPYRIGHTS.rtf"
+ Delete "$INSTDIR\COPYRIGHTS"
+
+ Delete "$INSTDIR\AUTHORS"
+ Delete "$INSTDIR\HISTORY"
+
+
+ ; Delete runtimes - 2
+ Delete "$INSTDIR\msvcr71.dll"
+ Delete "$INSTDIR\msvcp71.dll"
+
+
+ ;Delete accesory files, links etc.
+ Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
+ Delete "$INSTDIR\${PRODUCT_NAME}.url"
+ Delete "$INSTDIR\uninst.exe"
+
+ RMDir "$SMPROGRAMS\$ICONS_GROUP"
+ ; Remove the "illiminable" start menu group (but only if it's empty)
+ RMDir "$SMPROGRAMS\$ICONS_GROUP\.."
+
+ ; Need to change the working directory to something else (anything) besides
+ ; the output directory, so we can rmdir it
+ SetOutPath "$TEMP"
+ RMDir "$INSTDIR"
+
+ ; Remove the "illiminable" parent directory (but only if it's empty)
+ RMDir "$INSTDIR\.."
+
+ DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+ DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+; SetAutoClose true
+SectionEnd
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/DataSourceFactory.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/DataSourceFactory.cpp 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/DataSourceFactory.cpp 2006-06-13 14:39:34 UTC (rev 11565)
@@ -39,16 +39,16 @@
{
}
-IFilterDataSource* DataSourceFactory::createDataSource(string inSourceLocation) {
- string locType = identifySourceType(inSourceLocation);
+IFilterDataSource* DataSourceFactory::createDataSource(wstring inSourceLocation) {
+ wstring locType = identifySourceType(inSourceLocation);
if(locType.length() == 1) {
//File...
return new FilterFileSource;
- } else if (locType == "\\\\") {
+ } else if (locType == L"\\\\") {
//Network share...
return new FilterFileSource;
- } else if (locType == "http") {
+ } else if (locType == L"http") {
//Http stream
//return new HTTPFileSource;
return new HTTPStreamingFileSource;
@@ -63,35 +63,35 @@
}
}
-string DataSourceFactory::identifySourceType(string inSourceLocation) {
+wstring DataSourceFactory::identifySourceType(wstring inSourceLocation) {
size_t locPos = inSourceLocation.find(':');
if (locPos == string::npos) {
//No colon... not a normal file. See if it's a network share...
//Make sure it's long enough...
if (inSourceLocation.length() > 2) {
- string retStr = inSourceLocation.substr(0,2);
- if (retStr == "\\\\") {
+ wstring retStr = inSourceLocation.substr(0,2);
+ if (retStr == L"\\\\") {
//A "\\" is a network share
return retStr;
} else {
#ifdef WINCE
retStr = inSourceLocation.substr(0,1);
- if (retStr == "\\") {
+ if (retStr == L"\\") {
//WinCE absolute path
return retStr;
}
#endif
//Not a network share.
- return "";
+ return L"";
}
} else {
//Too short
- return "";
+ return L"";
}
} else {
- string retStr = inSourceLocation.substr(0,locPos);
+ wstring retStr = inSourceLocation.substr(0,locPos);
return retStr;
}
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/DataSourceFactory.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/DataSourceFactory.h 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/DataSourceFactory.h 2006-06-13 14:39:34 UTC (rev 11565)
@@ -40,6 +40,6 @@
DataSourceFactory(void);
~DataSourceFactory(void);
- static IFilterDataSource* createDataSource(string inSourceLocation);
- static string identifySourceType(string inSourceLocation);
+ static IFilterDataSource* createDataSource(wstring inSourceLocation);
+ static wstring identifySourceType(wstring inSourceLocation);
};
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/FilterFileSource.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/FilterFileSource.cpp 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/FilterFileSource.cpp 2006-06-13 14:39:34 UTC (rev 11565)
@@ -49,7 +49,7 @@
void FilterFileSource::close() {
mSourceFile.close();
}
-bool FilterFileSource::open(string inSourceLocation, unsigned long) {
+bool FilterFileSource::open(wstring inSourceLocation, unsigned long) {
mSourceFile.open(inSourceLocation.c_str(), ios_base::in|ios_base::binary);
return mSourceFile.is_open();
}
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/FilterFileSource.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/FilterFileSource.h 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/FilterFileSource.h 2006-06-13 14:39:34 UTC (rev 11565)
@@ -45,12 +45,12 @@
//IFilterDataSource Interface
virtual unsigned long seek(unsigned long inPos);
virtual void close();
- virtual bool open(string inSourceLocation, unsigned long inStartByte = 0);
+ virtual bool open(wstring inSourceLocation, unsigned long inStartByte = 0);
virtual void clear();
virtual bool isEOF();
virtual bool isError() { return false; }
virtual unsigned long read(char* outBuffer, unsigned long inNumBytes);
- virtual string shouldRetryAt() { return ""; }
+ virtual wstring shouldRetryAt() { return L""; }
//
protected:
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPFileSource.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPFileSource.h 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPFileSource.h 2006-06-13 14:39:34 UTC (rev 11565)
@@ -61,7 +61,7 @@
virtual bool isEOF();
virtual bool isError();
virtual unsigned long read(char* outBuffer, unsigned long inNumBytes);
- virtual string shouldRetryAt();
+ virtual wstring shouldRetryAt();
//CAMThread pure virtuals
DWORD HTTPFileSource::ThreadProc();
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPSocket.cpp 2006-06-13 14:39:34 UTC (rev 11565)
@@ -74,7 +74,7 @@
bool locValidURL = splitURL(inSourceLocation);
- locAddress.S_un.S_addr = inet_addr(mServerName.c_str());
+ locAddress.S_un.S_addr = inet_addr(mServerName.c_str());
if (locAddress.S_un.S_addr == INADDR_NONE) {
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPStreamingFileSource.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPStreamingFileSource.cpp 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPStreamingFileSource.cpp 2006-06-13 14:39:34 UTC (rev 11565)
@@ -285,7 +285,7 @@
unsigned short locResponseCode = getHTTPResponseCode(mLastResponse);
- mRetryAt = "";
+ mRetryAt = L"";
if ( (locResponseCode == 301)
|| (locResponseCode == 302)
|| (locResponseCode == 303)
@@ -296,8 +296,8 @@
size_t locEndPos = mLastResponse.find("\r", locLocPos);
if (locEndPos != string::npos) {
if (locEndPos > locLocPos) {
- mRetryAt = mLastResponse.substr(locLocPos, locEndPos - locLocPos);
- debugLog<<"Retry URL = "<<mRetryAt<<endl;
+ mRetryAt = StringHelper::toWStr(mLastResponse.substr(locLocPos, locEndPos - locLocPos));
+ //debugLog<<"Retry URL = "<<mRetryAt<<endl;
}
}
}
@@ -375,7 +375,7 @@
return 0;
}
}
-string HTTPStreamingFileSource::shouldRetryAt()
+wstring HTTPStreamingFileSource::shouldRetryAt()
{
return mRetryAt;
}
@@ -430,7 +430,7 @@
closeSocket();
clear();
- open(mSourceLocation, inPos);
+ open(StringHelper::toWStr(mSourceLocation), inPos);
return inPos;
} else {
@@ -471,7 +471,7 @@
CallWorker(THREAD_RUN);
return true;
}
-bool HTTPStreamingFileSource::open(string inSourceLocation, unsigned long inStartByte) {
+bool HTTPStreamingFileSource::open(wstring inSourceLocation, unsigned long inStartByte) {
//Open network connection and start feeding data into a buffer
//
mSeenResponse = false;
@@ -502,7 +502,7 @@
mMemoryBuffer->reset();
} //END CRITICAL SECTION
- bool locIsOK = setupSocket(inSourceLocation);
+ bool locIsOK = setupSocket(StringHelper::toNarrowStr(inSourceLocation));
if (!locIsOK) {
//debugLog<<"Setup socket FAILED"<<endl;
@@ -525,7 +525,7 @@
debugLog<<"Setting error to false";
mIsEOF = false;
mWasError = false;
- mRetryAt = "";
+ mRetryAt = L"";
mIsFirstChunk = true;
mChunkRemains = 0;
mNumLeftovers = 0;
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPStreamingFileSource.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPStreamingFileSource.h 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/HTTPStreamingFileSource.h 2006-06-13 14:39:34 UTC (rev 11565)
@@ -59,12 +59,12 @@
//IFilterDataSource Interface
virtual unsigned long seek(unsigned long inPos);
virtual void close() ;
- virtual bool open(string inSourceLocation, unsigned long inStartByte = 0);
+ virtual bool open(wstring inSourceLocation, unsigned long inStartByte = 0);
virtual void clear();
virtual bool isEOF();
virtual bool isError();
virtual unsigned long read(char* outBuffer, unsigned long inNumBytes);
- virtual string shouldRetryAt();
+ virtual wstring shouldRetryAt();
//CAMThread pure virtuals
@@ -87,7 +87,7 @@
bool mIsBufferFilling;
bool mIsFirstChunk;
- string mRetryAt;
+ wstring mRetryAt;
fstream debugLog;
fstream fileDump;
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/IFilterDataSource.h
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/IFilterDataSource.h 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/IFilterDataSource.h 2006-06-13 14:39:34 UTC (rev 11565)
@@ -40,11 +40,11 @@
virtual unsigned long seek(unsigned long inPos) = 0;
virtual void close() = 0;
- virtual bool open(string inSourceLocation, unsigned long inStartByte = 0) = 0;
+ virtual bool open(wstring inSourceLocation, unsigned long inStartByte = 0) = 0;
virtual void clear() = 0;
virtual bool isEOF() = 0;
virtual bool isError() = 0;
virtual unsigned long read(char* outBuffer, unsigned long inNumBytes) = 0;
- virtual string shouldRetryAt() = 0;
+ virtual wstring shouldRetryAt() = 0;
};
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggDemuxPacketSourceFilter.cpp 2006-06-13 14:39:34 UTC (rev 11565)
@@ -285,9 +285,9 @@
mDataSource = NULL;
//Before opening make the interface
- mDataSource = DataSourceFactory::createDataSource(StringHelper::toNarrowStr(mFileName).c_str());
+ mDataSource = DataSourceFactory::createDataSource(mFileName);
- mDataSource->open(StringHelper::toNarrowStr(mFileName).c_str());
+ mDataSource->open(mFileName);
}
mDataSource->seek(0); //Should always be zero for now.
@@ -333,13 +333,14 @@
//Create and open a data source if we are using the standard source.
debugLog<<"Pre data source creation"<<endl;
- mDataSource = DataSourceFactory::createDataSource(StringHelper::toNarrowStr(mFileName).c_str());
+ //mDataSource = DataSourceFactory::createDataSource(StringHelper::toNarrowStr(mFileName).c_str());
+ mDataSource = DataSourceFactory::createDataSource(mFileName);
debugLog<<"Post data source creation"<<endl;
if (mDataSource == NULL) {
return VFW_E_CANNOT_RENDER;
}
- if (!mDataSource->open(StringHelper::toNarrowStr(mFileName).c_str())) {
+ if (!mDataSource->open(mFileName)) {
return VFW_E_CANNOT_RENDER;
}
} else {
@@ -365,13 +366,13 @@
}
if (mDataSource->isEOF() || mDataSource->isError()) {
- if (mDataSource->isError() && (mDataSource->shouldRetryAt() != "") && (locRetryCount < RETRY_THRESHOLD) && (!mUsingCustomSource)) {
+ if (mDataSource->isError() && (mDataSource->shouldRetryAt() != L"") && (locRetryCount < RETRY_THRESHOLD) && (!mUsingCustomSource)) {
mOggBuffer.clearData();
- string locNewLocation = mDataSource->shouldRetryAt();
+ wstring locNewLocation = mDataSource->shouldRetryAt();
//debugLog<<"Retrying at : "<<locNewLocation<<endl;
delete mDataSource;
- mDataSource = DataSourceFactory::createDataSource(locNewLocation.c_str());
- mDataSource->open(locNewLocation.c_str());
+ mDataSource = DataSourceFactory::createDataSource(locNewLocation);
+ mDataSource->open(locNewLocation);
locRetryCount++;
//This prevents us dying on small files, if we hit eof but we also saw a +'ve gran pos, this file is ok.
} else if (!(mDataSource->isEOF() && mSeenPositiveGranulePos)) {
@@ -561,11 +562,11 @@
mSeekTable->addStream(locPin->getSerialNo(), locPin->getDecoderInterface());
}
debugLog<<"Pre seek table build"<<endl;
-#ifndef WINCE
+//#ifndef WINCE
mSeekTable->buildTable();
-#else
- mSeekTable->disableTable();
-#endif
+//#else
+ //mSeekTable->disableTable();
+//#endif
debugLog<<"Post seek table build"<<endl;
}
}
Modified: branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.cpp
===================================================================
--- branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.cpp 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/lib/core/directshow/dsfOggDemux2/OggStreamMapper.cpp 2006-06-13 14:39:34 UTC (rev 11565)
@@ -67,9 +67,10 @@
}
break;
case STRMAP_FINISHED:
+ case STRMAP_ERROR:
+ default:
+
return false;
- case STRMAP_ERROR:
- return false;
}
Modified: branches/oggdsf_ce_port/src/tests/testLoadLib/testLoadLib.cpp
===================================================================
--- branches/oggdsf_ce_port/src/tests/testLoadLib/testLoadLib.cpp 2006-06-13 08:45:56 UTC (rev 11564)
+++ branches/oggdsf_ce_port/src/tests/testLoadLib/testLoadLib.cpp 2006-06-13 14:39:34 UTC (rev 11565)
@@ -339,10 +339,10 @@
- //c_initialise();
+ c_initialise();
////wstring locStr = L"\\Storage Card\\do_you_see.ogg";
- //c_loadFileWithParams( L"\\Storage Card\\do_you_see.ogg", hDlg, 0,0,64,48);
- //c_play();
+ c_loadFileWithParams( L"http://www.illiminable.com/temp/do_you_see.ogg", hDlg, 0,0,64,48);
+ c_play();
@@ -360,20 +360,20 @@
- IGraphBuilder* locGraphBuilder = NULL;
- IMediaControl* locMediaControl = NULL;
- HRESULT locHR = S_FALSE;;
- CoInitialize(NULL);
- IBaseFilter* locTheoDecode = NULL;
- locHR = CoCreateInstance(CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, IID_IGraphBuilder, (void **)&locGraphBuilder);
+ //IGraphBuilder* locGraphBuilder = NULL;
+ //IMediaControl* locMediaControl = NULL;
+ //HRESULT locHR = S_FALSE;;
+ //CoInitialize(NULL);
+ //IBaseFilter* locTheoDecode = NULL;
+ //locHR = CoCreateInstance(CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, IID_IGraphBuilder, (void **)&locGraphBuilder);
- //locHR = CoCreateInstance(CLSID_X_Theora_Decoder, NULL, CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void **)&locTheoDecode);
-
+ ////locHR = CoCreateInstance(CLSID_X_Theora_Decoder, NULL, CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void **)&locTheoDecode);
+ //
-
- //IBaseFilter* locDemux = NULL;
- //locHR = CoCreateInstance(CLSID_XX_OggDemux, NULL, CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void **)&locDemux);
- locHR = locGraphBuilder->RenderFile(L"\\Storage Card\\carbon.ogg", NULL);
+ //
+ ////IBaseFilter* locDemux = NULL;
+ ////locHR = CoCreateInstance(CLSID_XX_OggDemux, NULL, CLSCTX_INPROC_SERVER, IID_IBaseFilter, (void **)&locDemux);
+ //locHR = locGraphBuilder->RenderFile(L"http://www.illiminable.com/temp/summer_city.ogg", NULL);
Modified: trunk/Tremor/win32/VS2005/libtremor/libtremor.vcproj
===================================================================
--- trunk/Tremor/win32/VS2005/libtremor/libtremor.vcproj 2006-06-13 08:45:56 UTC (rev 11564)
+++ trunk/Tremor/win32/VS2005/libtremor/libtremor.vcproj 2006-06-13 14:39:34 UTC (rev 11565)
@@ -81,12 +81,11 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -102,15 +101,17 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- RuntimeLibrary="2"
+ ExecutionBucket="7"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -134,18 +135,27 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
<Configuration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="$(SolutionDir)Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -161,18 +171,15 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
- MinimalRebuild="true"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -196,19 +203,11 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
</Configuration>
<Configuration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
@@ -515,6 +514,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ AdditionalOptions=""
/>
<Tool
Name="VCALinkTool"
More information about the commits
mailing list