[xiph-commits] r6898 - in trunk/oggdsf: sln/oggdsf_all

illiminable at dactyl.lonelymoon.com illiminable
Sun Jun 27 11:28:37 PDT 2004


src/lib/core/directshow/dsfOggDemux src/tools src/tools/CLOgg
Message-ID: <20040627182837.DBAAE9AAAB at dactyl.lonelymoon.com>

Author: illiminable
Date: Sun Jun 27 11:28:37 2004
New Revision: 6898

Added:
trunk/oggdsf/src/tools/CLOgg/
trunk/oggdsf/src/tools/CLOgg/CLOgg.cpp
trunk/oggdsf/src/tools/CLOgg/CLOgg.vcproj
trunk/oggdsf/src/tools/CLOgg/ReadMe.txt
trunk/oggdsf/src/tools/CLOgg/stdafx.cpp
trunk/oggdsf/src/tools/CLOgg/stdafx.h
Modified:
trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/DataSourceFactory.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/DataSourceFactory.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.h
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/IFilterDataSource.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
Log:
* Inconsistent state...
* Fleshed out the sockets code.
* Included a command line media play CLogg... way cooler than a wooden shoe.

Modified: trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/sln/oggdsf_all/oggdsf_all.sln	2004-06-27 18:28:35 UTC (rev 6898)
@@ -71,6 +71,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OOOggCommentDump", "..\..\src\tools\OOOggCommentDump\OOOggCommentDump.vcproj", "{43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLOgg", "..\..\src\tools\CLOgg\CLOgg.vcproj", "{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}"
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
ConfigName.0 = Debug
@@ -161,285 +163,315 @@
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.22 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.23 = {AE32588D-2807-4796-9E68-C9104817BC1A}
{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.24 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.25 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.26 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.27 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.28 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.29 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.30 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.31 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.32 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.33 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.34 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.35 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.36 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.37 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.38 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.39 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.40 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.41 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.42 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.43 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.44 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.45 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.46 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.47 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.48 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.49 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.50 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.51 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.52 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.53 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.54 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.55 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.56 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.57 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.58 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.59 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.60 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.61 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.62 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.63 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.64 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.65 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.66 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.67 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.68 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.69 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.70 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.71 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.72 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.73 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.74 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.75 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.76 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.77 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.78 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.79 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.80 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.81 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.82 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.83 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.84 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.85 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.86 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.87 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.88 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.89 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.90 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.91 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.92 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.93 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.94 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.95 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.96 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.97 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.98 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.99 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.100 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.101 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.102 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.103 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.104 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.105 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.106 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.107 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.108 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.109 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.110 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.111 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.112 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.113 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.114 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.115 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.116 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.117 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.118 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.119 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.120 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.121 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.122 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.123 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.124 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.125 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.126 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.127 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.128 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.129 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.130 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.131 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.132 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.133 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.134 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.135 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.136 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.137 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.138 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.139 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.140 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.141 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.142 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.143 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.144 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.145 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.146 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.147 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.148 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.149 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.150 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.151 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.152 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.153 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.154 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.155 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.156 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.157 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.158 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.159 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.160 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.161 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.162 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.163 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.164 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.165 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.166 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.167 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.168 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.169 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.170 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.171 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.172 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.173 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.174 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.175 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.176 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.177 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.178 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.179 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.180 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.181 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.182 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.183 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.184 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.185 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.186 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.187 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.188 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.189 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.190 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.191 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.192 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.193 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.194 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.195 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.196 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.197 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.198 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.199 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.200 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.201 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.202 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.203 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.204 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.205 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.206 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.207 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.208 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.209 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.210 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.211 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.212 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.213 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.214 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.215 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.216 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.217 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.218 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.219 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.220 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.221 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.222 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.223 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.224 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.225 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.226 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.227 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.228 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.229 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.230 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.231 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.232 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.233 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.234 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.235 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.236 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.237 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.238 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.239 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.240 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.241 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.242 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.243 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.244 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.245 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.246 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.247 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.248 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.249 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.250 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.251 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.252 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.253 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.254 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.255 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.256 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.257 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.258 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.259 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.260 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.261 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.262 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.263 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.264 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.265 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.266 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.267 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.268 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.269 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.270 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.271 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.272 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.273 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.274 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.275 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.276 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.277 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.278 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.279 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.280 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.281 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.282 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.283 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.284 = {AE32588D-2807-4796-9E68-C9104817BC1A}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.285 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.286 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.287 = {A882A968-3013-4A27-B653-E18CF5C791FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.288 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.289 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.290 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.291 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.292 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.293 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.294 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.295 = {4906E533-2864-4840-ABC1-00CD844623EB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.296 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.297 = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.298 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.299 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.300 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.301 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.302 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
-		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.303 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.25 = {DC4D86E2-72C1-4995-8FB1-0F08655E620A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.26 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.27 = {43DE5FC7-7E6F-43FE-AD8A-FBBA7AF5D139}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.28 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.29 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.30 = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.31 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.32 = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.33 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.34 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.35 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.36 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.37 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.38 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.39 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.40 = {6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.41 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.42 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.43 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.44 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.45 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.46 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.47 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.48 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.49 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.50 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.51 = {88532BA9-1EED-421F-84BF-88A7A87FB2D3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.52 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.53 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.54 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.55 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.56 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.57 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.58 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.59 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.60 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.61 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.62 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.63 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.64 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.65 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.66 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.67 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.68 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.69 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.70 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.71 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.72 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.73 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.74 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.75 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.76 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.77 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.78 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.79 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.80 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.81 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.82 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.83 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.84 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.85 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.86 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.87 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.88 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.89 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.90 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.91 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.92 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.93 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.94 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.95 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.96 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.97 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.98 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.99 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.100 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.101 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.102 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.103 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.104 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.105 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.106 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.107 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.108 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.109 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.110 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.111 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.112 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.113 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.114 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.115 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.116 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.117 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.118 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.119 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.120 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.121 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.122 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.123 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.124 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.125 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.126 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.127 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.128 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.129 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.130 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.131 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.132 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.133 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.134 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.135 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.136 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.137 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.138 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.139 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.140 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.141 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.142 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.143 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.144 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.145 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.146 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.147 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.148 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.149 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.150 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.151 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.152 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.153 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.154 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.155 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.156 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.157 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.158 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.159 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.160 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.161 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.162 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.163 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.164 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.165 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.166 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.167 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.168 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.169 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.170 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.171 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.172 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.173 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.174 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.175 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.176 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.177 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.178 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.179 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.180 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.181 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.182 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.183 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.184 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.185 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.186 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.187 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.188 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.189 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.190 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.191 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.192 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.193 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.194 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.195 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.196 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.197 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.198 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.199 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.200 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.201 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.202 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.203 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.204 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.205 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.206 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.207 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.208 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.209 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.210 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.211 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.212 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.213 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.214 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.215 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.216 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.217 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.218 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.219 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.220 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.221 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.222 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.223 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.224 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.225 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.226 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.227 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.228 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.229 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.230 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.231 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.232 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.233 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.234 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.235 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.236 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.237 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.238 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.239 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.240 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.241 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.242 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.243 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.244 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.245 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.246 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.247 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.248 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.249 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.250 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.251 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.252 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.253 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.254 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.255 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.256 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.257 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.258 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.259 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.260 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.261 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.262 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.263 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.264 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.265 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.266 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.267 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.268 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.269 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.270 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.271 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.272 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.273 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.274 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.275 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.276 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.277 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.278 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.279 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.280 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.281 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.282 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.283 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.284 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.285 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.286 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.287 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.288 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.289 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.290 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.291 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.292 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.293 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.294 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.295 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.296 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.297 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.298 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.299 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.300 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.301 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.302 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.303 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.304 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.305 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.306 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.307 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.308 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.309 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.310 = {D74A626E-C8CB-4787-913E-2E637FC04F2B}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.311 = {C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.312 = {AE0ABDB0-AE3B-4C38-843B-3408A6B87BA4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.313 = {2394BCBD-BAE8-443F-A65C-6BFDDD42D7CA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.314 = {AE32588D-2807-4796-9E68-C9104817BC1A}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.315 = {6B548F29-04A2-4F61-946F-72B86B4845DA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.316 = {95720FE9-89D5-4DCD-9A75-EE73BDF58AB2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.317 = {A882A968-3013-4A27-B653-E18CF5C791FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.318 = {F9F22B14-22FE-4651-81B8-5AE267A6B189}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.319 = {419E0701-9C9A-4671-B3B6-79FA206DEE25}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.320 = {DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.321 = {A0004AEB-B47C-4A0A-8FE7-4F65B5FD48FA}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.322 = {FB373486-0E6E-4BB6-8BF2-1F92EACA1468}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.323 = {BE48BAC3-F0DE-47AA-8192-C2A52798E0E5}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.324 = {A3BFBA6A-9B45-44C3-8FB0-A16FA2D9E487}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.325 = {4906E533-2864-4840-ABC1-00CD844623EB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.326 = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.327 = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.328 = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.329 = {11CBDFD6-0D73-40C0-95DF-997C5FD873F2}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.330 = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.331 = {3FB9B20E-790A-402F-A02C-B0FBDC5938E3}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.332 = {48CFEC13-E2BC-412F-8ECA-29090C7193B6}
+		{3214DF66-3E46-4E44-BF9D-BC7502B88C29}.333 = {73D3CA81-3BDC-42F1-8456-76224F6B337C}
{48CFEC13-E2BC-412F-8ECA-29090C7193B6}.0 = {223ACC19-608E-4E1B-A054-067F0CACB272}
{F9F22B14-22FE-4651-81B8-5AE267A6B189}.0 = {AE32588D-2807-4796-9E68-C9104817BC1A}
{F9F22B14-22FE-4651-81B8-5AE267A6B189}.1 = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
@@ -816,6 +848,16 @@
{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
+		{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
+		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Debug Unicode.Build.0 = Debug|Win32
+		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.MakeFile.ActiveCfg = Release|Win32
+		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.MakeFile.Build.0 = Release|Win32
+		{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}.Release.ActiveCfg = Release|Win32
+		{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
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/DataSourceFactory.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/DataSourceFactory.cpp	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/DataSourceFactory.cpp	2004-06-27 18:28:35 UTC (rev 6898)
@@ -1,3 +1,33 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//  notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
#include "StdAfx.h"
#include "datasourcefactory.h"

@@ -17,7 +47,7 @@
return new FilterFileSource;
} else if (locType == "http") {
//Http stream
-		return NULL;
+		return new HTTPFileSource;
} else {
//Something else
return NULL;

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/DataSourceFactory.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/DataSourceFactory.h	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/DataSourceFactory.h	2004-06-27 18:28:35 UTC (rev 6898)
@@ -1,7 +1,38 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//  notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
#pragma once
#include "IFilterDataSource.h"
#include "FilterFileSource.h"
-class DataSourceFactory
+#include "HTTPFileSource.h"
+class OGG_DEMUX_API DataSourceFactory
{
public:
DataSourceFactory(void);

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.cpp	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.cpp	2004-06-27 18:28:35 UTC (rev 6898)
@@ -1,3 +1,33 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//  notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
#include "StdAfx.h"
#include "filterfilesource.h"


Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.h	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/FilterFileSource.h	2004-06-27 18:28:35 UTC (rev 6898)
@@ -1,3 +1,33 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//  notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
#pragma once

#include <fstream>

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.cpp	2004-06-27 18:28:35 UTC (rev 6898)
@@ -1,3 +1,33 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//  notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
#include "StdAfx.h"
#include "httpfilesource.h"

@@ -6,6 +36,7 @@
,	mIsEOF(false)
,	mIsOpen(false)
{
+	debugLog.open("G:\\httpdebug.log", ios_base::out);
WORD locWinsockVersion = MAKEWORD(1,1);
WSADATA locWinsockData;
int locRet= 0;
@@ -13,21 +44,25 @@
locRet = WSAStartup(locWinsockVersion, &locWinsockData);
if ((locRet != 0) || (locWinsockData.wVersion != locWinsockVersion)) {
//Failed to setup.
+		debugLog<<"Failed to start winsock V "<<locWinsockData.wVersion<<endl;
WSACleanup();
throw 0;
}

+	debugLog<<"Winsock started"<<endl;


+
}

HTTPFileSource::~HTTPFileSource(void)
{
+	debugLog<<"Winsock ended"<<endl;
WSACleanup();
}

void HTTPFileSource::DataProcessLoop() {
-
+	debugLog<<"DataProcessLoop: "<<endl;
int locNumRead = 0;
char* locBuff = NULL;
const unsigned long RECV_BUFF_SIZE = 4096;
@@ -36,16 +71,19 @@

locNumRead = recv(mSocket, locBuff, RECV_BUFF_SIZE, 0);
if (locNumRead == SOCKET_ERROR) {
+			debugLog<<"Socket error receiving"<<endl;
mWasError = true;
break;
}

if (locNumRead == 0) {
+			debugLog<<"Read last bytes..."<<endl;
mIsEOF = true;
break;
}
-		//Add to buffer
+        //Add to buffer
mStreamBuffer.write(locBuff, locNumRead);
+		debugLog<<"Added to buffer "<<locNumRead<<" bytes."<<endl;
}

delete locBuff;
@@ -55,7 +93,7 @@

bool HTTPFileSource::setupSocket(string inSourceLocation) {

-
+	debugLog<<"Setup Socket:"<<endl;
IN_ADDR locAddress;  //iaHost
LPHOSTENT locHostData;;  //lpHost

@@ -73,12 +111,14 @@


if (locHostData == NULL) {
+		debugLog<<"LocHostData is NULL"<<endl;
//Failed
return false;
}

mSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (mSocket = INVALID_SOCKET) {
+		debugLog<<"Socket Invalid"<<endl;
//Failed
return false;
}
@@ -103,6 +143,7 @@
int locRetVal = 0;
locRetVal = connect(mSocket, (LPSOCKADDR)&locServiceSocketAddr, sizeof(SOCKADDR_IN));
if (locRetVal == SOCKET_ERROR) {
+		debugLog<<"Failed to connect..."<<endl;
closesocket(mSocket);
return false;
}
@@ -113,16 +154,18 @@
}

bool HTTPFileSource::httpRequest(string inRequest) {
-
+	debugLog<<"Http Request:"<<endl;
int locRetVal = send(mSocket, inRequest.c_str(), inRequest.length(), 0);

if (locRetVal == SOCKET_ERROR) {
+		debugLog<<"Socket error on send"<<endl;
closesocket(mSocket);
return false;
}
+	return true;
}
DWORD HTTPFileSource::ThreadProc(void) {
-
+	debugLog<<"ThreadProc:"<<endl;
while(true) {
DWORD locThreadCommand = GetRequest();

@@ -149,13 +192,48 @@
//Close the socket down
//Open up a new one to the same place.
//Make the partial content request.
+	debugLog<<"Seek ::::: EOROR NOT IMPL"<<endl;
return 0;
}

bool HTTPFileSource::splitURL(string inURL) {
-	return false;
+	debugLog<<"Split url:"<<endl;
+	string locProtocol;
+	string locServerName;
+	string locPath;
+	string locTemp;
+	size_t locPos2;
+	size_t locPos = inURL.find(':');
+	if (locPos == string::npos) {
+		//No colon... not a url or file... failure.
+		return false;
+	} else {
+		locProtocol = inURL.substr(0, locPos);
+		locTemp = inURL.substr(locPos+1);
+		locPos = locTemp.find("//");
+		if ((locPos == string::npos) || (locPos != 0)) {
+			return false;
+		} else {
+            locTemp = locTemp.substr(locPos+2);
+			locPos = locTemp.find('/');
+			if (locPos == string::npos) {
+				return false;
+			} else {
+				locServerName = locTemp.substr(0, locPos);
+				locPath = locTemp.substr(locPos+1);
+			}
+		}
+
+	}
+
+	mServerName = locServerName;
+	mFileName = locPath;
+	debugLog<<"Proto : "<<locProtocol<<endl<<"Server : "<<locServerName<<endl<<"Path : "<<mFileName<<endl;
+	return true;
+
}
void HTTPFileSource::closeSocket() {
+	debugLog<<"Close Socket:"<<endl;
closesocket(mSocket);
}
void HTTPFileSource::close() {
@@ -174,12 +252,15 @@
//Open network connection and start feeding data into a buffer
//

+	debugLog<<"Open:"<<endl;
bool locIsOK = setupSocket(inSourceLocation);

if (!locIsOK) {
+		debugLog<<"Setup socket FAILED"<<endl;
closeSocket();
return false;
}
+	debugLog<<"Socket ok... starting thread"<<endl;
locIsOK = startThread();


@@ -191,21 +272,28 @@
mWasError = false;
}
bool HTTPFileSource::isEOF() {
+
if ((mStreamBuffer.tellp() - mStreamBuffer.tellg() == 0) && mIsEOF) {
+		debugLog<<"It is EOF"<<endl;
return true;
} else {
+		debugLog<<"It's not EOF"<<endl;
return false;
}
}
unsigned long HTTPFileSource::read(char* outBuffer, unsigned long inNumBytes) {
//Reads from the buffer, will return 0 if nothing in buffer.
// If it returns 0 check the isEOF flag to see if it was the end of file or the network is just slow.
-
-	if(mIsEOF || mWasError) {
+	debugLog<<"Read:"<<endl;
+	if(isEOF() || mWasError) {
+		debugLog<<"Can't read is error or eof"<<endl;
return 0;
} else {
+		debugLog<<"Reading from buffer"<<endl;
mStreamBuffer.read(outBuffer, inNumBytes);
-		return mStreamBuffer.gcount();
+		unsigned long locNumRead = mStreamBuffer.gcount();
+		debugLog<<locNumRead<<" bytes read from buffer"<<endl;
+		return locNumRead;
}

}

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/HTTPFileSource.h	2004-06-27 18:28:35 UTC (rev 6898)
@@ -1,3 +1,33 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//  notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
#pragma once
#include "oggdllstuff.h"
#include <winsock.h>
@@ -3,4 +33,6 @@
//#include <stdlib.h>
#include <string>
+#include <sstream>
+#include <fstream>
using namespace std;
class OGG_DEMUX_API HTTPFileSource
@@ -43,6 +75,7 @@
SOCKET mSocket;
stringstream mStreamBuffer;

+	fstream debugLog;
bool mIsEOF;
bool mWasError;
bool mIsOpen;

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/IFilterDataSource.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/IFilterDataSource.h	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/IFilterDataSource.h	2004-06-27 18:28:35 UTC (rev 6898)
@@ -1,5 +1,36 @@
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//  notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
#pragma once
-
+#include <string>
+using namespace std;
class OGG_DEMUX_API IFilterDataSource
{
public:

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/OggDemuxSourceFilter.h	2004-06-27 18:28:35 UTC (rev 6898)
@@ -49,6 +49,7 @@
public IFileSourceFilter,
public IOggCallback
,	public BasicSeekable
+	,
{
public:
friend class OggStream;

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggDemux/dsfOggDemux.vcproj	2004-06-27 18:28:35 UTC (rev 6898)
@@ -26,11 +26,11 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"
CallingConvention="2"
-				DisableSpecificWarnings="4255;4251"
+				DisableSpecificWarnings="4255;4251;4275"
ShowIncludes="FALSE"/>
<Tool
Name="VCCustomBuildTool"/>

Added: trunk/oggdsf/src/tools/CLOgg/CLOgg.cpp
===================================================================
--- trunk/oggdsf/src/tools/CLOgg/CLOgg.cpp	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/tools/CLOgg/CLOgg.cpp	2004-06-27 18:28:35 UTC (rev 6898)
@@ -0,0 +1,61 @@
+//===========================================================================
+//Copyright (C) 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//  notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+// CLOgg.cpp : Command line minimalist audio player.
+//
+
+#include "stdafx.h"
+#include <dshow.h>
+#include <windows.h>
+#include <iostream>
+using namespace std;
+int __cdecl _tmain(int argc, _TCHAR* argv[])
+{
+	IGraphBuilder* locGraphBuilder = NULL;
+	IMediaControl* locMediaControl = NULL;
+	HRESULT locHR;
+	CoInitialize(NULL);
+	locHR = CoCreateInstance(CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, IID_IGraphBuilder, (void **)&locGraphBuilder);
+	locHR = locGraphBuilder->RenderFile(L"http://www.illiminable.com/th/m.mp3", NULL);
+
+	locHR = locGraphBuilder->QueryInterface(IID_IMediaControl, (void**)&locMediaControl);
+
+	locHR = locMediaControl->Run();
+
+	int x;
+	cin>>x;
+	locMediaControl->Release();
+	locGraphBuilder->Release();
+	CoUninitialize();
+
+	return 0;
+}
+

Added: trunk/oggdsf/src/tools/CLOgg/CLOgg.vcproj
===================================================================
--- trunk/oggdsf/src/tools/CLOgg/CLOgg.vcproj	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/tools/CLOgg/CLOgg.vcproj	2004-06-27 18:28:35 UTC (rev 6898)
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="CLOgg"
+	ProjectGUID="{9FAC2038-9D4F-4309-B79F-CF7C32BEE60F}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"
+				CallingConvention="2"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="strmiids.lib"
+				OutputFile="$(OutDir)/CLOgg.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/CLOgg.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="FALSE"
+				OptimizeForProcessor="2"
+				OptimizeForWindowsApplication="FALSE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"
+				CallingConvention="2"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="strmiids.lib"
+				OutputFile="$(OutDir)/CLOgg.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+			<File
+				RelativePath="CLOgg.cpp">
+			</File>
+			<File
+				RelativePath="stdafx.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc">
+			<File
+				RelativePath="stdafx.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+		<File
+			RelativePath="ReadMe.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: trunk/oggdsf/src/tools/CLOgg/ReadMe.txt
===================================================================
--- trunk/oggdsf/src/tools/CLOgg/ReadMe.txt	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/tools/CLOgg/ReadMe.txt	2004-06-27 18:28:35 UTC (rev 6898)
@@ -0,0 +1,32 @@
+========================================================================
+    CONSOLE APPLICATION : CLOgg Project Overview
+========================================================================
+
+AppWizard has created this CLOgg application for you.
+This file contains a summary of what you will find in each of the files that
+make up your CLOgg application.
+
+
+CLOgg.vcproj
+    This is the main project file for VC++ projects generated using an Application Wizard.
+    It contains information about the version of Visual C++ that generated the file, and
+    information about the platforms, configurations, and project features selected with the
+    Application Wizard.
+
+CLOgg.cpp
+    This is the main application source file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+    These files are used to build a precompiled header (PCH) file
+    named CLOgg.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////

Added: trunk/oggdsf/src/tools/CLOgg/stdafx.cpp
===================================================================
--- trunk/oggdsf/src/tools/CLOgg/stdafx.cpp	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/tools/CLOgg/stdafx.cpp	2004-06-27 18:28:35 UTC (rev 6898)
@@ -0,0 +1,39 @@
+//===========================================================================
+//Copyright (C) 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//  notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+// stdafx.cpp : source file that includes just the standard includes
+// CLOgg.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file

Added: trunk/oggdsf/src/tools/CLOgg/stdafx.h
===================================================================
--- trunk/oggdsf/src/tools/CLOgg/stdafx.h	2004-06-27 09:09:45 UTC (rev 6897)
+++ trunk/oggdsf/src/tools/CLOgg/stdafx.h	2004-06-27 18:28:35 UTC (rev 6898)
@@ -0,0 +1,43 @@
+//===========================================================================
+//Copyright (C) 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+//  notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+//  notice, this list of conditions and the following disclaimer in the
+//  documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+//  may be used to endorse or promote products derived from this software
+//  without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+#include <stdio.h>
+#include <tchar.h>
+
+// TODO: reference additional headers your program requires here



More information about the commits mailing list