[xiph-commits] r7666 - in trunk/oggdsf: build/CMMLCoreLibs build/XiphCoreLibs build/libFishSoundWithToolsAndTests build/libOOOggWithToolsAndTests build/oggcodecs build/oggcodecsDirectshowDecodeOnly build/oggcodecsDirectshowOnly sln/oggdsf_all src/lib/codecs/cmml/dsfCMMLDecoder src/lib/codecs/cmml/dsfCMMLRawSource src/lib/codecs/cmml/libCMMLTags src/lib/codecs/cmml/libWinCMMLParse src/lib/core/directshow/dsfAbstractAudioDecoder src/lib/core/directshow/dsfAnxDemux src/lib/core/directshow/dsfOggDemux src/lib/core/directshow/dsfSubtitleVMR9 website

illiminable at motherfish-iii.xiph.org illiminable at motherfish-iii.xiph.org
Mon Aug 30 12:08:39 PDT 2004


Author: illiminable
Date: 2004-08-30 12:08:38 -0700 (Mon, 30 Aug 2004)
New Revision: 7666

Modified:
   trunk/oggdsf/build/CMMLCoreLibs/CMMLCoreLibs.vdproj
   trunk/oggdsf/build/XiphCoreLibs/XiphCoreLibs.vdproj
   trunk/oggdsf/build/libFishSoundWithToolsAndTests/libFishSoundWithToolsAndTests.vdproj
   trunk/oggdsf/build/libOOOggWithToolsAndTests/libOOOggWithToolsAndTests.vdproj
   trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
   trunk/oggdsf/build/oggcodecsDirectshowDecodeOnly/oggcodecsDirectshowDecodeOnly.vdproj
   trunk/oggdsf/build/oggcodecsDirectshowOnly/oggcodecsDirectshowOnly.vdproj
   trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h
   trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h
   trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h
   trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.h
   trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SingleMediaFileCache.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SingleMediaFileCache.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp
   trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h
   trunk/oggdsf/website/index.html
Log:
* Changed the distribution project so the default one contains no .NET code... this is for anyone who *still* hasn't installed .NET or doesn't want to for whatever reason. The installer was forcing them to d/l 20megs of runtime that was only for an example app.

* Fixed some of the copyright notices i got wrong... vorbis has (C) back to 1994 i only had 2002, also, i bundled speex in the generic copyright rather than showing jm himself is the copyright holder... sorry jm ! :)
* Updated website files with more bugs... yay !
* Removed a bunch of debugging code.


Modified: trunk/oggdsf/build/CMMLCoreLibs/CMMLCoreLibs.vdproj
===================================================================
--- trunk/oggdsf/build/CMMLCoreLibs/CMMLCoreLibs.vdproj	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/build/CMMLCoreLibs/CMMLCoreLibs.vdproj	2004-08-30 19:08:38 UTC (rev 7666)
@@ -21,94 +21,88 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_256C53C724C145DD92FF859AF47D11D0"
-        "OwnerKey" = "8:_0948829C26A0484E8DDD2D3FADDC8C09"
+        "MsmKey" = "8:_27F6232758E74242B76F5586E7EE0639"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_256C53C724C145DD92FF859AF47D11D0"
-        "OwnerKey" = "8:_F97BA7EB0FE647F783C69DF80743AD47"
+        "MsmKey" = "8:_2DB4272DB9E147BEBEED0BB7A0F0175D"
+        "OwnerKey" = "8:_0948829C26A0484E8DDD2D3FADDC8C09"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_256C53C724C145DD92FF859AF47D11D0"
+        "MsmKey" = "8:_2DB4272DB9E147BEBEED0BB7A0F0175D"
         "OwnerKey" = "8:_F950B6FCF2DE412DA30583EF02B72C2D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_256C53C724C145DD92FF859AF47D11D0"
-        "OwnerKey" = "8:_27F6232758E74242B76F5586E7EE0639"
+        "MsmKey" = "8:_2DB4272DB9E147BEBEED0BB7A0F0175D"
+        "OwnerKey" = "8:_4E4F1C23C076E63F413C2DA8CAC18E79"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_27F6232758E74242B76F5586E7EE0639"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_4E4F1C23C076E63F413C2DA8CAC18E79"
+        "OwnerKey" = "8:_0948829C26A0484E8DDD2D3FADDC8C09"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_96582953F6FF475C9F02260168E445C5"
+        "MsmKey" = "8:_56A66C1EB2662D6C9F7CF7F5CE572B37"
         "OwnerKey" = "8:_0948829C26A0484E8DDD2D3FADDC8C09"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_96582953F6FF475C9F02260168E445C5"
+        "MsmKey" = "8:_56A66C1EB2662D6C9F7CF7F5CE572B37"
         "OwnerKey" = "8:_F97BA7EB0FE647F783C69DF80743AD47"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_96582953F6FF475C9F02260168E445C5"
-        "OwnerKey" = "8:_27F6232758E74242B76F5586E7EE0639"
+        "MsmKey" = "8:_56A66C1EB2662D6C9F7CF7F5CE572B37"
+        "OwnerKey" = "8:_F950B6FCF2DE412DA30583EF02B72C2D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E7D92EC5644796D7011E5861A23D27CB"
-        "OwnerKey" = "8:_F97BA7EB0FE647F783C69DF80743AD47"
+        "MsmKey" = "8:_56A66C1EB2662D6C9F7CF7F5CE572B37"
+        "OwnerKey" = "8:_27F6232758E74242B76F5586E7EE0639"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_F950B6FCF2DE412DA30583EF02B72C2D"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_DF1EDC32EF4019D3D4B5CD76879A1444"
+        "OwnerKey" = "8:_0948829C26A0484E8DDD2D3FADDC8C09"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_F97BA7EB0FE647F783C69DF80743AD47"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_DF1EDC32EF4019D3D4B5CD76879A1444"
+        "OwnerKey" = "8:_F97BA7EB0FE647F783C69DF80743AD47"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_FDD9BCF2DF46C3C7EE8839F22E3C3D3A"
-        "OwnerKey" = "8:_0948829C26A0484E8DDD2D3FADDC8C09"
+        "MsmKey" = "8:_DF1EDC32EF4019D3D4B5CD76879A1444"
+        "OwnerKey" = "8:_27F6232758E74242B76F5586E7EE0639"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_FF164B672C6744978DA3760EC6CBFB8E"
-        "OwnerKey" = "8:_0948829C26A0484E8DDD2D3FADDC8C09"
+        "MsmKey" = "8:_F950B6FCF2DE412DA30583EF02B72C2D"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_FF164B672C6744978DA3760EC6CBFB8E"
-        "OwnerKey" = "8:_FDD9BCF2DF46C3C7EE8839F22E3C3D3A"
+        "MsmKey" = "8:_F97BA7EB0FE647F783C69DF80743AD47"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
-        "Entry"
-        {
-        "MsmKey" = "8:_FF164B672C6744978DA3760EC6CBFB8E"
-        "OwnerKey" = "8:_F950B6FCF2DE412DA30583EF02B72C2D"
-        "MsmSig" = "8:_UNDEFINED"
-        }
     }
     "Configurations"
     {
@@ -174,10 +168,21 @@
         }
         "File"
         {
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_E7D92EC5644796D7011E5861A23D27CB"
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_4E4F1C23C076E63F413C2DA8CAC18E79"
             {
-            "SourcePath" = "8:msxml3.dll"
-            "TargetName" = "8:msxml3.dll"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:libiWrapper, Version=1.0.1700.36344, Culture=neutral"
+                "ScatterAssemblies"
+                {
+                    "_4E4F1C23C076E63F413C2DA8CAC18E79"
+                    {
+                    "Name" = "8:libiwrapper.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:libiwrapper.dll"
+            "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_BF4397A716F8470183C478AC3C8212AE"
             "Condition" = "8:"
@@ -189,26 +194,15 @@
             "Permanent" = "11:FALSE"
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
-            "Register" = "3:4"
+            "Register" = "3:1"
             "Exclude" = "11:TRUE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_FDD9BCF2DF46C3C7EE8839F22E3C3D3A"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_56A66C1EB2662D6C9F7CF7F5CE572B37"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:libiWrapper, Version=1.0.1670.23543, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_FDD9BCF2DF46C3C7EE8839F22E3C3D3A"
-                    {
-                    "Name" = "8:libiwrapper.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:libiwrapper.dll"
-            "TargetName" = "8:"
+            "SourcePath" = "8:MSVCR71D.dll"
+            "TargetName" = "8:MSVCR71D.dll"
             "Tag" = "8:"
             "Folder" = "8:_BF4397A716F8470183C478AC3C8212AE"
             "Condition" = "8:"
@@ -221,10 +215,30 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:TRUE"
+            "Exclude" = "11:FALSE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_DF1EDC32EF4019D3D4B5CD76879A1444"
+            {
+            "SourcePath" = "8:MSVCP71D.dll"
+            "TargetName" = "8:MSVCP71D.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_BF4397A716F8470183C478AC3C8212AE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
         }
         "FileType"
         {
@@ -778,38 +792,10 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_256C53C724C145DD92FF859AF47D11D0"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_2DB4272DB9E147BEBEED0BB7A0F0175D"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_96582953F6FF475C9F02260168E445C5"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_FF164B672C6744978DA3760EC6CBFB8E"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
             "SourcePath" = "8:dotnetfxredist_x86.msm"
                 "Properties"
                 {

Modified: trunk/oggdsf/build/XiphCoreLibs/XiphCoreLibs.vdproj
===================================================================
--- trunk/oggdsf/build/XiphCoreLibs/XiphCoreLibs.vdproj	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/build/XiphCoreLibs/XiphCoreLibs.vdproj	2004-08-30 19:08:38 UTC (rev 7666)
@@ -34,23 +34,11 @@
         "Entry"
         {
         "MsmKey" = "8:_BF671A3FCECE81CB5B6615E636C543F9"
-        "OwnerKey" = "8:_A60D5EE3D8B74B42BF2AF32A5F2D6726"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_BF671A3FCECE81CB5B6615E636C543F9"
         "OwnerKey" = "8:_9297F69221344C25876DCB6577CD4340"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_BF671A3FCECE81CB5B6615E636C543F9"
-        "OwnerKey" = "8:_FC4C0390D8BC485BB6D95E4837ECE7B2"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_FC4C0390D8BC485BB6D95E4837ECE7B2"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -691,7 +679,7 @@
         {
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_85BFDA4CE716439F99B132912ED31125"
             {
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\libs\\libspeex\\win32\\libspeex\\Debug\\libspeex.lib"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\libs\\libspeex\\win32\\libspeex\\Release\\libspeex.lib"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_35F67CC352C846C79B8F731AE14D6640"
@@ -719,7 +707,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_9297F69221344C25876DCB6577CD4340"
             {
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Debug\\vorbis_d.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Release\\vorbis.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_35F67CC352C846C79B8F731AE14D6640"
@@ -747,7 +735,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A60D5EE3D8B74B42BF2AF32A5F2D6726"
             {
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libogg\\win32\\Dynamic_Debug\\ogg_d.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libogg\\win32\\Dynamic_Release\\libogg.lib"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_35F67CC352C846C79B8F731AE14D6640"
@@ -775,7 +763,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_FC4C0390D8BC485BB6D95E4837ECE7B2"
             {
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libtheora\\win32\\libtheora\\Debug\\libtheora.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libtheora\\win32\\libtheora\\Release\\libtheora.lib"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_35F67CC352C846C79B8F731AE14D6640"

Modified: trunk/oggdsf/build/libFishSoundWithToolsAndTests/libFishSoundWithToolsAndTests.vdproj
===================================================================
--- trunk/oggdsf/build/libFishSoundWithToolsAndTests/libFishSoundWithToolsAndTests.vdproj	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/build/libFishSoundWithToolsAndTests/libFishSoundWithToolsAndTests.vdproj	2004-08-30 19:08:38 UTC (rev 7666)
@@ -21,20 +21,20 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_96E8D4E9AC634EBDA2A61EB30C4FC497"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_93E659412413F18081860F16DA3C466B"
+        "OwnerKey" = "8:_28CCE3E286304EA1AFE50DB7B2DE97F8"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_FB6E4BEAFF4D41B091A7389DAEAAF741"
+        "MsmKey" = "8:_93E659412413F18081860F16DA3C466B"
         "OwnerKey" = "8:_96E8D4E9AC634EBDA2A61EB30C4FC497"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_FB6E4BEAFF4D41B091A7389DAEAAF741"
-        "OwnerKey" = "8:_28CCE3E286304EA1AFE50DB7B2DE97F8"
+        "MsmKey" = "8:_96E8D4E9AC634EBDA2A61EB30C4FC497"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -95,6 +95,26 @@
         }
         "File"
         {
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_93E659412413F18081860F16DA3C466B"
+            {
+            "SourcePath" = "8:MSVCR71D.dll"
+            "TargetName" = "8:MSVCR71D.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_398A5F7D291247B7826810E37F282369"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
         }
         "FileType"
         {
@@ -648,20 +668,6 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_FB6E4BEAFF4D41B091A7389DAEAAF741"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
         }
         "ProjectOutput"
         {

Modified: trunk/oggdsf/build/libOOOggWithToolsAndTests/libOOOggWithToolsAndTests.vdproj
===================================================================
--- trunk/oggdsf/build/libOOOggWithToolsAndTests/libOOOggWithToolsAndTests.vdproj	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/build/libOOOggWithToolsAndTests/libOOOggWithToolsAndTests.vdproj	2004-08-30 19:08:38 UTC (rev 7666)
@@ -58,12 +58,6 @@
         "Entry"
         {
         "MsmKey" = "8:_BBD7397A8E5F1E7433D3C7836DB3EE7F"
-        "OwnerKey" = "8:_33A59244EB2841E5B6DD26D2B0A96CA0"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_BBD7397A8E5F1E7433D3C7836DB3EE7F"
         "OwnerKey" = "8:_FC3DA72FCAAA4F0E8B31462D44B32FD6"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -76,12 +70,6 @@
         "Entry"
         {
         "MsmKey" = "8:_BBD7397A8E5F1E7433D3C7836DB3EE7F"
-        "OwnerKey" = "8:_C0BA320CDA794057812E2CF28F5EA94C"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_BBD7397A8E5F1E7433D3C7836DB3EE7F"
         "OwnerKey" = "8:_9EB1B54CEB1D40979ADA34E55D07BB22"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -100,7 +88,7 @@
         "Entry"
         {
         "MsmKey" = "8:_BBD7397A8E5F1E7433D3C7836DB3EE7F"
-        "OwnerKey" = "8:_26C0712619CB412782A4FF601E1D24E9"
+        "OwnerKey" = "8:_33A59244EB2841E5B6DD26D2B0A96CA0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -118,12 +106,6 @@
         "Entry"
         {
         "MsmKey" = "8:_DCF47080823151CD8BF79A8AE0EA1C5D"
-        "OwnerKey" = "8:_33A59244EB2841E5B6DD26D2B0A96CA0"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_DCF47080823151CD8BF79A8AE0EA1C5D"
         "OwnerKey" = "8:_FC3DA72FCAAA4F0E8B31462D44B32FD6"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -136,12 +118,6 @@
         "Entry"
         {
         "MsmKey" = "8:_DCF47080823151CD8BF79A8AE0EA1C5D"
-        "OwnerKey" = "8:_C0BA320CDA794057812E2CF28F5EA94C"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_DCF47080823151CD8BF79A8AE0EA1C5D"
         "OwnerKey" = "8:_9EB1B54CEB1D40979ADA34E55D07BB22"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -160,7 +136,7 @@
         "Entry"
         {
         "MsmKey" = "8:_DCF47080823151CD8BF79A8AE0EA1C5D"
-        "OwnerKey" = "8:_26C0712619CB412782A4FF601E1D24E9"
+        "OwnerKey" = "8:_33A59244EB2841E5B6DD26D2B0A96CA0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -837,7 +813,7 @@
         {
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_15D86BBDBB4144F5959F2C5175939D6C"
             {
-            "SourcePath" = "8:..\\..\\src\\lib\\helper\\libilliCore\\Debug\\libilliCore.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\helper\\libilliCore\\Release\\libilliCore.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_ADE7E20E4D77439FB3A1B61B3F803F3B"
@@ -893,7 +869,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_33A59244EB2841E5B6DD26D2B0A96CA0"
             {
-            "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Debug\\OOOggCommentDump.exe"
+            "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Release\\OOOggCommentDump.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_ADE7E20E4D77439FB3A1B61B3F803F3B"
@@ -921,7 +897,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_9061237CE81A4BAC9A988D1713DCE01A"
             {
-            "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Debug\\OOOggValidate.exe"
+            "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Release\\OOOggValidate.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_ADE7E20E4D77439FB3A1B61B3F803F3B"
@@ -949,7 +925,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_9BF479E16E8E489CA7D9F11A166F5612"
             {
-            "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Debug\\OOOggDump.exe"
+            "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Release\\OOOggDump.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_ADE7E20E4D77439FB3A1B61B3F803F3B"
@@ -977,7 +953,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_9EB1B54CEB1D40979ADA34E55D07BB22"
             {
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Debug\\libOOOgg.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Release\\libOOOgg.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_ADE7E20E4D77439FB3A1B61B3F803F3B"
@@ -1005,7 +981,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_C0BA320CDA794057812E2CF28F5EA94C"
             {
-            "SourcePath" = "8:..\\..\\src\\tests\\testCircleBuffer\\Debug\\testCircleBuffer.exe"
+            "SourcePath" = "8:..\\..\\src\\tests\\testCircleBuffer\\Release\\testCircleBuffer.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_ADE7E20E4D77439FB3A1B61B3F803F3B"
@@ -1033,7 +1009,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DFF78663650B4CF0A485185D63D04FB5"
             {
-            "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Debug\\OOOggStat.exe"
+            "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Release\\OOOggStat.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_ADE7E20E4D77439FB3A1B61B3F803F3B"
@@ -1089,7 +1065,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_FC3DA72FCAAA4F0E8B31462D44B32FD6"
             {
-            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Debug\\libVorbisComment.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Release\\libVorbisComment.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_ADE7E20E4D77439FB3A1B61B3F803F3B"

Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj	2004-08-30 19:08:38 UTC (rev 7666)
@@ -81,762 +81,534 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_47225549A24F5D369822BE937CA1B1ED"
-        "OwnerKey" = "8:_585CCFE6D7240D5E8FE18F714EBE7445"
+        "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+        "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_47225549A24F5D369822BE937CA1B1ED"
-        "OwnerKey" = "8:_AA7CFEB795610E8A0A36E21EE484E892"
+        "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+        "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_47225549A24F5D369822BE937CA1B1ED"
-        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
+        "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_47225549A24F5D369822BE937CA1B1ED"
-        "OwnerKey" = "8:_DAE083F8E57A4B28B67607B3FB4826E5"
+        "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_47225549A24F5D369822BE937CA1B1ED"
-        "OwnerKey" = "8:_8B196B598C8B4033B13B43E0E7A63185"
+        "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+        "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_47225549A24F5D369822BE937CA1B1ED"
-        "OwnerKey" = "8:_7F96FF7D00B84764BBB42C4AA1EEAF39"
+        "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_47225549A24F5D369822BE937CA1B1ED"
-        "OwnerKey" = "8:_ED6FE6CF465CB58CEF4CEC2211C5BC52"
+        "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_47225549A24F5D369822BE937CA1B1ED"
-        "OwnerKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
+        "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
-        "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+        "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
-        "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+        "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+        "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+        "MsmKey" = "8:_65EFE52655DF4119A626446C8F593760"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+        "MsmKey" = "8:_695A6D70DADB417491C0662D82245C2B"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
-        "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+        "MsmKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+        "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_585CCFE6D7240D5E8FE18F714EBE7445"
-        "OwnerKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
+        "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_585CCFE6D7240D5E8FE18F714EBE7445"
-        "OwnerKey" = "8:_AA7CFEB795610E8A0A36E21EE484E892"
+        "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_585CCFE6D7240D5E8FE18F714EBE7445"
-        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
+        "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+        "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
-        "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
-        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
-        "OwnerKey" = "8:_DAE083F8E57A4B28B67607B3FB4826E5"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_B721259605524EFE965E8E131C1558D5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
-        "OwnerKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_695A6D70DADB417491C0662D82245C2B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_65EFE52655DF4119A626446C8F593760"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
         "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
-        "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
-        "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
-        "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
-        "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
-        "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_626292098059483FBAB1B81AA623F179"
-        "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_65EFE52655DF4119A626446C8F593760"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_9D218E3BE88D45308FB631B88D172C28"
+        "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_695A6D70DADB417491C0662D82245C2B"
+        "MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_6F3796EC49CD4C9CBDDD077F059CA73B"
+        "MsmKey" = "8:_AC8962A7F212481095173AB7C8C89025"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
+        "MsmKey" = "8:_B721259605524EFE965E8E131C1558D5"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
+        "MsmKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_7F96FF7D00B84764BBB42C4AA1EEAF39"
+        "MsmKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_D7835E050C942DE27CB20AF3D1EC70F4"
+        "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
+        "MsmKey" = "8:_D9BE90D398094F15B881B22369C3A231"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+        "MsmKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8B196B598C8B4033B13B43E0E7A63185"
+        "MsmKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+        "MsmKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+        "MsmKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
+        "MsmKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_AA7CFEB795610E8A0A36E21EE484E892"
-        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_AC8962A7F212481095173AB7C8C89025"
+        "MsmKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_B356F3D2B0EA418486DF89F7F8ED7998"
-        "OwnerKey" = "8:_6F3796EC49CD4C9CBDDD077F059CA73B"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_B356F3D2B0EA418486DF89F7F8ED7998"
-        "OwnerKey" = "8:_AA7CFEB795610E8A0A36E21EE484E892"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_B356F3D2B0EA418486DF89F7F8ED7998"
-        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_B356F3D2B0EA418486DF89F7F8ED7998"
-        "OwnerKey" = "8:_DAE083F8E57A4B28B67607B3FB4826E5"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_B356F3D2B0EA418486DF89F7F8ED7998"
-        "OwnerKey" = "8:_8B196B598C8B4033B13B43E0E7A63185"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_B356F3D2B0EA418486DF89F7F8ED7998"
-        "OwnerKey" = "8:_ED6FE6CF465CB58CEF4CEC2211C5BC52"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_B356F3D2B0EA418486DF89F7F8ED7998"
-        "OwnerKey" = "8:_7F96FF7D00B84764BBB42C4AA1EEAF39"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_B356F3D2B0EA418486DF89F7F8ED7998"
-        "OwnerKey" = "8:_47225549A24F5D369822BE937CA1B1ED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_B356F3D2B0EA418486DF89F7F8ED7998"
-        "OwnerKey" = "8:_585CCFE6D7240D5E8FE18F714EBE7445"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_B356F3D2B0EA418486DF89F7F8ED7998"
-        "OwnerKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_B721259605524EFE965E8E131C1558D5"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_DAE083F8E57A4B28B67607B3FB4826E5"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_B721259605524EFE965E8E131C1558D5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_8B196B598C8B4033B13B43E0E7A63185"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_7F96FF7D00B84764BBB42C4AA1EEAF39"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_79FF0B1DD62A45B4AC907B30008DA5D2"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_6F3796EC49CD4C9CBDDD077F059CA73B"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_695A6D70DADB417491C0662D82245C2B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_65EFE52655DF4119A626446C8F593760"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
-        "OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C2A615F8603E4749B90749EBB90FFE23"
+        "MsmKey" = "8:_F241F6D28A454A14B64CE2BE16A63A86"
         "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_D7835E050C942DE27CB20AF3D1EC70F4"
-        "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_D9BE90D398094F15B881B22369C3A231"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_DAE083F8E57A4B28B67607B3FB4826E5"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_ED6FE6CF465CB58CEF4CEC2211C5BC52"
-        "OwnerKey" = "8:_7F96FF7D00B84764BBB42C4AA1EEAF39"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_EE4A127518E84295835DA5640EBB17B2"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -892,13 +664,6 @@
         {
             "LaunchCondition"
             {
-                "{2522A265-4974-4402-83C5-3B575A2E935A}:_DCE8BBD956374862B7189CD44BFF7562"
-                {
-                "Name" = "8:.NET Framework"
-                "Message" = "8:[VSDNETMSG]"
-                "SupportedRuntimes" = "8:1.1.4322"
-                "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=9832"
-                }
             }
         }
         "Feature"
@@ -966,37 +731,6 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_47225549A24F5D369822BE937CA1B1ED"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:libiWrapper, Version=1.0.1688.40268, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_47225549A24F5D369822BE937CA1B1ED"
-                    {
-                    "Name" = "8:libiwrapper.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:libiwrapper.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_4812D148C77C9833CE1C0D8D175B84A4"
             {
             "SourcePath" = "8:msxml3.dll"
@@ -1037,21 +771,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_585CCFE6D7240D5E8FE18F714EBE7445"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_655D5383153A6AB10D15352A7EABCC7A"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:libCMMLTagsDotNET, Version=1.0.1688.42808, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_585CCFE6D7240D5E8FE18F714EBE7445"
-                    {
-                    "Name" = "8:libcmmltagsdotnet.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:libcmmltagsdotnet.dll"
-            "TargetName" = "8:"
+            "SourcePath" = "8:MSVCR71D.dll"
+            "TargetName" = "8:MSVCR71D.dll"
             "Tag" = "8:"
             "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
             "Condition" = "8:"
@@ -1088,37 +811,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_AA7CFEB795610E8A0A36E21EE484E892"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:libDSPlayDotNET, Version=1.0.1688.42817, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_AA7CFEB795610E8A0A36E21EE484E892"
-                    {
-                    "Name" = "8:libDSPlayDotNET.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:libDSPlayDotNET.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_D7835E050C942DE27CB20AF3D1EC70F4"
             {
             "SourcePath" = "8:libFLAC.dll"
@@ -1159,37 +851,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_ED6FE6CF465CB58CEF4CEC2211C5BC52"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:libVorbisCommentDotNET, Version=1.0.1688.42820, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_ED6FE6CF465CB58CEF4CEC2211C5BC52"
-                    {
-                    "Name" = "8:libVorbisCommentDotNET.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:libVorbisCommentDotNET.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
         }
         "FileType"
         {
@@ -1246,7 +907,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:oggcodecs"
         "ProductCode" = "8:{581AEA36-0A4B-4726-BD3B-1A63ED074627}"
-        "PackageCode" = "8:{38FF81D0-3C9F-4402-A2FE-832A4474710B}"
+        "PackageCode" = "8:{56AE0DCE-0343-4BB9-AFFD-EB1355E555F6}"
         "UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
@@ -2619,11 +2280,11 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_626292098059483FBAB1B81AA623F179"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_9D218E3BE88D45308FB631B88D172C28"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"
+            "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
                 "Properties"
                 {
                 }
@@ -2633,28 +2294,14 @@
             "Feature" = "8:"
             "IsolateTo" = "8:"
             }
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_B356F3D2B0EA418486DF89F7F8ED7998"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_F241F6D28A454A14B64CE2BE16A63A86"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:dotnetfxredist_x86.msm"
+            "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"
                 "Properties"
                 {
                 }
-            "LanguageId" = "3:1033"
-            "Exclude" = "11:TRUE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_C2A615F8603E4749B90749EBB90FFE23"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
-                "Properties"
-                {
-                }
             "LanguageId" = "3:0"
             "Exclude" = "11:FALSE"
             "Folder" = "8:"
@@ -3112,34 +2759,6 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_6F3796EC49CD4C9CBDDD077F059CA73B"
-            {
-            "SourcePath" = "8:..\\..\\src\\lib\\helper\\libiWrapper\\Release\\libiWrapper.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            "ProjectOutputGroupRegister" = "3:1"
-            "OutputConfiguration" = "8:"
-            "OutputGroupCanonicalName" = "8:Built"
-            "OutputProjectGuid" = "8:{FCFE729D-EADE-45BA-9506-7E82A46403F7}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_72A8CAFC6236498AA2DE5E1CBCAFC91B"
             {
             "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractAudioDecoder\\Release\\dsfAbstracOggAudioDecoder.dll"
@@ -3168,62 +2787,6 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_79FF0B1DD62A45B4AC907B30008DA5D2"
-            {
-            "SourcePath" = "8:..\\..\\src\\lib\\player\\libDSPlayDotNET\\Release\\libDSPlayDotNET.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            "ProjectOutputGroupRegister" = "3:1"
-            "OutputConfiguration" = "8:"
-            "OutputGroupCanonicalName" = "8:Built"
-            "OutputProjectGuid" = "8:{E274665B-12E3-4C7F-A749-FAB0C0A73522}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_7F96FF7D00B84764BBB42C4AA1EEAF39"
-            {
-            "SourcePath" = "8:..\\..\\src\\tools\\iOCE\\obj\\Release\\iOCE.exe"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            "ProjectOutputGroupRegister" = "3:1"
-            "OutputConfiguration" = "8:"
-            "OutputGroupCanonicalName" = "8:Built"
-            "OutputProjectGuid" = "8:{8BFD6626-7D04-4DB8-836C-767DBD256F33}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_83AF8D74700947168B69E69E5160F082"
             {
             "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC.dll"
@@ -3280,34 +2843,6 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8B196B598C8B4033B13B43E0E7A63185"
-            {
-            "SourcePath" = "8:..\\..\\sln\\oggdsf_all\\release\\libVorbisCommentDotNET.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            "ProjectOutputGroupRegister" = "3:1"
-            "OutputConfiguration" = "8:"
-            "OutputGroupCanonicalName" = "8:Built"
-            "OutputProjectGuid" = "8:{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8D9A2E4C592D4118B80A4AE8394D8963"
             {
             "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Release\\dsfSpeexEncoder.dll"
@@ -3504,34 +3039,6 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DAE083F8E57A4B28B67607B3FB4826E5"
-            {
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTagsDotNET\\Release\\libCMMLTagsDotNET.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            "ProjectOutputGroupRegister" = "3:1"
-            "OutputConfiguration" = "8:"
-            "OutputGroupCanonicalName" = "8:Built"
-            "OutputProjectGuid" = "8:{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DB60960DC12343B89500B86D5AB10D02"
             {
             "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC++.dll"
@@ -3672,34 +3179,6 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EE4A127518E84295835DA5640EBB17B2"
-            {
-            "SourcePath" = "8:..\\..\\src\\tools\\DNPlay\\obj\\Release\\DNPlay.exe"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            "ProjectOutputGroupRegister" = "3:1"
-            "OutputConfiguration" = "8:"
-            "OutputGroupCanonicalName" = "8:Built"
-            "OutputProjectGuid" = "8:{D3BA9CBE-5718-40BF-A8B8-FBA28F994423}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EFEA71FFF2864107815DBDECCCCA1178"
             {
             "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Release\\dsfVorbisDecoder.dll"

Modified: trunk/oggdsf/build/oggcodecsDirectshowDecodeOnly/oggcodecsDirectshowDecodeOnly.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecsDirectshowDecodeOnly/oggcodecsDirectshowDecodeOnly.vdproj	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/build/oggcodecsDirectshowDecodeOnly/oggcodecsDirectshowDecodeOnly.vdproj	2004-08-30 19:08:38 UTC (rev 7666)
@@ -15,244 +15,238 @@
     {
         "Entry"
         {
-        "MsmKey" = "8:_0C771AE044E648AD8873CBEEC4FD58A9"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_00B87E5A6E6CDB16FBE2EFCA49B3DA8A"
+        "OwnerKey" = "8:_E70206CFFDDC432C90E1B7D983A4C202"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_32E62E7624F44AC0BD7AD734792DBBF1"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_0876C0391469C5B83D35AEF37C1B12EC"
+        "OwnerKey" = "8:_0C771AE044E648AD8873CBEEC4FD58A9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_3E6DE61600F848E2BD66D5198275C29C"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_0876C0391469C5B83D35AEF37C1B12EC"
+        "OwnerKey" = "8:_EB87A539D53840C290A91B6AD25E581C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_44AD2291642745D2BB2532256BE18BD6"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_0876C0391469C5B83D35AEF37C1B12EC"
+        "OwnerKey" = "8:_E692141C62A24ACB8B5B7B3F7A2EBE10"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_54D222ED79094DC68F9CC05EC4938D60"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_0876C0391469C5B83D35AEF37C1B12EC"
+        "OwnerKey" = "8:_D7AFAA18153B45258645F7996F58E088"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61D2F5593816A4288D4F5E04C16E2131"
-        "OwnerKey" = "8:_7A0AC01868BC40D9B0C6C97E9B35879F"
+        "MsmKey" = "8:_0876C0391469C5B83D35AEF37C1B12EC"
+        "OwnerKey" = "8:_C41DECD585594D188528766AD607C52B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_7A0AC01868BC40D9B0C6C97E9B35879F"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_0876C0391469C5B83D35AEF37C1B12EC"
+        "OwnerKey" = "8:_7A0AC01868BC40D9B0C6C97E9B35879F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_BA195CF331B88FF8284A11058F549B4F"
-        "OwnerKey" = "8:_E70206CFFDDC432C90E1B7D983A4C202"
+        "MsmKey" = "8:_0876C0391469C5B83D35AEF37C1B12EC"
+        "OwnerKey" = "8:_54D222ED79094DC68F9CC05EC4938D60"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C033CFC071A5461A9CA3AB272C053739"
+        "MsmKey" = "8:_0C771AE044E648AD8873CBEEC4FD58A9"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C41DECD585594D188528766AD607C52B"
+        "MsmKey" = "8:_32E62E7624F44AC0BD7AD734792DBBF1"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C78B7A41D4214DD6A316AE5DD6366F36"
+        "MsmKey" = "8:_3E6DE61600F848E2BD66D5198275C29C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_D5F1F21AEE5342D4A33CDA236CF8DA17"
+        "MsmKey" = "8:_44AD2291642745D2BB2532256BE18BD6"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_D7AFAA18153B45258645F7996F58E088"
+        "MsmKey" = "8:_54D222ED79094DC68F9CC05EC4938D60"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_EB87A539D53840C290A91B6AD25E581C"
+        "MsmKey" = "8:_61D2F5593816A4288D4F5E04C16E2131"
+        "OwnerKey" = "8:_7A0AC01868BC40D9B0C6C97E9B35879F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_44AD2291642745D2BB2532256BE18BD6"
+        "MsmKey" = "8:_7A0AC01868BC40D9B0C6C97E9B35879F"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_C41DECD585594D188528766AD607C52B"
+        "MsmKey" = "8:_C033CFC071A5461A9CA3AB272C053739"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_E692141C62A24ACB8B5B7B3F7A2EBE10"
+        "MsmKey" = "8:_C41DECD585594D188528766AD607C52B"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_54D222ED79094DC68F9CC05EC4938D60"
+        "MsmKey" = "8:_C78B7A41D4214DD6A316AE5DD6366F36"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_E70206CFFDDC432C90E1B7D983A4C202"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_0C771AE044E648AD8873CBEEC4FD58A9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_C033CFC071A5461A9CA3AB272C053739"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_EB87A539D53840C290A91B6AD25E581C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_DD581EFD9D194289A875E01B0EC94B7B"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_E70206CFFDDC432C90E1B7D983A4C202"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_3E6DE61600F848E2BD66D5198275C29C"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_E692141C62A24ACB8B5B7B3F7A2EBE10"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_0C771AE044E648AD8873CBEEC4FD58A9"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_DD581EFD9D194289A875E01B0EC94B7B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_32E62E7624F44AC0BD7AD734792DBBF1"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_D7AFAA18153B45258645F7996F58E088"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
         "OwnerKey" = "8:_D5F1F21AEE5342D4A33CDA236CF8DA17"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_7A0AC01868BC40D9B0C6C97E9B35879F"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_C78B7A41D4214DD6A316AE5DD6366F36"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_D7AFAA18153B45258645F7996F58E088"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_C41DECD585594D188528766AD607C52B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DB96D94096994B318F57D9195527B926"
-        "OwnerKey" = "8:_C78B7A41D4214DD6A316AE5DD6366F36"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_C033CFC071A5461A9CA3AB272C053739"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_DD581EFD9D194289A875E01B0EC94B7B"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_7A0AC01868BC40D9B0C6C97E9B35879F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E692141C62A24ACB8B5B7B3F7A2EBE10"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_54D222ED79094DC68F9CC05EC4938D60"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_E70206CFFDDC432C90E1B7D983A4C202"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_44AD2291642745D2BB2532256BE18BD6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_EB87A539D53840C290A91B6AD25E581C"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_3E6DE61600F848E2BD66D5198275C29C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_EED44C7D446349BCB113E2966CF9DFF4"
-        "OwnerKey" = "8:_EB87A539D53840C290A91B6AD25E581C"
+        "MsmKey" = "8:_D3D2A5A73D658E1656089DFEB1E81119"
+        "OwnerKey" = "8:_32E62E7624F44AC0BD7AD734792DBBF1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_EED44C7D446349BCB113E2966CF9DFF4"
-        "OwnerKey" = "8:_E692141C62A24ACB8B5B7B3F7A2EBE10"
+        "MsmKey" = "8:_D5F1F21AEE5342D4A33CDA236CF8DA17"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_EED44C7D446349BCB113E2966CF9DFF4"
-        "OwnerKey" = "8:_54D222ED79094DC68F9CC05EC4938D60"
+        "MsmKey" = "8:_D7AFAA18153B45258645F7996F58E088"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_EED44C7D446349BCB113E2966CF9DFF4"
-        "OwnerKey" = "8:_0C771AE044E648AD8873CBEEC4FD58A9"
+        "MsmKey" = "8:_DD581EFD9D194289A875E01B0EC94B7B"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_EED44C7D446349BCB113E2966CF9DFF4"
-        "OwnerKey" = "8:_32E62E7624F44AC0BD7AD734792DBBF1"
+        "MsmKey" = "8:_E692141C62A24ACB8B5B7B3F7A2EBE10"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_EED44C7D446349BCB113E2966CF9DFF4"
-        "OwnerKey" = "8:_7A0AC01868BC40D9B0C6C97E9B35879F"
+        "MsmKey" = "8:_E70206CFFDDC432C90E1B7D983A4C202"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_EED44C7D446349BCB113E2966CF9DFF4"
-        "OwnerKey" = "8:_D7AFAA18153B45258645F7996F58E088"
+        "MsmKey" = "8:_EB87A539D53840C290A91B6AD25E581C"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
-        "Entry"
-        {
-        "MsmKey" = "8:_EED44C7D446349BCB113E2966CF9DFF4"
-        "OwnerKey" = "8:_C78B7A41D4214DD6A316AE5DD6366F36"
-        "MsmSig" = "8:_UNDEFINED"
-        }
     }
     "Configurations"
     {
@@ -311,6 +305,46 @@
         }
         "File"
         {
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_00B87E5A6E6CDB16FBE2EFCA49B3DA8A"
+            {
+            "SourcePath" = "8:libFLAC.dll"
+            "TargetName" = "8:libFLAC.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_750D5E929B7E43B2BA1A512EC03A125A"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_0876C0391469C5B83D35AEF37C1B12EC"
+            {
+            "SourcePath" = "8:MSVCP71D.dll"
+            "TargetName" = "8:MSVCP71D.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_750D5E929B7E43B2BA1A512EC03A125A"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_61D2F5593816A4288D4F5E04C16E2131"
             {
             "SourcePath" = "8:WSOCK32.dll"
@@ -331,10 +365,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_BA195CF331B88FF8284A11058F549B4F"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_D3D2A5A73D658E1656089DFEB1E81119"
             {
-            "SourcePath" = "8:libFLAC.dll"
-            "TargetName" = "8:libFLAC.dll"
+            "SourcePath" = "8:MSVCR71D.dll"
+            "TargetName" = "8:MSVCR71D.dll"
             "Tag" = "8:"
             "Folder" = "8:_750D5E929B7E43B2BA1A512EC03A125A"
             "Condition" = "8:"
@@ -347,7 +381,7 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:TRUE"
+            "Exclude" = "11:FALSE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
@@ -904,34 +938,6 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_DB96D94096994B318F57D9195527B926"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_EED44C7D446349BCB113E2966CF9DFF4"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
         }
         "ProjectOutput"
         {

Modified: trunk/oggdsf/build/oggcodecsDirectshowOnly/oggcodecsDirectshowOnly.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecsDirectshowOnly/oggcodecsDirectshowOnly.vdproj	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/build/oggcodecsDirectshowOnly/oggcodecsDirectshowOnly.vdproj	2004-08-30 19:08:38 UTC (rev 7666)
@@ -27,234 +27,210 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_2D339B5E717E47FC9EC803E4D6E0D8A7"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
+        "OwnerKey" = "8:_12187BF235FE463FA037BD632C78F601"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_30644D7D3D034BEB970A07F90F3E5D30"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
+        "OwnerKey" = "8:_FE3019A7F5454B14B0D9B353E4979EE9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
-        "OwnerKey" = "8:_27F23D4653BC47D1A4EC976817957C6C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
+        "OwnerKey" = "8:_F328FE4E1A7D440DA37A601EB6761327"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
-        "OwnerKey" = "8:_CD970ABA810745BB82E57C5839DABFC6"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
-        "OwnerKey" = "8:_12187BF235FE463FA037BD632C78F601"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_EA7442174FD24C288C0A58AC0FEA93FA"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
-        "OwnerKey" = "8:_C95FB42FBB5144A799BED5FEF0A1EF35"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
+        "OwnerKey" = "8:_E23F5D57A8784F4A9191FF849D5F4310"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
-        "OwnerKey" = "8:_FE3019A7F5454B14B0D9B353E4979EE9"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
+        "OwnerKey" = "8:_CED0C75065174049AD8704265EB5D948"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
-        "OwnerKey" = "8:_F328FE4E1A7D440DA37A601EB6761327"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
+        "OwnerKey" = "8:_CD970ABA810745BB82E57C5839DABFC6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
-        "OwnerKey" = "8:_E23F5D57A8784F4A9191FF849D5F4310"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
+        "OwnerKey" = "8:_CBDEBD728D034820925FAD989DCE5308"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
-        "OwnerKey" = "8:_CED0C75065174049AD8704265EB5D948"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
+        "OwnerKey" = "8:_CB06643F88184B91A105524E09310944"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
-        "OwnerKey" = "8:_CBDEBD728D034820925FAD989DCE5308"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
+        "OwnerKey" = "8:_C95FB42FBB5144A799BED5FEF0A1EF35"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
-        "OwnerKey" = "8:_CB06643F88184B91A105524E09310944"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_B8C35D5641C049FBA6587260DB4181D8"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_B6603D50B3154CF890C49D47A8134CC0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_B5C6A48CF16F4C7294FCC08761FA316A"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_A8998EDE41F6458BA1968337AD8F3A3D"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_9FC01D0F4DCF4B11B17A6082012C4D25"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_9CF46B96BAC940798335DD33376A52E3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_764F16893A924C2EA9C686295C714976"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_75CA99E80B1C4BB7B9377B8CFB847612"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_6C486993DD9A446A82870C69EA210F2F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_30644D7D3D034BEB970A07F90F3E5D30"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_41807F1874C64B7BA370CCEAEA74C40C"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_2D339B5E717E47FC9EC803E4D6E0D8A7"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
+        "MsmKey" = "8:_29D45A1D2CB66EAB12036B2E10A80C1F"
         "OwnerKey" = "8:_27F23D4653BC47D1A4EC976817957C6C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-        "OwnerKey" = "8:_EA7442174FD24C288C0A58AC0FEA93FA"
+        "MsmKey" = "8:_2D339B5E717E47FC9EC803E4D6E0D8A7"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-        "OwnerKey" = "8:_C95FB42FBB5144A799BED5FEF0A1EF35"
+        "MsmKey" = "8:_30644D7D3D034BEB970A07F90F3E5D30"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-        "OwnerKey" = "8:_FE3019A7F5454B14B0D9B353E4979EE9"
+        "MsmKey" = "8:_5CE91ED102293917CFEB6899BDE33703"
+        "OwnerKey" = "8:_27F23D4653BC47D1A4EC976817957C6C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-        "OwnerKey" = "8:_CED0C75065174049AD8704265EB5D948"
+        "MsmKey" = "8:_5CE91ED102293917CFEB6899BDE33703"
+        "OwnerKey" = "8:_FE3019A7F5454B14B0D9B353E4979EE9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-        "OwnerKey" = "8:_B8C35D5641C049FBA6587260DB4181D8"
+        "MsmKey" = "8:_5CE91ED102293917CFEB6899BDE33703"
+        "OwnerKey" = "8:_F328FE4E1A7D440DA37A601EB6761327"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-        "OwnerKey" = "8:_B6603D50B3154CF890C49D47A8134CC0"
+        "MsmKey" = "8:_5CE91ED102293917CFEB6899BDE33703"
+        "OwnerKey" = "8:_EA7442174FD24C288C0A58AC0FEA93FA"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-        "OwnerKey" = "8:_B5C6A48CF16F4C7294FCC08761FA316A"
+        "MsmKey" = "8:_5CE91ED102293917CFEB6899BDE33703"
+        "OwnerKey" = "8:_C95FB42FBB5144A799BED5FEF0A1EF35"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-        "OwnerKey" = "8:_9FC01D0F4DCF4B11B17A6082012C4D25"
+        "MsmKey" = "8:_5CE91ED102293917CFEB6899BDE33703"
+        "OwnerKey" = "8:_B8C35D5641C049FBA6587260DB4181D8"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-        "OwnerKey" = "8:_9CF46B96BAC940798335DD33376A52E3"
+        "MsmKey" = "8:_5CE91ED102293917CFEB6899BDE33703"
+        "OwnerKey" = "8:_B6603D50B3154CF890C49D47A8134CC0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-        "OwnerKey" = "8:_764F16893A924C2EA9C686295C714976"
+        "MsmKey" = "8:_5CE91ED102293917CFEB6899BDE33703"
+        "OwnerKey" = "8:_9CF46B96BAC940798335DD33376A52E3"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
+        "MsmKey" = "8:_5CE91ED102293917CFEB6899BDE33703"
         "OwnerKey" = "8:_75CA99E80B1C4BB7B9377B8CFB847612"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
+        "MsmKey" = "8:_5CE91ED102293917CFEB6899BDE33703"
         "OwnerKey" = "8:_6C486993DD9A446A82870C69EA210F2F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-        "OwnerKey" = "8:_2D339B5E717E47FC9EC803E4D6E0D8A7"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_6C486993DD9A446A82870C69EA210F2F"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -273,6 +249,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_838F84D984211985720B289AAA58AD19"
+        "OwnerKey" = "8:_CBDEBD728D034820925FAD989DCE5308"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_9981C0C369CF3CFBA37325B87140944A"
         "OwnerKey" = "8:_6C486993DD9A446A82870C69EA210F2F"
         "MsmSig" = "8:_UNDEFINED"
@@ -363,12 +345,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_F6EB218D39F952DD1904BA894A32EFB7"
-        "OwnerKey" = "8:_CBDEBD728D034820925FAD989DCE5308"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_FE3019A7F5454B14B0D9B353E4979EE9"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -431,10 +407,10 @@
         }
         "File"
         {
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_9981C0C369CF3CFBA37325B87140944A"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_29D45A1D2CB66EAB12036B2E10A80C1F"
             {
-            "SourcePath" = "8:WSOCK32.dll"
-            "TargetName" = "8:WSOCK32.dll"
+            "SourcePath" = "8:MSVCR71D.dll"
+            "TargetName" = "8:MSVCR71D.dll"
             "Tag" = "8:"
             "Folder" = "8:_42767C07C226490A82DDFB8406FC3CE4"
             "Condition" = "8:"
@@ -447,12 +423,32 @@
             "SharedLegacy" = "11:FALSE"
             "PackageAs" = "3:1"
             "Register" = "3:1"
-            "Exclude" = "11:TRUE"
+            "Exclude" = "11:FALSE"
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_F6EB218D39F952DD1904BA894A32EFB7"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_5CE91ED102293917CFEB6899BDE33703"
             {
+            "SourcePath" = "8:MSVCP71D.dll"
+            "TargetName" = "8:MSVCP71D.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_42767C07C226490A82DDFB8406FC3CE4"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_838F84D984211985720B289AAA58AD19"
+            {
             "SourcePath" = "8:libFLAC.dll"
             "TargetName" = "8:libFLAC.dll"
             "Tag" = "8:"
@@ -471,6 +467,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_9981C0C369CF3CFBA37325B87140944A"
+            {
+            "SourcePath" = "8:WSOCK32.dll"
+            "TargetName" = "8:WSOCK32.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_42767C07C226490A82DDFB8406FC3CE4"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
         }
         "FileType"
         {
@@ -1024,34 +1040,6 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_41807F1874C64B7BA370CCEAEA74C40C"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_61DB6C5EDA3C4F80BBBA633D3F3F5B25"
-            {
-            "UseDynamicProperties" = "11:TRUE"
-            "IsDependency" = "11:TRUE"
-            "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"
-                "Properties"
-                {
-                }
-            "LanguageId" = "3:0"
-            "Exclude" = "11:FALSE"
-            "Folder" = "8:"
-            "Feature" = "8:"
-            "IsolateTo" = "8:"
-            }
         }
         "ProjectOutput"
         {
@@ -1589,7 +1577,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EA7442174FD24C288C0A58AC0FEA93FA"
             {
-            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfflacencoder\\release\\dsfFLACEncoder.dll"
+            "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACEncoder\\Release\\dsfFLACEncoder.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_42767C07C226490A82DDFB8406FC3CE4"

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-08-30 19:08:38 UTC (rev 7666)
@@ -1128,6 +1128,7 @@
 		MakeFile = MakeFile
 		Release = Release
 		Release Unicode = Release Unicode
+		Release_NoDotNET = Release_NoDotNET
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Debug.ActiveCfg = Debug|Win32
@@ -1140,6 +1141,8 @@
 		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Release.Build.0 = Release|Win32
 		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Release Unicode.ActiveCfg = Release|Win32
 		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Release Unicode.Build.0 = Release|Win32
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{FB373486-0E6E-4BB6-8BF2-1F92EACA1468}.Release_NoDotNET.Build.0 = Release|Win32
 		{223ACC19-608E-4E1B-A054-067F0CACB272}.Debug.ActiveCfg = Debug|Win32
 		{223ACC19-608E-4E1B-A054-067F0CACB272}.Debug.Build.0 = Debug|Win32
 		{223ACC19-608E-4E1B-A054-067F0CACB272}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1150,6 +1153,8 @@
 		{223ACC19-608E-4E1B-A054-067F0CACB272}.Release.Build.0 = Release|Win32
 		{223ACC19-608E-4E1B-A054-067F0CACB272}.Release Unicode.ActiveCfg = Release|Win32
 		{223ACC19-608E-4E1B-A054-067F0CACB272}.Release Unicode.Build.0 = Release|Win32
+		{223ACC19-608E-4E1B-A054-067F0CACB272}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{223ACC19-608E-4E1B-A054-067F0CACB272}.Release_NoDotNET.Build.0 = Release|Win32
 		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}.Debug.ActiveCfg = Debug|Win32
 		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}.Debug.Build.0 = Debug|Win32
 		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1160,6 +1165,8 @@
 		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}.Release.Build.0 = Release|Win32
 		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}.Release Unicode.ActiveCfg = Release|Win32
 		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}.Release Unicode.Build.0 = Release|Win32
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}.Release_NoDotNET.Build.0 = Release|Win32
 		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.Debug.ActiveCfg = Debug|Win32
 		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.Debug.Build.0 = Debug|Win32
 		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1170,6 +1177,8 @@
 		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.Release.Build.0 = Release|Win32
 		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.Release Unicode.ActiveCfg = Release|Win32
 		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.Release Unicode.Build.0 = Release|Win32
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}.Release_NoDotNET.Build.0 = Release|Win32
 		{A882A968-3013-4A27-B653-E18CF5C791FE}.Debug.ActiveCfg = Debug|Win32
 		{A882A968-3013-4A27-B653-E18CF5C791FE}.Debug.Build.0 = Debug|Win32
 		{A882A968-3013-4A27-B653-E18CF5C791FE}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1180,6 +1189,8 @@
 		{A882A968-3013-4A27-B653-E18CF5C791FE}.Release.Build.0 = Release|Win32
 		{A882A968-3013-4A27-B653-E18CF5C791FE}.Release Unicode.ActiveCfg = Release|Win32
 		{A882A968-3013-4A27-B653-E18CF5C791FE}.Release Unicode.Build.0 = Release|Win32
+		{A882A968-3013-4A27-B653-E18CF5C791FE}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{A882A968-3013-4A27-B653-E18CF5C791FE}.Release_NoDotNET.Build.0 = Release|Win32
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Debug.ActiveCfg = Debug|Win32
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Debug.Build.0 = Debug|Win32
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Debug Unicode.ActiveCfg = Debug Unicode|Win32
@@ -1190,6 +1201,8 @@
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Release.Build.0 = Release|Win32
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Release Unicode.ActiveCfg = Release Unicode|Win32
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Release Unicode.Build.0 = Release Unicode|Win32
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Release_NoDotNET.Build.0 = Release|Win32
 		{4906E533-2864-4840-ABC1-00CD844623EB}.Debug.ActiveCfg = Debug|Win32
 		{4906E533-2864-4840-ABC1-00CD844623EB}.Debug.Build.0 = Debug|Win32
 		{4906E533-2864-4840-ABC1-00CD844623EB}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1200,6 +1213,8 @@
 		{4906E533-2864-4840-ABC1-00CD844623EB}.Release.Build.0 = Release|Win32
 		{4906E533-2864-4840-ABC1-00CD844623EB}.Release Unicode.ActiveCfg = Release|Win32
 		{4906E533-2864-4840-ABC1-00CD844623EB}.Release Unicode.Build.0 = Release|Win32
+		{4906E533-2864-4840-ABC1-00CD844623EB}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{4906E533-2864-4840-ABC1-00CD844623EB}.Release_NoDotNET.Build.0 = Release|Win32
 		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.Debug.ActiveCfg = Debug|Win32
 		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.Debug.Build.0 = Debug|Win32
 		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1210,6 +1225,8 @@
 		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.Release.Build.0 = Release|Win32
 		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.Release Unicode.ActiveCfg = Release|Win32
 		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.Release Unicode.Build.0 = Release|Win32
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}.Release_NoDotNET.Build.0 = Release|Win32
 		{AE32588D-2807-4796-9E68-C9104817BC1A}.Debug.ActiveCfg = Debug|Win32
 		{AE32588D-2807-4796-9E68-C9104817BC1A}.Debug.Build.0 = Debug|Win32
 		{AE32588D-2807-4796-9E68-C9104817BC1A}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1220,6 +1237,8 @@
 		{AE32588D-2807-4796-9E68-C9104817BC1A}.Release.Build.0 = Release|Win32
 		{AE32588D-2807-4796-9E68-C9104817BC1A}.Release Unicode.ActiveCfg = Release|Win32
 		{AE32588D-2807-4796-9E68-C9104817BC1A}.Release Unicode.Build.0 = Release|Win32
+		{AE32588D-2807-4796-9E68-C9104817BC1A}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{AE32588D-2807-4796-9E68-C9104817BC1A}.Release_NoDotNET.Build.0 = Release|Win32
 		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.Debug.ActiveCfg = Debug|Win32
 		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.Debug.Build.0 = Debug|Win32
 		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1230,6 +1249,8 @@
 		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.Release.Build.0 = Release|Win32
 		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.Release Unicode.ActiveCfg = Release|Win32
 		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.Release Unicode.Build.0 = Release|Win32
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}.Release_NoDotNET.Build.0 = Release|Win32
 		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}.Debug.ActiveCfg = Debug|Win32
 		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}.Debug.Build.0 = Debug|Win32
 		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1240,6 +1261,8 @@
 		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}.Release.Build.0 = Release|Win32
 		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}.Release Unicode.ActiveCfg = Release|Win32
 		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}.Release Unicode.Build.0 = Release|Win32
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}.Release_NoDotNET.Build.0 = Release|Win32
 		{6B548F29-04A2-4F61-946F-72B86B4845DA}.Debug.ActiveCfg = Debug|Win32
 		{6B548F29-04A2-4F61-946F-72B86B4845DA}.Debug.Build.0 = Debug|Win32
 		{6B548F29-04A2-4F61-946F-72B86B4845DA}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1250,6 +1273,8 @@
 		{6B548F29-04A2-4F61-946F-72B86B4845DA}.Release.Build.0 = Release|Win32
 		{6B548F29-04A2-4F61-946F-72B86B4845DA}.Release Unicode.ActiveCfg = Release|Win32
 		{6B548F29-04A2-4F61-946F-72B86B4845DA}.Release Unicode.Build.0 = Release|Win32
+		{6B548F29-04A2-4F61-946F-72B86B4845DA}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{6B548F29-04A2-4F61-946F-72B86B4845DA}.Release_NoDotNET.Build.0 = Release|Win32
 		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.Debug.ActiveCfg = Debug|Win32
 		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.Debug.Build.0 = Debug|Win32
 		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1260,6 +1285,8 @@
 		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.Release.Build.0 = Release|Win32
 		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.Release Unicode.ActiveCfg = Release|Win32
 		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.Release Unicode.Build.0 = Release|Win32
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}.Release_NoDotNET.Build.0 = Release|Win32
 		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Debug.ActiveCfg = Debug|Win32
 		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Debug.Build.0 = Debug|Win32
 		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1270,6 +1297,8 @@
 		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Release.Build.0 = Release|Win32
 		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Release Unicode.ActiveCfg = Release|Win32
 		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Release Unicode.Build.0 = Release|Win32
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}.Release_NoDotNET.Build.0 = Release|Win32
 		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.Debug.ActiveCfg = Debug|Win32
 		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.Debug.Build.0 = Debug|Win32
 		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1280,6 +1309,8 @@
 		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.Release.Build.0 = Release|Win32
 		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.Release Unicode.ActiveCfg = Release|Win32
 		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.Release Unicode.Build.0 = Release|Win32
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}.Release_NoDotNET.Build.0 = Release|Win32
 		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Debug.ActiveCfg = Debug|Win32
 		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Debug.Build.0 = Debug|Win32
 		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1290,6 +1321,8 @@
 		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Release.Build.0 = Release|Win32
 		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Release Unicode.ActiveCfg = Release|Win32
 		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Release Unicode.Build.0 = Release|Win32
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}.Release_NoDotNET.Build.0 = Release|Win32
 		{6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Debug.ActiveCfg = Debug|Win32
 		{6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Debug.Build.0 = Debug|Win32
 		{6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1300,6 +1333,8 @@
 		{6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Release.Build.0 = Release|Win32
 		{6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Release Unicode.ActiveCfg = Release|Win32
 		{6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Release Unicode.Build.0 = Release|Win32
+		{6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{6D653C6F-8722-4B10-9C3A-CB7094DD159F}.Release_NoDotNET.Build.0 = Release|Win32
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Debug.ActiveCfg = Debug|Win32
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Debug.Build.0 = Debug|Win32
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1310,6 +1345,8 @@
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Release.Build.0 = Release|Win32
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Release Unicode.ActiveCfg = Release|Win32
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Release Unicode.Build.0 = Release|Win32
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Release_NoDotNET.Build.0 = Release|Win32
 		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.Debug.ActiveCfg = Debug|Win32
 		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.Debug.Build.0 = Debug|Win32
 		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1320,6 +1357,8 @@
 		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.Release.Build.0 = Release|Win32
 		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.Release Unicode.ActiveCfg = Release|Win32
 		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.Release Unicode.Build.0 = Release|Win32
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}.Release_NoDotNET.Build.0 = Release|Win32
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.Debug.ActiveCfg = Debug|Win32
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.Debug.Build.0 = Debug|Win32
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1330,6 +1369,8 @@
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.Release.Build.0 = Release|Win32
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.Release Unicode.ActiveCfg = Release|Win32
 		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.Release Unicode.Build.0 = Release|Win32
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{419E0701-9C9A-4671-B3B6-79FA206DEE25}.Release_NoDotNET.Build.0 = Release|Win32
 		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}.Debug.ActiveCfg = Debug|Win32
 		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}.Debug.Build.0 = Debug|Win32
 		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1340,6 +1381,8 @@
 		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}.Release.Build.0 = Release|Win32
 		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}.Release Unicode.ActiveCfg = Release|Win32
 		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}.Release Unicode.Build.0 = Release|Win32
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}.Release_NoDotNET.Build.0 = Release|Win32
 		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Debug.ActiveCfg = Debug|Win32
 		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Debug.Build.0 = Debug|Win32
 		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1350,6 +1393,8 @@
 		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Release.Build.0 = Release|Win32
 		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Release Unicode.ActiveCfg = Release|Win32
 		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Release Unicode.Build.0 = Release|Win32
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231}.Release_NoDotNET.Build.0 = Release|Win32
 		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.Debug.ActiveCfg = Debug|Win32
 		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.Debug.Build.0 = Debug|Win32
 		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1360,6 +1405,8 @@
 		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.Release.Build.0 = Release|Win32
 		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.Release Unicode.ActiveCfg = Release|Win32
 		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.Release Unicode.Build.0 = Release|Win32
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}.Release_NoDotNET.Build.0 = Release|Win32
 		{73D3CA81-3BDC-42F1-8456-76224F6B337C}.Debug.ActiveCfg = Debug|Win32
 		{73D3CA81-3BDC-42F1-8456-76224F6B337C}.Debug.Build.0 = Debug|Win32
 		{73D3CA81-3BDC-42F1-8456-76224F6B337C}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1370,6 +1417,8 @@
 		{73D3CA81-3BDC-42F1-8456-76224F6B337C}.Release.Build.0 = Release|Win32
 		{73D3CA81-3BDC-42F1-8456-76224F6B337C}.Release Unicode.ActiveCfg = Release|Win32
 		{73D3CA81-3BDC-42F1-8456-76224F6B337C}.Release Unicode.Build.0 = Release|Win32
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{73D3CA81-3BDC-42F1-8456-76224F6B337C}.Release_NoDotNET.Build.0 = Release|Win32
 		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.Debug.ActiveCfg = Debug
 		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.Debug Unicode.ActiveCfg = Debug
 		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.Debug Unicode.Build.0 = Debug
@@ -1379,6 +1428,8 @@
 		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.Release.Build.0 = Release
 		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.Release Unicode.ActiveCfg = Release
 		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.Release Unicode.Build.0 = Release
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.Release_NoDotNET.ActiveCfg = Release
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.Release_NoDotNET.Build.0 = Release
 		{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.Debug.ActiveCfg = Debug|Win32
 		{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.Debug.Build.0 = Debug|Win32
 		{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1389,6 +1440,8 @@
 		{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.Release.Build.0 = Release|Win32
 		{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.Release Unicode.ActiveCfg = Release|Win32
 		{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.Release Unicode.Build.0 = Release|Win32
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.Release_NoDotNET.Build.0 = Release|Win32
 		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.Debug.ActiveCfg = Debug|Win32
 		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.Debug.Build.0 = Debug|Win32
 		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1399,6 +1452,8 @@
 		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.Release.Build.0 = Release|Win32
 		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.Release Unicode.ActiveCfg = Release|Win32
 		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.Release Unicode.Build.0 = Release|Win32
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{F9F22B14-22FE-4651-81B8-5AE267A6B189}.Release_NoDotNET.Build.0 = Release|Win32
 		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug.ActiveCfg = Debug|Win32
 		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug.Build.0 = Debug|Win32
 		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1409,6 +1464,8 @@
 		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release.Build.0 = Release|Win32
 		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release Unicode.ActiveCfg = Release|Win32
 		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release Unicode.Build.0 = Release|Win32
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release_NoDotNET.Build.0 = Release|Win32
 		{88532BA9-1EED-421F-84BF-88A7A87FB2D3}.Debug.ActiveCfg = Debug|Win32
 		{88532BA9-1EED-421F-84BF-88A7A87FB2D3}.Debug.Build.0 = Debug|Win32
 		{88532BA9-1EED-421F-84BF-88A7A87FB2D3}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1419,6 +1476,8 @@
 		{88532BA9-1EED-421F-84BF-88A7A87FB2D3}.Release.Build.0 = Release|Win32
 		{88532BA9-1EED-421F-84BF-88A7A87FB2D3}.Release Unicode.ActiveCfg = Release|Win32
 		{88532BA9-1EED-421F-84BF-88A7A87FB2D3}.Release Unicode.Build.0 = Release|Win32
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{88532BA9-1EED-421F-84BF-88A7A87FB2D3}.Release_NoDotNET.Build.0 = Release|Win32
 		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE}.Debug.ActiveCfg = Debug|Win32
 		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE}.Debug.Build.0 = Debug|Win32
 		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1429,6 +1488,8 @@
 		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE}.Release.Build.0 = Release|Win32
 		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE}.Release Unicode.ActiveCfg = Release|Win32
 		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE}.Release Unicode.Build.0 = Release|Win32
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{AD2DC5BB-AC7B-482D-9472-19BB98A833CE}.Release_NoDotNET.Build.0 = Release|Win32
 		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.Debug.ActiveCfg = Debug|Win32
 		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.Debug.Build.0 = Debug|Win32
 		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1439,6 +1500,8 @@
 		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.Release.Build.0 = Release|Win32
 		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.Release Unicode.ActiveCfg = Release|Win32
 		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.Release Unicode.Build.0 = Release|Win32
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}.Release_NoDotNET.Build.0 = Release|Win32
 		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug.ActiveCfg = Debug|Win32
 		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug.Build.0 = Debug|Win32
 		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1449,6 +1512,8 @@
 		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release.Build.0 = Release|Win32
 		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release Unicode.ActiveCfg = Release|Win32
 		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release Unicode.Build.0 = Release|Win32
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release_NoDotNET.Build.0 = Release|Win32
 		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug.ActiveCfg = Debug|Win32
 		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug.Build.0 = Debug|Win32
 		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1459,6 +1524,8 @@
 		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release.Build.0 = Release|Win32
 		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release Unicode.ActiveCfg = Release|Win32
 		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release Unicode.Build.0 = Release|Win32
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release_NoDotNET.Build.0 = Release|Win32
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Debug.ActiveCfg = Debug|Win32
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Debug.Build.0 = Debug|Win32
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1469,6 +1536,8 @@
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Release.Build.0 = Release|Win32
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Release Unicode.ActiveCfg = Release|Win32
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Release Unicode.Build.0 = Release|Win32
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Release_NoDotNET.Build.0 = Release|Win32
 		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.Debug.ActiveCfg = Debug|Win32
 		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.Debug.Build.0 = Debug|Win32
 		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1479,6 +1548,8 @@
 		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.Release.Build.0 = Release|Win32
 		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.Release Unicode.ActiveCfg = Release|Win32
 		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.Release Unicode.Build.0 = Release|Win32
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}.Release_NoDotNET.Build.0 = Release|Win32
 		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Debug.ActiveCfg = Debug|Win32
 		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Debug.Build.0 = Debug|Win32
 		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1489,6 +1560,8 @@
 		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Release.Build.0 = Release|Win32
 		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Release Unicode.ActiveCfg = Release|Win32
 		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Release Unicode.Build.0 = Release|Win32
+		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Release_NoDotNET.Build.0 = Release|Win32
 		{E274665B-12E3-4C7F-A749-FAB0C0A73522}.Debug.ActiveCfg = Debug|Win32
 		{E274665B-12E3-4C7F-A749-FAB0C0A73522}.Debug.Build.0 = Debug|Win32
 		{E274665B-12E3-4C7F-A749-FAB0C0A73522}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1499,6 +1572,7 @@
 		{E274665B-12E3-4C7F-A749-FAB0C0A73522}.Release.Build.0 = Release|Win32
 		{E274665B-12E3-4C7F-A749-FAB0C0A73522}.Release Unicode.ActiveCfg = Release|Win32
 		{E274665B-12E3-4C7F-A749-FAB0C0A73522}.Release Unicode.Build.0 = Release|Win32
+		{E274665B-12E3-4C7F-A749-FAB0C0A73522}.Release_NoDotNET.ActiveCfg = Release|Win32
 		{FCFE729D-EADE-45BA-9506-7E82A46403F7}.Debug.ActiveCfg = Debug|Win32
 		{FCFE729D-EADE-45BA-9506-7E82A46403F7}.Debug.Build.0 = Debug|Win32
 		{FCFE729D-EADE-45BA-9506-7E82A46403F7}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1509,6 +1583,8 @@
 		{FCFE729D-EADE-45BA-9506-7E82A46403F7}.Release.Build.0 = Release|Win32
 		{FCFE729D-EADE-45BA-9506-7E82A46403F7}.Release Unicode.ActiveCfg = Release|Win32
 		{FCFE729D-EADE-45BA-9506-7E82A46403F7}.Release Unicode.Build.0 = Release|Win32
+		{FCFE729D-EADE-45BA-9506-7E82A46403F7}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{FCFE729D-EADE-45BA-9506-7E82A46403F7}.Release_NoDotNET.Build.0 = Release|Win32
 		{D3BA9CBE-5718-40BF-A8B8-FBA28F994423}.Debug.ActiveCfg = Debug|.NET
 		{D3BA9CBE-5718-40BF-A8B8-FBA28F994423}.Debug.Build.0 = Debug|.NET
 		{D3BA9CBE-5718-40BF-A8B8-FBA28F994423}.Debug Unicode.ActiveCfg = Debug|.NET
@@ -1519,6 +1595,7 @@
 		{D3BA9CBE-5718-40BF-A8B8-FBA28F994423}.Release.Build.0 = Release|.NET
 		{D3BA9CBE-5718-40BF-A8B8-FBA28F994423}.Release Unicode.ActiveCfg = Release|.NET
 		{D3BA9CBE-5718-40BF-A8B8-FBA28F994423}.Release Unicode.Build.0 = Release|.NET
+		{D3BA9CBE-5718-40BF-A8B8-FBA28F994423}.Release_NoDotNET.ActiveCfg = Release|.NET
 		{53C3466C-6107-41CD-80D2-5F1D423D66F3}.Debug.ActiveCfg = Debug|Win32
 		{53C3466C-6107-41CD-80D2-5F1D423D66F3}.Debug.Build.0 = Debug|Win32
 		{53C3466C-6107-41CD-80D2-5F1D423D66F3}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1529,6 +1606,8 @@
 		{53C3466C-6107-41CD-80D2-5F1D423D66F3}.Release.Build.0 = Release|Win32
 		{53C3466C-6107-41CD-80D2-5F1D423D66F3}.Release Unicode.ActiveCfg = Release|Win32
 		{53C3466C-6107-41CD-80D2-5F1D423D66F3}.Release Unicode.Build.0 = Release|Win32
+		{53C3466C-6107-41CD-80D2-5F1D423D66F3}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{53C3466C-6107-41CD-80D2-5F1D423D66F3}.Release_NoDotNET.Build.0 = Release|Win32
 		{EC2EA6AA-3DD1-490B-A439-C44F8C1C2D15}.Debug.ActiveCfg = Debug|Win32
 		{EC2EA6AA-3DD1-490B-A439-C44F8C1C2D15}.Debug.Build.0 = Debug|Win32
 		{EC2EA6AA-3DD1-490B-A439-C44F8C1C2D15}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1539,6 +1618,8 @@
 		{EC2EA6AA-3DD1-490B-A439-C44F8C1C2D15}.Release.Build.0 = Release|Win32
 		{EC2EA6AA-3DD1-490B-A439-C44F8C1C2D15}.Release Unicode.ActiveCfg = Release|Win32
 		{EC2EA6AA-3DD1-490B-A439-C44F8C1C2D15}.Release Unicode.Build.0 = Release|Win32
+		{EC2EA6AA-3DD1-490B-A439-C44F8C1C2D15}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{EC2EA6AA-3DD1-490B-A439-C44F8C1C2D15}.Release_NoDotNET.Build.0 = Release|Win32
 		{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}.Debug.ActiveCfg = Debug|Win32
 		{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}.Debug.Build.0 = Debug|Win32
 		{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1549,6 +1630,7 @@
 		{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}.Release.Build.0 = Release|Win32
 		{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}.Release Unicode.ActiveCfg = Release|Win32
 		{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}.Release Unicode.Build.0 = Release|Win32
+		{9B83D147-AFE7-46EF-A3FF-EBEC65F00BA6}.Release_NoDotNET.ActiveCfg = Release|Win32
 		{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}.Debug.ActiveCfg = Debug|Win32
 		{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}.Debug.Build.0 = Debug|Win32
 		{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1559,6 +1641,8 @@
 		{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}.Release.Build.0 = Release|Win32
 		{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}.Release Unicode.ActiveCfg = Release|Win32
 		{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}.Release Unicode.Build.0 = Release|Win32
+		{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}.Release_NoDotNET.Build.0 = Release|Win32
 		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Debug.ActiveCfg = Debug|Win32
 		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Debug.Build.0 = Debug|Win32
 		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1569,6 +1653,7 @@
 		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Release.Build.0 = Release|Win32
 		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Release Unicode.ActiveCfg = Release|Win32
 		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Release Unicode.Build.0 = Release|Win32
+		{CD8398F5-6FF7-4BDA-9E48-ADF6C64A4747}.Release_NoDotNET.ActiveCfg = Release|Win32
 		{8BFD6626-7D04-4DB8-836C-767DBD256F33}.Debug.ActiveCfg = Debug|.NET
 		{8BFD6626-7D04-4DB8-836C-767DBD256F33}.Debug.Build.0 = Debug|.NET
 		{8BFD6626-7D04-4DB8-836C-767DBD256F33}.Debug Unicode.ActiveCfg = Debug|.NET
@@ -1579,6 +1664,7 @@
 		{8BFD6626-7D04-4DB8-836C-767DBD256F33}.Release.Build.0 = Release|.NET
 		{8BFD6626-7D04-4DB8-836C-767DBD256F33}.Release Unicode.ActiveCfg = Release|.NET
 		{8BFD6626-7D04-4DB8-836C-767DBD256F33}.Release Unicode.Build.0 = Release|.NET
+		{8BFD6626-7D04-4DB8-836C-767DBD256F33}.Release_NoDotNET.ActiveCfg = Release|.NET
 		{B5BF942B-4864-414C-9855-65E5CC923401}.Debug.ActiveCfg = Debug|Win32
 		{B5BF942B-4864-414C-9855-65E5CC923401}.Debug.Build.0 = Debug|Win32
 		{B5BF942B-4864-414C-9855-65E5CC923401}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1589,6 +1675,8 @@
 		{B5BF942B-4864-414C-9855-65E5CC923401}.Release.Build.0 = Release|Win32
 		{B5BF942B-4864-414C-9855-65E5CC923401}.Release Unicode.ActiveCfg = Release|Win32
 		{B5BF942B-4864-414C-9855-65E5CC923401}.Release Unicode.Build.0 = Release|Win32
+		{B5BF942B-4864-414C-9855-65E5CC923401}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{B5BF942B-4864-414C-9855-65E5CC923401}.Release_NoDotNET.Build.0 = Release|Win32
 		{191217F4-1F30-426D-A2AB-A9E613D9A401}.Debug.ActiveCfg = Debug|Win32
 		{191217F4-1F30-426D-A2AB-A9E613D9A401}.Debug.Build.0 = Debug|Win32
 		{191217F4-1F30-426D-A2AB-A9E613D9A401}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1599,6 +1687,8 @@
 		{191217F4-1F30-426D-A2AB-A9E613D9A401}.Release.Build.0 = Release|Win32
 		{191217F4-1F30-426D-A2AB-A9E613D9A401}.Release Unicode.ActiveCfg = Release|Win32
 		{191217F4-1F30-426D-A2AB-A9E613D9A401}.Release Unicode.Build.0 = Release|Win32
+		{191217F4-1F30-426D-A2AB-A9E613D9A401}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{191217F4-1F30-426D-A2AB-A9E613D9A401}.Release_NoDotNET.Build.0 = Release|Win32
 		{10F62E34-7F7E-415B-A0F4-9E1AE9704282}.Debug.ActiveCfg = Debug
 		{10F62E34-7F7E-415B-A0F4-9E1AE9704282}.Debug Unicode.ActiveCfg = Debug
 		{10F62E34-7F7E-415B-A0F4-9E1AE9704282}.Debug Unicode.Build.0 = Debug
@@ -1608,6 +1698,8 @@
 		{10F62E34-7F7E-415B-A0F4-9E1AE9704282}.Release.Build.0 = Release
 		{10F62E34-7F7E-415B-A0F4-9E1AE9704282}.Release Unicode.ActiveCfg = Release
 		{10F62E34-7F7E-415B-A0F4-9E1AE9704282}.Release Unicode.Build.0 = Release
+		{10F62E34-7F7E-415B-A0F4-9E1AE9704282}.Release_NoDotNET.ActiveCfg = Release
+		{10F62E34-7F7E-415B-A0F4-9E1AE9704282}.Release_NoDotNET.Build.0 = Release
 		{100109AA-F219-4934-9B21-0FCD25244860}.Debug.ActiveCfg = Debug
 		{100109AA-F219-4934-9B21-0FCD25244860}.Debug Unicode.ActiveCfg = Debug
 		{100109AA-F219-4934-9B21-0FCD25244860}.Debug Unicode.Build.0 = Debug
@@ -1617,6 +1709,8 @@
 		{100109AA-F219-4934-9B21-0FCD25244860}.Release.Build.0 = Release
 		{100109AA-F219-4934-9B21-0FCD25244860}.Release Unicode.ActiveCfg = Release
 		{100109AA-F219-4934-9B21-0FCD25244860}.Release Unicode.Build.0 = Release
+		{100109AA-F219-4934-9B21-0FCD25244860}.Release_NoDotNET.ActiveCfg = Release
+		{100109AA-F219-4934-9B21-0FCD25244860}.Release_NoDotNET.Build.0 = Release
 		{41CF6297-C38A-44E3-A564-25DB7E2904FC}.Debug.ActiveCfg = Debug
 		{41CF6297-C38A-44E3-A564-25DB7E2904FC}.Debug Unicode.ActiveCfg = Debug
 		{41CF6297-C38A-44E3-A564-25DB7E2904FC}.Debug Unicode.Build.0 = Debug
@@ -1626,24 +1720,32 @@
 		{41CF6297-C38A-44E3-A564-25DB7E2904FC}.Release.Build.0 = Release
 		{41CF6297-C38A-44E3-A564-25DB7E2904FC}.Release Unicode.ActiveCfg = Release
 		{41CF6297-C38A-44E3-A564-25DB7E2904FC}.Release Unicode.Build.0 = Release
+		{41CF6297-C38A-44E3-A564-25DB7E2904FC}.Release_NoDotNET.ActiveCfg = Release
+		{41CF6297-C38A-44E3-A564-25DB7E2904FC}.Release_NoDotNET.Build.0 = Release
 		{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Debug.ActiveCfg = Debug
 		{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Debug Unicode.ActiveCfg = Debug
 		{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.MakeFile.ActiveCfg = Release
 		{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Release.ActiveCfg = Release
 		{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Release.Build.0 = Release
 		{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Release Unicode.ActiveCfg = Release
+		{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Release_NoDotNET.ActiveCfg = Release
+		{A8FB902E-7246-46D2-9916-6DAFDB67E22B}.Release_NoDotNET.Build.0 = Release
 		{E2A342FB-F183-4076-88D4-06F109CA5415}.Debug.ActiveCfg = Debug
 		{E2A342FB-F183-4076-88D4-06F109CA5415}.Debug Unicode.ActiveCfg = Debug
 		{E2A342FB-F183-4076-88D4-06F109CA5415}.MakeFile.ActiveCfg = Release
 		{E2A342FB-F183-4076-88D4-06F109CA5415}.Release.ActiveCfg = Release
 		{E2A342FB-F183-4076-88D4-06F109CA5415}.Release.Build.0 = Release
 		{E2A342FB-F183-4076-88D4-06F109CA5415}.Release Unicode.ActiveCfg = Release
+		{E2A342FB-F183-4076-88D4-06F109CA5415}.Release_NoDotNET.ActiveCfg = Release
+		{E2A342FB-F183-4076-88D4-06F109CA5415}.Release_NoDotNET.Build.0 = Release
 		{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.Debug.ActiveCfg = Debug
 		{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.Debug Unicode.ActiveCfg = Debug
 		{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.MakeFile.ActiveCfg = Release
 		{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.Release.ActiveCfg = Release
 		{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.Release.Build.0 = Release
 		{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.Release Unicode.ActiveCfg = Release
+		{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.Release_NoDotNET.ActiveCfg = Release
+		{0176E805-7F0B-4144-9A31-2CE1DD228AC5}.Release_NoDotNET.Build.0 = Release
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Debug.ActiveCfg = Debug|Win32
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Debug.Build.0 = Debug|Win32
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1654,6 +1756,8 @@
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Release.Build.0 = Release|Win32
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Release Unicode.ActiveCfg = Release|Win32
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Release Unicode.Build.0 = Release|Win32
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Release_NoDotNET.Build.0 = Release|Win32
 		{16CBAA0F-A6A5-40DA-8C50-393AFEE7B1F4}.Debug.ActiveCfg = Debug|Win32
 		{16CBAA0F-A6A5-40DA-8C50-393AFEE7B1F4}.Debug.Build.0 = Debug|Win32
 		{16CBAA0F-A6A5-40DA-8C50-393AFEE7B1F4}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1664,6 +1768,8 @@
 		{16CBAA0F-A6A5-40DA-8C50-393AFEE7B1F4}.Release.Build.0 = Release|Win32
 		{16CBAA0F-A6A5-40DA-8C50-393AFEE7B1F4}.Release Unicode.ActiveCfg = Release|Win32
 		{16CBAA0F-A6A5-40DA-8C50-393AFEE7B1F4}.Release Unicode.Build.0 = Release|Win32
+		{16CBAA0F-A6A5-40DA-8C50-393AFEE7B1F4}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{16CBAA0F-A6A5-40DA-8C50-393AFEE7B1F4}.Release_NoDotNET.Build.0 = Release|Win32
 		{13BFE1FF-00A7-4741-B550-95445D9E0561}.Debug.ActiveCfg = Debug|Win32
 		{13BFE1FF-00A7-4741-B550-95445D9E0561}.Debug.Build.0 = Debug|Win32
 		{13BFE1FF-00A7-4741-B550-95445D9E0561}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1674,6 +1780,8 @@
 		{13BFE1FF-00A7-4741-B550-95445D9E0561}.Release.Build.0 = Release|Win32
 		{13BFE1FF-00A7-4741-B550-95445D9E0561}.Release Unicode.ActiveCfg = Release|Win32
 		{13BFE1FF-00A7-4741-B550-95445D9E0561}.Release Unicode.Build.0 = Release|Win32
+		{13BFE1FF-00A7-4741-B550-95445D9E0561}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{13BFE1FF-00A7-4741-B550-95445D9E0561}.Release_NoDotNET.Build.0 = Release|Win32
 		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug.ActiveCfg = Debug|Win32
 		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug.Build.0 = Debug|Win32
 		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug Unicode.ActiveCfg = Debug|Win32
@@ -1684,6 +1792,8 @@
 		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release.Build.0 = Release|Win32
 		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release Unicode.ActiveCfg = Release|Win32
 		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release Unicode.Build.0 = Release|Win32
+		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release_NoDotNET.ActiveCfg = Release|Win32
+		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release_NoDotNET.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionItems) = postSolution
 	EndGlobalSection

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -61,7 +61,7 @@
 	,	mHeadTag(NULL)
 	,	mCMMLCallbacks(NULL)
 {
-	debugLog.open("G:\\logs\\cmml_decode.logs", ios_base::out);
+	//debugLog.open("G:\\logs\\cmml_decode.logs", ios_base::out);
 		mCMMLParser = new CMMLParser;
 	//debugLog.open("C:\\Temp\\cmmlfilter.log", ios_base::out);
 	//debugLog<<"*** Log Begins ***"<<endl;
@@ -70,7 +70,7 @@
 CMMLDecodeFilter::~CMMLDecodeFilter(void)
 {
 	//debugLog<<"*** Log Ends ***"<<endl;
-	debugLog.close();
+	//debugLog.close();
 	delete mCMMLParser;
 }
 
@@ -99,7 +99,7 @@
 			(inInputMediaType->subtype == MEDIASUBTYPE_CMML) &&
 			(inInputMediaType->formattype == FORMAT_CMML) ){
 
-		debugLog<<"Input Type Accepted"<<endl;
+		//debugLog<<"Input Type Accepted"<<endl;
 		return S_OK;
 	} else {
 		return VFW_E_TYPE_NOT_ACCEPTED;
@@ -112,7 +112,7 @@
 			(inOutputMediaType->majortype == MEDIATYPE_Text) &&
 			(inOutputMediaType->subtype == MEDIASUBTYPE_SubtitleVMR9) ){
 
-		debugLog << "Transform Accepted"<<endl;
+		//debugLog << "Transform Accepted"<<endl;
 		return S_OK;
 	} else {
 		return VFW_E_TYPE_NOT_ACCEPTED;
@@ -185,11 +185,11 @@
 	}
 }
 HRESULT CMMLDecodeFilter::Transform(IMediaSample* inSample, IMediaSample* outSample) {
-	inSample->AddRef();
-	debugLog<<"In sample ref count = "<<inSample->Release();
+	//inSample->AddRef();
+	//debugLog<<"In sample ref count = "<<inSample->Release();
 
-	outSample->AddRef();
-	debugLog<<"Out sample ref count = "<<outSample->Release();
+	//outSample->AddRef();
+	//debugLog<<"Out sample ref count = "<<outSample->Release();
 
 	unsigned long locSize = inSample->GetActualDataLength();
 	char* locCMML = NULL;
@@ -204,13 +204,13 @@
 
 	LONGLONG locStart, locEnd;
 	inSample->GetTime(&locStart, &locEnd);
-	debugLog<<"Input Sample Time : "<<locStart<<" to "<<locEnd<<endl;
+	//debugLog<<"Input Sample Time : "<<locStart<<" to "<<locEnd<<endl;
 	LONGLONG locSampleTime = locStart;
 	inSample->GetMediaTime(&locStart, &locEnd);
-	debugLog<<"Input Sample Media Time : "<<locStart<<" to "<<locEnd<<endl;
+	//debugLog<<"Input Sample Media Time : "<<locStart<<" to "<<locEnd<<endl;
 	locSampleTime -= locStart;
-	debugLog<<"Corrected Sample time = "<<locSampleTime<<endl;
-	debugLog<<"Transform : Input Sample Size = "<<locSize<<endl;
+	//debugLog<<"Corrected Sample time = "<<locSampleTime<<endl;
+	//debugLog<<"Transform : Input Sample Size = "<<locSize<<endl;
 	if (locSize > 0) {
 		locCMML = new char[locSize+1];
 		locCMML[locSize] = '\0';
@@ -257,7 +257,7 @@
 				locTextStr = locClipTag.anchor()->text();
 				memcpy((void*)locOutBuff, (const void*) locTextStr.c_str(), locTextSize);
 				
-				debugLog << "               : Clip Text = "<<locTextStr<<endl;
+				//debugLog << "               : Clip Text = "<<locTextStr<<endl;
 				locOutBuff[locTextSize] = '\0';
 				outSample->SetActualDataLength(locTextSize + 1);
 				//debugLog<<"Setting Sample time "<<locClipTag.start()<<endl;
@@ -273,19 +273,19 @@
 				}
 
 			} else {
-				debugLog<<"          : Parse FAILED"<<endl;
+				//debugLog<<"          : Parse FAILED"<<endl;
 				delete locCMML;
 				return S_FALSE;
 			}
 		}
 
-		debugLog<<"Returning... "<<endl<<endl;
+		//debugLog<<"Returning... "<<endl<<endl;
 		delete locCMML;
 		return S_OK;
 
 	} else {
 		//Zero length Sample... Blank out... Don't send.
-		debugLog<<"Zero length sample..."<<endl;
+		//debugLog<<"Zero length sample..."<<endl;
 		outSample->SetActualDataLength(0);
 		//debugLog<<"Setting Sample time "<<locClipTag.start()<<endl;
 		//LONGLONG locSampleTime = ;

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLDecoder/CMMLDecodeFilter.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -71,7 +71,7 @@
 	C_HeadTag* mHeadTag;
 	ICMMLCallbacks* mCMMLCallbacks;
 
-	fstream debugLog;
+	//fstream debugLog;
 	
 
 };
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -46,4 +46,37 @@
 	} else {
 		return NULL;
 	}
+}
+
+//IAMFilterMiscFlags Interface
+ULONG CMMLRawSourceFilter::GetMiscFlags(void) {
+	return AM_FILTER_MISC_FLAGS_IS_SOURCE;
+}
+
+	//IFileSource Interface
+STDMETHODIMP CMMLRawSourceFilter::GetCurFile(LPOLESTR* outFileName, AM_MEDIA_TYPE* outMediaType) {
+	//Return the filename and mediatype of the raw data
+
+	 
+	LPOLESTR x = SysAllocString(mFileName.c_str());
+	*outFileName = x;
+	
+	return S_OK;
+}
+
+//ANX::: Seek table will need modifying to handle this.
+STDMETHODIMP CMMLRawSourceFilter::Load(LPCOLESTR inFileName, const AM_MEDIA_TYPE* inMediaType) {
+	//Initialise the file here and setup all the streams
+	CAutoLock locLock(m_pLock);
+	mFileName = inFileName;
+
+
+	
+	return S_OK;
+}
+
+STDMETHODIMP CMMLRawSourceFilter::NonDelegatingQueryInterface(REFIID riid, void **ppv)
+{
+
+	return CBaseFilter::NonDelegatingQueryInterface(riid, ppv); 
 }
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourceFilter.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -1,20 +1,37 @@
 #pragma once
 
+#include <string>
+using namespace std;
 
-
 class CMMLRawSourcePin;
 
 class CMMLRawSourceFilter
 	:	public CBaseFilter
+	,	public IFileSourceFilter
+	,	public IAMFilterMiscFlags
 {
 public:
+	DECLARE_IUNKNOWN
+	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
+
 	CMMLRawSourceFilter(void);
 	virtual ~CMMLRawSourceFilter(void);
 
 	static CUnknown* WINAPI CreateInstance(LPUNKNOWN pUnk, HRESULT *pHr);
 
+	//IBaseFilter Pure Virtuals
 	virtual int GetPinCount();
 	virtual CBasePin* GetPin(int inPinNo);
+
+	//IAMFilterMiscFlags Interface
+	ULONG STDMETHODCALLTYPE GetMiscFlags(void);
+	//
+
+	//IFileSource Interface
+	virtual STDMETHODIMP GetCurFile(LPOLESTR* outFileName, AM_MEDIA_TYPE* outMediaType);
+	virtual STDMETHODIMP Load(LPCOLESTR inFileName, const AM_MEDIA_TYPE* inMediaType);
+
 protected:
 	CMMLRawSourcePin* mCMMLSourcePin;
+	wstring mFileName;
 };

Modified: trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -66,7 +66,7 @@
 	virtual HRESULT DeliverEndFlush(void);
 	virtual HRESULT DeliverBeginFlush(void);
 protected:
-	fstream debugLog;
+	//fstream debugLog;
 	HRESULT mFilterHR;
 	COutputQueue* mDataQueue;
 	sCMMLFormatBlock* mCMMLFormatBlock;

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -52,10 +52,11 @@
 	return mRoot;
 }
 void C_CMMLDoc::setRoot(C_CMMLRootTag* inRootTag) {
+	delete mRoot;
 	mRoot = inRootTag;
 }
 string C_CMMLDoc::toString() {
 	string retStr = mPreamble->toString();
 	retStr += mRoot->toString();
 	return retStr;
-}
\ No newline at end of file
+}

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLTags/C_CMMLDoc.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -151,6 +151,8 @@
 protected:
 	C_CMMLPreamble* mPreamble;
 	C_CMMLRootTag* mRoot;
+
+
 	//bool mIsStreamReady;
 	//bool mIsEOF;
 	//bool mIsStreamError;

Modified: trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/codecs/cmml/libWinCMMLParse/CMMLParser.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -78,6 +78,7 @@
 	MSXML2::IXMLDOMNode* retNode = NULL;
 	
 	locHR = inDoc->selectSingleNode(locQuery, &retNode);
+	
 
     SysFreeString(locQuery);
 	return retNode;

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -47,7 +47,7 @@
 	,	mSeekTimeBase(0)
 {
 	//ConstructCodec();
-	debugLog.open("g:\\logs\\aad.log", ios_base::out);
+	//debugLog.open("g:\\logs\\aad.log", ios_base::out);
 	mAcceptableMediaType = inAcceptMediaType;
 	mStreamLock = new CCritSec;
 
@@ -105,7 +105,7 @@
 AbstractAudioDecodeInputPin::~AbstractAudioDecodeInputPin(void)
 {
 	//DestroyCodec();
-	debugLog.close();
+	//debugLog.close();
 	delete mStreamLock;
 }
 
@@ -132,8 +132,8 @@
 STDMETHODIMP AbstractAudioDecodeInputPin::Receive(IMediaSample* inSample) 
 {
 	//
-	inSample->AddRef();
-	debugLog<<"Received Sample with refcount = "<<inSample->Release()<<endl;
+	//inSample->AddRef();
+	//debugLog<<"Received Sample with refcount = "<<inSample->Release()<<endl;
 	//
 	//TO DO::: Fix this up...
 	CAutoLock locLock(mStreamLock);
@@ -182,7 +182,7 @@
 			}
 		}
 	} else {
-		debugLog<<"NOT STREAMING.... "<<endl;
+		//debugLog<<"NOT STREAMING.... "<<endl;
 		return locHR;
 	}
 	

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAbstractAudioDecoder/AbstractAudioDecodeInputPin.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -96,7 +96,7 @@
 	AbstractAudioDecodeFilter* mParentFilter;
 	CMediaType* mAcceptableMediaType;
 
-	fstream debugLog;
+	//fstream debugLog;
 	CCritSec* mStreamLock;
 	CCritSec* mFilterLock;
 

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -43,7 +43,7 @@
 										wstring inPinName) 
 											:	OggDemuxSourcePin(inObjectName, inParentFilter, inFilterLock, inHeaderSource, inMediaType, inPinName, true)
 {
-	debugLog.open("G:\\logs\\cmml_source_pin.log", ios_base::out);
+	//debugLog.open("G:\\logs\\cmml_source_pin.log", ios_base::out);
 }
 
 CMMLSourcePin::~CMMLSourcePin(void)
@@ -155,8 +155,8 @@
 	IMediaSample* locSample = NULL;
 	REFERENCE_TIME locStart = inPacket->endTime() * 10000;   //CMML Changes here.
 	REFERENCE_TIME locStop = inPacket->endTime() * 10000;
-	debugLog<<"Start   : "<<locStart<<endl;
-	debugLog<<"End     : "<<locStop<<endl;
+	//debugLog<<"Start   : "<<locStart<<endl;
+	//debugLog<<"End     : "<<locStop<<endl;
 	DbgLog((LOG_TRACE, 2, "Getting Buffer in Source Pin..."));
 	//DbgLog((LOG_TRACE, 2, ""));
 
@@ -166,7 +166,7 @@
 	if (locHR != S_OK) {
 		DbgLog((LOG_TRACE, 2, "Getting Delivery Buff FAILED"));
 		//Stopping, fluching or error
-		debugLog<<"Failure... No buffer"<<endl;
+		//debugLog<<"Failure... No buffer"<<endl;
 		return false;
 	}
 
@@ -193,12 +193,12 @@
 		locHR = mDataQueue->Receive(locSample);
 		
 		if (locHR != S_OK) {
-			debugLog << "Failure... Queue rejected sample..."<<endl;
+			//debugLog << "Failure... Queue rejected sample..."<<endl;
 			//Stopping ??
 			return false;
 			
 		} else {
-			debugLog<<"Delivery OK"<<endl;
+			//debugLog<<"Delivery OK"<<endl;
 			return true;
 		}
 	} else {

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLSourcePin.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -61,5 +61,5 @@
 	virtual bool CMMLSourcePin::deliverOggPacket(StampedOggPacket* inPacket);
 
 protected:
-	fstream debugLog;
+	//fstream debugLog;
 };

Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/CMMLStream.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -92,10 +92,10 @@
 }
 
 void CMMLStream::setLastEndGranPos(__int64 inPos) {
-	debugLog<<"CMML Stream Reset : inPos = "<<inPos<<"   --  last end gran = ";
-	debugLog<<"gran rate = "<<mCMMLFormatBlock->granuleNumerator<<" / "<<mCMMLFormatBlock->granuleDenominator<<endl;
+	//debugLog<<"CMML Stream Reset : inPos = "<<inPos<<"   --  last end gran = ";
+	//debugLog<<"gran rate = "<<mCMMLFormatBlock->granuleNumerator<<" / "<<mCMMLFormatBlock->granuleDenominator<<endl;
 	mLastEndGranulePos = ((inPos * mCMMLFormatBlock->granuleNumerator) / mCMMLFormatBlock->granuleDenominator)/ UNITS;
-	debugLog<<mLastEndGranulePos<<endl;
+	//debugLog<<mLastEndGranulePos<<endl;
 	//osDebug<<"Vorbis sets End Gran : "<<mLastEndGranulePos<<endl;
 }
 unsigned long CMMLStream::getFormatBlockSize() {

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -35,7 +35,7 @@
 	:	mBufferLock(NULL)
 {
 	mBufferLock = new CCritSec;
-	debugLog.open("G:\\logs\\httpdebug.log", ios_base::out);
+	//debugLog.open("G:\\logs\\httpdebug.log", ios_base::out);
 	//fileDump.open("G:\\filedump.ogg", ios_base::out|ios_base::binary);
 
 
@@ -45,32 +45,32 @@
 
 HTTPFileSource::~HTTPFileSource(void)
 {
-	debugLog<<"Winsock ended"<<endl;
-	debugLog.close();
+	//debugLog<<"Winsock ended"<<endl;
+	//debugLog.close();
 	//fileDump.close();
 	delete mBufferLock;
 	
 }
 
 void HTTPFileSource::DataProcessLoop() {
-	debugLog<<"DataProcessLoop: "<<endl;
+	//debugLog<<"DataProcessLoop: "<<endl;
 	int locNumRead = 0;
 	char* locBuff = NULL;
 	const unsigned long RECV_BUFF_SIZE = 1024;
 	locBuff = new char[RECV_BUFF_SIZE];
 	while(true) {
-		debugLog<<"About to call recv"<<endl;
+		//debugLog<<"About to call recv"<<endl;
 		locNumRead = recv(mSocket, locBuff, RECV_BUFF_SIZE, 0);
-		debugLog<<"recv complete"<<endl;
+		//debugLog<<"recv complete"<<endl;
 		if (locNumRead == SOCKET_ERROR) {
 			int locErr = WSAGetLastError();
-			debugLog<<"Socket error receiving - Err No = "<<locErr<<endl;
+			//debugLog<<"Socket error receiving - Err No = "<<locErr<<endl;
 			mWasError = true;
 			break;
 		}
 
 		if (locNumRead == 0) {
-			debugLog<<"Read last bytes..."<<endl;
+			//debugLog<<"Read last bytes..."<<endl;
 			mIsEOF = true;
 			delete locBuff;
 			return;
@@ -78,14 +78,14 @@
 
 		{//CRITICAL SECTION - PROTECTING BUFFER STATE
 			CAutoLock locLock(mBufferLock);
-			debugLog <<"Num Read = "<<locNumRead<<endl;
+			//debugLog <<"Num Read = "<<locNumRead<<endl;
 			if (mSeenResponse) {
 				//Add to buffer
 				bool locWriteOK = mFileCache.write((const unsigned char*)locBuff, locNumRead);
 				if (locWriteOK) {
-					debugLog<<"Added to cache "<<locNumRead<<" bytes."<<endl;
+					//debugLog<<"Added to cache "<<locNumRead<<" bytes."<<endl;
 				} else {
-					debugLog<<"Write to cache failed.."<<endl;
+					//debugLog<<"Write to cache failed.."<<endl;
 				}
 				//Dump to file
 				//fileDump.write(locBuff, locNumRead);
@@ -95,7 +95,7 @@
 				size_t locPos = locTemp.find("\r\n\r\n");
 				if (locPos != string::npos) {
 					//Found the break
-					debugLog<<"locPos = "<<locPos<<endl;
+					//debugLog<<"locPos = "<<locPos<<endl;
 					mSeenResponse = true;
 					mLastResponse = locTemp.substr(0, locPos);
 					char* locBuff2 = locBuff + locPos + 4;  //View only - don't delete.
@@ -108,10 +108,10 @@
 					
 
 					if(locWriteOK) {
-						debugLog<<"Added to Buffer "<<locNumRead - (locPos+4)<<" bytes... first after response."<<endl;
+						//debugLog<<"Added to Buffer "<<locNumRead - (locPos+4)<<" bytes... first after response."<<endl;
 						
 					} else {
-						debugLog<<"Buffering failure..."<<endl;
+						//debugLog<<"Buffering failure..."<<endl;
 					}
 
 					//size_t locG, locP;
@@ -159,7 +159,7 @@
 	//Close the socket down
 	//Open up a new one to the same place.
 	//Make the partial content request.
-	debugLog<<"Seeking to "<<inPos<<endl;
+	//debugLog<<"Seeking to "<<inPos<<endl;
 	if (mFileCache.readSeek(inPos)) {
 		return inPos;
 	} else {
@@ -186,7 +186,7 @@
 	//
 	mSeenResponse = false;
 	mLastResponse = "";
-	debugLog<<"Open: "<<inSourceLocation<<endl;
+	//debugLog<<"Open: "<<inSourceLocation<<endl;
 
 	{ //CRITICAL SECTION - PROTECTING STREAM BUFFER
 		CAutoLock locLock(mBufferLock);
@@ -198,28 +198,39 @@
 		//TODO::: Get rid of this path.
 		
 		//string locCacheFileName = "filecache.dat";
+		
+		//Init rand number generator
+		LARGE_INTEGER locTicks;
+		QueryPerformanceCounter(&locTicks);
+		srand((unsigned int)locTicks.LowPart);
+
+		int locRand = rand();
+
 		string locCacheFileName = getenv("TEMP");
-		debugLog<<"Temp = "<<locCacheFileName<<endl;
-		locCacheFileName += "\\filecache.dat";
-		debugLog<<"Cache file  = "<<locCacheFileName<<endl;
+		//debugLog<<"Temp = "<<locCacheFileName<<endl;
+		locCacheFileName += "\\filecache";
+		
+		locCacheFileName += StringHelper::numToString(locRand);
+		locCacheFileName += ".ogg";
+		//debugLog<<"Cache file  = "<<locCacheFileName<<endl;
 		if(mFileCache.open(locCacheFileName)) {
-			debugLog<<"OPEN : Cach file opened"<<endl;
+			//debugLog<<"OPEN : Cach file opened"<<endl;
 		}
 	} //END CRITICAL SECTION
 
 	bool locIsOK = setupSocket(inSourceLocation);
 
 	if (!locIsOK) {
-		debugLog<<"Setup socket FAILED"<<endl;
+		//debugLog<<"Setup socket FAILED"<<endl;
 		closeSocket();
 		return false;
 	}
 
-	debugLog<<"Sending request..."<<endl;
+	//debugLog<<"Sending request..."<<endl;
 
 	//How is filename already set ??
 	httpRequest(assembleRequest(mFileName));
-	debugLog<<"Socket ok... starting thread"<<endl;
+	//debugLog<<"Socket ok... starting thread"<<endl;
 	locIsOK = startThread();
 
 
@@ -236,12 +247,12 @@
 		unsigned long locSizeBuffed = mFileCache.bytesAvail();;
 	
 
-		debugLog<<"isEOF : Amount Buffered avail = "<<locSizeBuffed<<endl;
+		//debugLog<<"isEOF : Amount Buffered avail = "<<locSizeBuffed<<endl;
 		if ((locSizeBuffed == 0) && mIsEOF) {
-			debugLog<<"isEOF : It is EOF"<<endl;
+			//debugLog<<"isEOF : It is EOF"<<endl;
 			return true;
 		} else {
-			debugLog<<"isEOF : It's not EOF"<<endl;
+			//debugLog<<"isEOF : It's not EOF"<<endl;
 			return false;
 		}
 	} //END CRITICAL SECTION
@@ -254,9 +265,9 @@
 	{ //CRITICAL SECTION - PROTECTING STREAM BUFFER
 		CAutoLock locLock(mBufferLock);
 		
-		debugLog<<"Read:"<<endl;
+		//debugLog<<"Read:"<<endl;
 		if((mFileCache.bytesAvail() == 0) || mWasError) {
-			debugLog<<"read : Can't read is error or eof"<<endl;
+			//debugLog<<"read : Can't read is error or eof"<<endl;
 			return 0;
 		} else {
 			//debugLog<<"Reading from buffer"<<endl;
@@ -266,7 +277,7 @@
 				mStreamBuffer.clear();
 			}*/
 
-			debugLog<<locNumRead<<" bytes read from buffer"<<endl;
+			//debugLog<<locNumRead<<" bytes read from buffer"<<endl;
 			return locNumRead;
 		}
 	} //END CRITICAL SECTION

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -75,7 +75,7 @@
 	//stringstream mStreamBuffer;
 	SingleMediaFileCache mFileCache;
 
-	fstream debugLog;
+	//fstream debugLog;
 	//fstream fileDump;
 
 

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -37,7 +37,7 @@
 	,	mIsOpen(false)
 	,	mSeenResponse(false)
 {
-	debugLog2.open("G:\\logs\\httpsocket.log", ios_base::out);
+	//debugLog2.open("G:\\logs\\httpsocket.log", ios_base::out);
 
 	//Setup the socket API
 	WORD locWinsockVersion = MAKEWORD(1,1);
@@ -47,18 +47,18 @@
 	locRet = WSAStartup(locWinsockVersion, &locWinsockData);
 	if ((locRet != 0) || (locWinsockData.wVersion != locWinsockVersion)) {
 		//Failed to setup.
-		debugLog2<<"Failed to start winsock V "<<locWinsockData.wVersion<<endl;
+		//debugLog2<<"Failed to start winsock V "<<locWinsockData.wVersion<<endl;
 		WSACleanup();
 		throw 0;
 	}
 
-	debugLog2<<"Winsock started"<<endl;
+	//debugLog2<<"Winsock started"<<endl;
 }
 
 HTTPSocket::~HTTPSocket(void)
 {
-	debugLog2<<"Winsock ended"<<endl;
-	debugLog2.close();
+	//debugLog2<<"Winsock ended"<<endl;
+	//debugLog2.close();
 	
 	WSACleanup();
 }
@@ -66,7 +66,7 @@
 
 bool HTTPSocket::setupSocket(string inSourceLocation) {
 	
-	debugLog2<<"Setup Socket:"<<endl;
+	//debugLog2<<"Setup Socket:"<<endl;
 	IN_ADDR locAddress;  //iaHost
 	LPHOSTENT locHostData;;  //lpHost
 
@@ -84,14 +84,14 @@
 
 
 	if (locHostData == NULL) {
-		debugLog2<<"LocHostData is NULL"<<endl;
+		//debugLog2<<"LocHostData is NULL"<<endl;
 		//Failed
 		return false;
 	}
 
 	mSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if (mSocket == INVALID_SOCKET) {
-		debugLog2<<"Socket Invalid"<<endl;
+		//debugLog2<<"Socket Invalid"<<endl;
 		//Failed
 		return false;
 	}
@@ -121,7 +121,7 @@
 	int locRetVal = 0;
 	locRetVal = connect(mSocket, (LPSOCKADDR)&locServiceSocketAddr, sizeof(SOCKADDR_IN));
 	if (locRetVal == SOCKET_ERROR) {
-		debugLog2<<"Failed to connect..."<<endl;
+		//debugLog2<<"Failed to connect..."<<endl;
 		closesocket(mSocket);
 		return false;
 	}
@@ -134,16 +134,16 @@
 string HTTPSocket::assembleRequest(string inFilePath) {
 	string retRequest;
 	retRequest = "GET " + inFilePath+ " HTTP/1.1\n" + "Host: " + mServerName+ "\n\n";
-	debugLog2<<"Assembled Req : "<<endl<<retRequest<<endl;
+	//debugLog2<<"Assembled Req : "<<endl<<retRequest<<endl;
 	return retRequest;
 }
 
 bool HTTPSocket::httpRequest(string inRequest) {
-	debugLog2<<"Http Request:"<<endl;
+	//debugLog2<<"Http Request:"<<endl;
 	int locRetVal = send(mSocket, inRequest.c_str(), (int)inRequest.length(), 0);
 
 	if (locRetVal == SOCKET_ERROR) {
-		debugLog2<<"Socket error on send"<<endl;
+		//debugLog2<<"Socket error on send"<<endl;
 		closesocket(mSocket);
 		return false;
 	}
@@ -151,7 +151,7 @@
 }
 
 bool HTTPSocket::splitURL(string inURL) {
-	debugLog2<<"Split url:"<<endl;
+	//debugLog2<<"Split url:"<<endl;
 	string locProtocol;
 	string locServerName;
 	string locPath;
@@ -198,11 +198,11 @@
 	} else {
 		mPort = 0;
 	}
-	debugLog2<<"Proto : "<<locProtocol<<endl<<"Server : "<<locServerName<<endl<<" Path : "<<mFileName<<" Port : "<<mPort<<endl;
+	//debugLog2<<"Proto : "<<locProtocol<<endl<<"Server : "<<locServerName<<endl<<" Path : "<<mFileName<<" Port : "<<mPort<<endl;
 	return true;
 
 }
 void HTTPSocket::closeSocket() {
-	debugLog2<<"Close Socket:"<<endl;
+	//debugLog2<<"Close Socket:"<<endl;
 	closesocket(mSocket);
 }
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPSocket.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -56,6 +56,6 @@
 	bool mIsOpen;
 	bool mSeenResponse;
 
-	fstream debugLog2;
+	//fstream debugLog2;
 
 };

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -113,7 +113,7 @@
 	mDemuxLock = new CCritSec;
 	mStreamLock = new CCritSec;
 	mStreamMapper = new OggStreamMapper(this);
-	debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
+	//debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
 	//debugLog << "**************** Starting LOg ********************"<<endl;
 
 }
@@ -132,7 +132,7 @@
 	mDemuxLock = new CCritSec;
 	mStreamLock = new CCritSec;
 
-	debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
+	//debugLog.open("g:\\logs\\sourcelog.log", ios_base::out);
 	//When it is derived, it's up to the superclass to set this.
 	//mStreamMapper = new OggStreamMapper(this);
 
@@ -287,7 +287,7 @@
 	CAutoLock locLock(m_pLock);
 	
 	if (mSeekTable->enabled())  {
-		debugLog<<"SetPos : Current = "<<*pCurrent<<" Flags = "<<dwCurrentFlags<<" Stop = "<<*pStop<<" dwStopFlags = "<<dwStopFlags<<endl;
+		//debugLog<<"SetPos : Current = "<<*pCurrent<<" Flags = "<<dwCurrentFlags<<" Stop = "<<*pStop<<" dwStopFlags = "<<dwStopFlags<<endl;
 		//debugLog<<"       : Delivering begin flush..."<<endl;
 
 	
@@ -315,7 +315,7 @@
 		*pCurrent	= mSeekTimeBase 
 					= mSeekTable->getRealStartPos();
 
-		debugLog<<"Corrected pCurrent : "<<mSeekTimeBase<<endl;
+		//debugLog<<"Corrected pCurrent : "<<mSeekTimeBase<<endl;
 		for (unsigned long i = 0; i < mStreamMapper->numStreams(); i++) {
 			mStreamMapper->getOggStream(i)->setSendExcess(locSendExcess);		//Not needed
 			mStreamMapper->getOggStream(i)->setLastEndGranPos(*pCurrent);
@@ -533,7 +533,7 @@
 }
 
 void OggDemuxSourceFilter::DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) {
-	debugLog<<"DeliverNewSegment : Delivering start = "<<tStart<<" end = "<< tStop<<"rate = "<<dRate<<endl;
+	//debugLog<<"DeliverNewSegment : Delivering start = "<<tStart<<" end = "<< tStop<<"rate = "<<dRate<<endl;
 
 
 	IReferenceClock* locRefClock = NULL;
@@ -549,7 +549,7 @@
 	}
 }
 HRESULT OggDemuxSourceFilter::DataProcessLoop() {
-	debugLog<<"Starting DataProcessLoop :"<<endl;
+	//debugLog<<"Starting DataProcessLoop :"<<endl;
 	DWORD locCommand = 0;
 	char* locBuff = new  char[4096];
 	bool locKeepGoing = true;

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -77,7 +77,7 @@
 	virtual ~OggDemuxSourceFilter(void);
 
 	//IAMFilterMiscFlags Interface
-	ULONG STDMETHODCALLTYPE OggDemuxSourceFilter::GetMiscFlags(void);
+	ULONG STDMETHODCALLTYPE GetMiscFlags(void);
 	//
 
 	//IFileSource Interface

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -51,7 +51,7 @@
 	//Need to do something here !
 	mSerialNo = inBOSPage->header()->StreamSerialNo();
 	string locLogName = "G:\\logs\\oggstream" + StringHelper::numToString(mSerialNo) + ".log";
-	debugLog.open(locLogName.c_str(), ios_base::out);
+	//debugLog.open(locLogName.c_str(), ios_base::out);
 	mStreamLock = new CCritSec;
 	//This may need to be moved to derived class
 	//Yep, Sure did !
@@ -64,8 +64,8 @@
 
 OggStream::~OggStream(void)
 {
-	debugLog<<"Destructor..."<<endl;
-	debugLog.close();
+	//debugLog<<"Destructor..."<<endl;
+	//debugLog.close();
 	delete mSourcePin;
 	delete mCodecHeaders;
 	//delete mPartialPacket;
@@ -210,13 +210,13 @@
 
 void OggStream::setLastEndGranPos(__int64 inGranPos) {
 	//osDebug<<"*************************** ERROR ERROR ERROR **********************"<<endl;
-	debugLog<<"*************************** ERROR ERROR ERROR **********************"<<endl;
+	//debugLog<<"*************************** ERROR ERROR ERROR **********************"<<endl;
 	mLastEndGranulePos = inGranPos;
 }
 bool OggStream::acceptOggPage(OggPage* inOggPage) {
 	//FIX::: Add proper error checking.
 
-	debugLog<<"acceptOggPage : "<<endl<<inOggPage->header()->toString()<<endl<<endl;;
+	//debugLog<<"acceptOggPage : "<<endl<<inOggPage->header()->toString()<<endl<<endl;;
 	//StampedOggPacket* locPacket = NULL;
 	////osDebug<<"New page sets start gran to "<<mLastEndGranulePos<<endl;
 	mLastStartGranulePos = mLastEndGranulePos;
@@ -243,7 +243,7 @@
 
 //ANX::: Maybe also needs override. ??
 bool OggStream::dispatchPacket(StampedOggPacket* inPacket) {
-	debugLog<<"Ogg Stream : Packet stamps = "<<inPacket->startTime()<<" - "<<inPacket->endTime()<<endl;
+	//debugLog<<"Ogg Stream : Packet stamps = "<<inPacket->startTime()<<" - "<<inPacket->endTime()<<endl;
 	return mSourcePin->deliverOggPacket(inPacket);
 }
 

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggStream.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -117,5 +117,5 @@
 	OggDemuxSourceFilter* mOwningFilter;
 	CCritSec* mStreamLock;
 
-	fstream debugLog;
+	//fstream debugLog;
 };

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SingleMediaFileCache.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SingleMediaFileCache.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SingleMediaFileCache.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -36,23 +36,23 @@
 	,	mIsComplete(false)
 	,	mReadPtr(0)
 {
-	debugLog.open("G:\\logs\\mediacache.log", ios_base::out);
+	//debugLog.open("G:\\logs\\mediacache.log", ios_base::out);
 }
 
 SingleMediaFileCache::~SingleMediaFileCache(void)
 {
-	debugLog.close();
+	//debugLog.close();
 }
 
 bool SingleMediaFileCache::open(string inFileName) {
 	mBytesWritten = 0;
-	debugLog<<"Opening "<<inFileName<<endl;
+	//debugLog<<"Opening "<<inFileName<<endl;
 	mLocalFile.open(inFileName.c_str(), ios_base::in|ios_base::out|ios_base::binary|ios_base::trunc);
 
 	if (mLocalFile.is_open()) {
-		debugLog<<"File open...."<<endl;
+		//debugLog<<"File open...."<<endl;
 	} else {
-		debugLog<<"File open FAILED"<<endl;
+		//debugLog<<"File open FAILED"<<endl;
 	}
 	return mLocalFile.is_open();
 }
@@ -61,9 +61,9 @@
 	
 }
 bool SingleMediaFileCache::write(const unsigned char* inBuff, unsigned long inBuffSize) {
-	debugLog<<"Writeing "<<inBuffSize<<endl;
-	debugLog<<"Read Ptr = "<<mLocalFile.tellg();
-	debugLog<<"Write Ptr = "<<mLocalFile.tellp();
+	//debugLog<<"Writeing "<<inBuffSize<<endl;
+	//debugLog<<"Read Ptr = "<<mLocalFile.tellg();
+	//debugLog<<"Write Ptr = "<<mLocalFile.tellp();
 	mLocalFile.seekp(0, ios_base::end);
 	if (inBuffSize != 0) {
 		mLocalFile.write((const char*)inBuff, inBuffSize);
@@ -71,35 +71,35 @@
 	}
 
 	if (mLocalFile.fail()) {
-		debugLog<<"*** Write put into FAIL"<<endl;
+		//debugLog<<"*** Write put into FAIL"<<endl;
 	}
 	return !(mLocalFile.fail());
 }
 unsigned long SingleMediaFileCache::read(unsigned char* outBuff, unsigned long inBuffSize) {
-	debugLog<<"Read request for "<<inBuffSize<<"  got ";
-	debugLog<<"Read Ptr = "<<mLocalFile.tellg();
-	debugLog<<"Write Ptr = "<<mLocalFile.tellp();
+	//debugLog<<"Read request for "<<inBuffSize<<"  got ";
+	//debugLog<<"Read Ptr = "<<mLocalFile.tellg();
+	//debugLog<<"Write Ptr = "<<mLocalFile.tellp();
 	mLocalFile.seekg(mReadPtr);
 	unsigned long locBytesAvail = bytesAvail();
 	if (locBytesAvail >= inBuffSize) {
         mLocalFile.read((char*)outBuff, inBuffSize);
-        debugLog<<mLocalFile.gcount()<<endl;
+        //debugLog<<mLocalFile.gcount()<<endl;
 		mReadPtr+=mLocalFile.gcount();
 		return mLocalFile.gcount();
 	} else if (locBytesAvail > 0) {
 		mLocalFile.read((char*)outBuff, locBytesAvail);
-		debugLog<<locBytesAvail<<endl;
+		//debugLog<<locBytesAvail<<endl;
 		mReadPtr += locBytesAvail;
 		return locBytesAvail;
 	} else {
-		debugLog << "NOTHING"<<endl;
+		//debugLog << "NOTHING"<<endl;
 		return 0;
 	}
 	
 }
 bool SingleMediaFileCache::readSeek(unsigned long inSeekPos) {
 	if (inSeekPos < mBytesWritten) {
-		debugLog<<"Seeking to "<<inSeekPos<<endl;
+		//debugLog<<"Seeking to "<<inSeekPos<<endl;
 		mReadPtr = inSeekPos;
 		return true;
 	} else {
@@ -112,12 +112,12 @@
 }
 unsigned long SingleMediaFileCache::bytesAvail() {
 	if (mLocalFile.fail()) {
-		debugLog<<"bytesAvail : File is in fail state"<<endl;
+		//debugLog<<"bytesAvail : File is in fail state"<<endl;
 	}
-	debugLog<<"bytesAvail : Byteswritten = "<<mBytesWritten<<endl;
+	//debugLog<<"bytesAvail : Byteswritten = "<<mBytesWritten<<endl;
 	//if ((!mLocalFile.fail()) && (mBytesWritten > 0)) {
 	if (mBytesWritten > 0) {
-		debugLog<<"bytes Avail = "<<mBytesWritten - mReadPtr<<endl;
+		//debugLog<<"bytes Avail = "<<mBytesWritten - mReadPtr<<endl;
 		return mBytesWritten - mReadPtr;
 	} else {
 		return 0;

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SingleMediaFileCache.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SingleMediaFileCache.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/SingleMediaFileCache.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -62,6 +62,6 @@
 	unsigned long mBytesWritten;
 	unsigned long mReadPtr;
 	
-	fstream debugLog;
+	//fstream debugLog;
 	bool mIsComplete;
 };

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/TheoraStream.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -87,7 +87,7 @@
 }
 
 void TheoraStream::setLastEndGranPos(__int64 inPos) {
-	debugLog<<"Theora inPos: "<<inPos<<endl;
+	//debugLog<<"Theora inPos: "<<inPos<<endl;
 	LONGLONG locFrameDuration = (UNITS * mTheoraFormatBlock->frameRateDenominator) / (mTheoraFormatBlock->frameRateNumerator);
 
 	LONGLONG locAbsFramePos = inPos / locFrameDuration;
@@ -98,7 +98,7 @@
 	//LONGLONG locAbsFramePos = ((mLastSeenStartGranPos >> locFilter->mTheoraFormatInfo->maxKeyframeInterval) * locMod) + locInterFrameNo;
 	//REFERENCE_TIME locTimeBase = ((locAbsFramePos * mFrameDuration) - locThis->mSeekTimeBase;
 	//mLastEndGranulePos = (inPos * (__int64)mSpeexFormatBlock->samplesPerSec)/ UNITS;
-	debugLog<<"Theora sets End Gran : "<<mLastEndGranulePos<<endl;
+	//debugLog<<"Theora sets End Gran : "<<mLastEndGranulePos<<endl;
 }
 BYTE* TheoraStream::getFormatBlock() {
 

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/VorbisStream.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -71,9 +71,9 @@
 }
 
 void VorbisStream::setLastEndGranPos(__int64 inPos) {
-	debugLog<<"Vorbis inPos = "<<inPos<<endl;
+	//debugLog<<"Vorbis inPos = "<<inPos<<endl;
 	mLastEndGranulePos = (inPos * (__int64)mVorbisFormatBlock->samplesPerSec)/ UNITS;
-	debugLog<<"Vorbis sets End Gran : "<<mLastEndGranulePos<<endl;
+	//debugLog<<"Vorbis sets End Gran : "<<mLastEndGranulePos<<endl;
 }
 unsigned long VorbisStream::getFormatBlockSize() {
 	return sizeof(sVorbisFormatBlock);

Modified: trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.cpp	2004-08-30 19:08:38 UTC (rev 7666)
@@ -64,13 +64,13 @@
 	,	mVideoWindow(NULL)
 	,	mWindowLess(NULL)
 {
-	debugLog.open("G:\\logs\\vmr9_subs.log", ios_base::out);
+	//debugLog.open("G:\\logs\\vmr9_subs.log", ios_base::out);
 	//mOutputPin = new SubtitleVMR9OutputPin(this, m_pLock, NAME("SubtitleVMR9OutputPin"), L"Subtitle Out");
 }
 
 SubtitleVMR9Filter::~SubtitleVMR9Filter(void)
 {
-	debugLog.close();
+	//debugLog.close();
 }
 
 STDMETHODIMP SubtitleVMR9Filter::GetState(DWORD dw, FILTER_STATE *pState)
@@ -98,12 +98,12 @@
 	return S_OK;
 }
 HRESULT SubtitleVMR9Filter::DoRenderSample(IMediaSample* inMediaSample) {
-	debugLog<<"DoRenderSample : "<<endl;
+	//debugLog<<"DoRenderSample : "<<endl;
 	LONGLONG locStart, locEnd;
 	inMediaSample->GetTime(&locStart, &locEnd);
-	debugLog<<"DoRenderSample : Time = "<<locStart<<" to "<<locEnd<<endl;
+	//debugLog<<"DoRenderSample : Time = "<<locStart<<" to "<<locEnd<<endl;
 	inMediaSample->GetMediaTime(&locStart, &locEnd);
-	debugLog<<"DoRenderSample : Media Time = "<<locStart<<" to "<<locEnd<<endl;
+	//debugLog<<"DoRenderSample : Media Time = "<<locStart<<" to "<<locEnd<<endl;
 	static int c = 0;
 	const int hm = 50;
 	if (mBitmapMixer == NULL) {
@@ -114,7 +114,7 @@
 		IBaseFilter* locVMR9 = NULL;
 		HRESULT locHR = locFilterGraph->FindFilterByName(L"Video Mixing Renderer 9", &locVMR9);
 		if (locVMR9 != NULL) {
-			debugLog<<"DoRenderSample : Getting VMR9 pointer..."<<endl;
+			//debugLog<<"DoRenderSample : Getting VMR9 pointer..."<<endl;
 			HRESULT locHR = locVMR9->QueryInterface(IID_IVMRMixerBitmap9, (void**)&mBitmapMixer);
 			locHR = locVMR9->QueryInterface(IID_IVMRWindowlessControl9, (void**)&mWindowLess);
 
@@ -156,19 +156,19 @@
 			locStr = new char[inMediaSample->GetActualDataLength()];
 			memcpy((void*)locStr, (const void*) locBuff, inMediaSample->GetActualDataLength());
 			string x = locStr;
-			debugLog<<"DoRenderSample : Subtile = "<<x<<endl;
+			//debugLog<<"DoRenderSample : Subtile = "<<x<<endl;
 			SetSubtitle(x);
-			debugLog<<"DoRenderSample : SetSubtitle Returns"<<endl<<endl;
+			//debugLog<<"DoRenderSample : SetSubtitle Returns"<<endl<<endl;
 			delete locStr;
 		} else {
-			debugLog<<"DoRenderSample : Clearing Subtitle..."<<endl;
+			//debugLog<<"DoRenderSample : Clearing Subtitle..."<<endl;
 			SetSubtitle("");
 		}
 
 
 		return S_OK;
 	}
-	debugLog<<"DoRenderSample : NEVER SHOULD BE HERE !!!!!!"<<endl;
+	//debugLog<<"DoRenderSample : NEVER SHOULD BE HERE !!!!!!"<<endl;
 }
 
 
@@ -387,7 +387,7 @@
     DeleteObject(hbm);
     DeleteDC(hdcBmp);
 
-	debugLog<<"SetSubtitle : End of method: hr = "<<hr<<endl;
+	//debugLog<<"SetSubtitle : End of method: hr = "<<hr<<endl;
     return hr;
 }
 

Modified: trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/src/lib/core/directshow/dsfSubtitleVMR9/SubtitleVMR9Filter.h	2004-08-30 19:08:38 UTC (rev 7666)
@@ -89,6 +89,6 @@
 	VMR9AlphaBitmap mAlphaBitmap;
 
 	//debug only
-	fstream debugLog;
+	//fstream debugLog;
 	//
 };

Modified: trunk/oggdsf/website/index.html
===================================================================
--- trunk/oggdsf/website/index.html	2004-08-30 16:47:23 UTC (rev 7665)
+++ trunk/oggdsf/website/index.html	2004-08-30 19:08:38 UTC (rev 7666)
@@ -78,6 +78,7 @@
 <br>
 <br>
 <b><u>Known issues.</u></b><br>
+	<li>I've been told that the installer tries to force you to install .NET if you don't already have it... the filters don't need .NET, it's only for the example player application. The next version will fix this installation problem</li>
 	<li>FLAC seems to lose the first 1/2 second of audio if you stop then play again</li>
 	<li>Realised I broke the limited network streaming the previous version had. Don't try and stream anything. This is already resolved and will be in the next version coming soon.</li>
 	<li>Seeking is slightly less responsive in this latest version. Most noticable in speex.</li>



More information about the commits mailing list